-Mise a jour paquets X.org (plus de module xorg-util, les paquets sont separes maintenant)
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
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"
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})
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}
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}
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