From 5add42fba9337e28a30ee57d5d0da5f307572333 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 31 Oct 2009 00:12:15 +0000 Subject: [PATCH] Update xorg proto packages to Xorg 7.5 SVN-Revision: 18233 --- Xorg/xorg/proto/applewmproto/Makefile | 12 +++---- Xorg/xorg/proto/bigreqsproto/Makefile | 12 +++---- Xorg/xorg/proto/calibrateproto/Makefile | 6 ++-- Xorg/xorg/proto/compositeproto/Makefile | 12 +++---- Xorg/xorg/proto/damageproto/Makefile | 12 +++---- Xorg/xorg/proto/dmxproto/Makefile | 16 +++++---- .../proto/{evieext => dri2proto}/Makefile | 23 ++++++------ Xorg/xorg/proto/fixesproto/Makefile | 12 +++---- Xorg/xorg/proto/fontcacheproto/Makefile | 12 +++---- Xorg/xorg/proto/fontsproto/Makefile | 16 +++++---- Xorg/xorg/proto/glproto/Makefile | 12 +++---- Xorg/xorg/proto/inputproto/Makefile | 12 +++---- Xorg/xorg/proto/kbproto/Makefile | 12 +++---- Xorg/xorg/proto/packages | 31 ---------------- Xorg/xorg/proto/printproto/Makefile | 12 +++---- Xorg/xorg/proto/randrproto/Makefile | 12 +++---- .../randrproto/patches/010-fix-warning.patch | 15 -------- Xorg/xorg/proto/recordproto/Makefile | 12 +++---- Xorg/xorg/proto/renderproto/Makefile | 12 +++---- Xorg/xorg/proto/resourceproto/Makefile | 12 +++---- Xorg/xorg/proto/scrnsaverproto/Makefile | 12 +++---- Xorg/xorg/proto/template.mk | 36 ------------------- Xorg/xorg/proto/trapproto/Makefile | 36 ------------------- Xorg/xorg/proto/videoproto/Makefile | 12 +++---- Xorg/xorg/proto/windowswmproto/Makefile | 12 +++---- Xorg/xorg/proto/xcmiscproto/Makefile | 12 +++---- Xorg/xorg/proto/xextproto/Makefile | 12 +++---- Xorg/xorg/proto/xf86bigfontproto/Makefile | 10 +++--- Xorg/xorg/proto/xf86dgaproto/Makefile | 10 +++--- Xorg/xorg/proto/xf86driproto/Makefile | 12 +++---- Xorg/xorg/proto/xf86miscproto/Makefile | 36 ------------------- Xorg/xorg/proto/xf86rushproto/Makefile | 36 ------------------- Xorg/xorg/proto/xf86vidmodeproto/Makefile | 12 +++---- Xorg/xorg/proto/xineramaproto/Makefile | 12 +++---- Xorg/xorg/proto/xproto/Makefile | 12 +++---- 35 files changed, 179 insertions(+), 368 deletions(-) rename Xorg/xorg/proto/{evieext => dri2proto}/Makefile (56%) delete mode 100644 Xorg/xorg/proto/packages delete mode 100644 Xorg/xorg/proto/randrproto/patches/010-fix-warning.patch delete mode 100644 Xorg/xorg/proto/template.mk delete mode 100644 Xorg/xorg/proto/trapproto/Makefile delete mode 100644 Xorg/xorg/proto/xf86miscproto/Makefile delete mode 100644 Xorg/xorg/proto/xf86rushproto/Makefile diff --git a/Xorg/xorg/proto/applewmproto/Makefile b/Xorg/xorg/proto/applewmproto/Makefile index a0b2de6dc..b04675ae6 100644 --- a/Xorg/xorg/proto/applewmproto/Makefile +++ b/Xorg/xorg/proto/applewmproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=applewmproto -PKG_RELEASE:=3 -PKG_VERSION:=1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=1.4.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/bigreqsproto/Makefile b/Xorg/xorg/proto/bigreqsproto/Makefile index 8d510c425..3d5b69971 100644 --- a/Xorg/xorg/proto/bigreqsproto/Makefile +++ b/Xorg/xorg/proto/bigreqsproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigreqsproto -PKG_RELEASE:=3 -PKG_VERSION:=1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=1.1.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/calibrateproto/Makefile b/Xorg/xorg/proto/calibrateproto/Makefile index 9a7fa6667..40d812ea2 100644 --- a/Xorg/xorg/proto/calibrateproto/Makefile +++ b/Xorg/xorg/proto/calibrateproto/Makefile @@ -1,11 +1,9 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-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 diff --git a/Xorg/xorg/proto/compositeproto/Makefile b/Xorg/xorg/proto/compositeproto/Makefile index c624a1dc5..b52e466c4 100644 --- a/Xorg/xorg/proto/compositeproto/Makefile +++ b/Xorg/xorg/proto/compositeproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=compositeproto -PKG_RELEASE:=3 -PKG_VERSION:=0.4 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=0.4.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/damageproto/Makefile b/Xorg/xorg/proto/damageproto/Makefile index e078cfee7..54320dae4 100644 --- a/Xorg/xorg/proto/damageproto/Makefile +++ b/Xorg/xorg/proto/damageproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=damageproto -PKG_RELEASE:=3 -PKG_VERSION:=1.1.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=1.2.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/dmxproto/Makefile b/Xorg/xorg/proto/dmxproto/Makefile index 857ad3248..a3d6a3885 100644 --- a/Xorg/xorg/proto/dmxproto/Makefile +++ b/Xorg/xorg/proto/dmxproto/Makefile @@ -1,18 +1,20 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-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:=dmxproto -PKG_RELEASE:=3 -PKG_VERSION:=2.2.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=2.3 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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 diff --git a/Xorg/xorg/proto/evieext/Makefile b/Xorg/xorg/proto/dri2proto/Makefile similarity index 56% rename from Xorg/xorg/proto/evieext/Makefile rename to Xorg/xorg/proto/dri2proto/Makefile index 5cc0bbe44..dd7471f6e 100644 --- a/Xorg/xorg/proto/evieext/Makefile +++ b/Xorg/xorg/proto/dri2proto/Makefile @@ -1,27 +1,26 @@ -# -# Copyright (C) 2006-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. # -# blogic@openwrt.org + include $(TOPDIR)/rules.mk -PKG_NAME:=evieext -PKG_RELEASE:=3 -PKG_VERSION:=1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_NAME:=dri2proto +PKG_RELEASE:=1 +PKG_VERSION:=2.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk -define Package/evieext +define Package/dri2proto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= - TITLE:=evieext + TITLE:=dri2proto URL:=http://xorg.freedesktop.org/ endef @@ -33,4 +32,4 @@ define Build/Compile true endef -$(eval $(call BuildPackage,evieext)) +$(eval $(call BuildPackage,dri2proto)) diff --git a/Xorg/xorg/proto/fixesproto/Makefile b/Xorg/xorg/proto/fixesproto/Makefile index 0e2851d40..f53e7031b 100644 --- a/Xorg/xorg/proto/fixesproto/Makefile +++ b/Xorg/xorg/proto/fixesproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fixesproto -PKG_RELEASE:=3 -PKG_VERSION:=4.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=4.1.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/fontcacheproto/Makefile b/Xorg/xorg/proto/fontcacheproto/Makefile index 08cfc7010..2bfb77213 100644 --- a/Xorg/xorg/proto/fontcacheproto/Makefile +++ b/Xorg/xorg/proto/fontcacheproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fontcacheproto -PKG_RELEASE:=3 -PKG_VERSION:=0.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=0.1.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/fontsproto/Makefile b/Xorg/xorg/proto/fontsproto/Makefile index b79c4b012..6592eec73 100644 --- a/Xorg/xorg/proto/fontsproto/Makefile +++ b/Xorg/xorg/proto/fontsproto/Makefile @@ -1,18 +1,20 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-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:=fontsproto -PKG_RELEASE:=3 -PKG_VERSION:=2.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=2.1.0 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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:=f3a857deadca3144fba041af1dbf7603 include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/glproto/Makefile b/Xorg/xorg/proto/glproto/Makefile index b1b066a27..138a1093f 100644 --- a/Xorg/xorg/proto/glproto/Makefile +++ b/Xorg/xorg/proto/glproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glproto -PKG_RELEASE:=3 -PKG_VERSION:=1.4.9 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=1.4.10 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/inputproto/Makefile b/Xorg/xorg/proto/inputproto/Makefile index ed5611c22..0e3e78ac4 100644 --- a/Xorg/xorg/proto/inputproto/Makefile +++ b/Xorg/xorg/proto/inputproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=inputproto -PKG_RELEASE:=3 -PKG_VERSION:=1.4.4 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=2.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/kbproto/Makefile b/Xorg/xorg/proto/kbproto/Makefile index ba560e469..91065c25c 100644 --- a/Xorg/xorg/proto/kbproto/Makefile +++ b/Xorg/xorg/proto/kbproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kbproto -PKG_RELEASE:=3 -PKG_VERSION:=1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=1.0.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/packages b/Xorg/xorg/proto/packages deleted file mode 100644 index 23e1cccea..000000000 --- a/Xorg/xorg/proto/packages +++ /dev/null @@ -1,31 +0,0 @@ -applewmproto-1.0.3| -bigreqsproto-1.0.2| -compositeproto-0.4| -damageproto-1.1.0| -dmxproto-2.2.2| -evieext-1.0.2| -fixesproto-4.0| -fontcacheproto-0.1.2| -fontsproto-2.0.2| -glproto-1.4.9| -inputproto-1.4.4| -kbproto-1.0.3| -printproto-1.0.3| -randrproto-1.2.1| -recordproto-1.13.2| -renderproto-0.9.3| -resourceproto-1.0.2| -scrnsaverproto-1.1.0| -trapproto-3.4.3| -videoproto-2.2.2| -windowswmproto-1.0.3| -xcmiscproto-1.1.2| -xextproto-7.0.3| -xf86bigfontproto-1.1.2| -xf86dgaproto-2.0.3| -xf86driproto-2.0.4| -xf86miscproto-0.9.2| -xf86rushproto-1.1.2| -xf86vidmodeproto-2.2.2| -xineramaproto-1.1.2| -xproto-7.0.13| diff --git a/Xorg/xorg/proto/printproto/Makefile b/Xorg/xorg/proto/printproto/Makefile index 114de7bb0..8596e78fe 100644 --- a/Xorg/xorg/proto/printproto/Makefile +++ b/Xorg/xorg/proto/printproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=printproto -PKG_RELEASE:=3 -PKG_VERSION:=1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=1.0.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/randrproto/Makefile b/Xorg/xorg/proto/randrproto/Makefile index 186d907f1..90b93c497 100644 --- a/Xorg/xorg/proto/randrproto/Makefile +++ b/Xorg/xorg/proto/randrproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=randrproto -PKG_RELEASE:=3 -PKG_VERSION:=1.2.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=1.3.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/randrproto/patches/010-fix-warning.patch b/Xorg/xorg/proto/randrproto/patches/010-fix-warning.patch deleted file mode 100644 index 6406ada1b..000000000 --- a/Xorg/xorg/proto/randrproto/patches/010-fix-warning.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/randrproto.h b/randrproto.h -index abca369..cbbf6a8 100644 ---- a/randrproto.h -+++ b/randrproto.h -@@ -564,8 +564,8 @@ typedef struct { - CARD8 type; /* always evBase + ScreenChangeNotify */ - CARD8 rotation; /* new rotation */ - CARD16 sequenceNumber B16; -- Time timestamp B32; B32; /* time screen was changed */ -- Time configTimestamp B32; B32; /* time config data was changed */ -+ Time timestamp B32; /* time screen was changed */ -+ Time configTimestamp B32; /* time config data was changed */ - Window root B32; /* root window */ - Window window B32; /* window requesting notification */ - SizeID sizeID B16; /* new size ID */ diff --git a/Xorg/xorg/proto/recordproto/Makefile b/Xorg/xorg/proto/recordproto/Makefile index f7a32cee3..b354079f2 100644 --- a/Xorg/xorg/proto/recordproto/Makefile +++ b/Xorg/xorg/proto/recordproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=recordproto -PKG_RELEASE:=3 -PKG_VERSION:=1.13.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=1.14 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/renderproto/Makefile b/Xorg/xorg/proto/renderproto/Makefile index 9d720e0c6..749193a70 100644 --- a/Xorg/xorg/proto/renderproto/Makefile +++ b/Xorg/xorg/proto/renderproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=renderproto -PKG_RELEASE:=3 -PKG_VERSION:=0.9.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=0.11 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/resourceproto/Makefile b/Xorg/xorg/proto/resourceproto/Makefile index 9bba047ab..ec35485bf 100644 --- a/Xorg/xorg/proto/resourceproto/Makefile +++ b/Xorg/xorg/proto/resourceproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=resourceproto -PKG_RELEASE:=3 -PKG_VERSION:=1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=1.1.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/scrnsaverproto/Makefile b/Xorg/xorg/proto/scrnsaverproto/Makefile index 7194c3618..a117735d4 100644 --- a/Xorg/xorg/proto/scrnsaverproto/Makefile +++ b/Xorg/xorg/proto/scrnsaverproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=scrnsaverproto -PKG_RELEASE:=3 -PKG_VERSION:=1.1.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=1.2.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/template.mk b/Xorg/xorg/proto/template.mk deleted file mode 100644 index 47a269ff3..000000000 --- a/Xorg/xorg/proto/template.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (C) 2006 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:=@NAME@ -PKG_RELEASE:=3 -PKG_VERSION:=@VER@ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ -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-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:=@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 - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,@NAME@)) diff --git a/Xorg/xorg/proto/trapproto/Makefile b/Xorg/xorg/proto/trapproto/Makefile deleted file mode 100644 index cfb280ee5..000000000 --- a/Xorg/xorg/proto/trapproto/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (C) 2006-2008 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:=trapproto -PKG_RELEASE:=3 -PKG_VERSION:=3.4.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ -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/trapproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=trapproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,trapproto)) diff --git a/Xorg/xorg/proto/videoproto/Makefile b/Xorg/xorg/proto/videoproto/Makefile index 5b78a102e..f0311867f 100644 --- a/Xorg/xorg/proto/videoproto/Makefile +++ b/Xorg/xorg/proto/videoproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=videoproto -PKG_RELEASE:=3 -PKG_VERSION:=2.2.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=2.3.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/windowswmproto/Makefile b/Xorg/xorg/proto/windowswmproto/Makefile index a1b808fe5..21b05d55a 100644 --- a/Xorg/xorg/proto/windowswmproto/Makefile +++ b/Xorg/xorg/proto/windowswmproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=windowswmproto -PKG_RELEASE:=3 -PKG_VERSION:=1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=1.0.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/xcmiscproto/Makefile b/Xorg/xorg/proto/xcmiscproto/Makefile index 6f06a04ca..d344f7a2d 100644 --- a/Xorg/xorg/proto/xcmiscproto/Makefile +++ b/Xorg/xorg/proto/xcmiscproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xcmiscproto -PKG_RELEASE:=3 -PKG_VERSION:=1.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=1.2.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/xextproto/Makefile b/Xorg/xorg/proto/xextproto/Makefile index 0cea026b1..aafa11235 100644 --- a/Xorg/xorg/proto/xextproto/Makefile +++ b/Xorg/xorg/proto/xextproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xextproto -PKG_RELEASE:=3 -PKG_VERSION:=7.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=7.1.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/xf86bigfontproto/Makefile b/Xorg/xorg/proto/xf86bigfontproto/Makefile index 569bf6939..f2dc4addc 100644 --- a/Xorg/xorg/proto/xf86bigfontproto/Makefile +++ b/Xorg/xorg/proto/xf86bigfontproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86bigfontproto PKG_RELEASE:=3 -PKG_VERSION:=1.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_VERSION:=1.2.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/xf86dgaproto/Makefile b/Xorg/xorg/proto/xf86dgaproto/Makefile index f8c6688a2..8e2863f23 100644 --- a/Xorg/xorg/proto/xf86dgaproto/Makefile +++ b/Xorg/xorg/proto/xf86dgaproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86dgaproto PKG_RELEASE:=3 -PKG_VERSION:=2.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_VERSION:=2.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/xf86driproto/Makefile b/Xorg/xorg/proto/xf86driproto/Makefile index 88bc7de48..d4c71ccbc 100644 --- a/Xorg/xorg/proto/xf86driproto/Makefile +++ b/Xorg/xorg/proto/xf86driproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86driproto -PKG_RELEASE:=3 -PKG_VERSION:=2.0.4 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=2.1.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/xf86miscproto/Makefile b/Xorg/xorg/proto/xf86miscproto/Makefile deleted file mode 100644 index 48c2de7b3..000000000 --- a/Xorg/xorg/proto/xf86miscproto/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (C) 2006-2008 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:=xf86miscproto -PKG_RELEASE:=3 -PKG_VERSION:=0.9.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ -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/xf86miscproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=xf86miscproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,xf86miscproto)) diff --git a/Xorg/xorg/proto/xf86rushproto/Makefile b/Xorg/xorg/proto/xf86rushproto/Makefile deleted file mode 100644 index 129799ba3..000000000 --- a/Xorg/xorg/proto/xf86rushproto/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (C) 2006-2008 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:=xf86rushproto -PKG_RELEASE:=3 -PKG_VERSION:=1.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ -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/xf86rushproto - SECTION:=xorg-proto - CATEGORY:=Xorg - SUBMENU:=proto - DEPENDS:= - TITLE:=xf86rushproto - URL:=http://xorg.freedesktop.org/ -endef - -define Build/InstallDev - DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install -endef - -define Build/Compile - true -endef - -$(eval $(call BuildPackage,xf86rushproto)) diff --git a/Xorg/xorg/proto/xf86vidmodeproto/Makefile b/Xorg/xorg/proto/xf86vidmodeproto/Makefile index 458a19cd6..55485f129 100644 --- a/Xorg/xorg/proto/xf86vidmodeproto/Makefile +++ b/Xorg/xorg/proto/xf86vidmodeproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86vidmodeproto -PKG_RELEASE:=3 -PKG_VERSION:=2.2.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=2.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/xineramaproto/Makefile b/Xorg/xorg/proto/xineramaproto/Makefile index 849d88cb1..375f56d14 100644 --- a/Xorg/xorg/proto/xineramaproto/Makefile +++ b/Xorg/xorg/proto/xineramaproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xineramaproto -PKG_RELEASE:=3 -PKG_VERSION:=1.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=1.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/proto/xproto/Makefile b/Xorg/xorg/proto/xproto/Makefile index 7962683b4..bb5ff8d35 100644 --- a/Xorg/xorg/proto/xproto/Makefile +++ b/Xorg/xorg/proto/xproto/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xproto -PKG_RELEASE:=3 -PKG_VERSION:=7.0.13 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/ +PKG_RELEASE:=1 +PKG_VERSION:=7.0.16 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ 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)/ include $(INCLUDE_DIR)/package.mk -- 2.30.2