On Mon, Mar 7, 2011 at 7:05 AM, Dirk Wallenstein <hals...@t-online.de> wrote: > On Mon, Mar 07, 2011 at 05:13:42AM -0800, Dan Nicholson wrote: >> On Mon, Mar 7, 2011 at 3:15 AM, Dirk Wallenstein <hals...@t-online.de> wrote: >> > On Sun, Mar 06, 2011 at 09:29:50AM -0800, Dan Nicholson wrote: >> >> Since the openchrome driver is being distributed in the katamari, it >> >> makes sense to build it here even if it's not under X.Org. >> >> >> >> Signed-off-by: Dan Nicholson <dbn.li...@gmail.com> >> >> --- >> >> xorg.modules | 11 +++++++++++ >> >> 1 files changed, 11 insertions(+), 0 deletions(-) >> >> >> >> diff --git a/xorg.modules b/xorg.modules >> >> index deef23e..817e6b9 100644 >> >> --- a/xorg.modules >> >> +++ b/xorg.modules >> >> @@ -7,6 +7,8 @@ >> >> <moduleset> >> >> <repository type="git" name="git.freedesktop.org" default="yes" >> >> href="git://anongit.freedesktop.org/git/"/> >> >> + <repository type="svn" name="svn.openchrome.org" >> >> + href="http://svn.openchrome.org/"/> >> >> >> >> <autotools id="fontconfig"> >> >> <branch module="fontconfig" >> >> @@ -1285,6 +1287,14 @@ >> >> </dependencies> >> >> </autotools> >> >> >> >> + <autotools id="xf86-video-openchrome"> >> >> + <branch module="svn" repo="svn.openchrome.org" >> > >> > This should be: >> > <branch module="svn/trunk" repo="svn.openchrome.org" >> >> I actually should have said something about this in the commit >> message. The openchrome svn setup is a little unusual in that it >> doesn't have it's own project subdirectory. Instead, it's the root >> directory. jhbuild will take the trunk branch by default. If the root >> of the openchrome repository is http://svn.openchrome.org/, then >> adding on the module subdirectory of "svn" and the revision >> subdirectory (implicitly) of "trunk", then the path will be >> http://svn.openchrome.org/svn/trunk. This allows you to set revision >> in the branch definition and get resolved correctly to a branch or >> tag. I actually had to do a bit of trial and error to get it right. I >> was comparing it to this abiword definition in gnome-apps-3.0.modules. >> >> http://git.gnome.org/browse/jhbuild/tree/modulesets/gnome-apps-3.0.modules >> >> But I think you've worked with jhbuild a lot more than I have. What's >> the right way to handle svn repos? > > Oh, actually this is the only svn-repo I experimented with myself -- > also trial and error. It's just that it did not work without explicit > 'trunk', but that might be a fault of my patched jhbuild version. > If it works with a standard jhbuild it's probably ok.
I'm apparently on a December 9 commit. $ git describe 2.30.2-626-g4f1d851 I'll try this out with the last released version (2.30.2) as well as a more current master when I get the chance. -- Dan _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel