From 3ce63214f77d62bc29383945f454f23ac87ded9e Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Tue, 15 Oct 2013 22:18:43 -0400
Subject: [PATCH] build.sh: tarballs not found under their respective module
 directory

Currently, the module name is changed to add a subdir. For example "xcb" is
changed to "xcb/proto". The tarball cannot be found under xcb as expected.
This is done for pixman, xcb and mesa only, not for app, driver, lib, or any
other module which is inconsistent.

Moving the tarball under xcb/proto works, but yields a build structure
that is unpractical: xcb/proto/xcb-proto-1.8. The source code is now
under two subdirs rather than the usual one.

The package archive already contains the component directory, suffixed
with a version number.

By not changing the module name, we have xcb/xcb-proto-1.8. The same
pattern holds true for mesa and pixman. Changing the module name has
other adverse effects in subsequent functionality.

Note that for pixman, this module is under the "pixman" directory
and is not a component of the "lib" module. The module directory
structure is given by git and not by the location of the tarballs
on the web.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
---
 build.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/build.sh b/build.sh
index 1de9c7b..6690812 100755
--- a/build.sh
+++ b/build.sh
@@ -197,7 +197,6 @@ checkfortars() {
             component="libevdev"
             ;;
         "pixman")
-            module="lib"
             component="pixman"
             ;;
         "proto")
@@ -214,19 +213,15 @@ checkfortars() {
         "xcb")
             case $component in
                 "proto")
-                    module="xcb/proto"
                     component="xcb-proto"
                     ;;
                 "pthread-stubs")
-                    module="xcb/pthread-stubs"
                     component="libpthread-stubs"
                     ;;
                 "libxcb")
-                    module="xcb/libxcb"
                     component="libxcb"
                     ;;
                 util*)
-                    module="xcb/$component"
                     component="xcb-$component"
                     ;;
             esac
@@ -234,11 +229,9 @@ checkfortars() {
         "mesa")
             case $component in
                 "drm")
-                    module="mesa/drm"
                     component="libdrm"
                     ;;
                 "mesa")
-                    module="mesa/mesa"
                     component="MesaLib"
                     ;;
             esac
-- 
2.11.4.GIT