Make X compile (remove kernel drm headers, and fix libdrm_intel.la)

diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index b8dd47f82a86300c7865e3ddcd97953ba19909c4..f2b817603fffeefbeeaadc3c8db16721c4497619 100644 (file)
--- 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 (file)
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 <drm/i915_drm.h>
+ #include "xf86drm.h"
+ #include "sarea.h"
+ #define _XF86DRI_SERVER_

diff --git a/package/xenclient/kernel/kernel.mk b/package/xenclient/kernel/kernel.mk
index 7e267f428d5d28f3d2bde7038df8a37713039c09..2ab5c32d428f4ec17f3faa4144add9cfa9e8bd95 100644 (file)
--- 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 $@