[packages] Update xorg apps to Xorg 7.5
authorLars-Peter Clausen <lars@metafoo.de>
Sat, 31 Oct 2009 00:21:07 +0000 (00:21 +0000)
committerLars-Peter Clausen <lars@metafoo.de>
Sat, 31 Oct 2009 00:21:07 +0000 (00:21 +0000)
SVN-Revision: 18237

Xorg/xorg/app/fontconfig/Makefile
Xorg/xorg/app/iceauth/Makefile
Xorg/xorg/app/smproxy/Makefile
Xorg/xorg/app/x11perf/Makefile
Xorg/xorg/app/xauth/Makefile
Xorg/xorg/app/xkbcomp/Makefile [new file with mode: 0644]
Xorg/xorg/app/xrandr/Makefile
Xorg/xorg/app/xrdb/Makefile
Xorg/xorg/app/xset/Makefile
Xorg/xorg/app/xsetroot/Makefile
Xorg/xorg/app/xwd/Makefile

index f94d279..25c7b8b 100644 (file)
@@ -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
index cd1b2b7..9ee07dd 100644 (file)
@@ -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
index 57e3b89..c20c58b 100644 (file)
@@ -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
index 4a8574d..a1fa62e 100644 (file)
@@ -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
-
-include $(INCLUDE_DIR)/package.mk
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
+PKG_MD5SUM:=66e4aa4645f83809071eb69553ed0222
 PKG_INSTALL:=1
 
+include $(INCLUDE_DIR)/package.mk
+
 define Package/x11perf
   SECTION:=xorg-app
   CATEGORY:=Xorg
index 71c7c1d..7b3910e 100644 (file)
@@ -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 (file)
index 0000000..7a47d38
--- /dev/null
@@ -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))
index f5b90d8..5031750 100644 (file)
@@ -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
 
index d76b54c..20d53b4 100644 (file)
@@ -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
 
index 975aa26..e6cca33 100644 (file)
@@ -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 \
index 28a016a..af27a18 100644 (file)
@@ -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
 
index 919b5f5..b88b010 100644 (file)
@@ -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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_VERSION:=1.0.3
 
-include $(INCLUDE_DIR)/package.mk
+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/$(PKG_NAME)-$(PKG_VERSION)/
 
+PKG_MD5SUM:=007cea1f389abde5c93162dcd5541351
 PKG_INSTALL:=1
 
+include $(INCLUDE_DIR)/package.mk
+
 TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/xwd