X11R7.6RC1 moduleset

[Dirk Wallenstein]

Hi,
Attached are a moduleset for Xorg-7.6RC1 and a tinderwrap wrapper
plug-in to build only Xorg-7.6 modules.  The latter basically just adds
a list of modules to skip to the call, so that the dependencies of the
moduleset need not be modified. 

There is also a (sloppy) plug-in to create such a moduleset.  I did not
realize that the packagename of pthread-stubs is actually
libpthread-stubs when I created the xjh moduleset.  A patch to fix that
is attached, too, and necessary for the tagging script.

-- 
Greetings,
Dirk
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Xorg-7.6RC1.modules.bz2
Type: application/x-bzip2
Size: 5890 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20101113/f56da7c5/attachment-0001.bin>
-------------- next part --------------
#!/bin/sh
#xjh --callback tinderwrap start -s "
${XJHBUILD_CALLBACK} tinderwrap start -s "\
appres,\
beforelight,\
bitmap,\
cf,\
editres,\
font-bitstream-speedo,\
fontconfig,\
fonttosfnt,\
fslsfonts,\
fstobdf,\
gccmakedep,\
ico,\
imake,\
libdrm,\
libxkbui,\
listres,\
lndir,\
mesa,\
mesa-demos,\
mkcomposecache,\
modular,\
oclock,\
pixman,\
rendercheck,\
rgb,\
rstart,\
scripts,\
showfont,\
twm,\
viewres,\
xbiff,\
xcalc,\
xcb-util,\
xclipboard,\
xclock,\
xconsole,\
xdbedizzy,\
xditview,\
xdm,\
xedit,\
xeyes,\
xf86-input-penmount,\
xf86-video-impact,\
xf86-video-nouveau,\
xf86-video-qxl,\
xf86-video-radeonhd,\
xf86-video-sunbw2,\
xf86dga,\
xfd,\
xfontsel,\
xfs,\
xfsinfo,\
xgc,\
xinit,\
xkbprint,\
xkeyboard-config,\
xload,\
xlogo,\
xlsfonts,\
xmag,\
xman,\
xmessage,\
xmh,\
xmore,\
xscope,\
xsetmode,\
xsm,\
xstdcmap,\
xvidtune\
" xorg

-------------- next part --------------
#!/bin/bash

plugin_name=$(basename $0)

error() {
        echo "ERROR ($plugin_name): $@"
        exit
}

usage() {
    cat << EOU
Sub-Command Usage : $plugin_name <output-file-path>

Use the module-list.txt file from the modular repo to generate a
moduleset with the corresponding tags at <output-file-path>.
EOU
}

if [ $# -lt 1 ] ; then 
    usage
    echo
    error "No output-file-path given"
fi

case "$1" in
    -h|--help)
        usage
        exit 0
        ;;
esac

tagged_xjh_file="${1}"

# Account for changes in xjh versions greater-equal 0.2. Actually, the
# callback envvar is kept but deprecated.
#IS_XJH_VERSION_GE_0_2_0="nonempty-yes"
if [ -n "${IS_XJH_VERSION_GE_0_2_0}" ] ; then
    modulardir=$(xjh --callback modinfo -f dir modular)
    [[ $? -eq 0 ]] || error "I need the modular repo checked out."
    cp -v ~/.x-jhbuild/.internal/lib/xjhbuild/distro-modulesets/xjh.modules "${tagged_xjh_file}" || error "copying xjh.modules failed"
else
    modulardir=$(${XJHBUILD_CALLBACK} modinfo -f dir modular)
    [[ $? -eq 0 ]] || error "I need the modular repo checked out."
    cp -v ~/.x-jhbuild/.internal/distro-modulesets/xjh.modules "${tagged_xjh_file}" || error "copying xjh.modules failed"
fi

modulelist=${modulardir}/module-list.txt

for tag in $(cat ${modulelist}) ; do
    # skip openchrome
    [[ "${tag}" = xf86-video-openchrome* ]] && continue

    echo $tag

    pkgname=$(echo $tag | sed 's/-[0-9\.]*$//g')
    version="${tag##${pkgname}-}"

    [[ "${tag}" = xcb-proto* ]] && tag=${version}
    [[ "${tag}" = libpthread-stubs* ]] && tag=${version}
    [[ "${tag}" = libxcb* ]] && tag=${version}
    [[ "${tag}" = xf86-video-intel* ]] && tag=${version}

    match_string="checkoutdir=\".*/${pkgname}\""
    [[ $(grep ${match_string} ${tagged_xjh_file} | wc -l) -eq 1 ]] || error "not one match for ${pkgname} looking for \"${match_string}\""
    sed -i "s@${match_string}@\0 tag=\"${tag}\"@" "${tagged_xjh_file}"
done

# NOTE: need libpthread-stubs patch!!!