[PATCH] build.sh tar M/C for xcb, mesa, xkeyboard

[Gaetan Nadon]

On Sat, 2010-11-06 at 17:29 -0400, linux fan wrote:

> Use same xcb module subdirs as git.
> Mesa and xkeyboard-config tarballs were not being found.
> MesaLib unpacks to Mesa, so sed is required to adjust its SRCDIR.
> These tarballs work alternatively in topdir.
> Note: The absence of autogen.sh triggers checkfortars() function.


A "Signed-off-by:" line is required with your real name and a valid
e-mail address.
This certifies that you wrote it or otherwise have the right to pass it
on as a open-source patch.

The subject line should be [PATCH modular] because [PATCH] is assumed to
be a server patch.
http://www.x.org/wiki/Development/Documentation/SubmittingPatches

The patch looks otherwise good.

Thanks for making these improvements.

Gaetan

> ---
>  build.sh |   35 ++++++++++++++++++++++++++++++++---
>  1 files changed, 32 insertions(+), 3 deletions(-)
> 
> diff --git a/build.sh b/build.sh
> index 275a1e1..512da80 100755
> --- a/build.sh
> +++ b/build.sh
> @@ -131,11 +131,39 @@ checkfortars() {
>              ;;
>          "xcb")
>              case $C in
> -                "proto") C="xcb-proto" ;;
> -                "pthread-stubs") M="lib"; C="libpthread-stubs" ;;
> -                "util") C="xcb-util" ;;
> +                "proto")
> +                    M="xcb/proto"
> +                    C="xcb-proto"
> +                    ;;
> +                "pthread-stubs")
> +                    M="xcb/pthread-stubs"
> +                    C="libpthread-stubs"
> +                    ;;
> +                "libxcb")
> +                    M="xcb/libxcb"
> +                    C="libxcb"
> +                    ;;
> +                "util")
> +                    M="xcb/util"
> +                    C="xcb-util"
> +                    ;;
>              esac
>              ;;
> +        "mesa")
> +            case $C in
> +                "drm")
> +                    M="mesa/drm"
> +                    C="libdrm"
> +                    ;;
> +                "mesa")
> +                    M="mesa/mesa"
> +                    C="MesaLib"
> +                    ;;
> +            esac
> +            ;;
> +        "xkeyboard-config")
> +            C="xkeyboard-config"
> +            ;;
>          "xserver")
>              C="xorg-server"
>              ;;
> @@ -145,6 +173,7 @@ checkfortars() {
>              TARFILE=`ls -1rt $ii/$C-*.tar.$jj 2> /dev/null | tail -n 1`
>              if [ X"$TARFILE" != X ]; then
>                  SRCDIR=`echo $TARFILE | sed "s,.tar.$jj,,"`
> +                SRCDIR=`echo $SRCDIR | sed "s,MesaLib,Mesa,"`
>                  if [ ! -d $SRCDIR ]; then
>                      TAROPTS=xjf
>                      if [ X"$jj" = X"gz" ]; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20101106/8a70bfca/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20101106/8a70bfca/attachment.pgp>