From ce815aec9d5bd5a16a5fd769419e449976669aaa Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Fri, 11 Mar 2011 06:08:04 +0000
Subject: [PATCH] -Desactive certains drivers dans Mesa a cause d'un bug avec
 le HP Mini -Mise a jour paquets X.org (plus de module xorg-util, les paquets
 sont separes maintenant)

---
 config/packages-list   |  3 ++-
 stage4/hv-install-1    |  6 ++++--
 stage4/packages-update |  5 ++++-
 stage4/pkg/MesaLib     | 14 ++++++++++++++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/config/packages-list b/config/packages-list
index 24b8f5f..beef62c 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -446,7 +446,8 @@ XORG_VIDEO_NOUVEAU="xf86-video-nouveau-git-20110306"
 XORG_FONT=font-${XORG_VER}
 XORG_LIB=lib-${XORG_VER}
 XORG_PROTO=proto-${XORG_VER}
-XORG_UTIL=util-${XORG_VER}
+XORG_UTIL_MACROS="util-macros-1.11.0"
+XORG_MAKEDEPEND="makedepend-1.0.3"
 LIBXAU=libXau-1.0.6
 LIBXDMCP=libXdmcp-1.1.0
 XBITMAPS=xbitmaps-1.1.1
diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index 25c5ffd..37297bd 100755
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -52,15 +52,17 @@ install_xorg_modules()
     done
 }
 
-install_xorg_modules ${XORG_UTIL}
+ipkg_xorg ${XORG_UTIL_MACROS} "util"
 install_xorg_modules ${XORG_PROTO}
+ipkg_xorg ${XORG_MAKEDEPEND} "util"
 ipkg_xorg ${LIBXAU} "lib"
 ipkg_xorg ${LIBXDMCP} "lib"
 ipkg ${LIBPTHREAD_STUBS} ${XORG_CONFIG}
 ipkg ${XCB_PROTO} ${XORG_CONFIG}
+ipkg ${LIBXCB} ${XORG_CONFIG}
+install_xorg_modules ${XORG_LIB}
 ipkg ${GPERF}
 ipkg ${XCB_UTIL} ${XORG_CONFIG}
-install_xorg_modules ${XORG_LIB}
 ipkg -m acnb ${LESSTIF}
 ipkg_xorg ${XBITMAPS} "data"
 ipkg ${LIBDRM} "--enable-udev"
diff --git a/stage4/packages-update b/stage4/packages-update
index 957e213..5bd7d05 100755
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -10,7 +10,7 @@ update_packages_init ${*}
 
 lpkg     3 ${PYTHON}
 
-XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}"
+XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO}"
 
 for module in ${XORG_MODULES_LIST}; do
     MOD_NAME=$(get_pkg_name ${module})
@@ -59,6 +59,8 @@ for module in ${XORG_MODULES_LIST}; do
     popd >> ${LFS_LOG_FILE}
 done
 
+fpkg -m xorg -s util ${XORG_UTIL_MACROS}
+fpkg -m xorg -s util ${XORG_MAKEDEPEND}
 fpkg -m xorg -s lib ${LIBXAU}
 fpkg -m xorg -s lib ${LIBXDMCP}
 fpkg -m sf ${LESSTIF}
@@ -66,6 +68,7 @@ fpkg -m xorg -s data ${XBITMAPS}
 
 fpkg -m fd -o "xcb" -s "dist" ${LIBPTHREAD_STUBS}
 fpkg -m fd -o "xcb" -s "dist" ${XCB_PROTO}
+fpkg -m fd -o "xcb" -s "dist" ${LIBXCB}
 fpkg -m fd -o "xcb" -s "dist" ${XCB_UTIL}
 fpkg -m gnu ${GPERF}
 
diff --git a/stage4/pkg/MesaLib b/stage4/pkg/MesaLib
index 80b8017..45e210b 100644
--- a/stage4/pkg/MesaLib
+++ b/stage4/pkg/MesaLib
@@ -2,10 +2,24 @@
 
 hvconfig_pre()
 {
+    local DRVPTS=""
+
+    if [ -n "${XORG_VIDEO_DRIVER}" ]; then
+        case "${XORG_VIDEO_DRIVER}" in
+    	    nouveau)
+	        DRVPTS="--with-dri-drivers=nouveau --enable-gallium-nouveau"
+	        ;;
+	    intel)
+	        DRVPTS="--with-dri-drivers=i915,i965 --enable-gallium-i915 --enable-gallium-i965"
+	        ;;
+	esac
+    fi
+
     CONFIGURE_OPTS="\
         ${CONFIGURE_OPTS} \
         --enable-motif \
         --enable-xcb \
+        ${DRVPTS} \
         ${XORG_CONFIG}"
 
     # Mesa builds with debugging symbols. Remove the -g switch from both CFLAGS
-- 
2.20.1