/srv/irclogs.ubuntu.com/2008/05/10/#ubuntu-x.txt

bryceerf00:49
bryce$ git push00:49
brycePassword: 00:49
bryceTo ssh://bryce-guest@alioth.debian.org/git/pkg-xorg/xserver/xorg-server.git00:49
bryce ! [rejected]        debian-unstable -> debian-unstable (non-fast forward)00:49
bryceerror: failed to push some refs to 'ssh://bryce-guest@alioth.debian.org/git/pkg-xorg/xserver/xorg-server.git'00:49
ubottubryce: Error: I am only a bot, please don't think I'm intelligent :)00:49
bryceubottu: don't worry I'd never think that00:50
ubottubryce: Error: I am only a bot, please don't think I'm intelligent :)00:50
pwnguinheh03:36
tjaaltonbryce: git push origin ubuntu doesn't work?05:51
tjaaltonsigh05:54
tjaaltonI wonder how many lrm bugs are due to people booting the old kernel05:54
tjaaltonbug 226993 surely was05:54
ubottuLaunchpad bug 226993 in linux-restricted-modules-2.6.24 "Low res 800x600 NVIDIA 7300 LE" [Undecided,Invalid] https://launchpad.net/bugs/22699305:54
brycetjaalton: hmm $ git push origin ubuntu07:40
brycePassword: 07:40
bryceEverything up-to-date07:40
tjaaltonyou are on the ubuntu branch?07:44
brycewell it looks like it...  there are ubuntu changes in the debian/changelog file07:44
tjaaltongit status07:45
bryce$ git status07:45
bryce# On branch ubuntu07:45
brycenothing to commit (working directory clean)07:45
tjaaltonhmh07:46
bryceanyway, I think it's ok07:48
tjaaltonyou have changes to push?07:48
bryceno, I was just doublechecking that my last commit (a few weeks ago) actually made it07:49
tjaaltonah07:49
tjaaltongit.debian.org shows it07:49
tjaaltonhttp://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git;a=shortlog;h=refs/heads/ubuntu07:49
munckfishbryce: I'm just about to test the patch you pointed me to, but one of the existing patches (166_fix_lpl_monitors.diff) is failing to apply in the git ubuntu branch14:22
munckfishIs it ok for you?14:22
munckfishit affects hw/xfree86/modes/xf86EdidModes.c so I don't think it's clashing with the closedir() fix we added last14:23
munckfishhah, it's way too early in his timezone for him to be around yet! :D14:25
jcristauyeah, that patch doesn't apply14:30
munckfishjcristau: hi, yes it's just a different comment14:31
munckfishan extra line of commnt14:31
munckfishnope I'm wrong there's more to it than that :(14:44
jcristauyes, upstream commit 08afc70513e5496cc5cd8b76c8658c4292119e4b14:45
munckfishby upstream you mean debian, or x?14:46
jcristaux14:46
munckfishok14:46
munckfishjcristau: what should I really be working against here? I followed the X/GitUsage tut, but should I be working on debian-unstable branch? should I have pulled from debian-unstable into my ubuntu branch?14:47
jcristaui don't know. what are you trying to do?14:49
munckfishI'm trying to test out your non_pci_autoconfig.diff for ubuntu hardy xorg14:49
jcristauif you're just trying to test the ubuntu package, you're doing the right thing, but you got unlucky because of that broken patch14:49
munckfishLP 21764714:50
ubottuLaunchpad bug 217647 in ubuntu-ps3-port "Crash at startup on PS3 (hardy)" [Critical,In progress] https://launchpad.net/bugs/21764714:50
munckfishjcristau: ok. I'll cont as is. I presume best course of action is to pull that upstream change into a patch under debian/patches14:51
jcristaumunckfish: remove patch 166 from debian/patches/series and you should be able to build the package14:51
munckfishbut if I do that, I may as well ...14:51
munckfishyeah14:51
munckfishgood point14:51
munckfishthx14:51
jcristaunp14:51
munckfish:)14:51
munckfishBTW do you happen to know if it's possible to cross-compile as I build the xorg-server package?14:54
jcristauno idea14:56
munckfishis it common practice to cherry pick patches and then integrate them a little later?15:08
jcristauintegrate how?15:08
munckfishwell 15:08
munckfishif they don't apply successfully, but they've been committed15:09
munckfishthen at some point15:09
munckfishsomeone has to go thru and fix them so they do15:09
munckfishso that a release can be made15:09
munckfishthat's what I mean15:09
jcristauwell. i usually try not to do that :)15:09
munckfishok15:09
munckfishso, in my case this non_pci .... patch, 15:10
munckfishit's against a newer version of the codebase from upstream15:10
munckfisheven with the patches cherrypicked back into debian and ubuntu15:11
munckfishit doesn't apply15:11
munckfish(matchDriverFromFiles appears to be from a later refactoring)15:11
jcristauah, right.15:11
munckfishshould I be looking to modify the patch so it works against our code15:12
munckfishor15:12
munckfishshould I look to pull down more patches from above15:12
munckfishor should I ... do something else :)15:12
jcristaulet me have a look15:12
munckfishok15:12
munckfishthx, I'll try to speed you on your way ...15:13
munckfishpatch http://launchpadlibrarian.net/13978744/non_pci_autoconfig.patch15:13
munckfishI hope to get up to speed with how things work round here then I will cause minimum fuss15:15
jcristaudoesn't seem applicable15:15
munckfishBit too different? right15:15
munckfishso, now I will consider creating my own patch against our customised code, maybe with same intent as this upstream one15:17
munckfishthx for looking15:17
jcristauthe bug that patch fixes doesn't exist in the version in hardy15:17
munckfishyes15:17
jcristauas far as i can tell15:17
munckfishok15:18
munckfishactually there's two issues here really15:19
munckfishfirst is15:19
munckfishthe crash I reported in that bug15:19
munckfishoriginally I think that was cause NOT havig PCI info was an untested path through this code15:19
munckfishPS3 doesn't appear to have PCI info15:19
munckfishso it brought out this crash15:20
munckfish2nd issue is15:20
munckfishonce the crash is resolved X then goes on to choose the vesa driver instead of fbdev15:20
munckfishwhich is wrong15:20
jcristauyeah. do you have a log for that?15:21
munckfishI presumed that non_pci patch may do something to help15:21
jcristaunah. it doesn't.15:21
jcristauit fixes another crash :)15:21
munckfishLP 217647 has logs for both with an xorg and without. Both times it chooses the wrong driver15:22
ubottuLaunchpad bug 217647 in ubuntu-ps3-port "Crash at startup on PS3 (hardy)" [Critical,In progress] https://launchpad.net/bugs/21764715:22
munckfishI think Bryce suggested it as an alternative for the closedir patch15:22
munckfishSo ... I tell you what I'm going to just dig into this and understand the code a bit better. I'm sure I can come up with a fix, it'll be simple I'm sure.15:24
jcristauyeah, the code in chooseVideoDriver() is supposed to fall back to fbdev on ppc, but that part is probably not much tested15:26
jcristauso if you can step through what's going on in there, you should be able to come up with a fix15:26
munckfishI seem to remember seeing some codes further up the stack using preprocessor defines to decide on a default fallback15:27
munckfishit must be doing the wrong thing somehow15:27
munckfishthx!15:27

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!