From 5461d9d9394e8e66d179161df5b3578db86ed471 Mon Sep 17 00:00:00 2001 From: James Mckenzie Date: Thu, 26 Nov 2009 20:27:42 +0000 Subject: [PATCH] Make X compile (remove kernel drm headers, and fix libdrm_intel.la) --- package/libdrm/libdrm.mk | 2 + ...river_xf86-video-intel-2.6.3-dri-off.patch | 46 +++++++++++++++++++ package/xenclient/kernel/kernel.mk | 1 + 3 files changed, 49 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.6.3-dri-off.patch diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index b8dd47f..f2b8176 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -52,6 +52,8 @@ $(LIBDRM_DIR)/.compiled: $(LIBDRM_DIR)/.configured $(STAGING_DIR)/usr/lib/libdrm.so: $(LIBDRM_DIR)/.compiled $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBDRM_DIR) install $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libdrm.la + $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libdrm_intel.la + $(SED) "s,[^ ]*libdrm.la,$(STAGING_DIR)/usr/lib/libdrm.la,g" $(STAGING_DIR)/usr/lib/libdrm_intel.la #$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \ # -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ # -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \ diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.6.3-dri-off.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.6.3-dri-off.patch new file mode 100644 index 0000000..44ee157 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.6.3-dri-off.patch @@ -0,0 +1,46 @@ +--- xdriver_xf86-video-intel-2.6.3/configure.ac 2009-03-02 19:21:07.000000000 +0000 ++++ xdriver_xf86-video-intel-2.6.3-sucks/configure.ac 2009-11-26 18:34:40.000000000 +0000 +@@ -98,16 +98,22 @@ + CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags" + CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags" + AC_MSG_CHECKING([whether to include DRI support]) +-if test x$DRI != xno; then +- AC_CHECK_FILE([${sdkdir}/dri.h], +- [have_dri_h="yes"], [have_dri_h="no"]) +- AC_CHECK_FILE([${sdkdir}/sarea.h], +- [have_sarea_h="yes"], [have_sarea_h="no"]) +- AC_CHECK_FILE([${sdkdir}/dristruct.h], +- [have_dristruct_h="yes"], [have_dristruct_h="no"]) +- AC_CHECK_FILE([${sdkdir}/damage.h], +- [have_damage_h="yes"], [have_damage_h="no"]) +-fi ++#if test x$DRI != xno; then ++# AC_CHECK_FILE([${sdkdir}/dri.h], ++# [have_dri_h="yes"], [have_dri_h="no"]) ++# AC_CHECK_FILE([${sdkdir}/sarea.h], ++# [have_sarea_h="yes"], [have_sarea_h="no"]) ++# AC_CHECK_FILE([${sdkdir}/dristruct.h], ++# [have_dristruct_h="yes"], [have_dristruct_h="no"]) ++# AC_CHECK_FILE([${sdkdir}/damage.h], ++# [have_damage_h="yes"], [have_damage_h="no"]) ++#fi ++ ++have_dri_h="no" ++have_sarea_h="no" ++have_dristruct_h="no" ++have_damage_h="no" ++ + AC_MSG_CHECKING([whether to include DRI support]) + if test x$DRI = xauto; then + if test "$have_dri_h" = yes -a \ +diff -uNr xdriver_xf86-video-intel-2.6.3/src/i830.h xdriver_xf86-video-intel-2.6.3-sucks/src/i830.h +--- xdriver_xf86-video-intel-2.6.3/src/i830.h 2009-03-02 19:21:02.000000000 +0000 ++++ xdriver_xf86-video-intel-2.6.3-sucks/src/i830.h 2009-11-26 18:40:38.000000000 +0000 +@@ -66,6 +66,7 @@ + #endif + + #ifdef XF86DRI ++#include + #include "xf86drm.h" + #include "sarea.h" + #define _XF86DRI_SERVER_ diff --git a/package/xenclient/kernel/kernel.mk b/package/xenclient/kernel/kernel.mk index 7e267f4..2ab5c32 100644 --- a/package/xenclient/kernel/kernel.mk +++ b/package/xenclient/kernel/kernel.mk @@ -49,6 +49,7 @@ $(XENCLIENT_KERNEL_BUILD)/.compiled: $(XENCLIENT_KERNEL_BUILD)/.configured $(PROJECT_BUILD_DIR)/autotools-stamps/xen-kernel_target_installed: $(XENCLIENT_KERNEL_BUILD)/.compiled $(MAKE) -C $(XENCLIENT_KERNEL_BUILD) ARCH=i386 modules_install INSTALL_MOD_PATH=$(TARGET_DIR) + rm -rf $(XENCLIENT_KERNEL_BUILD)/dist_header/include/drm/ rsync -r $(XENCLIENT_KERNEL_BUILD)/dist_header/ $(STAGING_DIR)/usr mkdir -p $(PROJECT_BUILD_DIR)/autotools-stamps touch $@ -- 2.39.5