From 3fea517e4bccbbe5640a0c6ac0f872b418a3bf03 Mon Sep 17 00:00:00 2001 From: lars Date: Mon, 1 Sep 2008 21:31:52 +0000 Subject: [PATCH] Update XOrg packages to 7.3 git-svn-id: svn://svn.openwrt.org/openwrt/packages@12468 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- XOrg/app/packages | 18 +-- XOrg/app/template.mk | 18 +-- XOrg/app/xcalc/Makefile | 22 +-- XOrg/app/xclipboard/Makefile | 22 +-- XOrg/app/xdm/Makefile | 22 +-- XOrg/app/xeyes/Makefile | 22 +-- XOrg/app/xinit/Makefile | 33 ++-- XOrg/app/xlogo/Makefile | 22 +-- XOrg/app/xmessage/Makefile | 22 +-- XOrg/app/xset/Makefile | 22 +-- XOrg/app/xsetroot/Makefile | 24 +-- XOrg/data/xbitmaps/Makefile | 4 +- XOrg/driver/packages | 19 ++- .../patches/xf86-input-evdev/001-fix-compile.patch | 46 ++++++ .../xf86-input-evdev/002-mipointer-fix.patch | 30 ++++ XOrg/driver/template.mk | 6 +- XOrg/driver/xf86-input-evdev/Makefile | 10 +- .../xf86-input-evdev/patches/001-fix-compile.patch | 46 ++++++ .../patches/002-mipointer-fix.patch | 30 ++++ XOrg/driver/xf86-input-keyboard/Makefile | 10 +- XOrg/driver/xf86-input-mouse/Makefile | 10 +- XOrg/driver/xf86-video-ati/Makefile | 12 +- XOrg/driver/xf86-video-fbdev/Makefile | 10 +- .../xf86-video-i810/patches/100-sdkdir.patch | 13 -- .../{xf86-video-i810 => xf86-video-intel}/Makefile | 22 +-- .../patches}/100-sdkdir.patch | 0 XOrg/driver/xf86-video-nv/Makefile | 10 +- XOrg/driver/xf86-video-vesa/Makefile | 10 +- XOrg/driver/xf86-video-vga/Makefile | 10 +- XOrg/font-native/font-util/Makefile | 6 +- XOrg/font/encodings/Makefile | 22 +-- XOrg/font/font-alias/Makefile | 22 +-- XOrg/font/font-bh-75dpi/Makefile | 22 +-- XOrg/font/font-cursor-misc/Makefile | 22 +-- XOrg/font/font-daewoo-misc/Makefile | 22 +-- XOrg/font/font-dec-misc/Makefile | 22 +-- XOrg/font/font-ibm-type1/Makefile | 22 +-- XOrg/font/font-isas-misc/Makefile | 22 +-- XOrg/font/font-jis-misc/Makefile | 22 +-- XOrg/font/font-micro-misc/Makefile | 22 +-- XOrg/font/font-misc-cyrillic/Makefile | 22 +-- XOrg/font/font-misc-misc/Makefile | 7 +- XOrg/font/font-xfree86-type1/Makefile | 22 +-- XOrg/font/packages | 25 ++- XOrg/font/template.mk | 18 +-- XOrg/generate.sh | 14 +- XOrg/headers/native/Makefile | 4 +- XOrg/lib/libICE/Makefile | 26 +-- XOrg/lib/libSM/Makefile | 26 +-- XOrg/lib/libX11/Makefile | 29 ++-- XOrg/lib/libXau/Makefile | 26 +-- XOrg/lib/libXaw/Makefile | 26 +-- XOrg/lib/libXcursor/Makefile | 26 +-- XOrg/lib/libXdmcp/Makefile | 26 +-- XOrg/lib/libXext/Makefile | 29 ++-- XOrg/lib/libXfixes/Makefile | 38 ++--- XOrg/lib/libXfont/Makefile | 26 +-- XOrg/lib/libXft/Makefile | 6 +- XOrg/lib/libXmu/Makefile | 38 ++--- XOrg/lib/libXpm/Makefile | 38 ++--- XOrg/lib/libXrandr/Makefile | 26 +-- XOrg/lib/libXrender/Makefile | 38 ++--- XOrg/lib/libXt/Makefile | 40 ++--- XOrg/lib/libXv/Makefile | 24 +-- XOrg/lib/libXvMC/Makefile | 24 +-- XOrg/lib/libXxf86misc/Makefile | 38 ++--- XOrg/lib/libXxf86vm/Makefile | 38 ++--- XOrg/lib/libfontenc/Makefile | 26 +-- XOrg/lib/libxkbfile/Makefile | 28 ++-- XOrg/lib/packages | 46 +++--- XOrg/lib/template.mk | 17 +- XOrg/lib/xtrans/Makefile | 26 +-- XOrg/proto/applewmproto/Makefile | 8 +- XOrg/proto/bigreqsproto/Makefile | 8 +- XOrg/proto/compositeproto/Makefile | 8 +- XOrg/proto/damageproto/Makefile | 8 +- XOrg/proto/dmxproto/Makefile | 8 +- XOrg/proto/evieext/Makefile | 8 +- XOrg/proto/fixesproto/Makefile | 8 +- XOrg/proto/fontcacheproto/Makefile | 8 +- XOrg/proto/fontsproto/Makefile | 8 +- XOrg/proto/glproto/Makefile | 8 +- XOrg/proto/inputproto/Makefile | 8 +- XOrg/proto/kbproto/Makefile | 8 +- XOrg/proto/packages | 64 ++++---- XOrg/proto/printproto/Makefile | 8 +- XOrg/proto/randrproto/Makefile | 8 +- XOrg/proto/recordproto/Makefile | 8 +- XOrg/proto/renderproto/Makefile | 8 +- XOrg/proto/resourceproto/Makefile | 8 +- XOrg/proto/scrnsaverproto/Makefile | 8 +- XOrg/proto/template.mk | 4 +- XOrg/proto/trapproto/Makefile | 8 +- XOrg/proto/videoproto/Makefile | 8 +- XOrg/proto/windowswmproto/Makefile | 8 +- XOrg/proto/xcmiscproto/Makefile | 8 +- XOrg/proto/xextproto/Makefile | 8 +- XOrg/proto/xf86bigfontproto/Makefile | 8 +- XOrg/proto/xf86dgaproto/Makefile | 8 +- XOrg/proto/xf86driproto/Makefile | 8 +- XOrg/proto/xf86miscproto/Makefile | 8 +- XOrg/proto/xf86rushproto/Makefile | 8 +- XOrg/proto/xf86vidmodeproto/Makefile | 8 +- XOrg/proto/xineramaproto/Makefile | 8 +- XOrg/proto/xproto/Makefile | 8 +- XOrg/proto/xproxymanagementprotocol/Makefile | 8 +- XOrg/server/xorg-server-X11R7.3/Makefile | 178 +++++++++++++++++++++ .../xorg-server-X11R7.3/files/xorg-olpc.conf | 78 +++++++++ XOrg/server/xorg-server-X11R7.3/files/xorg.conf | 93 +++++++++++ .../patches/001-fix_avr32_compile | 20 +++ .../patches/100-uclibc-lm.patch | 12 ++ XOrg/utils/packages | 2 +- XOrg/utils/template.mk | 4 +- XOrg/utils/util-macros/Makefile | 8 +- 114 files changed, 1174 insertions(+), 1159 deletions(-) create mode 100644 XOrg/driver/patches/xf86-input-evdev/001-fix-compile.patch create mode 100644 XOrg/driver/patches/xf86-input-evdev/002-mipointer-fix.patch create mode 100644 XOrg/driver/xf86-input-evdev/patches/001-fix-compile.patch create mode 100644 XOrg/driver/xf86-input-evdev/patches/002-mipointer-fix.patch delete mode 100644 XOrg/driver/xf86-video-i810/patches/100-sdkdir.patch rename XOrg/driver/{xf86-video-i810 => xf86-video-intel}/Makefile (75%) rename XOrg/driver/{patches/xf86-video-i810 => xf86-video-intel/patches}/100-sdkdir.patch (100%) create mode 100644 XOrg/server/xorg-server-X11R7.3/Makefile create mode 100644 XOrg/server/xorg-server-X11R7.3/files/xorg-olpc.conf create mode 100644 XOrg/server/xorg-server-X11R7.3/files/xorg.conf create mode 100644 XOrg/server/xorg-server-X11R7.3/patches/001-fix_avr32_compile create mode 100644 XOrg/server/xorg-server-X11R7.3/patches/100-uclibc-lm.patch diff --git a/XOrg/app/packages b/XOrg/app/packages index df31465db..904bfa1e2 100644 --- a/XOrg/app/packages +++ b/XOrg/app/packages @@ -1,9 +1,9 @@ -xinit-X11R7.2-1.0.3| -xlogo-X11R7.0-1.0.1| -xset-X11R7.1-1.0.2| -xeyes-X11R7.0-1.0.1| -xclipboard-X11R7.0-1.0.1| -xcalc-X11R7.0-1.0.1|+font-misc-misc -xdm-X11R7.2-1.1.3| -xsetroot-X11R7.0-1.0.1| -xmessage-X11R7.0-1.0.1| +xcalc-1.0.2|+font-misc-misc +xclipboard-1.0.1| +xdm-1.1.6| +xeyes-1.0.1| +xinit-1.0.5| +xlogo-1.0.1| +xmessage-1.0.2| +xset-1.0.3| +xsetroot-1.0.2| diff --git a/XOrg/app/template.mk b/XOrg/app/template.mk index 38bad9a0c..d6d18690b 100644 --- a/XOrg/app/template.mk +++ b/XOrg/app/template.mk @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=@BASE_NAME@ PKG_NAME:=@NAME@ -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=@VER@ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app +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)/ @@ -33,7 +33,7 @@ define Package/@NAME@ endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (@NAME@,xdm) @@ -47,18 +47,6 @@ define Build/Compile make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/@NAME@/install $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1) diff --git a/XOrg/app/xcalc/Makefile b/XOrg/app/xcalc/Makefile index 121ef4d1d..7220d06ef 100644 --- a/XOrg/app/xcalc/Makefile +++ b/XOrg/app/xcalc/Makefile @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xcalc PKG_NAME:=xcalc -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app +PKG_RELEASE:=2 +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)/ @@ -33,7 +33,7 @@ define Package/xcalc endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xcalc,xdm) @@ -47,18 +47,6 @@ define Build/Compile make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/xcalc/install $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1) @@ -67,7 +55,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xclipboard/Makefile b/XOrg/app/xclipboard/Makefile index 18bc8b4ec..a09155c3d 100644 --- a/XOrg/app/xclipboard/Makefile +++ b/XOrg/app/xclipboard/Makefile @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xclipboard PKG_NAME:=xclipboard -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app +PKG_RELEASE:=2 +PKG_VERSION:=1.0.1 +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)/ @@ -33,7 +33,7 @@ define Package/xclipboard endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xclipboard,xdm) @@ -47,18 +47,6 @@ define Build/Compile make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/xclipboard/install $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1) @@ -67,7 +55,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xdm/Makefile b/XOrg/app/xdm/Makefile index 61a603f10..3b45e4dfe 100644 --- a/XOrg/app/xdm/Makefile +++ b/XOrg/app/xdm/Makefile @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xdm PKG_NAME:=xdm -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.1.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app +PKG_RELEASE:=2 +PKG_VERSION:=1.1.6 +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)/ @@ -33,7 +33,7 @@ define Package/xdm endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xdm,xdm) @@ -47,18 +47,6 @@ define Build/Compile make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/xdm/install $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1) @@ -67,7 +55,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xeyes/Makefile b/XOrg/app/xeyes/Makefile index 4aeb787ca..3acc212ea 100644 --- a/XOrg/app/xeyes/Makefile +++ b/XOrg/app/xeyes/Makefile @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xeyes PKG_NAME:=xeyes -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app +PKG_RELEASE:=2 +PKG_VERSION:=1.0.1 +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)/ @@ -33,7 +33,7 @@ define Package/xeyes endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xeyes,xdm) @@ -47,18 +47,6 @@ define Build/Compile make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/xeyes/install $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1) @@ -67,7 +55,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xinit/Makefile b/XOrg/app/xinit/Makefile index db1c0ce3f..94d9bbb05 100644 --- a/XOrg/app/xinit/Makefile +++ b/XOrg/app/xinit/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,25 +10,30 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xinit PKG_NAME:=xinit -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app +PKG_RELEASE:=2 +PKG_VERSION:=1.0.5 +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 (xinit,xinit) +_DEPEND+=xorg-server-essentials +endif + include $(INCLUDE_DIR)/package.mk define Package/xinit SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=+libX11 @DISPLAY_SUPPORT + DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT TITLE:=xinit URL:=http://xorg.freedesktop.org/ endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xinit,xdm) @@ -42,18 +47,6 @@ define Build/Compile make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/xinit/install $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1) @@ -62,8 +55,8 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit - cd $(1)/usr/bin/; ln -sf xinit startx + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + cd $(1)/usr/bin/; ln -s xinit startx endef $(eval $(call BuildPackage,xinit)) diff --git a/XOrg/app/xlogo/Makefile b/XOrg/app/xlogo/Makefile index 6b78dd088..dbf4ddb54 100644 --- a/XOrg/app/xlogo/Makefile +++ b/XOrg/app/xlogo/Makefile @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xlogo PKG_NAME:=xlogo -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app +PKG_RELEASE:=2 +PKG_VERSION:=1.0.1 +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)/ @@ -33,7 +33,7 @@ define Package/xlogo endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xlogo,xdm) @@ -47,18 +47,6 @@ define Build/Compile make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/xlogo/install $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1) @@ -67,7 +55,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xmessage/Makefile b/XOrg/app/xmessage/Makefile index d34f2a185..91f17f029 100644 --- a/XOrg/app/xmessage/Makefile +++ b/XOrg/app/xmessage/Makefile @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xmessage PKG_NAME:=xmessage -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app +PKG_RELEASE:=2 +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)/ @@ -33,7 +33,7 @@ define Package/xmessage endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xmessage,xdm) @@ -47,18 +47,6 @@ define Build/Compile make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/xmessage/install $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1) @@ -67,7 +55,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xset/Makefile b/XOrg/app/xset/Makefile index 8538210f0..bad4d2a71 100644 --- a/XOrg/app/xset/Makefile +++ b/XOrg/app/xset/Makefile @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xset PKG_NAME:=xset -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.1-1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app +PKG_RELEASE:=2 +PKG_VERSION:=1.0.3 +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)/ @@ -33,7 +33,7 @@ define Package/xset endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xset,xdm) @@ -47,18 +47,6 @@ define Build/Compile make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/xset/install $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1) @@ -67,7 +55,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/app/xsetroot/Makefile b/XOrg/app/xsetroot/Makefile index bc4f0e946..ea2a64a65 100644 --- a/XOrg/app/xsetroot/Makefile +++ b/XOrg/app/xsetroot/Makefile @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xsetroot PKG_NAME:=xsetroot -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app +PKG_RELEASE:=2 +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)/ @@ -27,13 +27,13 @@ define Package/xsetroot SECTION:=xorg-app CATEGORY:=Xorg SUBMENU:=app - DEPENDS:=${_DEPEND} +xbitmaps @DISPLAY_SUPPORT + DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT TITLE:=xsetroot URL:=http://xorg.freedesktop.org/ endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xsetroot,xdm) @@ -47,18 +47,6 @@ define Build/Compile make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/xsetroot/install $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1) @@ -67,7 +55,7 @@ endef define Package/xinit/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit cd $(1)/usr/bin/; ln -s xinit startx endef diff --git a/XOrg/data/xbitmaps/Makefile b/XOrg/data/xbitmaps/Makefile index fdcb95a92..7c7ccb1c8 100644 --- a/XOrg/data/xbitmaps/Makefile +++ b/XOrg/data/xbitmaps/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xbitmaps PKG_NAME:=xbitmaps PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/data/ +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)/ diff --git a/XOrg/driver/packages b/XOrg/driver/packages index f140c8aae..8c4f393ae 100644 --- a/XOrg/driver/packages +++ b/XOrg/driver/packages @@ -1,10 +1,9 @@ -xf86-input-evdev-X11R7.1-1.1.2| -xf86-input-keyboard-X11R7.2-1.1.1| -xf86-input-mouse-X11R7.2-1.1.2| -xf86-input-mouse-X11R7.2-1.1.2| -xf86-video-fbdev-X11R7.2-0.3.1| -xf86-video-vesa-X11R7.2-1.3.0| -xf86-video-vga-X11R7.1-4.1.0| -xf86-video-i810-X11R7.2-1.6.5|+libXvMC -xf86-video-nv-X11R7.2-1.2.2.1| -xf86-video-ati-X11R7.2-6.6.3| +xf86-input-evdev-1.1.2| +xf86-input-keyboard-1.2.2| +xf86-input-mouse-1.2.2| +xf86-video-fbdev-0.3.1| +xf86-video-vesa-1.3.0| +xf86-video-vga-4.1.0| +xf86-video-intel-2.1.1| +xf86-video-nv-2.1.3| +xf86-video-ati-6.6.3|@BROKEN diff --git a/XOrg/driver/patches/xf86-input-evdev/001-fix-compile.patch b/XOrg/driver/patches/xf86-input-evdev/001-fix-compile.patch new file mode 100644 index 000000000..adf20d124 --- /dev/null +++ b/XOrg/driver/patches/xf86-input-evdev/001-fix-compile.patch @@ -0,0 +1,46 @@ +--- xf86-input-evdev-1.1.2.orig/src/evdev.c.orig 2008-08-17 19:24:37.000000000 +0200 ++++ xf86-input-evdev-1.1.2/src/evdev.c 2008-08-17 19:33:40.000000000 +0200 +@@ -234,10 +234,6 @@ + else + return !Success; + break; +- case SendCoreEvents: +- case DontSendCoreEvents: +- xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents)); +- break; + default: + return !Success; + } +@@ -264,7 +260,9 @@ + pInfo->device_control = EvdevProc; + pInfo->read_input = EvdevReadInput; + pInfo->switch_mode = EvdevSwitchMode; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + pInfo->motion_history_proc = xf86GetMotionEvents; ++#endif + pInfo->conf_idev = driver->dev; + + pInfo->private = device; +@@ -451,8 +449,6 @@ + 0 + }; + +-#ifdef XFree86LOADER +- + static void + EvdevUnplug(pointer p) + { +@@ -474,7 +470,7 @@ + MODULEVENDORSTRING, + MODINFOSTRING1, + MODINFOSTRING2, +- 0, /* Missing from SDK: XORG_VERSION_CURRENT, */ ++ XORG_VERSION_CURRENT, + 1, 1, 0, + ABI_CLASS_XINPUT, + ABI_XINPUT_VERSION, +@@ -488,4 +484,3 @@ + EvdevPlug, + EvdevUnplug + }; +-#endif /* XFree86LOADER */ diff --git a/XOrg/driver/patches/xf86-input-evdev/002-mipointer-fix.patch b/XOrg/driver/patches/xf86-input-evdev/002-mipointer-fix.patch new file mode 100644 index 000000000..5397577de --- /dev/null +++ b/XOrg/driver/patches/xf86-input-evdev/002-mipointer-fix.patch @@ -0,0 +1,30 @@ +diff -urN xf86-input-evdev-1.1.2.orig/src/evdev_axes.c xf86-input-evdev-1.1.2/src/evdev_axes.c +--- xf86-input-evdev-1.1.2.orig/src/evdev_axes.c 2008-08-28 10:59:09.000000000 +0200 ++++ xf86-input-evdev-1.1.2/src/evdev_axes.c 2008-08-28 10:55:52.000000000 +0200 +@@ -532,8 +532,14 @@ + return Success; + + if (!InitValuatorClassDeviceStruct(device, axes, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 1 ++ GetMotionHistroy(), ++ GetMotionHistorSize(), ++#else + miPointerGetMotionEvents, ++ miPointerGetMotionBufferSize(), ++#endif ++ 0)) +- miPointerGetMotionBufferSize(), 0)) + return !Success; + + for (i = 0; i < axes; i++) { +@@ -543,8 +549,9 @@ + + if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) + return !Success; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 +- + xf86MotionHistoryAllocate (pInfo); ++#endif + + return Success; + } diff --git a/XOrg/driver/template.mk b/XOrg/driver/template.mk index f54a2ef4a..8375888db 100644 --- a/XOrg/driver/template.mk +++ b/XOrg/driver/template.mk @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=@BASE_NAME@ PKG_NAME:=@NAME@ -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=@VER@ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -46,7 +46,7 @@ define Build/Configure (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ if [ -x $(CONFIGURE_CMD) ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ + $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ $(CONFIGURE_VARS) \ $(CONFIGURE_CMD) \ diff --git a/XOrg/driver/xf86-input-evdev/Makefile b/XOrg/driver/xf86-input-evdev/Makefile index d9fd56cd9..7d739d717 100644 --- a/XOrg/driver/xf86-input-evdev/Makefile +++ b/XOrg/driver/xf86-input-evdev/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xf86 PKG_NAME:=xf86-input-evdev -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.1-1.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver +PKG_RELEASE:=2 +PKG_VERSION:=1.1.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,7 +27,7 @@ define Package/xf86-input-evdev endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ @@ -46,7 +46,7 @@ define Build/Configure (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ if [ -x $(CONFIGURE_CMD) ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ + $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ $(CONFIGURE_VARS) \ $(CONFIGURE_CMD) \ diff --git a/XOrg/driver/xf86-input-evdev/patches/001-fix-compile.patch b/XOrg/driver/xf86-input-evdev/patches/001-fix-compile.patch new file mode 100644 index 000000000..adf20d124 --- /dev/null +++ b/XOrg/driver/xf86-input-evdev/patches/001-fix-compile.patch @@ -0,0 +1,46 @@ +--- xf86-input-evdev-1.1.2.orig/src/evdev.c.orig 2008-08-17 19:24:37.000000000 +0200 ++++ xf86-input-evdev-1.1.2/src/evdev.c 2008-08-17 19:33:40.000000000 +0200 +@@ -234,10 +234,6 @@ + else + return !Success; + break; +- case SendCoreEvents: +- case DontSendCoreEvents: +- xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents)); +- break; + default: + return !Success; + } +@@ -264,7 +260,9 @@ + pInfo->device_control = EvdevProc; + pInfo->read_input = EvdevReadInput; + pInfo->switch_mode = EvdevSwitchMode; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + pInfo->motion_history_proc = xf86GetMotionEvents; ++#endif + pInfo->conf_idev = driver->dev; + + pInfo->private = device; +@@ -451,8 +449,6 @@ + 0 + }; + +-#ifdef XFree86LOADER +- + static void + EvdevUnplug(pointer p) + { +@@ -474,7 +470,7 @@ + MODULEVENDORSTRING, + MODINFOSTRING1, + MODINFOSTRING2, +- 0, /* Missing from SDK: XORG_VERSION_CURRENT, */ ++ XORG_VERSION_CURRENT, + 1, 1, 0, + ABI_CLASS_XINPUT, + ABI_XINPUT_VERSION, +@@ -488,4 +484,3 @@ + EvdevPlug, + EvdevUnplug + }; +-#endif /* XFree86LOADER */ diff --git a/XOrg/driver/xf86-input-evdev/patches/002-mipointer-fix.patch b/XOrg/driver/xf86-input-evdev/patches/002-mipointer-fix.patch new file mode 100644 index 000000000..5397577de --- /dev/null +++ b/XOrg/driver/xf86-input-evdev/patches/002-mipointer-fix.patch @@ -0,0 +1,30 @@ +diff -urN xf86-input-evdev-1.1.2.orig/src/evdev_axes.c xf86-input-evdev-1.1.2/src/evdev_axes.c +--- xf86-input-evdev-1.1.2.orig/src/evdev_axes.c 2008-08-28 10:59:09.000000000 +0200 ++++ xf86-input-evdev-1.1.2/src/evdev_axes.c 2008-08-28 10:55:52.000000000 +0200 +@@ -532,8 +532,14 @@ + return Success; + + if (!InitValuatorClassDeviceStruct(device, axes, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 1 ++ GetMotionHistroy(), ++ GetMotionHistorSize(), ++#else + miPointerGetMotionEvents, ++ miPointerGetMotionBufferSize(), ++#endif ++ 0)) +- miPointerGetMotionBufferSize(), 0)) + return !Success; + + for (i = 0; i < axes; i++) { +@@ -543,8 +549,9 @@ + + if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) + return !Success; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 +- + xf86MotionHistoryAllocate (pInfo); ++#endif + + return Success; + } diff --git a/XOrg/driver/xf86-input-keyboard/Makefile b/XOrg/driver/xf86-input-keyboard/Makefile index 322563873..461e23df5 100644 --- a/XOrg/driver/xf86-input-keyboard/Makefile +++ b/XOrg/driver/xf86-input-keyboard/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xf86 PKG_NAME:=xf86-input-keyboard -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.1.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver +PKG_RELEASE:=2 +PKG_VERSION:=1.2.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,7 +27,7 @@ define Package/xf86-input-keyboard endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ @@ -46,7 +46,7 @@ define Build/Configure (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ if [ -x $(CONFIGURE_CMD) ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ + $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ $(CONFIGURE_VARS) \ $(CONFIGURE_CMD) \ diff --git a/XOrg/driver/xf86-input-mouse/Makefile b/XOrg/driver/xf86-input-mouse/Makefile index 52a515979..17200ffaf 100644 --- a/XOrg/driver/xf86-input-mouse/Makefile +++ b/XOrg/driver/xf86-input-mouse/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xf86 PKG_NAME:=xf86-input-mouse -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver +PKG_RELEASE:=2 +PKG_VERSION:=1.2.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,7 +27,7 @@ define Package/xf86-input-mouse endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ @@ -46,7 +46,7 @@ define Build/Configure (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ if [ -x $(CONFIGURE_CMD) ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ + $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ $(CONFIGURE_VARS) \ $(CONFIGURE_CMD) \ diff --git a/XOrg/driver/xf86-video-ati/Makefile b/XOrg/driver/xf86-video-ati/Makefile index c34c3d970..afbe58957 100644 --- a/XOrg/driver/xf86-video-ati/Makefile +++ b/XOrg/driver/xf86-video-ati/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xf86 PKG_NAME:=xf86-video-ati -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-6.6.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver +PKG_RELEASE:=2 +PKG_VERSION:=6.6.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -21,13 +21,13 @@ define Package/xf86-video-ati SECTION:=xorg-driver CATEGORY:=Xorg SUBMENU:=driver - DEPENDS:=+xorg-server @DISPLAY_SUPPORT + DEPENDS:=+xorg-server @BROKEN @DISPLAY_SUPPORT TITLE:=xf86-video-ati URL:=http://xorg.freedesktop.org/ endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ @@ -46,7 +46,7 @@ define Build/Configure (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ if [ -x $(CONFIGURE_CMD) ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ + $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ $(CONFIGURE_VARS) \ $(CONFIGURE_CMD) \ diff --git a/XOrg/driver/xf86-video-fbdev/Makefile b/XOrg/driver/xf86-video-fbdev/Makefile index 7cc884ec8..677060a98 100644 --- a/XOrg/driver/xf86-video-fbdev/Makefile +++ b/XOrg/driver/xf86-video-fbdev/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xf86 PKG_NAME:=xf86-video-fbdev -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-0.3.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver +PKG_RELEASE:=2 +PKG_VERSION:=0.3.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,7 +27,7 @@ define Package/xf86-video-fbdev endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ @@ -46,7 +46,7 @@ define Build/Configure (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ if [ -x $(CONFIGURE_CMD) ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ + $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ $(CONFIGURE_VARS) \ $(CONFIGURE_CMD) \ diff --git a/XOrg/driver/xf86-video-i810/patches/100-sdkdir.patch b/XOrg/driver/xf86-video-i810/patches/100-sdkdir.patch deleted file mode 100644 index 1300a6a92..000000000 --- a/XOrg/driver/xf86-video-i810/patches/100-sdkdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac xf86-video-i810-X11R7.2-1.6.5/configure.ac ---- xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac 2007-09-21 03:54:25.000000000 +0200 -+++ xf86-video-i810-X11R7.2-1.6.5/configure.ac 2007-09-21 03:55:08.000000000 +0200 -@@ -72,7 +72,8 @@ - - # Checks for pkg-config packages - PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES]) --sdkdir=$(pkg-config --variable=sdkdir xorg-server) -+sdkdir=${SDKDIR} -+#$(pkg-config --variable=sdkdir xorg-server) - - # Checks for libraries. - diff --git a/XOrg/driver/xf86-video-i810/Makefile b/XOrg/driver/xf86-video-intel/Makefile similarity index 75% rename from XOrg/driver/xf86-video-i810/Makefile rename to XOrg/driver/xf86-video-intel/Makefile index f341d8f06..62f7ceb76 100644 --- a/XOrg/driver/xf86-video-i810/Makefile +++ b/XOrg/driver/xf86-video-intel/Makefile @@ -8,26 +8,26 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xf86 -PKG_NAME:=xf86-video-i810 -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.6.5 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver +PKG_NAME:=xf86-video-intel +PKG_RELEASE:=2 +PKG_VERSION:=2.1.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk -define Package/xf86-video-i810 +define Package/xf86-video-intel SECTION:=xorg-driver CATEGORY:=Xorg SUBMENU:=driver - DEPENDS:=+xorg-server +libXvMC @DISPLAY_SUPPORT - TITLE:=xf86-video-i810 + DEPENDS:=+xorg-server @DISPLAY_SUPPORT + TITLE:=xf86-video-intel URL:=http://xorg.freedesktop.org/ endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ @@ -46,7 +46,7 @@ define Build/Configure (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ if [ -x $(CONFIGURE_CMD) ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ + $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ $(CONFIGURE_VARS) \ $(CONFIGURE_CMD) \ @@ -63,9 +63,9 @@ define Build/Compile find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf endef -define Package/xf86-video-i810/install +define Package/xf86-video-intel/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ endef -$(eval $(call BuildPackage,xf86-video-i810)) +$(eval $(call BuildPackage,xf86-video-intel)) diff --git a/XOrg/driver/patches/xf86-video-i810/100-sdkdir.patch b/XOrg/driver/xf86-video-intel/patches/100-sdkdir.patch similarity index 100% rename from XOrg/driver/patches/xf86-video-i810/100-sdkdir.patch rename to XOrg/driver/xf86-video-intel/patches/100-sdkdir.patch diff --git a/XOrg/driver/xf86-video-nv/Makefile b/XOrg/driver/xf86-video-nv/Makefile index 4ddb93259..2b9535fe3 100644 --- a/XOrg/driver/xf86-video-nv/Makefile +++ b/XOrg/driver/xf86-video-nv/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xf86 PKG_NAME:=xf86-video-nv -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.2.2.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver +PKG_RELEASE:=2 +PKG_VERSION:=2.1.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,7 +27,7 @@ define Package/xf86-video-nv endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ @@ -46,7 +46,7 @@ define Build/Configure (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ if [ -x $(CONFIGURE_CMD) ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ + $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ $(CONFIGURE_VARS) \ $(CONFIGURE_CMD) \ diff --git a/XOrg/driver/xf86-video-vesa/Makefile b/XOrg/driver/xf86-video-vesa/Makefile index dd69fb88d..e617190e4 100644 --- a/XOrg/driver/xf86-video-vesa/Makefile +++ b/XOrg/driver/xf86-video-vesa/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xf86 PKG_NAME:=xf86-video-vesa -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.3.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver +PKG_RELEASE:=2 +PKG_VERSION:=1.3.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,7 +27,7 @@ define Package/xf86-video-vesa endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ @@ -46,7 +46,7 @@ define Build/Configure (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ if [ -x $(CONFIGURE_CMD) ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ + $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ $(CONFIGURE_VARS) \ $(CONFIGURE_CMD) \ diff --git a/XOrg/driver/xf86-video-vga/Makefile b/XOrg/driver/xf86-video-vga/Makefile index 48f4f70c3..c2879a196 100644 --- a/XOrg/driver/xf86-video-vga/Makefile +++ b/XOrg/driver/xf86-video-vga/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xf86 PKG_NAME:=xf86-video-vga -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.1-4.1.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver +PKG_RELEASE:=2 +PKG_VERSION:=4.1.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,7 +27,7 @@ define Package/xf86-video-vga endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ @@ -46,7 +46,7 @@ define Build/Configure (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ if [ -x $(CONFIGURE_CMD) ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ + $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ $(CONFIGURE_VARS) \ $(CONFIGURE_CMD) \ diff --git a/XOrg/font-native/font-util/Makefile b/XOrg/font-native/font-util/Makefile index 8e96ac084..1416be627 100644 --- a/XOrg/font-native/font-util/Makefile +++ b/XOrg/font-native/font-util/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=font-util -PKG_VERSION:=X11R7.1-1.0.1 -PKG_RELEASE:=1 +PKG_VERSION:=1.0.1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk diff --git a/XOrg/font/encodings/Makefile b/XOrg/font/encodings/Makefile index f3383002c..d6061ad6f 100644 --- a/XOrg/font/encodings/Makefile +++ b/XOrg/font/encodings/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=encodings PKG_NAME:=encodings -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.2 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk @@ -27,10 +27,10 @@ define Package/encodings endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 define Build/Compile UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) @@ -43,18 +43,6 @@ define Build/Compile mv {} {}.encodings endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/encodings/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/XOrg/font/font-alias/Makefile b/XOrg/font/font-alias/Makefile index 4db472e12..f730291cd 100644 --- a/XOrg/font/font-alias/Makefile +++ b/XOrg/font/font-alias/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=font PKG_NAME:=font-alias -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.1 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk @@ -27,10 +27,10 @@ define Package/font-alias endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 define Build/Compile UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) @@ -43,18 +43,6 @@ define Build/Compile mv {} {}.font-alias endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/font-alias/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/XOrg/font/font-bh-75dpi/Makefile b/XOrg/font/font-bh-75dpi/Makefile index 3eb9e1de3..b4117d9a8 100644 --- a/XOrg/font/font-bh-75dpi/Makefile +++ b/XOrg/font/font-bh-75dpi/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=font PKG_NAME:=font-bh-75dpi -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.0 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk @@ -27,10 +27,10 @@ define Package/font-bh-75dpi endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 define Build/Compile UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) @@ -43,18 +43,6 @@ define Build/Compile mv {} {}.font-bh-75dpi endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/font-bh-75dpi/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/XOrg/font/font-cursor-misc/Makefile b/XOrg/font/font-cursor-misc/Makefile index 78a14ac70..07880767c 100644 --- a/XOrg/font/font-cursor-misc/Makefile +++ b/XOrg/font/font-cursor-misc/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=font PKG_NAME:=font-cursor-misc -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.0 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk @@ -27,10 +27,10 @@ define Package/font-cursor-misc endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 define Build/Compile UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) @@ -43,18 +43,6 @@ define Build/Compile mv {} {}.font-cursor-misc endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/font-cursor-misc/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/XOrg/font/font-daewoo-misc/Makefile b/XOrg/font/font-daewoo-misc/Makefile index 4f9b08e10..331503685 100644 --- a/XOrg/font/font-daewoo-misc/Makefile +++ b/XOrg/font/font-daewoo-misc/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=font PKG_NAME:=font-daewoo-misc -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.0 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk @@ -27,10 +27,10 @@ define Package/font-daewoo-misc endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 define Build/Compile UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) @@ -43,18 +43,6 @@ define Build/Compile mv {} {}.font-daewoo-misc endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/font-daewoo-misc/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/XOrg/font/font-dec-misc/Makefile b/XOrg/font/font-dec-misc/Makefile index dc3b137d5..eb761b50e 100644 --- a/XOrg/font/font-dec-misc/Makefile +++ b/XOrg/font/font-dec-misc/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=font PKG_NAME:=font-dec-misc -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.0 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk @@ -27,10 +27,10 @@ define Package/font-dec-misc endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 define Build/Compile UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) @@ -43,18 +43,6 @@ define Build/Compile mv {} {}.font-dec-misc endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/font-dec-misc/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/XOrg/font/font-ibm-type1/Makefile b/XOrg/font/font-ibm-type1/Makefile index 21650ff8f..9d462e138 100644 --- a/XOrg/font/font-ibm-type1/Makefile +++ b/XOrg/font/font-ibm-type1/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=font PKG_NAME:=font-ibm-type1 -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.0 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk @@ -27,10 +27,10 @@ define Package/font-ibm-type1 endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 define Build/Compile UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) @@ -43,18 +43,6 @@ define Build/Compile mv {} {}.font-ibm-type1 endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/font-ibm-type1/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/XOrg/font/font-isas-misc/Makefile b/XOrg/font/font-isas-misc/Makefile index 5ea32e195..7697a791e 100644 --- a/XOrg/font/font-isas-misc/Makefile +++ b/XOrg/font/font-isas-misc/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=font PKG_NAME:=font-isas-misc -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.0 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk @@ -27,10 +27,10 @@ define Package/font-isas-misc endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 define Build/Compile UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) @@ -43,18 +43,6 @@ define Build/Compile mv {} {}.font-isas-misc endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/font-isas-misc/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/XOrg/font/font-jis-misc/Makefile b/XOrg/font/font-jis-misc/Makefile index b4c23c556..4e5dc8658 100644 --- a/XOrg/font/font-jis-misc/Makefile +++ b/XOrg/font/font-jis-misc/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=font PKG_NAME:=font-jis-misc -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.0 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk @@ -27,10 +27,10 @@ define Package/font-jis-misc endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 define Build/Compile UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) @@ -43,18 +43,6 @@ define Build/Compile mv {} {}.font-jis-misc endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/font-jis-misc/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/XOrg/font/font-micro-misc/Makefile b/XOrg/font/font-micro-misc/Makefile index 2403de5e6..b1b945619 100644 --- a/XOrg/font/font-micro-misc/Makefile +++ b/XOrg/font/font-micro-misc/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=font PKG_NAME:=font-micro-misc -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.0 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk @@ -27,10 +27,10 @@ define Package/font-micro-misc endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 define Build/Compile UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) @@ -43,18 +43,6 @@ define Build/Compile mv {} {}.font-micro-misc endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/font-micro-misc/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/XOrg/font/font-misc-cyrillic/Makefile b/XOrg/font/font-misc-cyrillic/Makefile index a87239023..699f615e3 100644 --- a/XOrg/font/font-misc-cyrillic/Makefile +++ b/XOrg/font/font-misc-cyrillic/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=font PKG_NAME:=font-misc-cyrillic -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.0 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk @@ -27,10 +27,10 @@ define Package/font-misc-cyrillic endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 define Build/Compile UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) @@ -43,18 +43,6 @@ define Build/Compile mv {} {}.font-misc-cyrillic endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/font-misc-cyrillic/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/XOrg/font/font-misc-misc/Makefile b/XOrg/font/font-misc-misc/Makefile index 37aa3d6a9..a481ef430 100644 --- a/XOrg/font/font-misc-misc/Makefile +++ b/XOrg/font/font-misc-misc/Makefile @@ -11,10 +11,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=font-base PKG_NAME:=font-misc-misc PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font -PKG_SOURCE:=font-misc-misc-X11R7.0-1.0.0.tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/fonts/font-misc-misc-X11R7.0-1.0.0/ +PKG_VERSION:=1.0.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 include $(INCLUDE_DIR)/package.mk diff --git a/XOrg/font/font-xfree86-type1/Makefile b/XOrg/font/font-xfree86-type1/Makefile index 568811667..d469198bc 100644 --- a/XOrg/font/font-xfree86-type1/Makefile +++ b/XOrg/font/font-xfree86-type1/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=font PKG_NAME:=font-xfree86-type1 -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.0 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk @@ -27,10 +27,10 @@ define Package/font-xfree86-type1 endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 define Build/Compile UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) @@ -43,18 +43,6 @@ define Build/Compile mv {} {}.font-xfree86-type1 endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/font-xfree86-type1/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/XOrg/font/packages b/XOrg/font/packages index 9a976e2ee..1766b9b03 100644 --- a/XOrg/font/packages +++ b/XOrg/font/packages @@ -1,13 +1,12 @@ -dejavu-fonts-ttf-2.23| -encodings-X11R7.2-1.0.2| -font-xfree86-type1-X11R7.0-1.0.0| -font-cursor-misc-X11R7.0-1.0.0| -font-daewoo-misc-X11R7.0-1.0.0| -font-dec-misc-X11R7.0-1.0.0| -font-ibm-type1-X11R7.0-1.0.0| -font-isas-misc-X11R7.0-1.0.0| -font-jis-misc-X11R7.0-1.0.0| -font-micro-misc-X11R7.0-1.0.0| -font-misc-cyrillic-X11R7.0-1.0.0| -font-bh-75dpi-X11R7.0-1.0.0| -font-alias-X11R7.0-1.0.1| +encodings-1.0.2| +font-xfree86-type1-1.0.0| +font-cursor-misc-1.0.0| +font-daewoo-misc-1.0.0| +font-dec-misc-1.0.0| +font-ibm-type1-1.0.0| +font-isas-misc-1.0.0| +font-jis-misc-1.0.0| +font-micro-misc-1.0.0| +font-misc-cyrillic-1.0.0| +font-bh-75dpi-1.0.0| +font-alias-1.0.1| diff --git a/XOrg/font/template.mk b/XOrg/font/template.mk index a3c69aff4..f6abfccf0 100644 --- a/XOrg/font/template.mk +++ b/XOrg/font/template.mk @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=@BASE_NAME@ PKG_NAME:=@NAME@ -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=@VER@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font include $(INCLUDE_DIR)/package.mk @@ -30,7 +30,7 @@ define Build/InstallDev DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef -CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 define Build/Compile UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) @@ -43,18 +43,6 @@ define Build/Compile mv {} {}.@NAME@ endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) ;\ - fi \ - ) -endef - define Package/@NAME@/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/XOrg/generate.sh b/XOrg/generate.sh index 814e28e99..9a99ba33d 100755 --- a/XOrg/generate.sh +++ b/XOrg/generate.sh @@ -4,15 +4,17 @@ for d in `find . -name packages`; do echo "Entering "`dirname $d` for p in `cat packages`; do _NAME=${p%%|*} - NAME=${_NAME%-X11*} + NAME=${_NAME%-*} BASE_NAME=${NAME%%-*} - _VER=${_NAME##*-X} - VER=X${_VER%%|*} + VER=${_NAME##*-} DEP=`echo ${p##*|} | sed "s/+/ +/g"` echo generating Makefile for ${NAME}-${VER} with deps : ${DEP} - rm -rf ${NAME} - if [ "$1" == "gen" ]; then - mkdir ${NAME} + rm -f ${NAME}/Makefile + rm -f ${NAME}/patches/* + if [ "$1" = "gen" ]; then + if [ ! -e ${NAME} ]; then + mkdir ${NAME} + fi sed "s/@VER@/${VER}/g" template.mk | sed "s/@DEP@/${DEP}/g" | sed "s/@NAME@/${NAME}/g" | sed "s/@BASE_NAME@/${BASE_NAME}/g" > ${NAME}/Makefile if [ -d `pwd`/patches/${NAME} ]; then mkdir ${NAME}/patches diff --git a/XOrg/headers/native/Makefile b/XOrg/headers/native/Makefile index 71b1289e4..425ce5924 100644 --- a/XOrg/headers/native/Makefile +++ b/XOrg/headers/native/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk -PKG_RELEASE:=1 -PKG_VERSION:=7.1 +PKG_RELEASE:=2 +PKG_VERSION:=7.3 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/headers/xorg-headers-native-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk diff --git a/XOrg/lib/libICE/Makefile b/XOrg/lib/libICE/Makefile index 1785dd155..d2d012cb3 100644 --- a/XOrg/lib/libICE/Makefile +++ b/XOrg/lib/libICE/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libICE PKG_NAME:=libICE -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,11 +27,11 @@ define Package/libICE endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libICE,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libICE/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libICE/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libICE)) diff --git a/XOrg/lib/libSM/Makefile b/XOrg/lib/libSM/Makefile index 839e015b2..c6622ac06 100644 --- a/XOrg/lib/libSM/Makefile +++ b/XOrg/lib/libSM/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libSM PKG_NAME:=libSM -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,11 +27,11 @@ define Package/libSM endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libSM,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libSM/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libSM/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libSM)) diff --git a/XOrg/lib/libX11/Makefile b/XOrg/lib/libX11/Makefile index bfb6a1f70..bba1a3ebb 100644 --- a/XOrg/lib/libX11/Makefile +++ b/XOrg/lib/libX11/Makefile @@ -9,14 +9,12 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libX11 PKG_NAME:=libX11 -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.1.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.1.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_FIXUP = libtool - include $(INCLUDE_DIR)/package.mk define Package/libX11 @@ -29,11 +27,11 @@ define Package/libX11 endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libX11,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -51,24 +49,16 @@ define Build/Compile make -C $(PKG_BUILD_DIR) mkdir -p $(PKG_INSTALL_DIR) DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libX11/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libX11/install @@ -81,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libX11)) diff --git a/XOrg/lib/libXau/Makefile b/XOrg/lib/libXau/Makefile index b7e018085..ffa277576 100644 --- a/XOrg/lib/libXau/Makefile +++ b/XOrg/lib/libXau/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXau PKG_NAME:=libXau -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,11 +27,11 @@ define Package/libXau endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXau,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXau/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libXau/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXau)) diff --git a/XOrg/lib/libXaw/Makefile b/XOrg/lib/libXaw/Makefile index 4e4363f90..676c3ad41 100644 --- a/XOrg/lib/libXaw/Makefile +++ b/XOrg/lib/libXaw/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXaw PKG_NAME:=libXaw -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.1-1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,11 +27,11 @@ define Package/libXaw endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXaw,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXaw/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libXaw/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXaw)) diff --git a/XOrg/lib/libXcursor/Makefile b/XOrg/lib/libXcursor/Makefile index dd99b7729..88e3cc9b6 100644 --- a/XOrg/lib/libXcursor/Makefile +++ b/XOrg/lib/libXcursor/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXcursor PKG_NAME:=libXcursor -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.1.8 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.1.9 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -21,17 +21,17 @@ define Package/libXcursor SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +libXrender +libXfixes @DISPLAY_SUPPORT + DEPENDS:=+xorg-headers-native +util-macros +libXrender +libXfixes @DISPLAY_SUPPORT TITLE:=libXcursor URL:=http://xorg.freedesktop.org/ endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXcursor,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,16 +53,7 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXcursor/install/Default @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXcursor)) diff --git a/XOrg/lib/libXdmcp/Makefile b/XOrg/lib/libXdmcp/Makefile index f08cbd21e..6f41cdc8d 100644 --- a/XOrg/lib/libXdmcp/Makefile +++ b/XOrg/lib/libXdmcp/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXdmcp PKG_NAME:=libXdmcp -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,11 +27,11 @@ define Package/libXdmcp endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXdmcp,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXdmcp/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libXdmcp/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXdmcp)) diff --git a/XOrg/lib/libXext/Makefile b/XOrg/lib/libXext/Makefile index a99e915f0..ee456865d 100644 --- a/XOrg/lib/libXext/Makefile +++ b/XOrg/lib/libXext/Makefile @@ -9,14 +9,12 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXext PKG_NAME:=libXext -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ -PKG_FIXUP = libtool - include $(INCLUDE_DIR)/package.mk define Package/libXext @@ -29,11 +27,11 @@ define Package/libXext endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXext,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -51,24 +49,16 @@ define Build/Compile make -C $(PKG_BUILD_DIR) mkdir -p $(PKG_INSTALL_DIR) DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXext/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libXext/install @@ -81,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXext)) diff --git a/XOrg/lib/libXfixes/Makefile b/XOrg/lib/libXfixes/Makefile index 2971a21e6..1c092d8ec 100644 --- a/XOrg/lib/libXfixes/Makefile +++ b/XOrg/lib/libXfixes/Makefile @@ -1,17 +1,17 @@ -# -# Copyright (C) 2007-2008 OpenWrt.org +# +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org +# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXfixes PKG_NAME:=libXfixes -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-4.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=4.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -21,27 +21,27 @@ define Package/libXfixes SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libX11 +libfreetype +zlib +xproto +libfontenc +xtrans +fontsproto +renderproto @DISPLAY_SUPPORT + DEPENDS:=+xorg-headers-native +util-macros @DISPLAY_SUPPORT TITLE:=libXfixes URL:=http://xorg.freedesktop.org/ endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXfixes,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys + $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys endef define libXt/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" + $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" endef define Build/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXfixes/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libXfixes/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXfixes)) diff --git a/XOrg/lib/libXfont/Makefile b/XOrg/lib/libXfont/Makefile index e8299d128..80bf7166e 100644 --- a/XOrg/lib/libXfont/Makefile +++ b/XOrg/lib/libXfont/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXfont PKG_NAME:=libXfont -PKG_RELEASE:=1 -PKG_VERSION:=1.3.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/archive/individual/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.3.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,11 +27,11 @@ define Package/libXfont endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXfont,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXfont/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libXfont/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXfont)) diff --git a/XOrg/lib/libXft/Makefile b/XOrg/lib/libXft/Makefile index 7e8d2ebe1..4d1162450 100644 --- a/XOrg/lib/libXft/Makefile +++ b/XOrg/lib/libXft/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXft PKG_NAME:=libXft -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-2.1.12 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=2.1.12 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ diff --git a/XOrg/lib/libXmu/Makefile b/XOrg/lib/libXmu/Makefile index 193c30136..136d16633 100644 --- a/XOrg/lib/libXmu/Makefile +++ b/XOrg/lib/libXmu/Makefile @@ -1,17 +1,17 @@ -# -# Copyright (C) 2007-2008 OpenWrt.org +# +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org +# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXmu PKG_NAME:=libXmu -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -21,27 +21,27 @@ define Package/libXmu SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libXt +libXext @DISPLAY_SUPPORT + DEPENDS:=+xorg-headers-native +util-macros @DISPLAY_SUPPORT TITLE:=libXmu URL:=http://xorg.freedesktop.org/ endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXmu,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys + $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys endef define libXt/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" + $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" endef define Build/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXmu/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libXmu/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXmu)) diff --git a/XOrg/lib/libXpm/Makefile b/XOrg/lib/libXpm/Makefile index db9c250f7..e92fee351 100644 --- a/XOrg/lib/libXpm/Makefile +++ b/XOrg/lib/libXpm/Makefile @@ -1,17 +1,17 @@ -# -# Copyright (C) 2007-2008 OpenWrt.org +# +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org +# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXpm PKG_NAME:=libXpm -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-3.5.6 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=3.5.7 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -21,27 +21,27 @@ define Package/libXpm SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libX11 @DISPLAY_SUPPORT + DEPENDS:=+xorg-headers-native +util-macros @DISPLAY_SUPPORT TITLE:=libXpm URL:=http://xorg.freedesktop.org/ endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXpm,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys + $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys endef define libXt/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" + $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" endef define Build/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXpm/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libXpm/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXpm)) diff --git a/XOrg/lib/libXrandr/Makefile b/XOrg/lib/libXrandr/Makefile index 5a445a945..184cffad8 100644 --- a/XOrg/lib/libXrandr/Makefile +++ b/XOrg/lib/libXrandr/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXrandr PKG_NAME:=libXrandr -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.2.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,11 +27,11 @@ define Package/libXrandr endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXrandr,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXrandr/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libXrandr/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXrandr)) diff --git a/XOrg/lib/libXrender/Makefile b/XOrg/lib/libXrender/Makefile index c7fb2ad6c..c3203e5dd 100644 --- a/XOrg/lib/libXrender/Makefile +++ b/XOrg/lib/libXrender/Makefile @@ -1,17 +1,17 @@ -# -# Copyright (C) 2007-2008 OpenWrt.org +# +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org +# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXrender PKG_NAME:=libXrender -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-0.9.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=0.9.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -21,27 +21,27 @@ define Package/libXrender SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libX11 +libfreetype +zlib +xproto +libfontenc +xtrans +fontsproto +renderproto @DISPLAY_SUPPORT + DEPENDS:=+xorg-headers-native +util-macros +libfreetype +zlib +xproto +libfontenc +xtrans +fontsproto +renderproto @DISPLAY_SUPPORT TITLE:=libXrender URL:=http://xorg.freedesktop.org/ endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXrender,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys + $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys endef define libXt/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" + $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" endef define Build/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXrender/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libXrender/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXrender)) diff --git a/XOrg/lib/libXt/Makefile b/XOrg/lib/libXt/Makefile index 56d2403da..2069839fb 100644 --- a/XOrg/lib/libXt/Makefile +++ b/XOrg/lib/libXt/Makefile @@ -1,17 +1,17 @@ -# -# Copyright (C) 2007-2008 OpenWrt.org +# +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org +# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXt PKG_NAME:=libXt -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.4 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -21,27 +21,27 @@ define Package/libXt SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libX11 +libSM @DISPLAY_SUPPORT + DEPENDS:=+xorg-headers-native +util-macros +libSM @DISPLAY_SUPPORT TITLE:=libXt URL:=http://xorg.freedesktop.org/ endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXt,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys + $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys endef define libXt/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" + $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" endef define Build/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXt/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libXt/install @@ -80,10 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ - $(INSTALL_DIR) $(2)/bin - mv $(1)/usr/bin/makestrs $(2)/bin + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXt)) diff --git a/XOrg/lib/libXv/Makefile b/XOrg/lib/libXv/Makefile index 29ef1f3a9..1ac79adba 100644 --- a/XOrg/lib/libXv/Makefile +++ b/XOrg/lib/libXv/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXv PKG_NAME:=libXv -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,11 +27,11 @@ define Package/libXv endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXv,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,16 +53,7 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXv/install/Default @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXv)) diff --git a/XOrg/lib/libXvMC/Makefile b/XOrg/lib/libXvMC/Makefile index 072b65af2..157a81c26 100644 --- a/XOrg/lib/libXvMC/Makefile +++ b/XOrg/lib/libXvMC/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXvMC PKG_NAME:=libXvMC -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.4 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,11 +27,11 @@ define Package/libXvMC endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXvMC,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,16 +53,7 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXvMC/install/Default @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXvMC)) diff --git a/XOrg/lib/libXxf86misc/Makefile b/XOrg/lib/libXxf86misc/Makefile index 875fb2e91..4ba01f455 100644 --- a/XOrg/lib/libXxf86misc/Makefile +++ b/XOrg/lib/libXxf86misc/Makefile @@ -1,17 +1,17 @@ -# -# Copyright (C) 2007-2008 OpenWrt.org +# +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org +# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXxf86misc PKG_NAME:=libXxf86misc -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.1-1.0.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -21,27 +21,27 @@ define Package/libXxf86misc SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libXt +libXext @DISPLAY_SUPPORT + DEPENDS:=+xorg-headers-native +util-macros @DISPLAY_SUPPORT TITLE:=libXxf86misc URL:=http://xorg.freedesktop.org/ endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXxf86misc,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys + $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys endef define libXt/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" + $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" endef define Build/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXxf86misc/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libXxf86misc/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXxf86misc)) diff --git a/XOrg/lib/libXxf86vm/Makefile b/XOrg/lib/libXxf86vm/Makefile index c85135cd4..4cc0b15b2 100644 --- a/XOrg/lib/libXxf86vm/Makefile +++ b/XOrg/lib/libXxf86vm/Makefile @@ -1,17 +1,17 @@ -# -# Copyright (C) 2007-2008 OpenWrt.org +# +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org +# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXxf86vm PKG_NAME:=libXxf86vm -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.1-1.0.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -21,27 +21,27 @@ define Package/libXxf86vm SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libX11 +libXext @DISPLAY_SUPPORT + DEPENDS:=+xorg-headers-native +util-macros @DISPLAY_SUPPORT TITLE:=libXxf86vm URL:=http://xorg.freedesktop.org/ endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXxf86vm,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys + $(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys endef define libXt/Compile $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" + $(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" endef define Build/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libXxf86vm/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libXxf86vm/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libXxf86vm)) diff --git a/XOrg/lib/libfontenc/Makefile b/XOrg/lib/libfontenc/Makefile index 3b525bdbd..3531449a9 100644 --- a/XOrg/lib/libfontenc/Makefile +++ b/XOrg/lib/libfontenc/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libfontenc PKG_NAME:=libfontenc -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.4 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,11 +27,11 @@ define Package/libfontenc endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libfontenc,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libfontenc/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libfontenc/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libfontenc)) diff --git a/XOrg/lib/libxkbfile/Makefile b/XOrg/lib/libxkbfile/Makefile index af66b0e97..a376ea104 100644 --- a/XOrg/lib/libxkbfile/Makefile +++ b/XOrg/lib/libxkbfile/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libxkbfile PKG_NAME:=libxkbfile -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.4 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -21,17 +21,17 @@ define Package/libxkbfile SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+xorg-headers-native +util-macros +libX11 @DISPLAY_SUPPORT + DEPENDS:=+xorg-headers-native +util-macros @DISPLAY_SUPPORT TITLE:=libxkbfile URL:=http://xorg.freedesktop.org/ endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libxkbfile,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/libxkbfile/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/libxkbfile/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,libxkbfile)) diff --git a/XOrg/lib/packages b/XOrg/lib/packages index ab1edd82b..ad41861bc 100644 --- a/XOrg/lib/packages +++ b/XOrg/lib/packages @@ -1,23 +1,23 @@ -libXau-X11R7.2-1.0.3|+xproto -xtrans-X11R7.2-1.0.3| -libXdmcp-X11R7.2-1.0.2|+xproto -libX11-X11R7.2-1.1.1|+bigreqsproto+xproto+xextproto+libXau+xtrans+xcmiscproto+libXdmcp+xf86bigfontproto+kbproto+inputproto -libfontenc-X11R7.2-1.0.4|+xproto+zlib -libXfont-X11R7.2-1.2.7|+zlib+libfontenc+fontcacheproto+fontsproto+libfreetype -libXrender-X11R7.2-0.9.2|+libfreetype+zlib+xproto+libfontenc+xtrans+fontsproto+renderproto -libXrandr-X11R7.2-1.1.2|+libXext+libXrender+randrproto+renderproto+xextproto+libX11 -libXext-X11R7.2-1.0.2|+xproto+xextproto+libXau+libX11 -libxkbfile-X11R7.2-1.0.4| -libXt-X11R7.2-1.0.4|+libSM -libSM-X11R7.2-1.0.2|+libICE -libICE-X11R7.2-1.0.3|+xproto+xtrans -libxkbui-X11R7.1-1.0.2| -libXxf86misc-X11R7.1-1.0.1| -libXxf86vm-X11R7.1-1.0.1| -libXaw-X11R7.1-1.0.2|+libXmu+libXpm+libXau+libXdmcp -libXmu-X11R7.2-1.0.3| -libXpm-X11R7.2-3.5.6| -libXvMC-X11R7.2-1.0.4|+libXext+videoproto+libXv -libXv-X11R7.2-1.0.3|+libXext+videoproto -libXcursor-X11R7.2-1.1.8|+libXrender+libXfixes -libXfixes-X11R7.2-4.0.3| +libfontenc-1.0.4|+xproto+zlib +libICE-1.0.4|+xproto+xtrans +libSM-1.0.3|+libICE +libX11-1.1.3|+bigreqsproto+xproto+xextproto+libXau+xtrans+xcmiscproto+libXdmcp+xf86bigfontproto+kbproto+inputproto +libXau-1.0.3|+xproto +libXaw-1.0.4|+libXmu+libXpm+libXau+libXdmcp +libXcursor-1.1.9|+libXrender+libXfixes +libXdmcp-1.0.2|+xproto +libXext-1.0.2|+xproto+xextproto+libXau+libX11 +libXfixes-4.0.3| +libXfont-1.3.1|+zlib+libfontenc+fontcacheproto+fontsproto+libfreetype +libxkbfile-1.0.4| +libxkbui-1.0.2| +libXmu-1.0.3| +libXpm-3.5.7| +libXrandr-1.2.2|+libXext+libXrender+randrproto+renderproto+xextproto+libX11 +libXrender-0.9.4|+libfreetype+zlib+xproto+libfontenc+xtrans+fontsproto+renderproto +libXt-1.0.4|+libSM +libXv-1.0.3|+libXext+videoproto +libXvMC-1.0.4|+libXext+videoproto+libXv +libXxf86misc-1.0.1| +libXxf86vm-1.0.1| +xtrans-1.0.4| diff --git a/XOrg/lib/template.mk b/XOrg/lib/template.mk index 9d4bd6854..40a8fd46e 100644 --- a/XOrg/lib/template.mk +++ b/XOrg/lib/template.mk @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=@BASE_NAME@ PKG_NAME:=@NAME@ -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=@VER@ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -31,7 +31,7 @@ define Build/InstallDev endef ifeq (@NAME@,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,16 +53,7 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/@NAME@/install/Default diff --git a/XOrg/lib/xtrans/Makefile b/XOrg/lib/xtrans/Makefile index cfe59370f..e9ef22471 100644 --- a/XOrg/lib/xtrans/Makefile +++ b/XOrg/lib/xtrans/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=xtrans PKG_NAME:=xtrans -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -27,11 +27,11 @@ define Package/xtrans endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (xtrans,libX11) - CONFIGURE_ARGS_XTRA=--without-xcb + CONFIGURE_ARGS+=--without-xcb endif define libX11/Compile @@ -53,21 +53,12 @@ define Build/Compile endef define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ - $(CONFIGURE_VARS) \ - $(CONFIGURE_CMD) \ - $(CONFIGURE_ARGS_XTRA) \ - $(CONFIGURE_ARGS) \ - --enable-malloc0returnsnull; \ - fi \ - ) + $(call Build/Configure/Default, --enable-malloc0returnsnull) endef define Package/xtrans/install/Default $(INSTALL_DIR) $(1)/usr/lib - find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib + find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib endef define Package/xtrans/install @@ -80,8 +71,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) endef $(eval $(call BuildPackage,xtrans)) diff --git a/XOrg/proto/applewmproto/Makefile b/XOrg/proto/applewmproto/Makefile index ddcbe0046..7f086c421 100644 --- a/XOrg/proto/applewmproto/Makefile +++ b/XOrg/proto/applewmproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=applewmproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/applewmproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/bigreqsproto/Makefile b/XOrg/proto/bigreqsproto/Makefile index dd5bf54d1..485fb7a8c 100644 --- a/XOrg/proto/bigreqsproto/Makefile +++ b/XOrg/proto/bigreqsproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigreqsproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/bigreqsproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/compositeproto/Makefile b/XOrg/proto/compositeproto/Makefile index dd94f55d0..cda993f47 100644 --- a/XOrg/proto/compositeproto/Makefile +++ b/XOrg/proto/compositeproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=compositeproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.1-0.3.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=0.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/compositeproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/damageproto/Makefile b/XOrg/proto/damageproto/Makefile index 0590667a2..799ca788e 100644 --- a/XOrg/proto/damageproto/Makefile +++ b/XOrg/proto/damageproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=damageproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.1.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/damageproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/dmxproto/Makefile b/XOrg/proto/dmxproto/Makefile index bc710361b..925f72cc1 100644 --- a/XOrg/proto/dmxproto/Makefile +++ b/XOrg/proto/dmxproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dmxproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-2.2.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=2.2.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/dmxproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/evieext/Makefile b/XOrg/proto/evieext/Makefile index 4b083c304..35bf46bb1 100644 --- a/XOrg/proto/evieext/Makefile +++ b/XOrg/proto/evieext/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=evieext -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/evieext endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/fixesproto/Makefile b/XOrg/proto/fixesproto/Makefile index 3fb9812fe..f7c307ea2 100644 --- a/XOrg/proto/fixesproto/Makefile +++ b/XOrg/proto/fixesproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fixesproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.1-4.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=4.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/fixesproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/fontcacheproto/Makefile b/XOrg/proto/fontcacheproto/Makefile index bdf8bfff8..db66be57a 100644 --- a/XOrg/proto/fontcacheproto/Makefile +++ b/XOrg/proto/fontcacheproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fontcacheproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-0.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=0.1.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/fontcacheproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/fontsproto/Makefile b/XOrg/proto/fontsproto/Makefile index 62c54289e..4bbc0fc4a 100644 --- a/XOrg/proto/fontsproto/Makefile +++ b/XOrg/proto/fontsproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fontsproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-2.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=2.0.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/fontsproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/glproto/Makefile b/XOrg/proto/glproto/Makefile index ebc3fc022..2179f95fa 100644 --- a/XOrg/proto/glproto/Makefile +++ b/XOrg/proto/glproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.4.8 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.4.8 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/glproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/inputproto/Makefile b/XOrg/proto/inputproto/Makefile index 43f7c6db2..5ef644530 100644 --- a/XOrg/proto/inputproto/Makefile +++ b/XOrg/proto/inputproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=inputproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.3.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.4.2.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/inputproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/kbproto/Makefile b/XOrg/proto/kbproto/Makefile index 014b755c3..5cd2b5ae1 100644 --- a/XOrg/proto/kbproto/Makefile +++ b/XOrg/proto/kbproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kbproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/kbproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/packages b/XOrg/proto/packages index 990a6ceb3..d2710f6d5 100644 --- a/XOrg/proto/packages +++ b/XOrg/proto/packages @@ -1,32 +1,32 @@ -compositeproto-X11R7.1-0.3.1| -damageproto-X11R7.0-1.0.3| -fixesproto-X11R7.1-4.0| -recordproto-X11R7.0-1.13.2| -resourceproto-X11R7.0-1.0.2| -scrnsaverproto-X11R7.1-1.1.0| -videoproto-X11R7.0-2.2.2| -xextproto-X11R7.0-7.0.2| -xproto-X11R7.2-7.0.10| -bigreqsproto-X11R7.0-1.0.2| -xcmiscproto-X11R7.0-1.1.2| -xf86bigfontproto-X11R7.0-1.1.2| -kbproto-X11R7.2-1.0.3| -inputproto-X11R7.0-1.3.2| -fontcacheproto-X11R7.0-0.1.2| -fontsproto-X11R7.0-2.0.2| -randrproto-X11R7.0-1.1.2| -renderproto-X11R7.0-0.9.2| -xf86driproto-X11R7.0-2.0.3| -glproto-X11R7.2-1.4.8| -xf86miscproto-X11R7.0-0.9.2| -xf86vidmodeproto-X11R7.0-2.2.2| -xf86dgaproto-X11R7.0-2.0.2| -trapproto-X11R7.0-3.4.3| -xineramaproto-X11R7.0-1.1.2| -evieext-X11R7.0-1.0.2| -applewmproto-X11R7.0-1.0.3| -dmxproto-X11R7.0-2.2.2| -printproto-X11R7.0-1.0.3| -windowswmproto-X11R7.0-1.0.3| -xf86rushproto-X11R7.0-1.1.2| -xproxymanagementprotocol-X11R7.0-1.0.2| +applewmproto-1.0.3| +bigreqsproto-1.0.2| +compositeproto-0.4| +damageproto-1.1.0| +dmxproto-2.2.2| +evieext-1.0.2| +fixesproto-4.0| +fontcacheproto-0.1.2| +fontsproto-2.0.2| +glproto-1.4.8| +inputproto-1.4.2.1| +kbproto-1.0.3| +printproto-1.0.3| +randrproto-1.2.1| +recordproto-1.13.2| +renderproto-0.9.3| +resourceproto-1.0.2| +scrnsaverproto-1.1.0| +trapproto-3.4.3| +videoproto-2.2.2| +windowswmproto-1.0.3| +xcmiscproto-1.1.2| +xextproto-7.0.2| +xf86bigfontproto-1.1.2| +xf86dgaproto-2.0.3| +xf86driproto-2.0.3| +xf86miscproto-0.9.2| +xf86rushproto-1.1.2| +xf86vidmodeproto-2.2.2| +xineramaproto-1.1.2| +xproto-7.0.10| +xproxymanagementprotocol-1.0.2| diff --git a/XOrg/proto/printproto/Makefile b/XOrg/proto/printproto/Makefile index 7c04074fe..dd9efec37 100644 --- a/XOrg/proto/printproto/Makefile +++ b/XOrg/proto/printproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=printproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/printproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/randrproto/Makefile b/XOrg/proto/randrproto/Makefile index ea262ffdc..e6ac38bc0 100644 --- a/XOrg/proto/randrproto/Makefile +++ b/XOrg/proto/randrproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=randrproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.2.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/randrproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/recordproto/Makefile b/XOrg/proto/recordproto/Makefile index 755d4354d..c3061808e 100644 --- a/XOrg/proto/recordproto/Makefile +++ b/XOrg/proto/recordproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=recordproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.13.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.13.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/recordproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/renderproto/Makefile b/XOrg/proto/renderproto/Makefile index 28a41088b..542f4c089 100644 --- a/XOrg/proto/renderproto/Makefile +++ b/XOrg/proto/renderproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=renderproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-0.9.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=0.9.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/renderproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/resourceproto/Makefile b/XOrg/proto/resourceproto/Makefile index 03bde5cd7..e37ec4a52 100644 --- a/XOrg/proto/resourceproto/Makefile +++ b/XOrg/proto/resourceproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=resourceproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/resourceproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/scrnsaverproto/Makefile b/XOrg/proto/scrnsaverproto/Makefile index 083aeceb6..83356a044 100644 --- a/XOrg/proto/scrnsaverproto/Makefile +++ b/XOrg/proto/scrnsaverproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=scrnsaverproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.1-1.1.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.1.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/scrnsaverproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/template.mk b/XOrg/proto/template.mk index a93069c92..c470ca7bf 100644 --- a/XOrg/proto/template.mk +++ b/XOrg/proto/template.mk @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=@NAME@ -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=@VER@ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ diff --git a/XOrg/proto/trapproto/Makefile b/XOrg/proto/trapproto/Makefile index 117328d3d..1de23faea 100644 --- a/XOrg/proto/trapproto/Makefile +++ b/XOrg/proto/trapproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trapproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-3.4.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=3.4.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/trapproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/videoproto/Makefile b/XOrg/proto/videoproto/Makefile index 3c0c7e5a5..cd5b20a24 100644 --- a/XOrg/proto/videoproto/Makefile +++ b/XOrg/proto/videoproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=videoproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-2.2.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=2.2.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/videoproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/windowswmproto/Makefile b/XOrg/proto/windowswmproto/Makefile index 018c5fd8b..c3de8d44d 100644 --- a/XOrg/proto/windowswmproto/Makefile +++ b/XOrg/proto/windowswmproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=windowswmproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/windowswmproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xcmiscproto/Makefile b/XOrg/proto/xcmiscproto/Makefile index b72ef9c21..0b88e6b06 100644 --- a/XOrg/proto/xcmiscproto/Makefile +++ b/XOrg/proto/xcmiscproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xcmiscproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.1.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/xcmiscproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xextproto/Makefile b/XOrg/proto/xextproto/Makefile index c67aadbad..7caff6df7 100644 --- a/XOrg/proto/xextproto/Makefile +++ b/XOrg/proto/xextproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xextproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-7.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=7.0.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/xextproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xf86bigfontproto/Makefile b/XOrg/proto/xf86bigfontproto/Makefile index 9f33250f8..91995bdd6 100644 --- a/XOrg/proto/xf86bigfontproto/Makefile +++ b/XOrg/proto/xf86bigfontproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86bigfontproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.1.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/xf86bigfontproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xf86dgaproto/Makefile b/XOrg/proto/xf86dgaproto/Makefile index a91cf32dc..1660343df 100644 --- a/XOrg/proto/xf86dgaproto/Makefile +++ b/XOrg/proto/xf86dgaproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86dgaproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-2.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=2.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/xf86dgaproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xf86driproto/Makefile b/XOrg/proto/xf86driproto/Makefile index 372131533..cda2f057e 100644 --- a/XOrg/proto/xf86driproto/Makefile +++ b/XOrg/proto/xf86driproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86driproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-2.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=2.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/xf86driproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xf86miscproto/Makefile b/XOrg/proto/xf86miscproto/Makefile index b64431132..181f39b7c 100644 --- a/XOrg/proto/xf86miscproto/Makefile +++ b/XOrg/proto/xf86miscproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86miscproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-0.9.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=0.9.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/xf86miscproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xf86rushproto/Makefile b/XOrg/proto/xf86rushproto/Makefile index ba2c0c298..47b76a6cd 100644 --- a/XOrg/proto/xf86rushproto/Makefile +++ b/XOrg/proto/xf86rushproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86rushproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.1.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/xf86rushproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xf86vidmodeproto/Makefile b/XOrg/proto/xf86vidmodeproto/Makefile index fd90798e5..e9966b381 100644 --- a/XOrg/proto/xf86vidmodeproto/Makefile +++ b/XOrg/proto/xf86vidmodeproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86vidmodeproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-2.2.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=2.2.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/xf86vidmodeproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xineramaproto/Makefile b/XOrg/proto/xineramaproto/Makefile index 66fbdbf5a..65d09377b 100644 --- a/XOrg/proto/xineramaproto/Makefile +++ b/XOrg/proto/xineramaproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xineramaproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.1.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/xineramaproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xproto/Makefile b/XOrg/proto/xproto/Makefile index daaefce76..4109f9c7a 100644 --- a/XOrg/proto/xproto/Makefile +++ b/XOrg/proto/xproto/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xproto -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-7.0.10 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=7.0.10 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/xproto endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xproxymanagementprotocol/Makefile b/XOrg/proto/xproxymanagementprotocol/Makefile index bb3dc247c..31219e256 100644 --- a/XOrg/proto/xproxymanagementprotocol/Makefile +++ b/XOrg/proto/xproxymanagementprotocol/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xproxymanagementprotocol -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.0-1.0.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/ +PKG_RELEASE:=2 +PKG_VERSION:=1.0.2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/xproxymanagementprotocol endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/server/xorg-server-X11R7.3/Makefile b/XOrg/server/xorg-server-X11R7.3/Makefile new file mode 100644 index 000000000..8c93bedbe --- /dev/null +++ b/XOrg/server/xorg-server-X11R7.3/Makefile @@ -0,0 +1,178 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xorg-server +PKG_RELEASE:=1 +PKG_VERSION:=1.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/xserver/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/server/xorg-server-$(PKG_VERSION)/ + +include $(INCLUDE_DIR)/package.mk + +EXTRA_CFLAGS+= -I${STAGING_DIR}/usr/include/X11/GL -I${STAGING_DIR}/usr/include/X11/dri/ -I${STAGING_DIR}/usr/include/X11/ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +#CONFIGURE_ARGS_KDRIVE=--enable-composite --enable-kdrive \ +# --disable-dga --disable-dri --disable-xinerama \ +# --disable-xf86misc --disable-xf86vidmode \ +# --disable-xorg --disable-xorgcfg \ +# --disable-xkb --disable-xnest --disable-xvfb \ +# --disable-xevie --disable-xprint --disable-xtrap \ +# --disable-dmx --disable-w100 \ +# --with-default-font-path=built-ins \ +# --enable-tslib --enable-xcalibrate + +CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes +#CONFIGURE_ARGS+=$(if $(CONFIG_XORG_BUILD_KDRIVE), $(CONFIGURE_ARGS_KDRIVE)) + +DEPENDS_SERVER:=+calibrateproto \ + +compositeproto \ + +damageproto \ + +fixesproto \ + +recordproto \ + +resourceproto \ + +scrnsaverproto \ + +videoproto \ + +xextproto \ + +xproto \ + +libXext \ + +libXdmcp \ + +libXfont \ + +libXrandr \ + +xtrans \ + +libX11 \ + +glproto \ + +xf86driproto \ + +applewmproto \ + +dmxproto \ + +printproto \ + +windowswmproto \ + +xf86rushproto \ + +xproxymanagementprotocol \ + +libdrm \ + +xf86miscproto \ + +xf86vidmodeproto \ + +xf86dgaproto \ + +trapproto \ + +xineramaproto \ + +evieext \ + +libxkbfile \ + +libXt \ + +libSM \ + +libxkbui \ + +libXxf86misc \ + +libXxf86vm \ + +libXaw \ + +libXmu \ + +libXpm \ + +libnotimpl \ + +Mesa \ + +pixman \ + @DISPLAY_SUPPORT + +#DEPENDS_KDRIVE:=+calibrateproto \ +# +compositeproto \ +# +damageproto \ +# +fixesproto \ +# +recordproto \ +# +resourceproto \ +# +scrnsaverproto \ +# +videoproto \ +# +xextproto \ +# +xproto \ +# +libXext \ +# +libXdmcp \ +# +libXfont \ +# +libXrandr \ +# +xtrans \ +# +libX11 \ +# @DISPLAY_SUPPORT + + +ifeq ($(CONFIG_TARGET_olpc),y) + XORG_CONFIG_FILE=xorg-olpc.conf +else + XORG_CONFIG_FILE=xorg.conf +endif + +#define Package/xorg-server/config +# config XORG_BUILD_KDRIVE +# bool "Build kdrive instead of xserver" +# depends PACKAGE_xorg-server || BROKEN +#endef + +define Package/xorg-server/Default + SECTION:=xorg-server + CATEGORY:=Xorg + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xorg-server +$(call Package/xorg-server/Default) + TITLE:=Xorg server + MENU:=1 + DEPENDS:=$(if $(CONFIG_XORG_BUILD_KDRIVE), $(DEPENDS_KDRIVE), $(DEPENDS_SERVER)) +endef + +define Package/xorg-server-config +$(call Package/xorg-server/Default) + TITLE:=Xorg server configuration tools + DEPENDS:=xorg-server +endef + +define Build/Configure + (cd $(PKG_BUILD_DIR) \ + $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ + $(CONFIGURE_VARS) \ + $(CONFIGURE_CMD) \ + $(CONFIGURE_ARGS_XTRA) \ + $(CONFIGURE_ARGS) \ + --with-default-font-path=built-ins \ + ); +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) + $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install + +endef + +define Package/xorg-server/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/Xorg $(1)/usr/bin/ + cd $(1)/usr/bin; ln -sf Xorg X + $(INSTALL_DIR) $(1)/usr/share + $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/ + $(INSTALL_DIR) $(1)/usr/lib/xserver + $(CP) $(PKG_INSTALL_DIR)/usr/lib/xserver/* $(1)/usr/lib/xserver + $(INSTALL_DIR) $(1)/usr/lib/xorg/ + $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/xorg/* $(1)/usr/lib/xorg/ + find $(1)/usr/lib/xorg/ -name *.la | xargs rm -rf + $(INSTALL_DIR) $(1)/usr/lib/X11/ + $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/X11/* $(1)/usr/lib/X11/ + rm -rf $(1)/usr/share/X11 $(1)/usr/lib/X11/xserver + $(INSTALL_DIR) $(1)/var/log/ + $(INSTALL_DIR) $(1)/etc/X11/ + $(CP) files/$(XORG_CONFIG_FILE) $(1)/etc/X11/xorg.conf +endef + +define Packages/xorg-server-config/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xorgconfig $(1)/usr/bin/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/xorg-server.pc $(1)/usr/lib/pkgconfig/ +endef + +$(eval $(call BuildPackage,xorg-server)) +$(eval $(call BuildPackage,xorg-server-config)) diff --git a/XOrg/server/xorg-server-X11R7.3/files/xorg-olpc.conf b/XOrg/server/xorg-server-X11R7.3/files/xorg-olpc.conf new file mode 100644 index 000000000..0bbb1ae67 --- /dev/null +++ b/XOrg/server/xorg-server-X11R7.3/files/xorg-olpc.conf @@ -0,0 +1,78 @@ +# xorg configuration + +Section "ServerLayout" + Identifier "Default Layout" + Screen 0 "Screen0" 0 0 + InputDevice "Mouse0" "CorePointer" + InputDevice "Keyboard0" "CoreKeyboard" +EndSection + +Section "Files" + FontPath "/usr/lib/X11/fonts/misc" +EndSection + +Section "Module" + Load "dbe" + Load "extmod" + Load "fbdevhw" +# Load "glx" + Load "record" + Load "freetype" + Load "type1" +EndSection + +Section "InputDevice" + Identifier "Keyboard0" + Driver "keyboard" + Option "XkbModel" "pc105" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Mouse0" + Driver "mouse" +# Option "Protocol" "PS/2" + Option "Protocol" "IMPS/2" +# Option "Device" "/dev/psaux" + Option "Device" "/dev/mice" +# Option "ZAxisMapping" "4 5" +# Option "Emulate3Buttons" "yes" +EndSection + +Section "Monitor" + Identifier "Monitor0" + HorizSync 30-67 + VertRefresh 48-52 + DisplaySize 152 114 + Mode "1200x900" + DotClock 57.275 + HTimings 1200 1208 1216 1240 + VTimings 900 905 908 912 + Flags "-HSync" "-VSync" + EndMode +EndSection + +Section "Device" + Identifier "Videocard0" + Driver "geode" + Option "PanelGeometry" "1200x900" +EndSection + +Section "Screen" + Identifier "Screen0" + Device "Videocard0" + Monitor "Monitor0" + DefaultDepth 16 + + SubSection "Display" + Depth 16 + Modes "1200x900" + EndSubsection + +EndSection + +Section "DRI" + Group 0 + Mode 0666 +EndSection + diff --git a/XOrg/server/xorg-server-X11R7.3/files/xorg.conf b/XOrg/server/xorg-server-X11R7.3/files/xorg.conf new file mode 100644 index 000000000..ee0322853 --- /dev/null +++ b/XOrg/server/xorg-server-X11R7.3/files/xorg.conf @@ -0,0 +1,93 @@ +# xorg configuration + +Section "ServerLayout" + Identifier "Default Layout" + Screen 0 "Screen0" 0 0 + InputDevice "Mouse0" "CorePointer" + InputDevice "Keyboard0" "CoreKeyboard" +EndSection + +Section "Files" + FontPath "/usr/lib/X11/fonts/misc" +EndSection + +Section "Module" + Load "dbe" + Load "extmod" + Load "fbdevhw" +# Load "glx" + Load "record" + Load "freetype" + Load "type1" +EndSection + +Section "InputDevice" + Identifier "Keyboard0" + Driver "keyboard" + Option "XkbModel" "pc105" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Mouse0" + Driver "mouse" + Option "Protocol" "PS/2" +# Option "Protocol" "IMPS/2" + Option "Device" "/dev/psaux" +# Option "Device" "/dev/input/mice" + Option "ZAxisMapping" "4 5" + Option "Emulate3Buttons" "yes" +EndSection + +Section "Monitor" + Identifier "Monitor0" + VendorName "Monitor Vendor" + ModelName "OWRT" + Option "dpms" +EndSection + +Section "Device" + Identifier "Videocard0" + Driver "vesa" + VendorName "Videocard vendor" + BoardName "Vesa driver" +EndSection + +Section "Device" + Identifier "FBDev" + Driver "fbdev" + #Option "shadowfb" "off" + VideoRam 4096 +EndSection + +Section "Screen" + Identifier "Screen0" + Device "Videocard0" + Monitor "Monitor0" +# DefaultDepth 8 + DefaultDepth 16 +# DefaultDepth 24 + + SubSection "Display" + Depth 8 + Modes "1024x768" "800x600" "640x480" + EndSubsection + + SubSection "Display" + Depth 16 + Modes "1024x768" "800x600" "640x480" + EndSubsection + + SubSection "Display" + Depth 24 + FbBpp 32 + Modes "1024x768" "800x600" "640x480" + EndSubsection + +EndSection + +Section "DRI" + Group 0 + Mode 0666 +EndSection + diff --git a/XOrg/server/xorg-server-X11R7.3/patches/001-fix_avr32_compile b/XOrg/server/xorg-server-X11R7.3/patches/001-fix_avr32_compile new file mode 100644 index 000000000..4072e94c9 --- /dev/null +++ b/XOrg/server/xorg-server-X11R7.3/patches/001-fix_avr32_compile @@ -0,0 +1,20 @@ +--- xorg-server-X11R7.2-1.4.0/config.sub.orig 2008-05-14 22:56:34.000000000 -0500 ++++ xorg-server-X11R7.2-1.4.0/config.sub 2008-05-14 22:57:00.000000000 -0500 +@@ -228,7 +228,7 @@ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ +@@ -295,7 +295,7 @@ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ +- | avr-* \ ++ | avr-* | avr32-* \ + | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | cydra-* \ diff --git a/XOrg/server/xorg-server-X11R7.3/patches/100-uclibc-lm.patch b/XOrg/server/xorg-server-X11R7.3/patches/100-uclibc-lm.patch new file mode 100644 index 000000000..8409f1c73 --- /dev/null +++ b/XOrg/server/xorg-server-X11R7.3/patches/100-uclibc-lm.patch @@ -0,0 +1,12 @@ +diff -urN xorg-server-X11R7.2-1.4.0.orig/hw/xfree86/utils/gtf/Makefile.in xorg-server-X11R7.2-1.4.0/hw/xfree86/utils/gtf/Makefile.in +--- xorg-server-X11R7.2-1.4.0.orig/hw/xfree86/utils/gtf/Makefile.in 2007-09-14 21:23:18.000000000 +0200 ++++ xorg-server-X11R7.2-1.4.0/hw/xfree86/utils/gtf/Makefile.in 2007-09-14 21:23:42.000000000 +0200 +@@ -576,7 +576,7 @@ + xpconfigdir = @xpconfigdir@ + gtf_SOURCES = gtf.c + gtf_CFLAGS = $(XORG_CFLAGS) +-gtf_LDADD = -lm ++gtf_LDADD = -lm -lnotimpl + appmandir = $(APP_MAN_DIR) + appman_PRE = gtf.man + appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) diff --git a/XOrg/utils/packages b/XOrg/utils/packages index ec64a06d3..ba7853c45 100644 --- a/XOrg/utils/packages +++ b/XOrg/utils/packages @@ -1 +1 @@ -util-macros-X11R7.2-1.1.5| +util-macros-1.1.5| diff --git a/XOrg/utils/template.mk b/XOrg/utils/template.mk index 989393b13..c9735e5d9 100644 --- a/XOrg/utils/template.mk +++ b/XOrg/utils/template.mk @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=@NAME@ -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=@VER@ -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/util/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/util/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ diff --git a/XOrg/utils/util-macros/Makefile b/XOrg/utils/util-macros/Makefile index 180b53ff1..d11731c8a 100644 --- a/XOrg/utils/util-macros/Makefile +++ b/XOrg/utils/util-macros/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-macros -PKG_RELEASE:=1 -PKG_VERSION:=X11R7.2-1.1.5 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/util/ +PKG_RELEASE:=2 +PKG_VERSION:=1.1.5 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/util/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ @@ -26,7 +26,7 @@ define Package/util-macros endef define Build/InstallDev - DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef define Build/Configure -- 2.11.0