From 133965b9700c8dea9953c417eee4f1307ee6ba41 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Mon, 1 Dec 2008 23:07:01 +0000 Subject: [PATCH] Cleanup xorg packages dependencies. Make all dependecies on proto packages build dependencies as those packages only contain header files. Let only the xservers depend on DISPLAY_SUPPORT. SVN-Revision: 13460 --- Xorg/app/eterm/Makefile | 6 +++--- Xorg/app/fluxbox/Makefile | 6 +++--- Xorg/app/font-util/Makefile | 6 +++--- Xorg/app/fontconfig/Makefile | 2 +- Xorg/app/iceauth/Makefile | 14 ++------------ Xorg/app/matchbox/Makefile | 4 ++-- Xorg/app/xcalc/Makefile | 8 ++++---- Xorg/app/xclipboard/Makefile | 8 ++++---- Xorg/app/xdm/Makefile | 8 ++++---- Xorg/app/xine-ui/Makefile | 4 ++-- Xorg/app/xmessage/Makefile | 8 ++++---- Xorg/app/xset/Makefile | 2 +- Xorg/app/xterm-233/Makefile | 6 +++--- Xorg/data/xbitmaps/Makefile | 9 ++++----- Xorg/driver/xf86-video-intel/Makefile | 1 + Xorg/lib/libICE/Makefile | 12 +++++++----- Xorg/lib/libSM/Makefile | 12 +++++++----- Xorg/lib/libX11/Makefile | 13 ++++++++----- Xorg/lib/libXau/Makefile | 12 +++++++----- Xorg/lib/libXaw/Makefile | 12 +++++++----- Xorg/lib/libXcursor/Makefile | 11 ++++++----- Xorg/lib/libXdmcp/Makefile | 12 +++++++----- Xorg/lib/libXext/Makefile | 12 +++++++----- Xorg/lib/libXfixes/Makefile | 12 +++++++----- Xorg/lib/libXfont/Makefile | 12 +++++++----- Xorg/lib/libXft/Makefile | 4 ++-- Xorg/lib/libXi/Makefile | 7 ++++--- Xorg/lib/libXpm/Makefile | 12 +++++++----- Xorg/lib/libXrandr/Makefile | 12 +++++++----- Xorg/lib/libXrender/Makefile | 12 +++++++----- Xorg/lib/libXt/Makefile | 12 +++++++----- Xorg/lib/libXtst/Makefile | 12 +++++++----- Xorg/lib/libXv/Makefile | 12 +++++++----- Xorg/lib/libXvMC/Makefile | 12 +++++++----- Xorg/lib/libXxf86misc/Makefile | 12 +++++++----- Xorg/lib/libXxf86vm/Makefile | 12 +++++++----- Xorg/lib/libdrm/Makefile | 11 ++++++----- Xorg/lib/libfontenc/Makefile | 12 +++++++----- Xorg/lib/libmatchbox/Makefile | 2 +- Xorg/lib/libpciaccess/Makefile | 2 +- Xorg/lib/libxkbfile/Makefile | 12 +++++++----- Xorg/lib/xtrans/Makefile | 11 ++++++----- Xorg/proto/applewmproto/Makefile | 6 +++--- Xorg/proto/bigreqsproto/Makefile | 6 +++--- Xorg/proto/calibrateproto/Makefile | 4 ++-- Xorg/proto/compositeproto/Makefile | 6 +++--- Xorg/proto/damageproto/Makefile | 6 +++--- Xorg/proto/dmxproto/Makefile | 6 +++--- Xorg/proto/evieext/Makefile | 6 +++--- Xorg/proto/fixesproto/Makefile | 6 +++--- Xorg/proto/fontcacheproto/Makefile | 6 +++--- Xorg/proto/fontsproto/Makefile | 6 +++--- Xorg/proto/glproto/Makefile | 6 +++--- Xorg/proto/inputproto/Makefile | 6 +++--- Xorg/proto/kbproto/Makefile | 6 +++--- Xorg/proto/printproto/Makefile | 6 +++--- Xorg/proto/randrproto/Makefile | 6 +++--- Xorg/proto/recordproto/Makefile | 6 +++--- Xorg/proto/renderproto/Makefile | 6 +++--- Xorg/proto/resourceproto/Makefile | 6 +++--- Xorg/proto/scrnsaverproto/Makefile | 6 +++--- Xorg/proto/trapproto/Makefile | 6 +++--- Xorg/proto/videoproto/Makefile | 6 +++--- Xorg/proto/windowswmproto/Makefile | 6 +++--- Xorg/proto/xcmiscproto/Makefile | 6 +++--- Xorg/proto/xextproto/Makefile | 6 +++--- Xorg/proto/xf86bigfontproto/Makefile | 6 +++--- Xorg/proto/xf86dgaproto/Makefile | 6 +++--- Xorg/proto/xf86driproto/Makefile | 6 +++--- Xorg/proto/xf86miscproto/Makefile | 6 +++--- Xorg/proto/xf86rushproto/Makefile | 6 +++--- Xorg/proto/xf86vidmodeproto/Makefile | 6 +++--- Xorg/proto/xineramaproto/Makefile | 6 +++--- Xorg/proto/xproto/Makefile | 6 +++--- Xorg/util/util-macros/Makefile | 9 +++++---- Xorg/xserver/xorg-xserver/Makefile | 20 ++++---------------- 76 files changed, 312 insertions(+), 288 deletions(-) diff --git a/Xorg/app/eterm/Makefile b/Xorg/app/eterm/Makefile index 07a2a605f3..5cc06b4a8c 100644 --- a/Xorg/app/eterm/Makefile +++ b/Xorg/app/eterm/Makefile @@ -1,5 +1,5 @@ -# -# 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. @@ -28,7 +28,7 @@ endef define Package/eterm $(call Package/eterm/Default) TITLE:=eterm - DEPENDS:=+libX11 +libXcursor +imlib2 +libast +libiconv @DISPLAY_SUPPORT + DEPENDS:=+libX11 +libXcursor +imlib2 +libast +libiconv endef define Package/esetroot diff --git a/Xorg/app/fluxbox/Makefile b/Xorg/app/fluxbox/Makefile index 0d781f2292..b85cefc76c 100644 --- a/Xorg/app/fluxbox/Makefile +++ b/Xorg/app/fluxbox/Makefile @@ -1,5 +1,5 @@ -# -# 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. @@ -31,7 +31,7 @@ endef define Package/fluxbox $(call Package/fluxbox/Default) - DEPENDS:=+uclibcxx +libXt @DISPLAY_SUPPORT + DEPENDS:=+uclibcxx +libXt TITLE:=fluxbox window manager MENU:=1 endef diff --git a/Xorg/app/font-util/Makefile b/Xorg/app/font-util/Makefile index 9e53bf2684..1b8a63b379 100644 --- a/Xorg/app/font-util/Makefile +++ b/Xorg/app/font-util/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -22,7 +22,7 @@ define Package/font-util CATEGORY:=Xorg SUBMENU:=app TITLE:=misc tool to generate x fonts - DEPENDS:=+xserver @DISPLAY_SUPPORT + DEPENDS:=+xserver endef define Build/Configure diff --git a/Xorg/app/fontconfig/Makefile b/Xorg/app/fontconfig/Makefile index 60f2b9fee8..3374781a93 100644 --- a/Xorg/app/fontconfig/Makefile +++ b/Xorg/app/fontconfig/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. diff --git a/Xorg/app/iceauth/Makefile b/Xorg/app/iceauth/Makefile index 6909cbe8b2..9392fc8177 100644 --- a/Xorg/app/iceauth/Makefile +++ b/Xorg/app/iceauth/Makefile @@ -16,11 +16,7 @@ PKG_VERSION:=1.0.2 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ - -_DEPEND:= -ifneq (iceauth,xinit) -_DEPEND+=xorg-server-essentials -endif +PKG_BUILD_DEPENDS:=xproto include $(INCLUDE_DIR)/package.mk @@ -32,7 +28,7 @@ define Package/iceauth SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:=+libICE TITLE:=iceauth URL:=http://xorg.freedesktop.org/ endef @@ -47,10 +43,4 @@ define Package/iceauth/install rm -rf $(1)/usr/man/ endef -define Package/xinit/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit - cd $(1)/usr/bin/; ln -s xinit startx -endef - $(eval $(call BuildPackage,iceauth)) diff --git a/Xorg/app/matchbox/Makefile b/Xorg/app/matchbox/Makefile index be5bf3fa73..d40046d813 100644 --- a/Xorg/app/matchbox/Makefile +++ b/Xorg/app/matchbox/Makefile @@ -1,5 +1,5 @@ -# -# 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. diff --git a/Xorg/app/xcalc/Makefile b/Xorg/app/xcalc/Makefile index dc555e028e..ebf707a577 100644 --- a/Xorg/app/xcalc/Makefile +++ b/Xorg/app/xcalc/Makefile @@ -1,10 +1,10 @@ -# -# 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 +# blogic@openwrt.org include $(TOPDIR)/rules.mk @@ -22,7 +22,7 @@ define Package/xcalc SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=+libXaw @DISPLAY_SUPPORT + DEPENDS:=+libXaw TITLE:=xcalc URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/app/xclipboard/Makefile b/Xorg/app/xclipboard/Makefile index 49b4e5f2a4..7c7b451ea8 100644 --- a/Xorg/app/xclipboard/Makefile +++ b/Xorg/app/xclipboard/Makefile @@ -1,10 +1,10 @@ -# -# 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 +# blogic@openwrt.org include $(TOPDIR)/rules.mk @@ -22,7 +22,7 @@ define Package/xclipboard SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=@DISPLAY_SUPPORT + DEPENDS:= TITLE:=xclipboard URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/app/xdm/Makefile b/Xorg/app/xdm/Makefile index a532b77131..0d601c4503 100644 --- a/Xorg/app/xdm/Makefile +++ b/Xorg/app/xdm/Makefile @@ -1,10 +1,10 @@ -# -# 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 +# blogic@openwrt.org include $(TOPDIR)/rules.mk @@ -22,7 +22,7 @@ define Package/xdm SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=@DISPLAY_SUPPORT + DEPENDS:= TITLE:=xdm URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/app/xine-ui/Makefile b/Xorg/app/xine-ui/Makefile index c61a5d151c..8012e07e51 100644 --- a/Xorg/app/xine-ui/Makefile +++ b/Xorg/app/xine-ui/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/Xorg/app/xmessage/Makefile b/Xorg/app/xmessage/Makefile index 40ad618c37..03850785e1 100644 --- a/Xorg/app/xmessage/Makefile +++ b/Xorg/app/xmessage/Makefile @@ -1,10 +1,10 @@ -# -# 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 +# blogic@openwrt.org include $(TOPDIR)/rules.mk @@ -22,7 +22,7 @@ define Package/xmessage SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=@DISPLAY_SUPPORT + DEPENDS:= TITLE:=xmessage URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/app/xset/Makefile b/Xorg/app/xset/Makefile index c43527c31d..a85c783878 100644 --- a/Xorg/app/xset/Makefile +++ b/Xorg/app/xset/Makefile @@ -25,7 +25,7 @@ define Package/xset SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=@DISPLAY_SUPPORT + DEPENDS:= TITLE:=xset URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/app/xterm-233/Makefile b/Xorg/app/xterm-233/Makefile index fee0ec2db1..cdbc076c1e 100644 --- a/Xorg/app/xterm-233/Makefile +++ b/Xorg/app/xterm-233/Makefile @@ -1,5 +1,5 @@ -# -# 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. @@ -22,7 +22,7 @@ define Package/xterm CATEGORY:=Xorg SUBMENU:=terminals TITLE:=xterm - DEPENDS:=+libX11 +libncurses +libXaw @DISPLAY_SUPPORT + DEPENDS:=+libX11 +libncurses +libXaw endef define Build/Configure diff --git a/Xorg/data/xbitmaps/Makefile b/Xorg/data/xbitmaps/Makefile index 7c7ccb1c8b..8cbfe1d076 100644 --- a/Xorg/data/xbitmaps/Makefile +++ b/Xorg/data/xbitmaps/Makefile @@ -1,9 +1,10 @@ -# +# # Copyright (C) 2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xbitmaps @@ -12,9 +13,7 @@ PKG_RELEASE:=1 PKG_VERSION:=1.0.1 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/data/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ - -#PKG_FIXUP = libtool +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -22,7 +21,7 @@ define Package/xbitmaps SECTION:=xorg-data CATEGORY:=Xorg SUBMENU:=data - DEPENDS:=@DISPLAY_SUPPORT + DEPENDS:= TITLE:=xbitmaps URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/driver/xf86-video-intel/Makefile b/Xorg/driver/xf86-video-intel/Makefile index e1763d2a93..53dbc5427c 100644 --- a/Xorg/driver/xf86-video-intel/Makefile +++ b/Xorg/driver/xf86-video-intel/Makefile @@ -14,6 +14,7 @@ PKG_VERSION:=2.4.2 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_DEPENDS:=xf86driproto glproto include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/lib/libICE/Makefile b/Xorg/lib/libICE/Makefile index def161ee9e..a1e1070adf 100644 --- a/Xorg/lib/libICE/Makefile +++ b/Xorg/lib/libICE/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libICE @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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 include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libICE SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +xproto +xtrans @DISPLAY_SUPPORT + DEPENDS:=+xtrans TITLE:=libICE URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libSM/Makefile b/Xorg/lib/libSM/Makefile index 9300eb59e1..d903019aaa 100644 --- a/Xorg/lib/libSM/Makefile +++ b/Xorg/lib/libSM/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libSM @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.3 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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 include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libSM SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +xproto +xtrans +libICE @DISPLAY_SUPPORT + DEPENDS:=+xtrans +libICE TITLE:=libSM URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libX11/Makefile b/Xorg/lib/libX11/Makefile index d2c7a968c6..f6beceab29 100644 --- a/Xorg/lib/libX11/Makefile +++ b/Xorg/lib/libX11/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libX11 @@ -13,7 +14,9 @@ PKG_RELEASE:=2 PKG_VERSION:=1.1.5 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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:=bigreqsproto xproto xextproto xcmiscproto xf86bigfontproto \ + kbproto inputproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +24,7 @@ define Package/libX11 SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:=+bigreqsproto +xproto +xextproto +xtrans +xcmiscproto +libXdmcp +xf86bigfontproto +kbproto +inputproto +libXau @DISPLAY_SUPPORT + DEPENDS:=+xtrans +libXdmcp +libXau TITLE:=libX11 URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXau/Makefile b/Xorg/lib/libXau/Makefile index 698c87799d..a243cb6ba0 100644 --- a/Xorg/lib/libXau/Makefile +++ b/Xorg/lib/libXau/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXau @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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 include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXau SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +xproto @DISPLAY_SUPPORT + DEPENDS:= TITLE:=libXau URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXaw/Makefile b/Xorg/lib/libXaw/Makefile index d316c7f061..a5e6f0df22 100644 --- a/Xorg/lib/libXaw/Makefile +++ b/Xorg/lib/libXaw/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXaw @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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 xextproto printproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXaw SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +xproto +libX11 +libXext +xextproto +libXt +libXmu +libXpm +printproto +libXau @DISPLAY_SUPPORT + DEPENDS:=+libX11 +libXext +libXt +libXmu +libXpm +libXau TITLE:=libXaw URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXcursor/Makefile b/Xorg/lib/libXcursor/Makefile index 86d1df9405..00c1f716a0 100644 --- a/Xorg/lib/libXcursor/Makefile +++ b/Xorg/lib/libXcursor/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXcursor @@ -13,7 +14,7 @@ PKG_RELEASE:=2 PKG_VERSION:=1.1.9 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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)/ include $(INCLUDE_DIR)/package.mk @@ -21,7 +22,7 @@ define Package/libXcursor SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +libXrender +libXfixes @DISPLAY_SUPPORT + DEPENDS:=+libXrender +libXfixes TITLE:=libXcursor URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXdmcp/Makefile b/Xorg/lib/libXdmcp/Makefile index f61ddb5a3b..f342def5e6 100644 --- a/Xorg/lib/libXdmcp/Makefile +++ b/Xorg/lib/libXdmcp/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXdmcp @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.2 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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 include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXdmcp SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +xproto @DISPLAY_SUPPORT + DEPENDS:= TITLE:=libXdmcp URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXext/Makefile b/Xorg/lib/libXext/Makefile index 18aecc103d..726b39705c 100644 --- a/Xorg/lib/libXext/Makefile +++ b/Xorg/lib/libXext/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXext @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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 xextproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXext SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +xproto +xextproto +libX11 +libXau @DISPLAY_SUPPORT + DEPENDS:=+libX11 +libXau TITLE:=libXext URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXfixes/Makefile b/Xorg/lib/libXfixes/Makefile index 97f456646b..068e8dadfc 100644 --- a/Xorg/lib/libXfixes/Makefile +++ b/Xorg/lib/libXfixes/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXfixes @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=4.0.3 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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 fixesproto xextproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXfixes SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +xproto +fixesproto +xextproto +libX11 @DISPLAY_SUPPORT + DEPENDS:=+libX11 TITLE:=libXfixes URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXfont/Makefile b/Xorg/lib/libXfont/Makefile index 02f25a1524..80aa9ec945 100644 --- a/Xorg/lib/libXfont/Makefile +++ b/Xorg/lib/libXfont/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXfont @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.3.3 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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 fontcacheproto fontsproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXfont SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +zlib +xproto +xtrans +libfontenc +fontcacheproto +fontsproto +libfreetype @DISPLAY_SUPPORT + DEPENDS:= +zlib +xtrans +libfontenc +libfreetype TITLE:=libXfont URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXft/Makefile b/Xorg/lib/libXft/Makefile index 9cbed2ba1c..08488e40dd 100644 --- a/Xorg/lib/libXft/Makefile +++ b/Xorg/lib/libXft/Makefile @@ -1,5 +1,5 @@ # -# 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. @@ -13,7 +13,7 @@ PKG_RELEASE:=1 PKG_VERSION:=2.1.13 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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_FIXUP=libtool diff --git a/Xorg/lib/libXi/Makefile b/Xorg/lib/libXi/Makefile index 919c815ecd..f03c48c827 100644 --- a/Xorg/lib/libXi/Makefile +++ b/Xorg/lib/libXi/Makefile @@ -1,5 +1,5 @@ # -# 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. @@ -13,8 +13,9 @@ PKG_RELEASE:=1 PKG_VERSION:=1.1.3 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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_FIXUP:=libtool +PKG_BUILD_DEPENDS:=xproto xextproto inputproto include $(INCLUDE_DIR)/package.mk @@ -24,7 +25,7 @@ define Package/libXi SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xproto +xextproto +inputproto +libX11 +libXext @DISPLAY_SUPPORT + DEPENDS:=+libX11 +libXext TITLE:=libXi URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXpm/Makefile b/Xorg/lib/libXpm/Makefile index 578f7db7c1..5a2b92d603 100644 --- a/Xorg/lib/libXpm/Makefile +++ b/Xorg/lib/libXpm/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXpm @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=3.5.7 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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_BUID_DEPENDS:=xproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXpm SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +xproto +libX11 @DISPLAY_SUPPORT + DEPENDS:=+libX11 TITLE:=libXpm URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXrandr/Makefile b/Xorg/lib/libXrandr/Makefile index 75ba11750e..cfdf3bd33c 100644 --- a/Xorg/lib/libXrandr/Makefile +++ b/Xorg/lib/libXrandr/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXrandr @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.2.3 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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:=randrproto renderproto xextproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXrandr SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +libXext +libXrender +randrproto +renderproto +xextproto +libX11 @DISPLAY_SUPPORT + DEPENDS:=+libXext +libXrender +libX11 TITLE:=libXrandr URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXrender/Makefile b/Xorg/lib/libXrender/Makefile index d26e21d403..8a66168db6 100644 --- a/Xorg/lib/libXrender/Makefile +++ b/Xorg/lib/libXrender/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXrender @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=0.9.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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:=renderproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXrender SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +libX11 +renderproto @DISPLAY_SUPPORT + DEPENDS:=+libX11 TITLE:=libXrender URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXt/Makefile b/Xorg/lib/libXt/Makefile index 79092a4fe2..6fb26618f2 100644 --- a/Xorg/lib/libXt/Makefile +++ b/Xorg/lib/libXt/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXt @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.5 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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 kbproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXt SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +libSM +libX11 +xproto +kbproto @DISPLAY_SUPPORT + DEPENDS:=+libSM +libX11 TITLE:=libXt URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXtst/Makefile b/Xorg/lib/libXtst/Makefile index b4f7422625..957fbae7c8 100644 --- a/Xorg/lib/libXtst/Makefile +++ b/Xorg/lib/libXtst/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXtst @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.3 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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:=recordproto xextproto inputproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXtst SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +libX11 +libXext +recordproto +xextproto +inputproto @DISPLAY_SUPPORT + DEPENDS:=+libX11 +libXext TITLE:=libXtst URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXv/Makefile b/Xorg/lib/libXv/Makefile index b46201bc61..b846d2e9ee 100644 --- a/Xorg/lib/libXv/Makefile +++ b/Xorg/lib/libXv/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXv @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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:=videoproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXv SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +libXext +videoproto @DISPLAY_SUPPORT + DEPENDS:=+libXext TITLE:=libXv URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXvMC/Makefile b/Xorg/lib/libXvMC/Makefile index 828d424afc..9725ba22eb 100644 --- a/Xorg/lib/libXvMC/Makefile +++ b/Xorg/lib/libXvMC/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXvMC @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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:=videoproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXvMC SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +libXext +videoproto +libXv @DISPLAY_SUPPORT + DEPENDS:=+libXext +libXv TITLE:=libXvMC URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXxf86misc/Makefile b/Xorg/lib/libXxf86misc/Makefile index 118a314709..5e37c3dcf3 100644 --- a/Xorg/lib/libXxf86misc/Makefile +++ b/Xorg/lib/libXxf86misc/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXxf86misc @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.1 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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 xextproto xf86miscproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXxf86misc SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +xproto +libX11 +xextproto +libXext +xf86miscproto @DISPLAY_SUPPORT + DEPENDS:=+libX11 +libXext TITLE:=libXxf86misc URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libXxf86vm/Makefile b/Xorg/lib/libXxf86vm/Makefile index dca45cb8a3..bb152bb3f0 100644 --- a/Xorg/lib/libXxf86vm/Makefile +++ b/Xorg/lib/libXxf86vm/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXxf86vm @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.2 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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 xextproto xf86vidmodeproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libXxf86vm SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +xproto +libX11 +xextproto +libXext +xf86vidmodeproto @DISPLAY_SUPPORT + DEPENDS:=+libX11 +libXext TITLE:=libXxf86vm URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libdrm/Makefile b/Xorg/lib/libdrm/Makefile index a48c4d2611..a8f5610633 100644 --- a/Xorg/lib/libdrm/Makefile +++ b/Xorg/lib/libdrm/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libdrm @@ -13,7 +14,7 @@ PKG_RELEASE:=2 PKG_VERSION:=2.3.1 PKG_SOURCE_URL:=http://dri.freedesktop.org/libdrm 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)/ include $(INCLUDE_DIR)/package.mk @@ -21,7 +22,7 @@ define Package/libdrm SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:=@DISPLAY_SUPPORT + DEPENDS:= TITLE:=libdrm URL:=http://dri.freedesktop.org/ endef diff --git a/Xorg/lib/libfontenc/Makefile b/Xorg/lib/libfontenc/Makefile index 566dc30e06..b87bd03086 100644 --- a/Xorg/lib/libfontenc/Makefile +++ b/Xorg/lib/libfontenc/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libfontenc @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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 include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libfontenc SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +xproto +zlib @DISPLAY_SUPPORT + DEPENDS:=+zlib TITLE:=libfontenc URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/libmatchbox/Makefile b/Xorg/lib/libmatchbox/Makefile index b99eed50f9..c58950ddd5 100644 --- a/Xorg/lib/libmatchbox/Makefile +++ b/Xorg/lib/libmatchbox/Makefile @@ -14,7 +14,7 @@ PKG_VERSION:=1.9 PKG_SOURCE_URL:=http://matchbox-project.org/sources/libmatchbox/$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_MD5SUM:=9f73e7515cc4679171a5db180dc1343b -PKG_BUILD_DIR=$(BUILD_DIR)/${PKG_NAME}-$(PKG_VERSION) +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_FIXUP:=libtool EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib/ diff --git a/Xorg/lib/libpciaccess/Makefile b/Xorg/lib/libpciaccess/Makefile index 86416e627d..b8b9ff51fe 100644 --- a/Xorg/lib/libpciaccess/Makefile +++ b/Xorg/lib/libpciaccess/Makefile @@ -13,7 +13,7 @@ PKG_RELEASE:=1 PKG_VERSION:=0.10.3 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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_FIXUP:=libtool include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/lib/libxkbfile/Makefile b/Xorg/lib/libxkbfile/Makefile index 6c091c08eb..daa99ce54f 100644 --- a/Xorg/lib/libxkbfile/Makefile +++ b/Xorg/lib/libxkbfile/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libxkbfile @@ -13,7 +14,8 @@ PKG_RELEASE:=2 PKG_VERSION:=1.0.5 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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:=kbproto include $(INCLUDE_DIR)/package.mk @@ -21,7 +23,7 @@ define Package/libxkbfile SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= +libX11 +kbproto @DISPLAY_SUPPORT + DEPENDS:=+libX11 TITLE:=libxkbfile URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/lib/xtrans/Makefile b/Xorg/lib/xtrans/Makefile index 5b37ac7a6b..05dcbb1b28 100644 --- a/Xorg/lib/xtrans/Makefile +++ b/Xorg/lib/xtrans/Makefile @@ -1,10 +1,11 @@ -# -# 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 +# blogic@openwrt.org + include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xtrans @@ -13,7 +14,7 @@ PKG_RELEASE:=2 PKG_VERSION:=1.2.1 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ 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)/ include $(INCLUDE_DIR)/package.mk @@ -21,7 +22,7 @@ define Package/xtrans SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=lib - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=xtrans URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/applewmproto/Makefile b/Xorg/proto/applewmproto/Makefile index 3d25442403..a0b2de6dc2 100644 --- a/Xorg/proto/applewmproto/Makefile +++ b/Xorg/proto/applewmproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=1.0.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/applewmproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=applewmproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/bigreqsproto/Makefile b/Xorg/proto/bigreqsproto/Makefile index 1f59c3da59..8d510c4254 100644 --- a/Xorg/proto/bigreqsproto/Makefile +++ b/Xorg/proto/bigreqsproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=1.0.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/bigreqsproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=bigreqsproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/calibrateproto/Makefile b/Xorg/proto/calibrateproto/Makefile index 8ae52427e4..9a7fa66675 100644 --- a/Xorg/proto/calibrateproto/Makefile +++ b/Xorg/proto/calibrateproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -19,7 +19,7 @@ define Package/calibrateproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:=@DISPLAY_SUPPORT + DEPENDS:= TITLE:=calibrateproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/compositeproto/Makefile b/Xorg/proto/compositeproto/Makefile index 559347b26b..c624a1dc5b 100644 --- a/Xorg/proto/compositeproto/Makefile +++ b/Xorg/proto/compositeproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=0.4 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/compositeproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=compositeproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/damageproto/Makefile b/Xorg/proto/damageproto/Makefile index 1fe996fb6e..e078cfee72 100644 --- a/Xorg/proto/damageproto/Makefile +++ b/Xorg/proto/damageproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=1.1.0 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/damageproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=damageproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/dmxproto/Makefile b/Xorg/proto/dmxproto/Makefile index 0f99a18699..857ad32481 100644 --- a/Xorg/proto/dmxproto/Makefile +++ b/Xorg/proto/dmxproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=2.2.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/dmxproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=dmxproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/evieext/Makefile b/Xorg/proto/evieext/Makefile index ad5b42e5c4..5cc0bbe448 100644 --- a/Xorg/proto/evieext/Makefile +++ b/Xorg/proto/evieext/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=1.0.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/evieext SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=evieext URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/fixesproto/Makefile b/Xorg/proto/fixesproto/Makefile index d8ad0f18af..0e2851d403 100644 --- a/Xorg/proto/fixesproto/Makefile +++ b/Xorg/proto/fixesproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=4.0 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/fixesproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=fixesproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/fontcacheproto/Makefile b/Xorg/proto/fontcacheproto/Makefile index 7e142780fa..08cfc70107 100644 --- a/Xorg/proto/fontcacheproto/Makefile +++ b/Xorg/proto/fontcacheproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=0.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/fontcacheproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=fontcacheproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/fontsproto/Makefile b/Xorg/proto/fontsproto/Makefile index 3436607663..b79c4b0129 100644 --- a/Xorg/proto/fontsproto/Makefile +++ b/Xorg/proto/fontsproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=2.0.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/fontsproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=fontsproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/glproto/Makefile b/Xorg/proto/glproto/Makefile index 6eef44be53..b1b066a271 100644 --- a/Xorg/proto/glproto/Makefile +++ b/Xorg/proto/glproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=1.4.9 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/glproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=glproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/inputproto/Makefile b/Xorg/proto/inputproto/Makefile index 901e5edbc4..ed5611c226 100644 --- a/Xorg/proto/inputproto/Makefile +++ b/Xorg/proto/inputproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=1.4.4 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/inputproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=inputproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/kbproto/Makefile b/Xorg/proto/kbproto/Makefile index f26c3bf8e8..ba560e4695 100644 --- a/Xorg/proto/kbproto/Makefile +++ b/Xorg/proto/kbproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=1.0.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/kbproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=kbproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/printproto/Makefile b/Xorg/proto/printproto/Makefile index 039da84ece..114de7bb06 100644 --- a/Xorg/proto/printproto/Makefile +++ b/Xorg/proto/printproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=1.0.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/printproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=printproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/randrproto/Makefile b/Xorg/proto/randrproto/Makefile index 8641a9912b..186d907f1e 100644 --- a/Xorg/proto/randrproto/Makefile +++ b/Xorg/proto/randrproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=1.2.1 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/randrproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=randrproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/recordproto/Makefile b/Xorg/proto/recordproto/Makefile index b832cbb341..f7a32cee39 100644 --- a/Xorg/proto/recordproto/Makefile +++ b/Xorg/proto/recordproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=1.13.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/recordproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=recordproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/renderproto/Makefile b/Xorg/proto/renderproto/Makefile index f870bd26fb..9d720e0c6d 100644 --- a/Xorg/proto/renderproto/Makefile +++ b/Xorg/proto/renderproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=0.9.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/renderproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=renderproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/resourceproto/Makefile b/Xorg/proto/resourceproto/Makefile index a23e47f13e..9bba047ab7 100644 --- a/Xorg/proto/resourceproto/Makefile +++ b/Xorg/proto/resourceproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=1.0.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/resourceproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=resourceproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/scrnsaverproto/Makefile b/Xorg/proto/scrnsaverproto/Makefile index 220c4bf852..7194c3618e 100644 --- a/Xorg/proto/scrnsaverproto/Makefile +++ b/Xorg/proto/scrnsaverproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=1.1.0 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/scrnsaverproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=scrnsaverproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/trapproto/Makefile b/Xorg/proto/trapproto/Makefile index 4a91cf78c7..cfb280ee5b 100644 --- a/Xorg/proto/trapproto/Makefile +++ b/Xorg/proto/trapproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/trapproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=trapproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/videoproto/Makefile b/Xorg/proto/videoproto/Makefile index 840277278a..5b78a102ec 100644 --- a/Xorg/proto/videoproto/Makefile +++ b/Xorg/proto/videoproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=2.2.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/videoproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=videoproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/windowswmproto/Makefile b/Xorg/proto/windowswmproto/Makefile index 11e4516b71..a1b808fe56 100644 --- a/Xorg/proto/windowswmproto/Makefile +++ b/Xorg/proto/windowswmproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=1.0.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/windowswmproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=windowswmproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/xcmiscproto/Makefile b/Xorg/proto/xcmiscproto/Makefile index a564a5f823..6f06a04caf 100644 --- a/Xorg/proto/xcmiscproto/Makefile +++ b/Xorg/proto/xcmiscproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/xcmiscproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=xcmiscproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/xextproto/Makefile b/Xorg/proto/xextproto/Makefile index 459760985d..0cea026b13 100644 --- a/Xorg/proto/xextproto/Makefile +++ b/Xorg/proto/xextproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=7.0.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/xextproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=xextproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/xf86bigfontproto/Makefile b/Xorg/proto/xf86bigfontproto/Makefile index 63b7ca37d2..569bf6939e 100644 --- a/Xorg/proto/xf86bigfontproto/Makefile +++ b/Xorg/proto/xf86bigfontproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/xf86bigfontproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=xf86bigfontproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/xf86dgaproto/Makefile b/Xorg/proto/xf86dgaproto/Makefile index baab1214df..f8c6688a22 100644 --- a/Xorg/proto/xf86dgaproto/Makefile +++ b/Xorg/proto/xf86dgaproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=2.0.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/xf86dgaproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=xf86dgaproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/xf86driproto/Makefile b/Xorg/proto/xf86driproto/Makefile index 56f6ec6876..88bc7de48d 100644 --- a/Xorg/proto/xf86driproto/Makefile +++ b/Xorg/proto/xf86driproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=2.0.4 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/xf86driproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=xf86driproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/xf86miscproto/Makefile b/Xorg/proto/xf86miscproto/Makefile index 4cbaa1e5ed..48c2de7b3f 100644 --- a/Xorg/proto/xf86miscproto/Makefile +++ b/Xorg/proto/xf86miscproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/xf86miscproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=xf86miscproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/xf86rushproto/Makefile b/Xorg/proto/xf86rushproto/Makefile index 22dc672185..129799ba37 100644 --- a/Xorg/proto/xf86rushproto/Makefile +++ b/Xorg/proto/xf86rushproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/xf86rushproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=xf86rushproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/xf86vidmodeproto/Makefile b/Xorg/proto/xf86vidmodeproto/Makefile index f00076b55a..458a19cd6d 100644 --- a/Xorg/proto/xf86vidmodeproto/Makefile +++ b/Xorg/proto/xf86vidmodeproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=2.2.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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/xf86vidmodeproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=xf86vidmodeproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/xineramaproto/Makefile b/Xorg/proto/xineramaproto/Makefile index 1babaa47c5..849d88cb1d 100644 --- a/Xorg/proto/xineramaproto/Makefile +++ b/Xorg/proto/xineramaproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/xineramaproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=xineramaproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/proto/xproto/Makefile b/Xorg/proto/xproto/Makefile index a56a518fbd..7962683b47 100644 --- a/Xorg/proto/xproto/Makefile +++ b/Xorg/proto/xproto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=3 PKG_VERSION:=7.0.13 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)/ +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +20,7 @@ define Package/xproto SECTION:=xorg-proto CATEGORY:=Xorg SUBMENU:=proto - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=xproto URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/util/util-macros/Makefile b/Xorg/util/util-macros/Makefile index 8d3f355c0f..128c3f309c 100644 --- a/Xorg/util/util-macros/Makefile +++ b/Xorg/util/util-macros/Makefile @@ -1,10 +1,11 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# 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:=util-macros @@ -12,7 +13,7 @@ PKG_RELEASE:=1 PKG_VERSION:=1.1.6 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/util/ 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)/ include $(INCLUDE_DIR)/package.mk @@ -20,7 +21,7 @@ define Package/util-macros SECTION:=xorg-utils CATEGORY:=Xorg SUBMENU:=utils - DEPENDS:= @DISPLAY_SUPPORT + DEPENDS:= TITLE:=${PKG_NAME} URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/xserver/xorg-xserver/Makefile b/Xorg/xserver/xorg-xserver/Makefile index ec2227ab46..2c35acb28d 100644 --- a/Xorg/xserver/xorg-xserver/Makefile +++ b/Xorg/xserver/xorg-xserver/Makefile @@ -14,6 +14,10 @@ PKG_VERSION:=1.5.1 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/xserver/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/xserver/xorg-server-$(PKG_VERSION)/ +PKG_BUILD_DEPENDS:=randrproto renderproto fixesproto damageproto xcmiscproto \ + xextproto xproto scrnsaverproto bigreqsproto resourceproto \ + fontsproto inputproto kbproto videoproto resourceproto \ + xf86dgaproto include $(INCLUDE_DIR)/package.mk @@ -124,22 +128,6 @@ define Package/xserver/Default $(call Package/xorg/Default) DEPENDS:=+xserver-common \ +libpthread \ - +randrproto \ - +renderproto \ - +fixesproto \ - +damageproto \ - +xcmiscproto \ - +xextproto \ - +xproto \ - +scrnsaverproto \ - +bigreqsproto \ - +resourceproto \ - +fontsproto \ - +inputproto \ - +kbproto \ - +videoproto \ - +resourceproto \ - +xf86dgaproto \ +xtrans \ +libxkbfile \ +libXfont \ -- 2.30.2