From 5665a01886406ee056d2ab0d61e91707f3a17d9c Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 31 Oct 2009 00:24:09 +0000 Subject: [PATCH] [packages] Update xorg dirvers to Xorg 7.5 SVN-Revision: 18239 --- Xorg/xorg/driver/packages | 8 --- Xorg/xorg/driver/template.mk | 70 ------------------- Xorg/xorg/driver/xf86-input-evdev/Makefile | 14 ++-- Xorg/xorg/driver/xf86-input-keyboard/Makefile | 17 ++--- Xorg/xorg/driver/xf86-input-mouse/Makefile | 15 ++-- Xorg/xorg/driver/xf86-video-ati/Makefile | 13 ++-- Xorg/xorg/driver/xf86-video-fbdev/Makefile | 21 +++--- Xorg/xorg/driver/xf86-video-geode/Makefile | 19 ++--- Xorg/xorg/driver/xf86-video-intel/Makefile | 15 ++-- Xorg/xorg/driver/xf86-video-nv/Makefile | 12 ++-- Xorg/xorg/driver/xf86-video-vesa/Makefile | 14 ++-- 11 files changed, 79 insertions(+), 139 deletions(-) delete mode 100644 Xorg/xorg/driver/packages delete mode 100644 Xorg/xorg/driver/template.mk diff --git a/Xorg/xorg/driver/packages b/Xorg/xorg/driver/packages deleted file mode 100644 index 66efe641c9..0000000000 --- a/Xorg/xorg/driver/packages +++ /dev/null @@ -1,8 +0,0 @@ -xf86-input-evdev-2.0.4| -xf86-input-keyboard-1.3.1| -xf86-input-mouse-1.3.0| -xf86-video-fbdev-0.4.0| -xf86-video-vesa-2.0.0| -xf86-video-intel-2.4.2| -xf86-video-nv-2.1.12| -xf86-video-ati-6.9.0|@BROKEN diff --git a/Xorg/xorg/driver/template.mk b/Xorg/xorg/driver/template.mk deleted file mode 100644 index ac67d2466a..0000000000 --- a/Xorg/xorg/driver/template.mk +++ /dev/null @@ -1,70 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org -include $(TOPDIR)/rules.mk - -PKG_BASE_NAME:=@BASE_NAME@ -PKG_NAME:=@NAME@ -PKG_RELEASE:=2 -PKG_VERSION:=@VER@ -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)/ - -include $(INCLUDE_DIR)/package.mk - -define Package/@NAME@ - SECTION:=xorg-driver - CATEGORY:=Xorg - SUBMENU:=driver - DEPENDS:=+xorg-server @DEP@ @DISPLAY_SUPPORT - TITLE:=@NAME@ - 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/ \ - $(TARGET_CPPFLAGS) - -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/@NAME@/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,@NAME@)) diff --git a/Xorg/xorg/driver/xf86-input-evdev/Makefile b/Xorg/xorg/driver/xf86-input-evdev/Makefile index 4f37115e92..f700d2ab75 100644 --- a/Xorg/xorg/driver/xf86-input-evdev/Makefile +++ b/Xorg/xorg/driver/xf86-input-evdev/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,17 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86-input-evdev -PKG_RELEASE:=4 -PKG_VERSION:=2.0.4 +PKG_RELEASE:=1 +PKG_VERSION:=2.3.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/driver +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=ac97e155ea4db87a8393297493f9c406 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=21dac6461379d67ee3b333c77f63e7bf + PKG_BUILD_DEPENDS:=randrproto inputproto xproto PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +-include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk) define Package/xf86-input-evdev SECTION:=xorg-driver diff --git a/Xorg/xorg/driver/xf86-input-keyboard/Makefile b/Xorg/xorg/driver/xf86-input-keyboard/Makefile index cad3eb5556..939d2d5edd 100644 --- a/Xorg/xorg/driver/xf86-input-keyboard/Makefile +++ b/Xorg/xorg/driver/xf86-input-keyboard/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,18 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86-input-keyboard -PKG_RELEASE:=4 -PKG_VERSION:=1.3.1 +PKG_RELEASE:=1 +PKG_VERSION:=1.4.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/driver +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=ebe5dcf8eed819103909f18321fc3b9d +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=fd17158ffeacecc8cc670604460cb98b + PKG_BUILD_DEPENDS:=randrproto inputproto kbproto xproto +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk - -PKG_INSTALL:=1 +-include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk) define Package/xf86-input-keyboard SECTION:=xorg-driver diff --git a/Xorg/xorg/driver/xf86-input-mouse/Makefile b/Xorg/xorg/driver/xf86-input-mouse/Makefile index e11b354c4e..866e5a605b 100644 --- a/Xorg/xorg/driver/xf86-input-mouse/Makefile +++ b/Xorg/xorg/driver/xf86-input-mouse/Makefile @@ -8,18 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86-input-mouse -PKG_RELEASE:=4 -PKG_VERSION:=1.3.0 +PKG_RELEASE:=1 +PKG_VERSION:=1.5.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/driver +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=31a51b0e5ddc4fac19754f48a3adf881 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=c58629fddf0782dad5c02da6aeb35521 + PKG_BUILD_DEPENDS:=randrproto inputproto xproto +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk - -PKG_INSTALL:=1 +-include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk) define Package/xf86-input-mouse SECTION:=xorg-driver diff --git a/Xorg/xorg/driver/xf86-video-ati/Makefile b/Xorg/xorg/driver/xf86-video-ati/Makefile index d21b25d142..4d5fbd132f 100644 --- a/Xorg/xorg/driver/xf86-video-ati/Makefile +++ b/Xorg/xorg/driver/xf86-video-ati/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -9,13 +9,16 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xf86 PKG_NAME:=xf86-video-ati -PKG_RELEASE:=2 -PKG_VERSION:=6.9.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/driver +PKG_RELEASE:=1 +PKG_VERSION:=6.12.4 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/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/${PKG_NAME}-$(PKG_VERSION)/ +PKG_MD5SUM:= include $(INCLUDE_DIR)/package.mk +-include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk) define Package/xf86-video-ati SECTION:=xorg-driver diff --git a/Xorg/xorg/driver/xf86-video-fbdev/Makefile b/Xorg/xorg/driver/xf86-video-fbdev/Makefile index fe202c6ff4..233fe3780f 100644 --- a/Xorg/xorg/driver/xf86-video-fbdev/Makefile +++ b/Xorg/xorg/driver/xf86-video-fbdev/Makefile @@ -1,25 +1,26 @@ -# -# Copyright (C) 2007 OpenWrt.org +# +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_NAME:=xf86-video-fbdev -PKG_RELEASE:=3 -PKG_VERSION:=0.4.0 +PKG_RELEASE:=1 +PKG_VERSION:=0.4.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/driver +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_MD5SUM:=6572b39fec77b8e6de1c858a93992924 - -include $(INCLUDE_DIR)/package.mk +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=79ce1eb9f9d2ed56de70d8e06cb767d9 PKG_INSTALL:=1 +include $(INCLUDE_DIR)/package.mk +-include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk) + define Package/xf86-video-fbdev SECTION:=xorg-driver CATEGORY:=Xorg diff --git a/Xorg/xorg/driver/xf86-video-geode/Makefile b/Xorg/xorg/driver/xf86-video-geode/Makefile index 01ac010999..d63cca3069 100644 --- a/Xorg/xorg/driver/xf86-video-geode/Makefile +++ b/Xorg/xorg/driver/xf86-video-geode/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,19 +8,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86-video-geode -PKG_RELEASE:=2 -PKG_VERSION:=2.10.1 +PKG_RELEASE:=1 +PKG_VERSION:=2.11.6 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/driver/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_MD5SUM:=e307ab55a2a81d7868506df789f76dfb -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:= + +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + PKG_BUILD_DEPENDS:=randrproto renderproto videoproto xextproto xf86dgaproto \ xproto fontsproto +PKG_INSTALL:=1 -include $(INCLUDE_DIR)/package.mk -PKG_INSTALL:=1 +include $(INCLUDE_DIR)/package.mk +-include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk) define Package/xf86-video-geode SECTION:=xorg-driver diff --git a/Xorg/xorg/driver/xf86-video-intel/Makefile b/Xorg/xorg/driver/xf86-video-intel/Makefile index 42a416addd..0275d2a235 100644 --- a/Xorg/xorg/driver/xf86-video-intel/Makefile +++ b/Xorg/xorg/driver/xf86-video-intel/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -9,15 +9,18 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xf86 PKG_NAME:=xf86-video-intel -PKG_RELEASE:=3 -PKG_VERSION:=2.4.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/driver +PKG_RELEASE:=1 +PKG_VERSION:=2.9.1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_MD5SUM:=5cd6b3ed57c7e78ab51e9d9266e73fb6 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/${PKG_NAME}-$(PKG_VERSION)/ PKG_BUILD_DEPENDS:=xf86driproto glproto +PKG_MD5SUM:= + include $(INCLUDE_DIR)/package.mk +-include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk) define Package/xf86-video-intel SECTION:=xorg-driver diff --git a/Xorg/xorg/driver/xf86-video-nv/Makefile b/Xorg/xorg/driver/xf86-video-nv/Makefile index ea3e0fe97e..bde237a4bb 100644 --- a/Xorg/xorg/driver/xf86-video-nv/Makefile +++ b/Xorg/xorg/driver/xf86-video-nv/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,13 +10,15 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xf86 PKG_NAME:=xf86-video-nv PKG_RELEASE:=3 -PKG_VERSION:=2.1.12 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/driver +PKG_VERSION:=2.1.15 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_MD5SUM:=42f12a36d7afc26c817e8e8f5c8b7274 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/${PKG_NAME}-$(PKG_VERSION)/ +PKG_MD5SUM:= include $(INCLUDE_DIR)/package.mk +-include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk) define Package/xf86-video-nv SECTION:=xorg-driver diff --git a/Xorg/xorg/driver/xf86-video-vesa/Makefile b/Xorg/xorg/driver/xf86-video-vesa/Makefile index 74ab0dac40..b32495b22f 100644 --- a/Xorg/xorg/driver/xf86-video-vesa/Makefile +++ b/Xorg/xorg/driver/xf86-video-vesa/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,17 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86-video-vesa -PKG_RELEASE:=4 -PKG_VERSION:=2.0.0 +PKG_RELEASE:=1 +PKG_VERSION:=2.2.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/driver +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=433cf6f961eb4a2ab6fcb086def0b2b4 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:= PKG_BUILD_DEPENDS:=xproto fontsproto randrproto renderproto xextproto PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +-include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk) define Package/xf86-video-vesa -- 2.30.2