[PATCH v2 modular 1/2] jhbuild: Add moduleset with tarballs used for 7.6 katamari

[Dan Nicholson]

On Mon, Nov 29, 2010 at 9:46 PM, Alan Coopersmith
<alan.coopersmith at oracle.com> wrote:
> Dan Nicholson wrote:
>> Add a moduleset for the 7.6 katamari based on xorg.modules. This uses
>> the module list from 7.6-rc1 with gzipped tarballs and sha1sums from
>> announce emails (when available).
>>
>> Modules not included in the katamari have been removed. It might be a
>> good idea to include typical addons such as xinit and put them in an
>> "extras" metamodule.
>>
>> Some modules have autogen-sh="configure" specified in their definitions.
>> This is because jhbuild will run autogen.sh rather than configure if
>> it's available. Arguably this is a bug in the module for including
>> autogen.sh in the tarball and/or jhbuild for preferring autogen.sh in a
>> tarball, but this works around it for now.
>>
>> Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
>
> I've never looked at jhbuild modules before, so I can't really review, but it
> appears reasonable at a brief glance.   (Though I wonder if we're going to
> have one per katamari if we'll want a subdir to keep them all in at some point.)

Yes, ultimately I think there should be a moduleset/ subdirectory, but
one step at a time.

> Also, as far as dependencies go, if building documentation, then a lot of
> modules now depend on xorg-sgml-doctools for the xsl stylesheets, but I
> don't know if you can express conditional dependencies like that for jhbuild.

Probably. There's not any big harm in making doctools a dep for all
the metamodules like macros. Worst case you get an unused stylesheet
installed.

>> +  <metamodule id="xorg-fonts">
>> +    <dependencies>
>> +      <dep package="fonts-util"/>
>> +      <dep package="fonts-encodings"/>
>> +      <dep package="adobe-75dpi"/>
>> +      <dep package="adobe-100dpi"/>
>> +      <dep package="adobe-utopia-75dpi"/>
>> +      <dep package="adobe-utopia-100dpi"/>
>> +      <dep package="adobe-utopia-type1"/>
>> +      <dep package="bitstream-75dpi"/>
>> +      <dep package="bitstream-100dpi"/>
>> +      <dep package="bitstream-type1"/>
>> +      <dep package="fonts-cursor"/>
>> +      <dep package="fonts-misc"/>
>> +      <dep package="fonts-alias"/>
>> +    </dependencies>
>> +  </metamodule>
>
> Aren't there a lot more font packages than that?

Probably. I just took xorg.modules and adjusted it, but it looks like
it's incomplete.

>> +  <metamodule id="xorg-x86-drivers">
>> +    <dependencies>
>> +      <dep package="xf86-input-vmmouse"/>
>> +    </dependencies>
>> +  </metamodule>
>> +
>> +  <!-- This probably isn't sufficient, but it is a start -->
>> +
>> +  <metamodule id="xorg-sun-drivers">
>
> Should that be xorg-sparc-drivers to match the xorg-x86-drivers?
>
> Should geode be called out as 32-bit x86 only?

I think yes for both. These are also issues in xorg.modules, and I
didn't want to mix bug fixes in here. There was a recent patch to
adjust the skipped modules based on the current architecture. That
hasn't gotten in modular yet, but the concept is simple and could also
be here.

--
Dan