mesa: disable all dri drivers except for swrast for non-x86 (compile errors)

[openwrt/svn-archive/archive.git] / Xorg / lib / mesa / Makefile

diff --git a/Xorg/lib/mesa/Makefile b/Xorg/lib/mesa/Makefile
index 009650e9a1db220730b2c4ad100f8bcbb4c9786a..ae33cdb644865a7d244c39ad9a409294fc20f900 100644 (file)
--- a/Xorg/lib/mesa/Makefile
+++ b/Xorg/lib/mesa/Makefile
@@ -4,12 +4,11 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=Mesa
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_VERSION:=7.2
 
 PKG_SOURCE_URL:=@SF/mesa3d
@@ -25,8 +24,8 @@ PKG_INSTALL:=1
 define Package/libgl-mesa
   SECTION:=xorg-lib
   CATEGORY:=Xorg
-  SUBMENU:=lib
-  DEPENDS:=+libX11 +libXext +libXfixes +libXdamage +libXxf86vm +libdrm
+  SUBMENU:=libraries
+  DEPENDS:=+libX11 +libXext +libXfixes +libXdamage +libXxf86vm +libdrm +libexpat
   TITLE:=Mesa OpenGL library
   URL:=http://mesa3d.org
 endef
@@ -34,7 +33,7 @@ endef
 define Package/libglu-mesa
   SECTION:=xorg-lib
   CATEGORY:=Xorg
-  SUBMENU:=lib
+  SUBMENU:=libraries
   DEPENDS:=+libgl-mesa
   TITLE:=Mesa OpenGL utility library
   URL:=http://mesa3d.org
@@ -44,8 +43,8 @@ define Package/libgl-mesa-dri/Default
 define Package/libgl-mesa-dri-$(1)
   SECTION:=xorg-lib
   CATEGORY:=Xorg
-  SUBMENU:=lib
-  DEPENDS:=libgl-mesa
+  SUBMENU:=libraries
+  DEPENDS:=libgl-mesa @DISPLAY_SUPPORT $(if $(findstring swrast,$(1)),,@TARGET_x86)
   TITLE:=mesa dri $(1)
   URL:=http://mesa3d.org
 endef
@@ -74,7 +73,7 @@ define Build/InstallDev
                $(PKG_INSTALL_DIR)/usr/include/GL/* \
                $(1)/usr/include/GL
 
-       $(INSTALL_DATA) \
+       $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/*.so* \
                $(1)/usr/lib
 
@@ -85,14 +84,14 @@ endef
 
 define Package/libgl-mesa/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) \
+       $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/libGL.so* \
                $(1)/usr/lib/
 endef
 
 define Package/libglu-mesa/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) \
+       $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/libGLU.so* \
                $(1)/usr/lib/
 endef
@@ -100,7 +99,7 @@ endef
 define Package/libgl-mesa-dri/install/Default
 define Package/libgl-mesa-dri-$(1)/install
        $(INSTALL_DIR) $$(1)/usr/lib/dri/
-       $(INSTALL_DATA) \
+       $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/dri/$(1)_dri.so* \
                $$(1)/usr/lib/dri
 endef