From 255a08fdebae99265216cbc7b8e6278810395141 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 31 Oct 2009 00:12:52 +0000 Subject: [PATCH] Update xorg lib packages to Xorg 7.5 SVN-Revision: 18234 --- Xorg/xorg/lib/libICE/Makefile | 14 +- Xorg/xorg/lib/libSM/Makefile | 14 +- Xorg/xorg/lib/libX11/Makefile | 20 +- .../libX11/patches/003-cross-compile.patch | 45 ----- .../libX11/patches/005-fix-include-path.patch | 143 ++++++++++++++ Xorg/xorg/lib/libXau/Makefile | 13 +- Xorg/xorg/lib/libXaw/Makefile | 18 +- .../lib/libXaw/patches/001-fix-includes.patch | 13 ++ Xorg/xorg/lib/libXcomposite/Makefile | 13 +- Xorg/xorg/lib/libXcursor/Makefile | 13 +- Xorg/xorg/lib/libXdamage/Makefile | 13 +- Xorg/xorg/lib/libXdmcp/Makefile | 13 +- Xorg/xorg/lib/libXext/Makefile | 18 +- Xorg/xorg/lib/libXfixes/Makefile | 13 +- Xorg/xorg/lib/libXfont/Makefile | 14 +- .../patches/010-cleanup-saved-builtins.patch | 185 ------------------ Xorg/xorg/lib/libXft/Makefile | 13 +- Xorg/xorg/lib/libXi/Makefile | 18 +- Xorg/xorg/lib/libXmu/Makefile | 14 +- Xorg/xorg/lib/libXpm/Makefile | 14 +- Xorg/xorg/lib/libXrandr/Makefile | 12 +- Xorg/xorg/lib/libXrender/Makefile | 14 +- Xorg/xorg/lib/libXt/Makefile | 22 ++- .../libXt/patches/001-cross-compiling.patch | 36 ---- Xorg/xorg/lib/libXtst/Makefile | 16 +- Xorg/xorg/lib/libXv/Makefile | 14 +- Xorg/xorg/lib/libXvMC/Makefile | 14 +- Xorg/xorg/lib/libXxf86misc/Makefile | 57 ------ Xorg/xorg/lib/libXxf86vm/Makefile | 18 +- Xorg/xorg/lib/libfontenc/Makefile | 13 +- Xorg/xorg/lib/libpciaccess/Makefile | 15 +- Xorg/xorg/lib/libxkbfile/Makefile | 14 +- Xorg/xorg/lib/xtrans/Makefile | 18 +- 33 files changed, 374 insertions(+), 510 deletions(-) delete mode 100644 Xorg/xorg/lib/libX11/patches/003-cross-compile.patch create mode 100644 Xorg/xorg/lib/libX11/patches/005-fix-include-path.patch create mode 100644 Xorg/xorg/lib/libXaw/patches/001-fix-includes.patch delete mode 100644 Xorg/xorg/lib/libXfont/patches/010-cleanup-saved-builtins.patch delete mode 100644 Xorg/xorg/lib/libXt/patches/001-cross-compiling.patch delete mode 100644 Xorg/xorg/lib/libXxf86misc/Makefile diff --git a/Xorg/xorg/lib/libICE/Makefile b/Xorg/xorg/lib/libICE/Makefile index 2162135c9..0a9acc7e6 100644 --- a/Xorg/xorg/lib/libICE/Makefile +++ b/Xorg/xorg/lib/libICE/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=libICE -PKG_RELEASE:=4 -PKG_VERSION:=1.0.4 +PKG_RELEASE:=1 +PKG_VERSION:=1.0.6 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=4ab4e67e0b8845aa201e984153087f4a +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=2d39bc924af24325dae589e9a849180c + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto xtrans diff --git a/Xorg/xorg/lib/libSM/Makefile b/Xorg/xorg/lib/libSM/Makefile index b54e27da7..9c9c67f4d 100644 --- a/Xorg/xorg/lib/libSM/Makefile +++ b/Xorg/xorg/lib/libSM/Makefile @@ -1,22 +1,22 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libSM PKG_NAME:=libSM -PKG_RELEASE:=4 -PKG_VERSION:=1.0.3 +PKG_RELEASE:=1 +PKG_VERSION:=1.1.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=184cbf502b3cd5d7ba5f9d1290a99606 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=6889a455496aaaa65b1fa05fc518d179 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto xtrans diff --git a/Xorg/xorg/lib/libX11/Makefile b/Xorg/xorg/lib/libX11/Makefile index babe51b01..13106c18c 100644 --- a/Xorg/xorg/lib/libX11/Makefile +++ b/Xorg/xorg/lib/libX11/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=libX11 -PKG_RELEASE:=4 -PKG_VERSION:=1.1.5 +PKG_RELEASE:=1 +PKG_VERSION:=1.3.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=d1512d65dadd4f48c779d4749e7753a8 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=001d780829f936e34851ef7cd37b4dfd + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto xextproto xf86bigfontproto kbproto inputproto \ @@ -42,7 +42,11 @@ define Build/Configure endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/src/util HOSTCC=$(HOSTCC) + $(MAKE) -C $(PKG_BUILD_DIR)/src/util \ + CC="$(HOSTCC)" \ + CFLAGS="$(HOST_CFLAGS)" \ + LDFLAGS="$(HOST_LDFLAGS)" + $(call Build/Compile/Default) endef diff --git a/Xorg/xorg/lib/libX11/patches/003-cross-compile.patch b/Xorg/xorg/lib/libX11/patches/003-cross-compile.patch deleted file mode 100644 index 0f3fa738d..000000000 --- a/Xorg/xorg/lib/libX11/patches/003-cross-compile.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- libX11-1.1.5/src/util/Makefile.in.orig 2008-10-05 00:47:56.000000000 +0200 -+++ libX11-1.1.5/src/util/Makefile.in 2008-10-05 01:45:07.000000000 +0200 -@@ -56,11 +56,11 @@ - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) makekeys \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) makekeys - CCLD = $(CC) - SOURCES = makekeys.c - DIST_SOURCES = makekeys.c -@@ -80,9 +80,9 @@ - AWK = @AWK@ - BIGFONT_CFLAGS = @BIGFONT_CFLAGS@ - BIGFONT_LIBS = @BIGFONT_LIBS@ --CC = @CC@ -+CC = $(HOSTCC) - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+CFLAGS = - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ -@@ -114,7 +114,7 @@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - KEYSYMDEF = @KEYSYMDEF@ - LAUNCHD = @LAUNCHD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ -@@ -230,7 +230,6 @@ - makekeys_CFLAGS = $(X11_CFLAGS) - - #override CC = gcc --LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - EXTRA_DIST = mkks.sh - - # Check source code with tools like lint & sparse diff --git a/Xorg/xorg/lib/libX11/patches/005-fix-include-path.patch b/Xorg/xorg/lib/libX11/patches/005-fix-include-path.patch new file mode 100644 index 000000000..6d28221a4 --- /dev/null +++ b/Xorg/xorg/lib/libX11/patches/005-fix-include-path.patch @@ -0,0 +1,143 @@ +diff --git a/modules/im/ximcp/Makefile.in b/modules/im/ximcp/Makefile.in +index 905d526..6027e58 100644 +--- a/modules/im/ximcp/Makefile.in ++++ b/modules/im/ximcp/Makefile.in +@@ -96,7 +96,7 @@ ximcp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(ximcp_la_LDFLAGS) $(LDFLAGS) -o $@ + @XLIB_LOADABLE_I18N_TRUE@am_ximcp_la_rpath = -rpath $(commonlibdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/modules/lc/Utf8/Makefile.in b/modules/lc/Utf8/Makefile.in +index 4078c1c..e7e52fa 100644 +--- a/modules/lc/Utf8/Makefile.in ++++ b/modules/lc/Utf8/Makefile.in +@@ -88,7 +88,7 @@ xlcUTF8Load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $@ + @XLIB_LOADABLE_I18N_TRUE@am_xlcUTF8Load_la_rpath = -rpath \ + @XLIB_LOADABLE_I18N_TRUE@ $(commonlibdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/modules/lc/def/Makefile.in b/modules/lc/def/Makefile.in +index b37cec6..89ce832 100644 +--- a/modules/lc/def/Makefile.in ++++ b/modules/lc/def/Makefile.in +@@ -86,7 +86,7 @@ xlcDef_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(xlcDef_la_LDFLAGS) $(LDFLAGS) -o $@ + @XLIB_LOADABLE_I18N_TRUE@am_xlcDef_la_rpath = -rpath $(commonlibdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/modules/lc/gen/Makefile.in b/modules/lc/gen/Makefile.in +index 6e2e522..e832723 100644 +--- a/modules/lc/gen/Makefile.in ++++ b/modules/lc/gen/Makefile.in +@@ -86,7 +86,7 @@ xlibi18n_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(xlibi18n_la_LDFLAGS) $(LDFLAGS) -o $@ + @XLIB_LOADABLE_I18N_TRUE@am_xlibi18n_la_rpath = -rpath $(commonlibdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/modules/lc/xlocale/Makefile.in b/modules/lc/xlocale/Makefile.in +index 7c947ee..b68b06e 100644 +--- a/modules/lc/xlocale/Makefile.in ++++ b/modules/lc/xlocale/Makefile.in +@@ -86,7 +86,7 @@ xlocale_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(xlocale_la_LDFLAGS) $(LDFLAGS) -o $@ + @XLIB_LOADABLE_I18N_TRUE@am_xlocale_la_rpath = -rpath $(commonlibdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/modules/om/generic/Makefile.in b/modules/om/generic/Makefile.in +index e39802b..0979207 100644 +--- a/modules/om/generic/Makefile.in ++++ b/modules/om/generic/Makefile.in +@@ -89,7 +89,7 @@ xomGeneric_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(xomGeneric_la_LDFLAGS) $(LDFLAGS) -o $@ + @XLIB_LOADABLE_I18N_TRUE@am_xomGeneric_la_rpath = -rpath \ + @XLIB_LOADABLE_I18N_TRUE@ $(commonlibdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/src/util/Makefile.in b/src/util/Makefile.in +index 65c181e..bfa7c05 100644 +--- a/src/util/Makefile.in ++++ b/src/util/Makefile.in +@@ -59,7 +59,7 @@ am__v_lt_0 = --silent + makekeys_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(makekeys_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/src/xcms/Makefile.in b/src/xcms/Makefile.in +index 6573196..a140221 100644 +--- a/src/xcms/Makefile.in ++++ b/src/xcms/Makefile.in +@@ -65,7 +65,7 @@ libxcms_la_OBJECTS = $(am_libxcms_la_OBJECTS) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/src/xkb/Makefile.in b/src/xkb/Makefile.in +index 0e52692..43a9660 100644 +--- a/src/xkb/Makefile.in ++++ b/src/xkb/Makefile.in +@@ -57,7 +57,7 @@ libxkb_la_OBJECTS = $(am_libxkb_la_OBJECTS) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/src/xlibi18n/Makefile.in b/src/xlibi18n/Makefile.in +index 50ac253..6c44c48 100644 +--- a/src/xlibi18n/Makefile.in ++++ b/src/xlibi18n/Makefile.in +@@ -85,7 +85,7 @@ libi18n_la_OBJECTS = $(am_libi18n_la_OBJECTS) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/src/Makefile.in b/src/Makefile.in +index a79daa8..ca7f366 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -218,7 +218,7 @@ libX11_la_OBJECTS = $(am_libX11_la_OBJECTS) + libX11_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libX11_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/ -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f diff --git a/Xorg/xorg/lib/libXau/Makefile b/Xorg/xorg/lib/libXau/Makefile index ac1baf824..c52138150 100644 --- a/Xorg/xorg/lib/libXau/Makefile +++ b/Xorg/xorg/lib/libXau/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,13 +10,14 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXau PKG_NAME:=libXau -PKG_RELEASE:=4 -PKG_VERSION:=1.0.4 +PKG_RELEASE:=1 +PKG_VERSION:=1.0.5 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=0f2b88d857e0a3f5898e4759c541af46 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=993b3185c629e4b89401fca072dcb663 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto diff --git a/Xorg/xorg/lib/libXaw/Makefile b/Xorg/xorg/lib/libXaw/Makefile index 1fa958428..e22de1076 100644 --- a/Xorg/xorg/lib/libXaw/Makefile +++ b/Xorg/xorg/lib/libXaw/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXaw -PKG_RELEASE:=4 -PKG_VERSION:=1.0.4 +PKG_RELEASE:=1 +PKG_VERSION:=1.0.7 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=73671d8f1cf36fdd81395328cc3539c9 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=815e74de989ccda684e2baf8d12cf519 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto xextproto printproto @@ -35,6 +36,7 @@ define Build/Configure $(call Build/Configure/Default, \ --disable-xaw6 \ --disable-xaw8 \ + --disable-docs \ ) endef @@ -50,10 +52,6 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/X11/Xaw/* \ $(1)/usr/include/X11/Xaw/ - $(INSTALL_DIR) $(1)/usr/share/aclocal - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/share/aclocal/* \ - $(1)/usr/share/aclocal/ endef define Package/libXaw/install diff --git a/Xorg/xorg/lib/libXaw/patches/001-fix-includes.patch b/Xorg/xorg/lib/libXaw/patches/001-fix-includes.patch new file mode 100644 index 000000000..036523c9f --- /dev/null +++ b/Xorg/xorg/lib/libXaw/patches/001-fix-includes.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.in b/src/Makefile.in +index eff87e9..3a9834e 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -126,7 +126,7 @@ libXaw7_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libXaw7_la_CFLAGS) \ + $(CFLAGS) $(libXaw7_la_LDFLAGS) $(LDFLAGS) -o $@ + @BUILD_XAW7_TRUE@am_libXaw7_la_rpath = -rpath $(libdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ diff --git a/Xorg/xorg/lib/libXcomposite/Makefile b/Xorg/xorg/lib/libXcomposite/Makefile index 6a7d0fb98..43fc20fc5 100644 --- a/Xorg/xorg/lib/libXcomposite/Makefile +++ b/Xorg/xorg/lib/libXcomposite/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,13 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXcomposite -PKG_RELEASE:=2 -PKG_VERSION:=0.4.0 +PKG_RELEASE:=1 +PKG_VERSION:=0.4.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=7e95395dea89be21bae929b9b7f16641 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=0f1367f57fdf5df17a8dd71d0fa68248 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=compositeproto fixesproto diff --git a/Xorg/xorg/lib/libXcursor/Makefile b/Xorg/xorg/lib/libXcursor/Makefile index 49ba11142..cdee69734 100644 --- a/Xorg/xorg/lib/libXcursor/Makefile +++ b/Xorg/xorg/lib/libXcursor/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXcursor -PKG_RELEASE:=4 -PKG_VERSION:=1.1.9 +PKG_RELEASE:=1 +PKG_VERSION:=1.1.10 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=99b7554037a92b260891091e81815a0a +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=7dcdad1c10daea872cb3355af414b2ca + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=fixesproto diff --git a/Xorg/xorg/lib/libXdamage/Makefile b/Xorg/xorg/lib/libXdamage/Makefile index ff3bc6c40..d8f6e2433 100644 --- a/Xorg/xorg/lib/libXdamage/Makefile +++ b/Xorg/xorg/lib/libXdamage/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,13 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXdamage -PKG_RELEASE:=3 -PKG_VERSION:=1.1.1 +PKG_RELEASE:=1 +PKG_VERSION:=1.1.2 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=ac0ce6b0063a9858c8f24ddb4c60487d +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=b42780bce703ec202a33e5693991c09d + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto xextproto fixesproto damageproto diff --git a/Xorg/xorg/lib/libXdmcp/Makefile b/Xorg/xorg/lib/libXdmcp/Makefile index cf27ab8f2..47992716b 100644 --- a/Xorg/xorg/lib/libXdmcp/Makefile +++ b/Xorg/xorg/lib/libXdmcp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXdmcp -PKG_RELEASE:=4 -PKG_VERSION:=1.0.2 +PKG_RELEASE:=1 +PKG_VERSION:=1.0.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=10facf2bc7cbd5e5c1a698b8a210a582 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=d60941d471800f41a3f19b24bea855a7 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto diff --git a/Xorg/xorg/lib/libXext/Makefile b/Xorg/xorg/lib/libXext/Makefile index 045be877b..6a1bebccd 100644 --- a/Xorg/xorg/lib/libXext/Makefile +++ b/Xorg/xorg/lib/libXext/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=libXext -PKG_RELEASE:=4 -PKG_VERSION:=1.0.4 +PKG_RELEASE:=1 +PKG_VERSION:=1.1.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=a91f1f722ac80c597cf0b75dcb8b48c0 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=c417c0e8df39a067f90a2a2e7133637d + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto xextproto @@ -45,6 +45,10 @@ define Build/InstallDev $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ $(1)/usr/lib/pkgconfig/ + $(INSTALL_DIR) $(1)/usr/include/X11/extensions + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ endef define Package/libXext/install diff --git a/Xorg/xorg/lib/libXfixes/Makefile b/Xorg/xorg/lib/libXfixes/Makefile index 02509df58..9f31ff569 100644 --- a/Xorg/xorg/lib/libXfixes/Makefile +++ b/Xorg/xorg/lib/libXfixes/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXfixes -PKG_RELEASE:=4 -PKG_VERSION:=4.0.3 +PKG_RELEASE:=1 +PKG_VERSION:=4.0.4 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=1990d19725a3c7f32290037f02d3737f +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=7f2c40852eb337b237ad944ca5c30d49 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto fixesproto xextproto diff --git a/Xorg/xorg/lib/libXfont/Makefile b/Xorg/xorg/lib/libXfont/Makefile index 73f29f709..e72489024 100644 --- a/Xorg/xorg/lib/libXfont/Makefile +++ b/Xorg/xorg/lib/libXfont/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=libXfont -PKG_RELEASE:=4 -PKG_VERSION:=1.3.3 +PKG_RELEASE:=1 +PKG_VERSION:=1.4.1 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=4f174b9613f87cf00d731da428a1b194 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=4f2bed2a2be82e90a51a24bb3a22cdf0 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto fontcacheproto fontsproto xtrans diff --git a/Xorg/xorg/lib/libXfont/patches/010-cleanup-saved-builtins.patch b/Xorg/xorg/lib/libXfont/patches/010-cleanup-saved-builtins.patch deleted file mode 100644 index 7c3accfd0..000000000 --- a/Xorg/xorg/lib/libXfont/patches/010-cleanup-saved-builtins.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff --git a/src/builtins/dir.c b/src/builtins/dir.c -index 1f7f547..3a8d944 100644 ---- a/src/builtins/dir.c -+++ b/src/builtins/dir.c -@@ -29,172 +29,32 @@ - #endif - #include "builtin.h" - --static BuiltinDirPtr --BuiltinDirsDup (const BuiltinDirPtr a_dirs, -- int a_dirs_len) --{ -- BuiltinDirPtr dirs=NULL ; -- int i=0 ; -- -- if (!a_dirs) -- return NULL ; -- -- dirs = xcalloc (a_dirs_len, sizeof (BuiltinDirRec)) ; -- if (!dirs) -- return NULL ; -- -- for (i=0; i < a_dirs_len; i++) { -- int len = strlen (a_dirs[i].file_name) ; -- dirs[i].file_name = xcalloc (1, len) ; -- memmove (dirs[i].file_name, a_dirs[i].file_name, len); -- len = strlen (a_dirs[i].font_name) ; -- dirs[i].font_name = xcalloc (1, len) ; -- memmove (dirs[i].font_name, a_dirs[i].font_name, len); -- } -- return dirs ; --} -- --/** -- * Copy a_save back into a_cur -- * @param a_cur the instance of BuiltinDir to restore -- * @param a_saved the saved instance of BuiltinDir to copy into a_cur -- * @return 0 if went okay, 1 otherwise. -- */ --static int --BuiltinDirRestore (BuiltinDirPtr a_cur, -- const BuiltinDirPtr a_saved) --{ -- if (!a_cur) -- return 1 ; -- if (!a_saved) -- return 0 ; -- -- if (a_saved->font_name) -- memmove (a_cur->font_name, a_saved->font_name, strlen (a_saved->font_name)) ; -- return 0 ; --} -- -- --static int --BuiltinDirsRestore (BuiltinDirPtr a_cur_tab, -- const BuiltinDirPtr a_saved_tab, -- int a_tab_len) --{ -- int i=0 ; -- -- if (!a_cur_tab) -- return 1 ; -- if (!a_saved_tab) -- return 0 ; -- -- for (i=0 ; i < a_tab_len; i++) { -- if (BuiltinDirRestore (&a_cur_tab[i], &a_saved_tab[i])) -- return 1 ; -- } -- return 0 ; --} -- --static BuiltinAliasPtr --BuiltinAliasesDup (const BuiltinAliasPtr a_aliases, -- int a_aliases_len) --{ -- BuiltinAliasPtr aliases=NULL ; -- int i=0 ; -- -- if (!a_aliases) -- return NULL ; -- -- aliases = xcalloc (a_aliases_len, sizeof (BuiltinAliasRec)) ; -- if (!aliases) -- return NULL ; -- -- for (i=0; i < a_aliases_len; i++) { -- int len = strlen (a_aliases[i].font_name) ; -- aliases[i].font_name = xcalloc (1, len) ; -- memmove (aliases[i].font_name, a_aliases[i].font_name, len); -- } -- return aliases ; --} -- --/** -- * Copy a_save back into a_cur -- * @param a_cur the instance of BuiltinAlias to restore -- * @param a_saved the saved instance of BuiltinAlias to copy into a_cur -- * @return 0 if went okay, 1 otherwise. -- */ --static int --BuiltinAliasRestore (BuiltinAliasPtr a_cur, -- const BuiltinAliasPtr a_save) --{ -- if (!a_cur) -- return 1 ; -- if (!a_save) -- return 0 ; -- if (a_save->alias_name) -- memmove (a_cur->alias_name, a_save->alias_name, strlen (a_save->alias_name)) ; -- if (a_save->font_name) -- memmove (a_cur->font_name, a_save->font_name, strlen (a_save->font_name)) ; -- return 0 ; --} -- --static int --BuiltinAliasesRestore (BuiltinAliasPtr a_cur_tab, -- const BuiltinAliasPtr a_saved_tab, -- int a_tab_len) --{ -- int i=0 ; -- -- if (!a_cur_tab) -- return 1 ; -- if (!a_saved_tab) -- return 0 ; -- -- for (i=0 ; i < a_tab_len; i++) { -- if (BuiltinAliasRestore (&a_cur_tab[i], &a_saved_tab[i])) -- return 1 ; -- } -- return 0 ; --} -- - int - BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir) - { - FontDirectoryPtr dir; - int i; - -- static BuiltinDirPtr saved_builtin_dir; -- static BuiltinAliasPtr saved_builtin_alias; -+ static char **builtin_dir_font_name_copy = NULL; - - dir = FontFileMakeDir ("", builtin_dir_count); - -- if (saved_builtin_dir) -- { -- BuiltinDirsRestore ((BuiltinDirPtr) builtin_dir, -- saved_builtin_dir, -- builtin_dir_count) ; -- } -- else -- { -- saved_builtin_dir = BuiltinDirsDup ((const BuiltinDirPtr) builtin_dir, -- builtin_dir_count) ; -- } -- -- if (saved_builtin_alias) -+ if (!builtin_dir_font_name_copy) - { -- BuiltinAliasesRestore ((BuiltinAliasPtr) builtin_alias, -- saved_builtin_alias, -- builtin_alias_count) ; -+ builtin_dir_font_name_copy = malloc (sizeof(char*) * builtin_dir_count); -+ for (i = 0; i < builtin_dir_count; ++i) -+ builtin_dir_font_name_copy[i] = strdup(builtin_dir[i].font_name); - } - else - { -- saved_builtin_alias = BuiltinAliasesDup ((const BuiltinAliasPtr) builtin_alias, -- builtin_alias_count) ; -+ for (i = 0; i < builtin_dir_count; ++i) -+ strcpy(builtin_dir_font_name_copy[i], builtin_dir[i].font_name); - } - - for (i = 0; i < builtin_dir_count; i++) - { - if (!FontFileAddFontFile (dir, -- (char *) builtin_dir[i].font_name, -+ (char *) builtin_dir_font_name_copy[i], - (char *) builtin_dir[i].file_name)) - { - FontFileFreeDir (dir); diff --git a/Xorg/xorg/lib/libXft/Makefile b/Xorg/xorg/lib/libXft/Makefile index 8899a3aa0..1b865890c 100644 --- a/Xorg/xorg/lib/libXft/Makefile +++ b/Xorg/xorg/lib/libXft/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXft -PKG_RELEASE:=3 -PKG_VERSION:=2.1.13 +PKG_RELEASE:=1 +PKG_VERSION:=2.1.14 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=bc8881851f3bd8dcc625fac37350a1c6 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=254e62a233491e0e1251636536163e20 + PKG_FIXUP:=libtool PKG_INSTALL:=1 diff --git a/Xorg/xorg/lib/libXi/Makefile b/Xorg/xorg/lib/libXi/Makefile index 68b806cec..661450cde 100644 --- a/Xorg/xorg/lib/libXi/Makefile +++ b/Xorg/xorg/lib/libXi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,13 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXi -PKG_RELEASE:=3 -PKG_VERSION:=1.1.3 +PKG_RELEASE:=1 +PKG_VERSION:=1.3 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=7c510abb0cad8dc20493fb27ff7859d8 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=8df4ece9bd1efb02c28acb2b6f485e09 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto xextproto inputproto @@ -50,6 +51,11 @@ define Build/InstallDev $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ $(1)/usr/lib/pkgconfig/ + + $(INSTALL_DIR) $(1)/usr/include/X11/extensions + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ endef $(eval $(call BuildPackage,libXi)) diff --git a/Xorg/xorg/lib/libXmu/Makefile b/Xorg/xorg/lib/libXmu/Makefile index 8e9f23f6b..885bdc8fb 100644 --- a/Xorg/xorg/lib/libXmu/Makefile +++ b/Xorg/xorg/lib/libXmu/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=libXmu -PKG_RELEASE:=5 -PKG_VERSION:=1.0.4 +PKG_RELEASE:=1 +PKG_VERSION:=1.0.5 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=fb372a5f3ab42b5ba16d7af4d833a0cb +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:= + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=libXt libXext xextproto diff --git a/Xorg/xorg/lib/libXpm/Makefile b/Xorg/xorg/lib/libXpm/Makefile index 04f7869b1..0322cd081 100644 --- a/Xorg/xorg/lib/libXpm/Makefile +++ b/Xorg/xorg/lib/libXpm/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=libXpm -PKG_RELEASE:=4 -PKG_VERSION:=3.5.7 +PKG_RELEASE:=1 +PKG_VERSION:=3.5.8 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=cd15ee542d9f515538b4462a6f79d977 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=38e58e72d476a74298a59052fde185a3 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUID_DEPENDS:=xproto xextproto diff --git a/Xorg/xorg/lib/libXrandr/Makefile b/Xorg/xorg/lib/libXrandr/Makefile index 8d4289981..9be996548 100644 --- a/Xorg/xorg/lib/libXrandr/Makefile +++ b/Xorg/xorg/lib/libXrandr/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=libXrandr PKG_RELEASE:=4 -PKG_VERSION:=1.2.3 +PKG_VERSION:=1.3.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=5cd67cc02a50c9644ba0a1846ea3b08e +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=68eb59c3b7524db6ffd78746ee893d1d + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=randrproto renderproto xextproto diff --git a/Xorg/xorg/lib/libXrender/Makefile b/Xorg/xorg/lib/libXrender/Makefile index 45c8eda28..c3b973e8b 100644 --- a/Xorg/xorg/lib/libXrender/Makefile +++ b/Xorg/xorg/lib/libXrender/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=libXrender -PKG_RELEASE:=4 -PKG_VERSION:=0.9.4 +PKG_RELEASE:=1 +PKG_VERSION:=0.9.5 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=dc266e850c51368f964e0d67bf5fb5e6 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=276dd9e85daf0680616cd9f132b354c9 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=renderproto diff --git a/Xorg/xorg/lib/libXt/Makefile b/Xorg/xorg/lib/libXt/Makefile index cef300da5..be4408655 100644 --- a/Xorg/xorg/lib/libXt/Makefile +++ b/Xorg/xorg/lib/libXt/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=libXt -PKG_RELEASE:=4 -PKG_VERSION:=1.0.5 +PKG_RELEASE:=1 +PKG_VERSION:=1.0.7 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=f3bdd67785ace8cd0b23249e9d8c9975 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=96f3c93434a93186d178b60d4a262496 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto kbproto @@ -26,7 +26,7 @@ define Package/libXt SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+libSM +libX11 + DEPENDS:=+libSM +libX11 +libICE TITLE:=libXt URL:=http://xorg.freedesktop.org/ endef @@ -35,11 +35,15 @@ define Build/Configure $(call Build/Configure/Default, \ --enable-malloc0returnsnull \ --without-xcb \ + , \ + CC_FOR_BUILD="$(HOSTCC)" \ + CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ + LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ ) endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/util HOSTCC=$(HOSTCC) + $(MAKE) -C $(PKG_BUILD_DIR)/util $(call Build/Compile/Default) endef diff --git a/Xorg/xorg/lib/libXt/patches/001-cross-compiling.patch b/Xorg/xorg/lib/libXt/patches/001-cross-compiling.patch deleted file mode 100644 index 54dc773b2..000000000 --- a/Xorg/xorg/lib/libXt/patches/001-cross-compiling.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- libXt-1.0.5/util/Makefile.in.orig 2008-10-05 16:09:29.000000000 +0200 -+++ libXt-1.0.5/util/Makefile.in 2008-10-05 16:09:33.000000000 +0200 -@@ -59,10 +59,10 @@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) makekeys - LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CFLAGS) $(CFLAGS) -+ $(AM_CFLAGS) $(CFLAGS) makekeys - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@@ -92,9 +92,9 @@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ --CC = @CC@ -+CC = $(HOSTCC) - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+CFLAGS = - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ -@@ -123,7 +123,7 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ diff --git a/Xorg/xorg/lib/libXtst/Makefile b/Xorg/xorg/lib/libXtst/Makefile index 1d8f9f5a6..8d4dd0e5c 100644 --- a/Xorg/xorg/lib/libXtst/Makefile +++ b/Xorg/xorg/lib/libXtst/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=libXtst -PKG_RELEASE:=3 -PKG_VERSION:=1.0.3 +PKG_RELEASE:=1 +PKG_VERSION:=1.1.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=090c1ad04e34982eada5cf3b1a0792fd +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=dd6f3e20b87310187121539f9605d977 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=recordproto xextproto inputproto @@ -26,7 +26,7 @@ define Package/libXtst SECTION:=xorg-lib CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+libX11 +libXext + DEPENDS:=+libX11 +libXext +libXi TITLE:=libXtst URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/xorg/lib/libXv/Makefile b/Xorg/xorg/lib/libXv/Makefile index 215f101b8..9c1de5501 100644 --- a/Xorg/xorg/lib/libXv/Makefile +++ b/Xorg/xorg/lib/libXv/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=libXv -PKG_RELEASE:=4 -PKG_VERSION:=1.0.4 +PKG_RELEASE:= +PKG_VERSION:=1.0.5 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=723a0275227165383e967a1ca8899b52 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=1d97798b1d8bbf8d9085e1b223a0738f + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=videoproto xextproto diff --git a/Xorg/xorg/lib/libXvMC/Makefile b/Xorg/xorg/lib/libXvMC/Makefile index 448b42956..4ff11115e 100644 --- a/Xorg/xorg/lib/libXvMC/Makefile +++ b/Xorg/xorg/lib/libXvMC/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=libXvMC -PKG_RELEASE:=4 -PKG_VERSION:=1.0.4 +PKG_RELEASE:=1 +PKG_VERSION:=1.0.5 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=b54600573daf9d1a29b952e8d35b389e +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=16c3a11add14979beb7510e44623cac6 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=videoproto xextproto diff --git a/Xorg/xorg/lib/libXxf86misc/Makefile b/Xorg/xorg/lib/libXxf86misc/Makefile deleted file mode 100644 index de7349cc1..000000000 --- a/Xorg/xorg/lib/libXxf86misc/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# blogic@openwrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libXxf86misc -PKG_RELEASE:=4 -PKG_VERSION:=1.0.1 - -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=7cee0df63903cef7f7a3fb68cdd99eef -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=xproto xextproto xf86miscproto - -include $(INCLUDE_DIR)/package.mk - -define Package/libXxf86misc - SECTION:=xorg-lib - CATEGORY:=Xorg - SUBMENU:=libraries - DEPENDS:=+libX11 +libXext - TITLE:=libXxf86misc - URL:=http://xorg.freedesktop.org/ -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-malloc0returnsnull \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ - $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ -endef - -define Package/libXxf86misc/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libXxf86misc)) diff --git a/Xorg/xorg/lib/libXxf86vm/Makefile b/Xorg/xorg/lib/libXxf86vm/Makefile index 3fc85924a..7b76c62e2 100644 --- a/Xorg/xorg/lib/libXxf86vm/Makefile +++ b/Xorg/xorg/lib/libXxf86vm/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXxf86vm -PKG_RELEASE:=4 -PKG_VERSION:=1.0.2 +PKG_RELEASE:=1 +PKG_VERSION:=1.1.0 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=304d37bd0a10d9b58aa9b64469ad73e5 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=b431ad7084e1055fef99a9115237edd8 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto xextproto xf86vidmodeproto @@ -38,6 +39,11 @@ define Package/libXxf86vm endef define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/X11/extensions + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ diff --git a/Xorg/xorg/lib/libfontenc/Makefile b/Xorg/xorg/lib/libfontenc/Makefile index ea9a42c44..6f5879a30 100644 --- a/Xorg/xorg/lib/libfontenc/Makefile +++ b/Xorg/xorg/lib/libfontenc/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libfontenc -PKG_RELEASE:=4 -PKG_VERSION:=1.0.4 +PKG_RELEASE:=1 +PKG_VERSION:=1.0.5 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=5cd16a2e51ca7b96a3081c7486ff98b9 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=4f0d8191819be9f2bdf9dad49a65e43b + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=xproto diff --git a/Xorg/xorg/lib/libpciaccess/Makefile b/Xorg/xorg/lib/libpciaccess/Makefile index a4303479c..54ac26db6 100644 --- a/Xorg/xorg/lib/libpciaccess/Makefile +++ b/Xorg/xorg/lib/libpciaccess/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,18 +9,19 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libpciaccess PKG_NAME:=libpciaccess -PKG_RELEASE:=3 -PKG_VERSION:=0.10.3 +PKG_RELEASE:=1 +PKG_VERSION:=0.10.9 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=6d5468debf76fac84576ca26c9535821 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=685cb20e7a6165bc010972f1183addbd + PKG_FIXUP:=libtool +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -PKG_INSTALL:=1 define Package/libpciaccess SECTION:=xorg-libraries diff --git a/Xorg/xorg/lib/libxkbfile/Makefile b/Xorg/xorg/lib/libxkbfile/Makefile index 3d3ee98f3..83169ced0 100644 --- a/Xorg/xorg/lib/libxkbfile/Makefile +++ b/Xorg/xorg/lib/libxkbfile/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=libxkbfile -PKG_RELEASE:=4 -PKG_VERSION:=1.0.5 +PKG_RELEASE:=1 +PKG_VERSION:=1.0.6 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=0726a845fe5a56551de2718c9f6b0e35 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=b01156e263eca8177e6b7f10441951c4 + PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=kbproto diff --git a/Xorg/xorg/lib/xtrans/Makefile b/Xorg/xorg/lib/xtrans/Makefile index d37413e3d..5a1220b01 100644 --- a/Xorg/xorg/lib/xtrans/Makefile +++ b/Xorg/xorg/lib/xtrans/Makefile @@ -1,21 +1,21 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# blogic@openwrt.org include $(TOPDIR)/rules.mk PKG_NAME:=xtrans -PKG_RELEASE:=3 -PKG_VERSION:=1.2.1 +PKG_RELEASE:=1 +PKG_VERSION:=1.2.5 -PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=96e142331edd498a9364887b2548f1bb +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=2d1e57e82acc5f21797e92341415af2f + PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -30,10 +30,10 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xtrans} - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(PKG_INSTALL_DIR)/usr/share/pkgconfig/* \ $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/usr/include/X11/Xtrans/* \ $(1)/usr/include/X11/Xtrans/ -- 2.30.2