From 2c8bdd365ffe005b56aa9c56dc414ac1a9c4e022 Mon Sep 17 00:00:00 2001 From: lars Date: Sat, 31 Oct 2009 00:21:07 +0000 Subject: [PATCH] [packages] Update xorg apps to Xorg 7.5 git-svn-id: svn://svn.openwrt.org/openwrt/packages@18237 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Xorg/xorg/app/fontconfig/Makefile | 15 +++-------- Xorg/xorg/app/iceauth/Makefile | 13 ++++----- Xorg/xorg/app/smproxy/Makefile | 9 ++++--- Xorg/xorg/app/x11perf/Makefile | 16 +++++------ Xorg/xorg/app/xauth/Makefile | 13 ++++----- Xorg/xorg/app/xkbcomp/Makefile | 44 +++++++++++++++++++++++++++++++ Xorg/xorg/app/xrandr/Makefile | 14 +++++----- Xorg/xorg/app/xrdb/Makefile | 2 +- Xorg/xorg/app/xset/Makefile | 13 ++++----- Xorg/xorg/app/xsetroot/Makefile | 15 ++++++----- Xorg/xorg/app/xwd/Makefile | 14 +++++----- 11 files changed, 106 insertions(+), 62 deletions(-) create mode 100644 Xorg/xorg/app/xkbcomp/Makefile diff --git a/Xorg/xorg/app/fontconfig/Makefile b/Xorg/xorg/app/fontconfig/Makefile index f94d279ea..25c7b8beb 100644 --- a/Xorg/xorg/app/fontconfig/Makefile +++ b/Xorg/xorg/app/fontconfig/Makefile @@ -36,19 +36,10 @@ CONFIGURE_VARS+= \ ac_cv_prog_HASDOCBOOK=no \ define Build/Compile - # XXX: the following 4 are compiled using CC_FOR_BUILD $(foreach dir,fc-arch fc-case fc-lang fc-glyphname, \ - $(MAKE) -C $(PKG_BUILD_DIR)/$(dir) \ - CC="$(HOSTCC)" \ - CFLAGS="$(HOST_CFLAGS)" \ - CPPFLAGS="" \ - LDFLAGS="$(HOST_LDFLAGS)"\ - ; \ - ) - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - DOCSRC="" \ - install + $(MAKE) -C $(PKG_BUILD_DIR)/$(dir) CFLAGS="$(HOST_CFLAGS)" \ + CPPFLAGS="" LDFLAGS="$(HOST_LDFLAGS)" || exit 1;) + $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" DOCSRC="" install endef define Build/InstallDev diff --git a/Xorg/xorg/app/iceauth/Makefile b/Xorg/xorg/app/iceauth/Makefile index cd1b2b7c8..9ee07dd1d 100644 --- a/Xorg/xorg/app/iceauth/Makefile +++ b/Xorg/xorg/app/iceauth/Makefile @@ -8,14 +8,15 @@ include $(TOPDIR)/rules.mk -PKG_BASE_NAME:=iceauth PKG_NAME:=iceauth -PKG_RELEASE:=3 -PKG_VERSION:=1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app +PKG_RELEASE:=1 +PKG_VERSION:=1.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=7ab8b64edf0212a9d9a3c8129901a450 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=975ade3f238c1eb10705da0a91e6e8e7 PKG_BUILD_DEPENDS:=xproto include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/app/smproxy/Makefile b/Xorg/xorg/app/smproxy/Makefile index 57e3b89b3..c20c58b0b 100644 --- a/Xorg/xorg/app/smproxy/Makefile +++ b/Xorg/xorg/app/smproxy/Makefile @@ -9,11 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=smproxy PKG_RELEASE:=1 -PKG_VERSION:=1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app +PKG_VERSION:=1.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=31da204a0255ba8c6a65386e65dc1c90 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=ba7dbde81be24fc1bd4156b360e5f8cf PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/Xorg/xorg/app/x11perf/Makefile b/Xorg/xorg/app/x11perf/Makefile index 4a8574d1b..a1fa62e46 100644 --- a/Xorg/xorg/app/x11perf/Makefile +++ b/Xorg/xorg/app/x11perf/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2008-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,17 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=x11perf -PKG_RELEASE:=2 -PKG_VERSION:=1.5 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app +PKG_RELEASE:=1 +PKG_VERSION:=1.5.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=31283bfc3c78718ac1bd71e510d4e774 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=66e4aa4645f83809071eb69553ed0222 +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -PKG_INSTALL:=1 - define Package/x11perf SECTION:=xorg-app CATEGORY:=Xorg diff --git a/Xorg/xorg/app/xauth/Makefile b/Xorg/xorg/app/xauth/Makefile index 71c7c1d14..7b3910e1a 100644 --- a/Xorg/xorg/app/xauth/Makefile +++ b/Xorg/xorg/app/xauth/Makefile @@ -8,16 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xauth -PKG_RELEASE:=2 -PKG_VERSION:=1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app +PKG_RELEASE:=1 +PKG_VERSION:=1.0.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=e91e10ace1df0d5f2cbc74ead256407a +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=fa00078c414c4a57cab7a6d89a0c8734 +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -PKG_INSTALL:=1 TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib diff --git a/Xorg/xorg/app/xkbcomp/Makefile b/Xorg/xorg/app/xkbcomp/Makefile new file mode 100644 index 000000000..7a47d388f --- /dev/null +++ b/Xorg/xorg/app/xkbcomp/Makefile @@ -0,0 +1,44 @@ +# +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xkbcomp +PKG_RELEASE:=1 +PKG_VERSION:=1.1.1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/app +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=38c387bacdc01038c8ac280588792bcf + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +TARGET_LDFLAGS+= \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + -Wl,-rpath=/usr/lib + +define Package/xkbcomp + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libX11 + TITLE:=xkbcomp + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xkbcomp/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin + $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/share/xkbdata/compiled +endef + +$(eval $(call BuildPackage,xkbcomp)) diff --git a/Xorg/xorg/app/xrandr/Makefile b/Xorg/xorg/app/xrandr/Makefile index f5b90d8a5..503175031 100644 --- a/Xorg/xorg/app/xrandr/Makefile +++ b/Xorg/xorg/app/xrandr/Makefile @@ -8,16 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xrandr -PKG_RELEASE:=2 -PKG_VERSION:=1.2.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app +PKG_RELEASE:=1 +PKG_VERSION:=1.3.2 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/app/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=41a9d0cc073fa6165a31fbf9e85f68a6 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=2cb19bb1c19ccf77c40032b03dbe06f0 +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -PKG_INSTALL:=1 TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib diff --git a/Xorg/xorg/app/xrdb/Makefile b/Xorg/xorg/app/xrdb/Makefile index d76b54cac..20d53b482 100644 --- a/Xorg/xorg/app/xrdb/Makefile +++ b/Xorg/xorg/app/xrdb/Makefile @@ -13,7 +13,7 @@ PKG_VERSION:=1.0.5 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app 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:=9c30b8e1709d5367beb7706146640c07 PKG_INSTALL:=1 diff --git a/Xorg/xorg/app/xset/Makefile b/Xorg/xorg/app/xset/Makefile index 975aa26b0..e6cca3357 100644 --- a/Xorg/xorg/app/xset/Makefile +++ b/Xorg/xorg/app/xset/Makefile @@ -9,17 +9,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xset -PKG_RELEASE:=3 -PKG_VERSION:=1.0.4 +PKG_RELEASE:=1 +PKG_VERSION:=1.1.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=2f41fd983ba4d89419204854936025e2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=eeb0d02f69c76bd40470dede99b4bd49 +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -PKG_INSTALL:=1 TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ diff --git a/Xorg/xorg/app/xsetroot/Makefile b/Xorg/xorg/app/xsetroot/Makefile index 28a016a64..af27a189d 100644 --- a/Xorg/xorg/app/xsetroot/Makefile +++ b/Xorg/xorg/app/xsetroot/Makefile @@ -4,21 +4,22 @@ # 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:=xsetroot -PKG_RELEASE:=4 -PKG_VERSION:=1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app +PKG_RELEASE:=1 +PKG_VERSION:=1.0.3 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=9af7db9f3052aef0b11636720b3101dd +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=cbda9b9b8da5af4614110883d5a276b8 +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -PKG_INSTALL:=1 TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib diff --git a/Xorg/xorg/app/xwd/Makefile b/Xorg/xorg/app/xwd/Makefile index 919b5f5bc..b88b010f2 100644 --- a/Xorg/xorg/app/xwd/Makefile +++ b/Xorg/xorg/app/xwd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,15 +10,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xwd PKG_RELEASE:=1 -PKG_VERSION:=1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app +PKG_VERSION:=1.0.3 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app 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:=007cea1f389abde5c93162dcd5541351 +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -PKG_INSTALL:=1 - TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib define Package/xwd