disable some drivers, touchup build system, and install into STAGING_DIR prefix

diff --git a/package/directfb/directfb-i830-detect.patch b/package/directfb/directfb-i830-detect.patch
new file mode 100644 (file)
index 0000000..fbe4816
--- /dev/null
+++ b/package/directfb/directfb-i830-detect.patch
@@ -0,0 +1,17 @@
+Detect the presence of the I830 fb driver rather than 
+just assuming it always exists.
+
+--- DirectFB-0.9.22/configure
++++ DirectFB-0.9.22/configure
+@@ -23622,9 +23622,9 @@
+ /* end confdefs.h.  */
+ 
+ #include <linux/fb.h>
+-//#ifdef FB_ACCEL_I830
++#ifdef FB_ACCEL_I830
+   yes
+-//#endif
++#endif
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index aaa93136bb955f425e9c371fbab13685ca071e72..803158587928ed0711174a4b3d9f010dadf72995 100644 (file)
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -16,17 +16,21 @@ directfb-source: $(DL_DIR)/$(DIRECTFB_SOURCE)
 
 $(DIRECTFB_DIR)/.unpacked: $(DL_DIR)/$(DIRECTFB_SOURCE)
        $(DIRECTFB_CAT) $(DL_DIR)/$(DIRECTFB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+       toolchain/patch-kernel.sh $(DIRECTFB_DIR) package/directfb/ directfb\*.patch
        touch $(DIRECTFB_DIR)/.unpacked
 
 $(DIRECTFB_DIR)/.configured: $(DIRECTFB_DIR)/.unpacked
        (cd $(DIRECTFB_DIR); \
        $(TARGET_CONFIGURE_OPTS) \
        CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+       LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+       ac_cv_header_linux_wm97xx_h=no \
+       ac_cv_header_linux_sisfb_h=no \
        ./configure \
        --target=$(GNU_TARGET_NAME) \
        --host=$(GNU_TARGET_NAME) \
        --build=$(GNU_HOST_NAME) \
-       --prefix=/usr \
+       --prefix=$(STAGING_DIR)/usr \
        --with-gfxdrivers=cle266,unichrome \
        --enable-jpeg \
        --enable-png \
@@ -40,13 +44,11 @@ $(DIRECTFB_DIR)/.configured: $(DIRECTFB_DIR)/.unpacked
        touch  $(DIRECTFB_DIR)/.configured
 
 $(DIRECTFB_DIR)/.compiled: $(DIRECTFB_DIR)/.configured
-       $(MAKE) -C $(DIRECTFB_DIR) \
-       LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
-       INCLS="-I. -I$(STAGING_DIR)/include"
+       $(MAKE) -C $(DIRECTFB_DIR)
        touch $(DIRECTFB_DIR)/.compiled
 
 $(STAGING_DIR)/usr/lib/libdirectfb.so: $(DIRECTFB_DIR)/.compiled
-       $(MAKE) -C $(DIRECTFB_DIR) DESTDIR=$(STAGING_DIR) install
+       $(MAKE) -C $(DIRECTFB_DIR) install
        touch -c $(STAGING_DIR)/lib/libdirectfb.so
 
 $(TARGET_DIR)/usr/lib/libdirectfb.so: $(STAGING_DIR)/usr/lib/libdirectfb.so