Updated Xorg components

diff --git a/packages-list b/packages-list
index c708d2f..b345995 100644 (file)
--- a/packages-list
+++ b/packages-list
@@ -431,23 +431,22 @@ WINDOWMAKER_EXTRA="WindowMaker-extra-0.1"
 WMNOTIFY="wmnotify-0.3.2"
 WV="wv-1.2.4"
 
-XORG_APP=app-7.5-2
-XORG_DATA=data-7.2
-XORG_DRIVER=driver-7.5-2
-XORG_FONT=font-7.5-2
-XORG_LIB=lib-7.5-2
-XORG_PROTO=proto-7.5-2
-XORG_UTIL=util-7.5-2
-LIBXAU=libXau-1.0.5
+XORG_APP=app-7.5-3
+XORG_DRIVER=driver-7.5-3
+XORG_FONT=font-7.5-3
+XORG_LIB=lib-7.5-3
+XORG_PROTO=proto-7.5-3
+XORG_UTIL=util-7.5-3
+LIBXAU=libXau-1.0.6
 LIBXDMCP=libXdmcp-1.0.3
 XBITMAPS=xbitmaps-1.1.0
-LIBDRM=libdrm-2.4.14
-MESALIB=MesaLib-7.6
+LIBDRM=libdrm-2.4.21
+MESALIB=MesaLib-7.8.2
 XCURSOR_THEMES=xcursor-themes-1.0.2
-XKEYBOARD_CONFIG=xkeyboard-config-1.7
-LUIT=luit-1.0.4
-XORG_SERVER=xorg-server-1.7.1
-XDM=xdm-1.1.9
+XKEYBOARD_CONFIG=xkeyboard-config-1.8
+LUIT=luit-1.0.5
+XORG_SERVER=xorg-server-1.8.2
+XDM=xdm-1.1.10
 
 XMLTO="xmlto-0.0.23"
 XMLTOMAN="xmltoman-0.4"

diff --git a/stage4/packages-update b/stage4/packages-update
index 0c89478..475957f 100755 (executable)
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -23,7 +23,7 @@ fi
 
 lpkg     3 ${PYTHON}
 
-XORG_MODULES_LIST="${XORG_APP} ${XORG_DATA} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}"
+XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}"
 
 for module in ${XORG_MODULES_LIST}; do
     MOD_NAME=$(get_pkg_name ${module})
@@ -35,10 +35,9 @@ for module in ${XORG_MODULES_LIST}; do
     if [ "${MOD_NAME}" = "driver" ]; then
         # Remove unwanted drivers
         for ext in wget md5; do
-            sed -i -e '/.*xf86-video-vmware.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
-            sed -i -e '/.*xf86-video-newport.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
-            sed -i -e '/.*xf86-video-xgixp.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
-            sed -i -e '/.*xf86-video-geode.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+            for excldrv in vmware newport xgixp geode; do
+                sed -i -e "/.*xf86-video-${excldrv}.*/d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+            done
         done
     fi
     if [ "${MOD_NAME}" = "app" ]; then