From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sun, 14 Dec 2008 23:27:08 +0000 (+0000)
Subject: Cleanup xf86-video-vesa package  makefile.
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=b3593530439231c34c6d05f6b9bb9c22775d95bc

Cleanup xf86-video-vesa package  makefile.


SVN-Revision: 13641
---

diff --git a/Xorg/xorg/driver/xf86-video-vesa/Makefile b/Xorg/xorg/driver/xf86-video-vesa/Makefile
index 75c8bb78e2..dfe8fddad0 100644
--- a/Xorg/xorg/driver/xf86-video-vesa/Makefile
+++ b/Xorg/xorg/driver/xf86-video-vesa/Makefile
@@ -1,71 +1,40 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=xf86
 PKG_NAME:=xf86-video-vesa
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=2.0.0
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/driver
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xproto fontsproto randrproto renderproto xextproto
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+
 define Package/xf86-video-vesa
   SECTION:=xorg-driver
   CATEGORY:=Xorg
   SUBMENU:=driver
-  DEPENDS:=+xserver-xorg
+  DEPENDS:=+xserver-xorg +libpciaccess
   TITLE:=xf86-video-vesa
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/InstallDev
-	DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
-		-I$(STAGING_DIR)/usr/include/X11/ \
-		-I$(STAGING_DIR)/usr/include/ \
-		-I$(STAGING_DIR)/include/
-
-EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
-
-acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
-
-CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
-	sdkdir=$(STAGING_DIR) 
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-	if [ -x $(CONFIGURE_CMD) ]; then \
-		$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-		$(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
-		sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
-		$(CONFIGURE_VARS) \
-		$(CONFIGURE_CMD) \
-		$(CONFIGURE_ARGS_XTRA) \
-		$(CONFIGURE_ARGS) \
-		CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
-	fi \
-	)
-endef
-
-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/xf86-video-vesa/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/xorg/modules/drivers
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/xorg/modules/drivers/vesa_drv.so \
+		$(1)/usr/lib/xorg/modules/drivers/
 endef
 
 $(eval $(call BuildPackage,xf86-video-vesa))