Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 117725 - mplayer-1.0.20060102 fails mplayer-mythtv.patch
Summary: mplayer-1.0.20060102 fails mplayer-mythtv.patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: x86 Linux
: High major
Assignee: Gentoo Media-video project
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-01-04 04:56 UTC by Peter Lindman
Modified: 2006-06-22 18:11 UTC (History)
3 users (show)

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


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Peter Lindman 2006-01-04 04:56:45 UTC
Building hard-masked package mplayer-1.0.20060102 fails mplayer-mythtv.patch:

Uncertain if this should be reported or not but figured that someone wants to know about it so here goes:

# emerge -av mplayer

These are the packages that I would merge, in order:

Calculating dependencies ...done!
[ebuild     U ] media-video/mplayer-1.0.20060102 [1.0_pre7-r1] -3dfx +3dnow +3dnowext +X +aac -aalib +alsa (-altivec) +arts +bidi -bindist -bl +cdparanoia +cpudetection -custom-cflags -debug -dga +directfb -doc -dts -dv +dvb +dvd +dvdread -edl +encode +esd -fbcon -ggi +gif +gtk -i8x0 -ipv6 +jack +joystick +jpeg -libcaca +lirc -live -livecd -lzo +mad +matroska -matrox +mmx -mmxext +mythtv +nas +nls +nvidia -opengl* -oss +png -real -rtc +samba +sdl +sse -sse2 -svga -tga +theora +truetype -v4l +v4l2 +vorbis +win32codecs -xanim +xinerama +xmms +xv +xvid -xvmc 0 kB

Total size of downloads: 0 kB

Do you want me to merge these packages? [Yes/No] y
>>> emerge (1 of 1) media-video/mplayer-1.0.20060102 to /
>>> md5 files   ;-) mplayer-1.0.20060102.ebuild
>>> md5 files   ;-) mplayer-1.0_pre7-r1.ebuild
>>> md5 files   ;-) files/mplayer-1.0_pre7-ppc64.patch
>>> md5 files   ;-) files/mplayer-1.0_pre7-gcc4-amd64.patch
>>> md5 files   ;-) files/mmst_fix_20050415.diff
>>> md5 files   ;-) files/mplayer-1.0_pre7-gcc_detection.patch
>>> md5 files   ;-) files/mplayer.desktop
>>> md5 files   ;-) files/mplayer-mythtv.patch
>>> md5 files   ;-) files/digest-mplayer-1.0.20060102
>>> md5 files   ;-) files/digest-mplayer-1.0_pre7-r1
>>> md5 files   ;-) files/rtsp_fix_20050415.diff
>>> md5 files   ;-) files/mplayer-1.0_pre7-gcc4.patch
>>> md5 src_uri ;-) mplayer-1.0.20060102.tar.bz2
>>> md5 src_uri ;-) font-arial-iso-8859-1.tar.bz2
>>> md5 src_uri ;-) font-arial-iso-8859-2.tar.bz2
>>> md5 src_uri ;-) font-arial-cp1250.tar.bz2
>>> md5 src_uri ;-) Blue-1.4.tar.bz2
>>> Unpacking source...
>>> Unpacking mplayer-1.0.20060102.tar.bz2 to /var/tmp/portage/mplayer-1.0.20060102/work
>>> Unpacking font-arial-iso-8859-1.tar.bz2 to /var/tmp/portage/mplayer-1.0.20060102/work
>>> Unpacking font-arial-iso-8859-2.tar.bz2 to /var/tmp/portage/mplayer-1.0.20060102/work
>>> Unpacking font-arial-cp1250.tar.bz2 to /var/tmp/portage/mplayer-1.0.20060102/work
>>> Unpacking Blue-1.4.tar.bz2 to /var/tmp/portage/mplayer-1.0.20060102/work
 * Applying mplayer-mythtv.patch ...

 * Failed Patch: mplayer-mythtv.patch !
 *  ( /usr/portage/media-video/mplayer/files/mplayer-mythtv.patch )
 *
 * Include in your bugreport the contents of:
 *
 *   /var/tmp/portage/mplayer-1.0.20060102/temp/mplayer-mythtv.patch-18954.out


!!! ERROR: media-video/mplayer-1.0.20060102 failed.
!!! Function epatch, Line 350, Exitcode 0
!!! Failed Patch: mplayer-mythtv.patch!
!!! If you need support, post the topmost build error, NOT this status message.


Contents of /var/tmp/portage/mplayer-1.0.20060102/temp/mplayer-mythtv.patch-18954.out:

***** mplayer-mythtv.patch *****

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

PATCH COMMAND:  patch -p0 -g0 --no-backup-if-mismatch < /usr/portage/media-video/mplayer/files/mplayer-mythtv.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 -ru MPlayer-0.90/libmpcodecs/native/nuppelvideo.c MPlayer-0.90+mdz/libmpcodecs/native/nuppelvideo.c
|--- MPlayer-0.90/libmpcodecs/native/nuppelvideo.c	2002-08-28 18:45:45.000000000 -0400
|+++ MPlayer-0.90+mdz/libmpcodecs/native/nuppelvideo.c	2003-04-07 09:49:51.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 35 Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ru MPlayer-0.90/libmpdemux/demux_nuv.c MPlayer-0.90+mdz/libmpdemux/demux_nuv.c
|--- MPlayer-0.90/libmpdemux/demux_nuv.c	2002-09-30 17:10:41.000000000 -0400
|+++ MPlayer-0.90+mdz/libmpdemux/demux_nuv.c	2003-04-07 09:50:30.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
7 out of 7 hunks ignored
can't find file to patch at input line 351 Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Only in MPlayer-0.90+mdz/libmpdemux: demux_nuv.c~ diff -ru 
|MPlayer-0.90/libmpdemux/nuppelvideo.h MPlayer-0.90+mdz/libmpdemux/nuppelvideo.h
|--- MPlayer-0.90/libmpdemux/nuppelvideo.h	2001-12-27 17:20:15.000000000 -0500
|+++ MPlayer-0.90+mdz/libmpdemux/nuppelvideo.h	2003-04-07 09:49:51.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
================================

PATCH COMMAND:  patch -p1 -g0 --no-backup-if-mismatch < /usr/portage/media-video/mplayer/files/mplayer-mythtv.patch

================================
patching file libmpcodecs/native/nuppelvideo.c Hunk #1 succeeded at 34 (offset 1 line).
Hunk #2 succeeded at 47 (offset 2 lines).
Hunk #3 succeeded at 95 (offset 2 lines).
patching file libmpdemux/demux_nuv.c
Hunk #1 succeeded at 18 with fuzz 2 (offset -25 lines).
Hunk #2 FAILED at 176.
Hunk #3 FAILED at 212.
Hunk #4 FAILED at 229.
Hunk #5 succeeded at 506 (offset 109 lines).
Hunk #6 succeeded at 522 with fuzz 2 (offset 109 lines).
Hunk #7 FAILED at 582.
4 out of 7 hunks FAILED -- saving rejects to file libmpdemux/demux_nuv.c.rej patching file libmpdemux/nuppelvideo.h Hunk #1 succeeded at 154 with fuzz 2 (offset 64 lines).
================================

PATCH COMMAND:  patch -p2 -g0 --no-backup-if-mismatch < /usr/portage/media-video/mplayer/files/mplayer-mythtv.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 -ru MPlayer-0.90/libmpcodecs/native/nuppelvideo.c MPlayer-0.90+mdz/libmpcodecs/native/nuppelvideo.c
|--- MPlayer-0.90/libmpcodecs/native/nuppelvideo.c	2002-08-28 18:45:45.000000000 -0400
|+++ MPlayer-0.90+mdz/libmpcodecs/native/nuppelvideo.c	2003-04-07 09:49:51.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 35 Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ru MPlayer-0.90/libmpdemux/demux_nuv.c MPlayer-0.90+mdz/libmpdemux/demux_nuv.c
|--- MPlayer-0.90/libmpdemux/demux_nuv.c	2002-09-30 17:10:41.000000000 -0400
|+++ MPlayer-0.90+mdz/libmpdemux/demux_nuv.c	2003-04-07 09:50:30.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
7 out of 7 hunks ignored
can't find file to patch at input line 351 Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Only in MPlayer-0.90+mdz/libmpdemux: demux_nuv.c~ diff -ru 
|MPlayer-0.90/libmpdemux/nuppelvideo.h MPlayer-0.90+mdz/libmpdemux/nuppelvideo.h
|--- MPlayer-0.90/libmpdemux/nuppelvideo.h	2001-12-27 17:20:15.000000000 -0500
|+++ MPlayer-0.90+mdz/libmpdemux/nuppelvideo.h	2003-04-07 09:49:51.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
================================

PATCH COMMAND:  patch -p3 -g0 --no-backup-if-mismatch < /usr/portage/media-video/mplayer/files/mplayer-mythtv.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 -ru MPlayer-0.90/libmpcodecs/native/nuppelvideo.c MPlayer-0.90+mdz/libmpcodecs/native/nuppelvideo.c
|--- MPlayer-0.90/libmpcodecs/native/nuppelvideo.c	2002-08-28 18:45:45.000000000 -0400
|+++ MPlayer-0.90+mdz/libmpcodecs/native/nuppelvideo.c	2003-04-07 09:49:51.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
missing header for unified diff at line 35 of patch can't find file to patch at input line 35 Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ru MPlayer-0.90/libmpdemux/demux_nuv.c MPlayer-0.90+mdz/libmpdemux/demux_nuv.c
|--- MPlayer-0.90/libmpdemux/demux_nuv.c	2002-09-30 17:10:41.000000000 -0400
|+++ MPlayer-0.90+mdz/libmpdemux/demux_nuv.c	2003-04-07 09:50:30.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
7 out of 7 hunks ignored
missing header for unified diff at line 351 of patch can't find file to patch at input line 351 Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Only in MPlayer-0.90+mdz/libmpdemux: demux_nuv.c~ diff -ru 
|MPlayer-0.90/libmpdemux/nuppelvideo.h MPlayer-0.90+mdz/libmpdemux/nuppelvideo.h
|--- MPlayer-0.90/libmpdemux/nuppelvideo.h	2001-12-27 17:20:15.000000000 -0500
|+++ MPlayer-0.90+mdz/libmpdemux/nuppelvideo.h	2003-04-07 09:49:51.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
================================

PATCH COMMAND:  patch -p4 -g0 --no-backup-if-mismatch < /usr/portage/media-video/mplayer/files/mplayer-mythtv.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 -ru MPlayer-0.90/libmpcodecs/native/nuppelvideo.c MPlayer-0.90+mdz/libmpcodecs/native/nuppelvideo.c
|--- MPlayer-0.90/libmpcodecs/native/nuppelvideo.c	2002-08-28 18:45:45.000000000 -0400
|+++ MPlayer-0.90+mdz/libmpcodecs/native/nuppelvideo.c	2003-04-07 09:49:51.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
missing header for unified diff at line 35 of patch can't find file to patch at input line 35 Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ru MPlayer-0.90/libmpdemux/demux_nuv.c MPlayer-0.90+mdz/libmpdemux/demux_nuv.c
|--- MPlayer-0.90/libmpdemux/demux_nuv.c	2002-09-30 17:10:41.000000000 -0400
|+++ MPlayer-0.90+mdz/libmpdemux/demux_nuv.c	2003-04-07 09:50:30.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
7 out of 7 hunks ignored
missing header for unified diff at line 351 of patch can't find file to patch at input line 351 Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Only in MPlayer-0.90+mdz/libmpdemux: demux_nuv.c~ diff -ru 
|MPlayer-0.90/libmpdemux/nuppelvideo.h MPlayer-0.90+mdz/libmpdemux/nuppelvideo.h
|--- MPlayer-0.90/libmpdemux/nuppelvideo.h	2001-12-27 17:20:15.000000000 -0500
|+++ MPlayer-0.90+mdz/libmpdemux/nuppelvideo.h	2003-04-07 09:49:51.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored


Best regards
Peter / Sweden
Comment 1 Peter Lindman 2006-01-04 04:57:55 UTC
Portage 2.0.53 (default-linux/x86/2005.1, gcc-3.3.6, glibc-2.3.5-r2, 2.6.13-gentoo-r5 i686)
=================================================================
System uname: 2.6.13-gentoo-r5 i686 AMD Athlon(tm) 64 X2 Dual Core Processor 3800+
Gentoo Base System version 1.6.13
dev-lang/python:     2.3.5, 2.4.2
sys-apps/sandbox:    1.2.12
sys-devel/autoconf:  2.13, 2.59-r6
sys-devel/automake:  1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r1
sys-devel/binutils:  2.15.92.0.2-r10
sys-devel/libtool:   1.5.20
virtual/os-headers:  2.6.11-r2
ACCEPT_KEYWORDS="x86"
AUTOCLEAN="yes"
CBUILD="i686-pc-linux-gnu"
CFLAGS="-O2 -pipe -march=athlon-xp"
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 /usr/share/texmf/dvipdfm/config/ /usr/share/texmf/dvips/config/ /usr/share/texmf/tex/generic/config/ /usr/share/texmf/tex/platex/config/ /usr/share/texmf/xdvi/ /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-O2 -pipe -march=athlon-xp"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoconfig distlocks sandbox sfperms strict"
GENTOO_MIRRORS="http://ftp.du.se/pub/os/gentoo http://ds.thn.htu.se/linux/gentoo http://mirror.pudas.net/gentoo ftp://ftp.du.se/pub/os/gentoo ftp://mirror.pudas.net/gentoo"
MAKEOPTS="-j4"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="3dnow 3dnowext X X509 a52 aac alsa apache2 apm arts artswrappersuid audiofile avi bash-completion berkdb bidi bitmap-fonts bootsplash bzip2 canna caps cdda cddb cdparanoia cdr cjk clamav cpdflib cpudetection crypt cscope css cups curl dbus dbx dio directfb dri dvb dvd dvdr dvdread eds encode escreen esd ethereal examples exif expat fam ffmpeg flac flash foomaticdb fortran ftp gd gdbm gdm gif gpm gstreamer gtk gtk2 idn imagemagick imap imlib innodb jack java javascript john joystick jpeg junit kde lcms ldap libclamav libg++ libwww lirc lm_sensors mad matroska mcve mhash mikmod mime ming mjpeg mmx mng motif mp3 mpeg mysql mysqli mythtv nas ncurses net netboot nls nptl nvidia ogg oggvorbis openal openntpd pam pcre pdflib perl php png python qt quicktime readline reiserfs samba sdl session smartcard snmp soap sockets spell spl sse ssl swat tcpd tetex theora threads tiff transcode truetype truetype-fonts type1-fonts udev usb v4l2 vcd vhosts vorbis win32codecs x86 xine xinerama xml xml2 xmms xv xvid xvidinfo zlib userland_GNU kernel_linux elibc_glibc"
Unset:  ASFLAGS, CTARGET, LANG, LC_ALL, LDFLAGS, LINGUAS
Comment 2 Alex Ainscow 2006-01-05 17:31:51 UTC
A brief look at what the mythtv patch does suggests that at least the majority of the changes have been checked in to the mplayer main code, thus this patch is no longer necessary.

>> I am quite new to this hole gentoo thing, so I am not going to check this in myself. <<

In the short term, you could simply remove the mythtv USE flag, but the following change needs to be made to the ebuild:

--- mplayer-1.0.20060102.ebuild     2006-01-03 11:35:49.000000000 +0000
+++ mplayer-1.0.20060102.ebuild.new 2006-01-06 01:24:28.000000000 +0000
@@ -8,7 +8,7 @@
 IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts bidi bl bindist
 cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dv
 dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca
-lirc live livecd lzo mad matroska matrox mmx mmxext mythtv nas nls nvidia
+lirc live livecd lzo mad matroska matrox mmx mmxext nas nls nvidia
 vorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype
 v4l v4l2 win32codecs X xanim xinerama xmms xv xvid xvmc"

@@ -148,9 +144,6 @@

        cd ${S}

-       #adds mythtv support to mplayer
-       use mythtv && epatch ${FILESDIR}/mplayer-mythtv.patch
-
        # Fix hppa compilation
        [ "${ARCH}" = "hppa" ] && sed -i -e "s/-O4/-O1/" "${S}/configure"

Comment 3 Luca Barbato gentoo-dev 2006-01-05 21:12:21 UTC
I'm about to remove that right now
Comment 4 Reimar Döffinger 2006-01-07 02:44:16 UTC
btw. I'm interested in samples that do not work with the parts applied to MPlayer - the parts that were not applied were just too ugly and I couldn't think of a good way to put them in.
btw2. in contrast to the original mythtv patch, the parts that are in MPlayer CVS now should also work on bigendian, though it could need some more testing.
Comment 5 Steve Dibb (RETIRED) gentoo-dev 2006-06-22 18:11:50 UTC
Should be fixed in newer versions, reopen if issue is still present

thanks all