Update to build.sh

[Dan Nicholson]

On Sun, Apr 6, 2008 at 10:26 AM, Robert Boucher <rboucher at bcssi.com> wrote:
> Dan Nicholson wrote:
> >
> > Could you send this as a patch against the original build.sh? I'd just
> > like to see what's changed.
> >
>
>  Sure.

Looks nice. I'd really like to see this applied to try to reduce the
number of build scripts and possibly have one canonical "Use this
script to build a new Xorg" script.

> --- build.sh.orig       2008-04-03 10:33:18.511220289 -0400
>  +++ build.sh    2008-04-05 22:43:12.873364467 -0400
<snip>
>
>  -    if [ ! -d $1/$2 ]; then
>  +    SRCDIR=""
>  +    CONFCMD=""
>  +    if [ -f $1/$2/autogen.sh ]; then
>  +        SRCDIR="$1/$2"
>  +        CONFCMD="autogen.sh"
>  +    else
>  +        checkfortars $1 $2
>  +        CONFCMD="configure"
>  +    fi

I see we're not handling Mesa-7.0.x and older here, and it looks like
the actual call to "build mesa mesa" is commented out. That should be
handled somehow, but becomes a lot easier with newer mesa which has
autoconf. That's not a regression from this patch, though.

>  @@ -96,6 +173,7 @@
>      build proto compositeproto
>      build proto damageproto
>      build proto dmxproto
>  +    build proto dri2proto
>      build proto evieproto
>      build proto fixesproto
>      build proto fontcacheproto
>  @@ -204,6 +282,7 @@
>      build lib libXxf86misc
>      build lib libXxf86vm
>      build lib libpciaccess
>  +    build pixman ""
>   }
>
>   # Most apps depend at least on libX11.
>  @@ -245,6 +324,7 @@
>      build app viewres
>      build app x11perf
>      build app xauth
>  +    build app xbacklight
>      build app xbiff
>      build app xcalc
>      build app xclipboard
>  @@ -322,7 +402,6 @@
>   # The server requires at least the following libraries:
>   # Xfont, Xau, Xdmcp, pciaccess
>   build_xserver() {
>  -    build pixman ""
>      build xserver ""
>   }
>
>  @@ -421,11 +500,13 @@
>      build driver xf86-video-ark
>      build driver xf86-video-ast
>      build driver xf86-video-ati
>  +    build driver xf86-video-avivo
>      build driver xf86-video-chips
>      build driver xf86-video-cirrus
>      build driver xf86-video-cyrix
>      build driver xf86-video-dummy
>      build driver xf86-video-fbdev
>  +    build driver xf86-video-geode
>   #    build driver xf86-video-glide
>      build driver xf86-video-glint
>      build driver xf86-video-i128
>  @@ -433,6 +514,7 @@
>      build driver xf86-video-mga
>      build driver xf86-video-neomagic
>      build driver xf86-video-newport
>  +    build driver xf86-video-nouveau
>      build driver xf86-video-nsc
>      build driver xf86-video-nv
>      build driver xf86-video-radeonhd
>  @@ -528,6 +610,9 @@
>      build util makedepend
>      build util gccmakedep
>      build util lndir
>  +    if test x"$USE_XCB" != xNO ; then
>  +        build xcb util
>  +    fi
>   }
>

It'd be nice if the module additions and movements were in a separate
patch. Looks good, though.

--
Dan