added XOrg video drivers for i810, ati, nv and fbdev
authorJohn Crispin <john@openwrt.org>
Fri, 21 Sep 2007 19:11:49 +0000 (19:11 +0000)
committerJohn Crispin <john@openwrt.org>
Fri, 21 Sep 2007 19:11:49 +0000 (19:11 +0000)
SVN-Revision: 8933

XOrg/driver/common.mk
XOrg/driver/packages
XOrg/driver/patches/xf86-video-i810-X11R7.2/100-sdkdir.patch [new file with mode: 0644]
XOrg/driver/xf86-video-ati-X11R7.2/Makefile [new file with mode: 0644]
XOrg/driver/xf86-video-i810-X11R7.2/Makefile [new file with mode: 0644]
XOrg/driver/xf86-video-i810-X11R7.2/patches/100-sdkdir.patch [new file with mode: 0644]
XOrg/driver/xf86-video-nv-X11R7.2/Makefile [new file with mode: 0644]

index b5f7a2a..110dc44 100644 (file)
@@ -12,12 +12,15 @@ _CATEGORY:=driver
 _DEPEND+=+xorg-server-X11R7.2
 include ../../common.mk
 
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-endef
-
 EXTRA_CFLAGS+= -I${STAGING_DIR}/usr/include/xorg -I${STAGING_DIR}/usr/include/X11/
 
+CONFIGURE_VARS+=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/"
+
+acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
+
+CONFIGURE_VARS += $(foreach a,dri.h sarea.h dristruct.h exa.h,ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes) \
+               ac_cv_file__usr_share_sgml_X11_defs_ent=yes
+
 define Build/Configure
        (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
        if [ -x $(CONFIGURE_CMD) ]; then \
@@ -25,16 +28,18 @@ define Build/Configure
                $(CONFIGURE_VARS) \
                $(CONFIGURE_CMD) \
                $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               as_ac_File=no \
-               --enable-malloc0returnsnull; \
+               $(CONFIGURE_ARGS) ;\
        fi \
        )
 endef
 
-define Package/${PKG_NAME}/install
+define Build/Compile
+       make -C $(PKG_BUILD_DIR)
        DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
+endef
+
+define Package/${PKG_NAME}/install
        $(INSTALL_DIR) $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-       find $(1)/usr/lib/ -name *a | xargs rm -rf
 endef
index 622a9ac..4c55b1a 100644 (file)
@@ -5,3 +5,6 @@ xf86-input-mouse-X11R7.2-1.1.2|
 xf86-video-fbdev-X11R7.2-0.3.1|
 xf86-video-vesa-X11R7.2-1.3.0|
 xf86-video-vga-X11R7.1-4.1.0|
+xf86-video-i810-X11R7.2-1.6.5|+libXvMC-X11R7.2
+xf86-video-nv-X11R7.2-1.2.2.1|
+xf86-video-ati-X11R7.2-6.6.3|
diff --git a/XOrg/driver/patches/xf86-video-i810-X11R7.2/100-sdkdir.patch b/XOrg/driver/patches/xf86-video-i810-X11R7.2/100-sdkdir.patch
new file mode 100644 (file)
index 0000000..1300a6a
--- /dev/null
@@ -0,0 +1,13 @@
+diff -urN xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac xf86-video-i810-X11R7.2-1.6.5/configure.ac
+--- xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac    2007-09-21 03:54:25.000000000 +0200
++++ xf86-video-i810-X11R7.2-1.6.5/configure.ac 2007-09-21 03:55:08.000000000 +0200
+@@ -72,7 +72,8 @@
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES])
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++sdkdir=${SDKDIR}
++#$(pkg-config --variable=sdkdir xorg-server)
+ # Checks for libraries.
diff --git a/XOrg/driver/xf86-video-ati-X11R7.2/Makefile b/XOrg/driver/xf86-video-ati-X11R7.2/Makefile
new file mode 100644 (file)
index 0000000..ee4d521
--- /dev/null
@@ -0,0 +1,13 @@
+include $(TOPDIR)/rules.mk
+
+PKG_BASE_NAME:=xf86
+PKG_NAME:=xf86-video-ati-X11R7.2
+PKG_RELEASE:=1
+PKG_VERSION:=6.6.3
+
+_DEPEND:=
+
+
+include ../common.mk
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/XOrg/driver/xf86-video-i810-X11R7.2/Makefile b/XOrg/driver/xf86-video-i810-X11R7.2/Makefile
new file mode 100644 (file)
index 0000000..4dc76af
--- /dev/null
@@ -0,0 +1,13 @@
+include $(TOPDIR)/rules.mk
+
+PKG_BASE_NAME:=xf86
+PKG_NAME:=xf86-video-i810-X11R7.2
+PKG_RELEASE:=1
+PKG_VERSION:=1.6.5
+
+_DEPEND:= +libXvMC-X11R7.2
+
+
+include ../common.mk
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/XOrg/driver/xf86-video-i810-X11R7.2/patches/100-sdkdir.patch b/XOrg/driver/xf86-video-i810-X11R7.2/patches/100-sdkdir.patch
new file mode 100644 (file)
index 0000000..1300a6a
--- /dev/null
@@ -0,0 +1,13 @@
+diff -urN xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac xf86-video-i810-X11R7.2-1.6.5/configure.ac
+--- xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac    2007-09-21 03:54:25.000000000 +0200
++++ xf86-video-i810-X11R7.2-1.6.5/configure.ac 2007-09-21 03:55:08.000000000 +0200
+@@ -72,7 +72,8 @@
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES])
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++sdkdir=${SDKDIR}
++#$(pkg-config --variable=sdkdir xorg-server)
+ # Checks for libraries.
diff --git a/XOrg/driver/xf86-video-nv-X11R7.2/Makefile b/XOrg/driver/xf86-video-nv-X11R7.2/Makefile
new file mode 100644 (file)
index 0000000..9e16ba1
--- /dev/null
@@ -0,0 +1,13 @@
+include $(TOPDIR)/rules.mk
+
+PKG_BASE_NAME:=xf86
+PKG_NAME:=xf86-video-nv-X11R7.2
+PKG_RELEASE:=1
+PKG_VERSION:=1.2.2.1
+
+_DEPEND:=
+
+
+include ../common.mk
+
+$(eval $(call BuildPackage,$(PKG_NAME)))