From: John Crispin <john@openwrt.org>
Date: Fri, 21 Sep 2007 19:11:49 +0000 (+0000)
Subject: added XOrg video drivers for i810, ati, nv and fbdev
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=aee423e2dbaccba159d7fd1381d5ad564897f4d5;p=openwrt%2Fsvn-archive%2Fpackages.git

added XOrg video drivers for i810, ati, nv and fbdev

SVN-Revision: 8933
---

diff --git a/XOrg/driver/common.mk b/XOrg/driver/common.mk
index b5f7a2ac2..110dc4418 100644
--- a/XOrg/driver/common.mk
+++ b/XOrg/driver/common.mk
@@ -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
diff --git a/XOrg/driver/packages b/XOrg/driver/packages
index 622a9ace5..4c55b1aad 100644
--- a/XOrg/driver/packages
+++ b/XOrg/driver/packages
@@ -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
index 000000000..1300a6a92
--- /dev/null
+++ b/XOrg/driver/patches/xf86-video-i810-X11R7.2/100-sdkdir.patch
@@ -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
index 000000000..ee4d52166
--- /dev/null
+++ b/XOrg/driver/xf86-video-ati-X11R7.2/Makefile
@@ -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
index 000000000..4dc76af30
--- /dev/null
+++ b/XOrg/driver/xf86-video-i810-X11R7.2/Makefile
@@ -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
index 000000000..1300a6a92
--- /dev/null
+++ b/XOrg/driver/xf86-video-i810-X11R7.2/patches/100-sdkdir.patch
@@ -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
index 000000000..9e16ba112
--- /dev/null
+++ b/XOrg/driver/xf86-video-nv-X11R7.2/Makefile
@@ -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)))