when i try to emerge xorg-x11-6.8.0-r4.ebuild or xorg-x11-6.8.1.901.ebuild on my xbox emerge dies when it tries top applie the xbox patch. * 9990_x86_6.8.0-xbox-20041024.patch ... * Failed Patch: 9990_x86_6.8.0-xbox-20041024.patch! * * Include in your bugreport the contents of: * * /var/tmp/portage/xorg-x11-6.8.1.901/temp/9990_x86_6.8.0-xbox-20041024.patch-32571.out Reproducible: Always Steps to Reproduce: 1. use the xbox profile 2. emerge xorg-x11 Actual Results: * Failed Patch: 9990_x86_6.8.0-xbox-20041024.patch! * * Include in your bugreport the contents of: * * /var/tmp/portage/xorg-x11-6.8.0-r4/temp/9990_x86_6.8.0-xbox-20041024.patch-2486.out Portage 2.0.51-r3 (default-linux/x86/xbox, gcc-3.3.4, glibc-2.3.4.20040808-r1, 2.6.8-xbox i686) ================================================================= System uname: 2.6.8-xbox i686 Celeron (Coppermine) Gentoo Base System version 1.4.16 Autoconf: sys-devel/autoconf-2.59-r5 Automake: sys-devel/automake-1.8.5-r1 Binutils: sys-devel/binutils-2.15.90.0.1.1-r3 Headers: sys-kernel/linux26-headers-2.6.8.1-r1 Libtools: sys-devel/libtool-1.5.2-r7 ACCEPT_KEYWORDS="x86" AUTOCLEAN="yes" CFLAGS="-O3 -march=pentium3 -fomit-frame-pointer -pipe" CHOST="i686-pc-linux-gnu" COMPILER="" CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3/share/config /usr/share/config /var/qmail/control" CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d" CXXFLAGS="-O3 -march=pentium3 -fomit-frame-pointer -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="autoaddcvs autoconfig ccache distlocks sandbox sfperms" GENTOO_MIRRORS="ftp://pandemonium.tiscali.de/pub/gentoo/ http://ftp-stud.fht-esslingen.de/pub/Mirrors/gentoo/ http://pandemonium.tiscali.de/pub/gentoo/ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/gentoo/" MAKEOPTS="-j1" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/local/portage" SYNC="rsync://rsync16.de.gentoo.org/gentoo-merged" USE="x86 X aalib acl alsa avi berkdb bitmap-fonts crypt cups directfb divx4linux dvd dvdnav encode fbcon fbdev flac foomaticdb fortran gdbm gif gpm ipv6 jpeg libwww lirc mad mikmod miknod mmx motif mpeg ncurses nls oggvorbis opengl oss pam pdflib perl png python quicktime readline sdl slang spell sse ssl svga tcpd truetype vdr xml2 xv zlib"
Created attachment 47728 [details] log of the failed attempt to patch xorg
Please supply an updated patch that applies cleanly.
Created attachment 47812 [details] xorg-x11/xorg-x11-6.8.0-r4.ebuild The ebbuild is just for testing the patches, since they are not included into the xorg patchset.
Created attachment 47813 [details] xorg-x11/files/9990_x86_6.8.0-nvxbox-20050107.patch This patch adds the Xbox nvdriver
Created attachment 47814 [details] xorg-x11/files/9991_x86_6.8.0-xbox-pci-20050107.patch This patch adds the OS Pci scanning support which is required for the xbox
Created attachment 47815 [details] xorg-x11/files/9992_x86_6.8.0-xbox-config-20050107.patch Patch for example xorg.conf
Created attachment 47816 [details] xorg-x11/files/digest-xorg-x11-6.8.0-r4
I have splitted the xbox support patch. 9990_x86_6.8.0-nvxbox-20050107.patch -> ist the driver itselfe 9991_x86_6.8.0-xbox-pci-20050107.patch -> os pci scanning support 9992_x86_6.8.0-xbox-config-20050107.patch -> xorg.conf patch for xbox Patching the original xorg nv driver is removed for the moment. The xbox support breaks the normal nv driver on a std pc. I'll provide a patch when i have fixed it. The patches schould not break xorg on standard architectures. At least the os pci scanning patch could be usefull on platforms or hardware where a pci scann with the xorg mechanism fails.
speaking as upstream, please feel free to also file these in Xorg's bugzilla: http://bugs.freedesktop.org/
Can you please add this patchset asap, people are beginning to complain that the old one is broken on the mailing list (one person who missed this bug report even supplied a patched version of the old patch). Ed, thanks for the patch, maybe you could try getting them included upstream as Adam suggested? Would make life easier in the future ;-)
I'll submit it to http://bugs.freedesktop.org/ when 6.8.2 gets released.
Is there any reason these should be in 2005.0, or can they wait til a day after the snapshot for 6.8.0-r4?
They can wait, 2005.0 doesn't affect xbox gentoo at all.
Very sorry about the delay on this, will get to it ASAP.
I was just hoping to add these to 6.8.1.904, but the pci patch fails.
I'll investigate in the problem and work out a new patch.
Created attachment 50699 [details] xorg-x11/xorg-x11-6.8.1.904.ebuild
Created attachment 50700 [details, diff] xorg-x11/files/9991_x86_6.8.1.904-xbox-pci-20050207.patch
Created attachment 50701 [details] xorg-x11/files/digest-xorg-x11-6.8.1.904
The patches works now with xorg 6.8.1.904.
I'll try to get to this within the next day or two. Thanks again, Edgar, for updating those.
Added 9990 and 9991 to 6.8.2. Thanks again for your patience.
