=== yofel_ is now known as yofel
[07:00] <tjaalton> RAOF: btw, did you commit the git-cleanup on the mesa ubuntu branch on purpose?
[07:01] <RAOF> Rather than on the debian-branch?  No; I thought I'd done it in debian?
[07:02] <tjaalton> well, is it more than a matter of taste should we keep git as close to upstream as possible, and only cleanup the symlinks before building but not commit the changes?
[07:02] <tjaalton> I don't have a strong opinion there, just noticed that I couldn't build a source package from the debian branch
[07:03] <tjaalton> and noticed the dif
[07:03] <tjaalton> diff
[07:03] <RAOF> Hm.  It was meant to be set up so that you *could* build a source package from the branch.
[07:03] <RAOF> That doesn't work?
[07:03] <tjaalton> yeah it works from the ubuntu branch :)
[07:03] <RAOF> Oh, right :)
[07:04] <tjaalton> but not the binary build, need bin/install-sh for that
[07:05] <RAOF> Yeah.  That needs to happen in a chroot.
[07:05] <RAOF> Or, rather, in an unpacked source package.
[07:07] <tjaalton> yep
=== ara_ is now known as ara
[10:06] <tjaalton> with the mesa swrast patches from ajax compiz runs, unity is still "weird" but overall it works. compiz takes 150% cpu though on a core2 :P
[10:08] <jcristau> that leaves plenty of cpu free for other tasks
[10:08] <jcristau> :)
[10:09] <tjaalton> yeah!
[10:10] <tjaalton> I need to try it on the sis laptop..
[10:10] <tjaalton> it'll boil
[10:10] <RAOF> Use that heat to distil alcohol!
[10:21] <tjaalton> got plenty already :)
[10:23] <tjaalton> could fry an egg or two though, since I'm hungryy.. ->
[18:51] <Sarvatt> ricotz: https://launchpadlibrarian.net/78736960/buildlog_ubuntu-oneiric-i386.mesa_7.12.0~git20110901.49e24d3b-0ubuntu0sarvatt_FAILEDTOBUILD.txt.gz
[18:51] <Sarvatt> wayland packages need updating?
[18:53] <ricotz> Sarvatt, mhh
[18:54] <Sarvatt> my thoughts exactly :(
[18:54] <ricotz> why doesnt mesa have a proper buildsys to check for its dependencies :\
[18:55] <ricotz> but it looks like that
[18:56] <Sarvatt> because windows
[18:56] <ricotz> there were quite some commit for wayland lately
[18:57] <Sarvatt> its in pkg-xorg now isnt it? might be able to start updating it in my daily build script
[18:58] <ricotz> yes, but better to use the ubuntu branch
[18:58] <Prf_Jakob> ricotz: You know, we do actually have a autoconf part which is the part that does the dependancy checking.
[18:59] <Prf_Jakob> ricotz: so its only the developers that adds the wayland part that fails to add checks.
[18:59] <ricotz> i see
[18:59] <ricotz> it is also hard to check for unreleased version of libraries ;)
[18:59] <Prf_Jakob> that too
[19:46] <Sarvatt> ricotz: hmm, pretty sure i got wayland working with auto-xorg-git, are version strings like wayland-0.1+git20110902.25fddf65 going to mess anything up?
[19:50] <ricotz> Sarvatt, should be atleast 0.1.0
[19:50] <Sarvatt> just pushed it to lp:~xorg-edgers/xorg-server/xorg-pkg-tools, ./auto-xorg-git -d origin/ubuntu -t + -a 0ubuntu0sarvatt -g -p wayland seems to dtrt
[19:50] <ricotz> like 0.1.0~git...
[19:50] <Sarvatt> okie easy enough
[19:50] <ricotz> to actually override the oneiric one
[19:51] <Sarvatt> oh joy http://paste.ubuntu.com/680825/ :)
[19:53] <Sarvatt> just need to set PACKAGE_VERSION=0.1.0 in a hook then and use -t '~' instead of -t +
[19:57] <Sarvatt> wayland (0.1.0~git20110902.25fddf65-0ubuntu0sarvatt) oneiric; urgency=low there we go
[19:57] <Sarvatt> just need to patch the symbols and i'll push it all to xorg-pkg-tools
[19:58] <Sarvatt> bryceh: wasnt there a work item to put git wayland in xorg-edgers somewhere?
[19:58] <Sarvatt> that took all of 15 minutes, sheesh
[19:59] <bryceh> Sarvatt, yep
[20:00] <bryceh> Sarvatt, thanks!
[20:00] <ricotz> Sarvatt, did you remove the hard dep in rules?
[20:01] <bryceh> Sarvatt, yeah you'd been blocked by something when I asked last time, but I don't remember what the issue was
[20:01] <Sarvatt> ah yeah it was mesa not having wayland support
[20:01] <Sarvatt> ricotz: nope, looking into that now
[20:02] <ricotz> ok
[20:07] <Sarvatt> bryceh: well hold off marking it done, this symbols stuff might be tricky
[20:14] <Sarvatt> ricotz: any pointers on what the right way to get around the symbols is? patch debian/libwayland0.symbols.in in a hook? can ya bzr branch lp:~xorg-edgers/xorg-server/xorg-pkg-tools and do a ./auto-xorg-git -H hooks-sarvatt -d origin/ubuntu -t '~' -a 0ubuntu0ricotz -g -p wayland to see if ya spot any problems?
[20:19] <ricotz> Sarvatt, just remove the symbols check in rules and change c4 to c1
[20:34] <Sarvatt> ricotz: c0?
[20:35] <Sarvatt> c1 fails because symbols disappeared
[20:35] <ricotz> for this purpose c0 is fine too, but then you can drop the whole section "# Generate hard dependencies:"
[20:35] <ricotz> oh there are?
[20:36] <Sarvatt> yeah
[20:36] <ricotz> oh right the symbols file contains 0.1.0~0 instead of 0.1.0
[20:36] <ricotz> dropping the whole section should be fine then
[20:37] <ricotz> assuming the git builds are done in sync it should work
[20:38] <Sarvatt> done in sync with mesa, or wayland-demos too?
[20:41] <ricotz> oh right, demos would need to be updated too
[20:52] <Sarvatt> ok think i got it going now, just need to add wayland-demos support to auto-xorg-git then get that updated too
[20:52] <Sarvatt> really appreciate the help ricotz
[20:52] <bryceh> awesome
[20:53] <ricotz> Sarvatt, oh, thought i wasnt much of a help here, i am not really present
[21:55] <Sarvatt> \o/ the optional cairo-egl patch was upstreamed in wayland-demos
[22:27] <Sarvatt> so mesa doesnt even build with wayland master ( http://paste.ubuntu.com/680881/ ), and wayland-demos will be broken without a mesa rebuilt against the new one, i'll hold off uploading all this for now