Merge branch 'master' of git+ssh://openadk.org/git/openadk

78 files changed, 510 insertions, 793 deletions

diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile
index 83e39c26e..62166e2b9 100644
--- a/package/aufs2-util/Makefile
+++ b/package/aufs2-util/Makefile
@@ -22,11 +22,12 @@ PKG_HOST_DEPENDS:=	!cygwin !freebsd !openbsd !netbsd
 
 PKG_SUBPKGS:=		AUFS2_UTIL LIBAU
 PKGSD_LIBAU:=		aufs2 userspace library
+PKGSC_LIBAU:=		libs
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,AUFS2_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAU,libau,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBAU},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAU,libau,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBAU},${PKGSC_LIBAU}))
 
 CONFIG_STYLE:=		manual
 XAKE_FLAGS+=		Install=install CPPFLAGS_FOR_BUILD="-I${LINUX_HEADER_DIR}/include"
diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile
index 05488be69..fb7cc7f97 100644
--- a/package/bigreqsproto/Makefile
+++ b/package/bigreqsproto/Makefile
@@ -4,11 +4,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		bigreqsproto
-PKG_VERSION:=		1.1.0
+PKG_VERSION:=		1.1.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		882d49cc3bb591dbdccdf9e680bd2e4b
+PKG_DESCR:=		Big Requests Extension headers
+PKG_SECTION:=		x11/devel
+PKG_MD5SUM:=		3392142c19cb5a22058cae88be3c554a
 PKG_SITES:=		${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
 
 include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,BIGREQSPROTO,bigreqsproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_BIGREQSPROTO}/usr/include
+	${CP} ${WRKINST}/usr/include/X11 ${IDIR_BIGREQSPROTO}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile
index 3b5abb435..423327db7 100644
--- a/package/compositeproto/Makefile
+++ b/package/compositeproto/Makefile
@@ -7,8 +7,16 @@ PKG_NAME:=		compositeproto
 PKG_VERSION:=		0.4.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		6994a209774fe7877fd8e0c9fafe2466
+PKG_DESCR:=		X11 composite headers
+PKG_SECTION:=		x11/devel
 PKG_SITES:=		${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
 
 include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,COMPOSITEPROTO,compositeproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_COMPOSITEPROTO}/usr/include
+	${CP} ${WRKINST}/usr/include/X11 ${IDIR_COMPOSITEPROTO}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile
index e3883040e..ae3e008e1 100644
--- a/package/damageproto/Makefile
+++ b/package/damageproto/Makefile
@@ -7,8 +7,16 @@ PKG_NAME:=		damageproto
 PKG_VERSION:=		1.2.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		423516fd64e43e8671120056b0d9f597
+PKG_DESCR:=		X DAMAGE Extension headers
+PKG_SECTION:=		x11/devel
 PKG_SITES:=		${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
 
 include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,DAMAGEPROTO,damageproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_DAMAGEPROTO}/usr/include
+	${CP} ${WRKINST}/usr/include/X11 ${IDIR_DAMAGEPROTO}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile
index a4d11920f..204d27bd3 100644
--- a/package/dri2proto/Makefile
+++ b/package/dri2proto/Makefile
@@ -7,8 +7,16 @@ PKG_NAME:=		dri2proto
 PKG_VERSION:=		2.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2087269416782cff56f9b22d1449c192
-PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/proto/
-PKG_SUBPKGS:=
+PKG_DESCR:=		DRI protocol headers
+PKG_SECTION:=		x11/devel
+PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,DRI2PROTO,dri2proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_DRI2PROTO}/usr/include
+	${CP} ${WRKINST}/usr/include/X11 ${IDIR_DRI2PROTO}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile
index aeca1101e..b3a9185d6 100644
--- a/package/fixesproto/Makefile
+++ b/package/fixesproto/Makefile
@@ -4,11 +4,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		fixesproto
-PKG_VERSION:=		4.1.1
+PKG_VERSION:=		4.1.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		95806b9b648639d4c3e5b226d10927c0
+PKG_DESCR:=		XFIXES Extension headers
+PKG_SECTION:=		x11/devel
+PKG_MD5SUM:=		352e7ea8278bc31a8d75b31232a61cd4
 PKG_SITES:=		${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
 
 include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FIXESPROTO,fixesproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_FIXESPROTO}/usr/include
+	${CP} ${WRKINST}/usr/include/X11 ${IDIR_FIXESPROTO}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glproto/Makefile b/package/glproto/Makefile
index d85612a22..19a1086cb 100644
--- a/package/glproto/Makefile
+++ b/package/glproto/Makefile
@@ -4,13 +4,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		glproto
-PKG_VERSION:=		1.4.11
+PKG_VERSION:=		1.4.12
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		78e7c4dc7dcb74b1869fee7897e00f59
-PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/proto/
-PKG_SUBPKGS:=
-
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+PKG_DESCR:=		OpenGL headers
+PKG_SECTION:=		x11/devel
+PKG_MD5SUM:=		c528c5903bb836b33a35863f97613c64
+PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GLPROTO,glproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_GLPROTO}/usr/include
+	${CP} ${WRKINST}/usr/include/GL ${IDIR_GLPROTO}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index 5e0a8ead8..6393f75ed 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -31,6 +31,7 @@ CONFIGURE_ARGS+=	--disable-gtk-doc-html \
 			--disable-xinerama \
 			--without-xinput \
 			--disable-gtk-doc \
+			--disable-cups \
 			--disable-papi \
 			--disable-introspection
 CONFIGURE_ENV+=		gio_can_sniff=no \
diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile
index bf22d9d9a..09cccadd3 100644
--- a/package/inputproto/Makefile
+++ b/package/inputproto/Makefile
@@ -4,11 +4,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		inputproto
-PKG_VERSION:=		2.0
+PKG_VERSION:=		2.0.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		13d91739cf70a781f1db24d8d3677574
+PKG_DESCR:=		X Input Extension headers
+PKG_SECTION:=		x11/devel
+PKG_MD5SUM:=		796829adecc14a78bfef8e119e6e9c63
 PKG_SITES:=		${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
 
 include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,INPUTPROTO,inputproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_INPUTPROTO}/usr/include
+	${CP} ${WRKINST}/usr/include/X11 ${IDIR_INPUTPROTO}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile
index f8b7bd0d6..764a3417b 100644
--- a/package/kbproto/Makefile
+++ b/package/kbproto/Makefile
@@ -4,11 +4,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		kbproto
-PKG_VERSION:=		1.0.4
+PKG_VERSION:=		1.0.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		4deef518a03bc94a7a25902bb7c98dd6
+PKG_DESCR:=		X11 keyboard protocol headers
+PKG_SECTION:=		x11/devel
+PKG_MD5SUM:=		cb95bc6ffb2dfa27498aeb4663dee964
 PKG_SITES:=		${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
 
 include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,KBPROTO,kbproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_KBPROTO}/usr/include
+	${CP} ${WRKINST}/usr/include/X11 ${IDIR_KBPROTO}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index 79ab03131..7502e80e8 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libICE
-PKG_VERSION:=		1.0.6
+PKG_VERSION:=		1.0.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		4a8f09f15fc92196b91d61e2dc9afcea
+PKG_MD5SUM:=		91ff02eb5af6073c2e014a5290e65f17
 PKG_DESCR:=		Inter-Client Exchange library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		xtrans xproto
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index 7256e80c8..33c09cf6e 100644
--- a/package/libSM/Makefile
+++ b/package/libSM/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libSM
-PKG_VERSION:=		1.1.1
+PKG_VERSION:=		1.2.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1ee90d479298e48df7bb86a7ccbe00c9
+PKG_MD5SUM:=		4dcf47665aa64161bc5ca74c0778a149
 PKG_DESCR:=		X11 Session Management library
 PKG_SECTION:=		x11/libs
 PKG_DEPENDS:=		libuuid
diff --git a/package/libSM/patches/patch-ltmain_sh b/package/libSM/patches/patch-ltmain_sh
index f01192003..0d222aff6 100644
--- a/package/libSM/patches/patch-ltmain_sh
+++ b/package/libSM/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- libSM-1.1.1.orig/ltmain.sh	2009-08-07 14:22:14.000000000 +0200
-+++ libSM-1.1.1/ltmain.sh	2011-01-15 00:11:06.000000000 +0100
-@@ -4772,7 +4772,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
+--- libSM-1.2.0.orig/ltmain.sh	2010-10-28 07:27:06.000000000 +0200
++++ libSM-1.2.0/ltmain.sh	2011-01-24 18:32:41.000000000 +0100
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+       # @file                GCC response files
+       # -tp=*                Portland pgcc target processor selection
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*)
          func_quote_for_eval "$arg"
  	arg="$func_quote_for_eval_result"
          func_append compile_command " $arg"
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 322c190a7..6d7f9b644 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -4,13 +4,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libX11
-PKG_VERSION:=		1.3.2
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		b68aebbfcac1174c4c95d260e9369766
+PKG_VERSION:=		1.4.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		3cb91f1f20884661b2b8aae03853441d
 PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xproto xextproto xtrans libXdmcp libXau 
-PKG_BUILDDEP+=		xcmiscproto bigreqsproto kbproto inputproto
+PKG_BUILDDEP:=		xproto xextproto xtrans libXdmcp libXau xcb-proto
+PKG_BUILDDEP+=		xcmiscproto bigreqsproto kbproto inputproto libxcb
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SUBPKGS:=		LIBX11 LIBX11_DEV
@@ -26,17 +26,15 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBX11_DEV},${PKGSC_LIBX11_DEV},${PKG_OPTS}))
 
-XAKE_FLAGS+=		HOSTCPPFLAGS=-I${STAGING_TARGET_DIR}/usr/include/xproto
 CONFIGURE_ARGS+=	--enable-xlocale \
 			--disable-specs \
 			--disable-xf86bigfont \
-			--disable-malloc0returnsnull \
-			--without-xcb
+			--disable-malloc0returnsnull
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11
 	${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/
-	${CP} ${WRKINST}/usr/share/X11/XKeysymDB ${IDIR_LIBX11}/usr/share/X11
+	${CP} ${WRKINST}/usr/share/X11/XErrorDB ${IDIR_LIBX11}/usr/share/X11
 
 libx11-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/include/X11
diff --git a/package/libX11/patches/patch-ltmain_sh b/package/libX11/patches/patch-ltmain_sh
index d88493e60..19c2fa84b 100644
--- a/package/libX11/patches/patch-ltmain_sh
+++ b/package/libX11/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- libX11-1.3.2.orig/ltmain.sh	2009-10-17 07:26:21.000000000 +0200
-+++ libX11-1.3.2/ltmain.sh	2011-01-14 00:51:57.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @file GCC response files
+--- libX11-1.4.0.orig/ltmain.sh	2010-11-21 23:15:51.000000000 +0100
++++ libX11-1.4.0/ltmain.sh	2011-01-24 16:20:51.000000000 +0100
+@@ -5840,7 +5840,7 @@ func_mode_link ()
+       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
+       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in
index dd3a39e71..a92899818 100644
--- a/package/libX11/patches/patch-src_util_Makefile_in
+++ b/package/libX11/patches/patch-src_util_Makefile_in
@@ -1,67 +1,10 @@
---- libX11-1.3.2.orig/src/util/Makefile.in	2009-10-23 22:55:44.000000000 +0200
-+++ libX11-1.3.2/src/util/Makefile.in	2009-11-20 08:55:51.000000000 +0100
-@@ -58,7 +58,7 @@ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERB
- 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 $@
-+	$(CFLAGS) $(AM_LDFLAGS) $(HOSTLDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -103,7 +103,7 @@ BIGFONT_LIBS = @BIGFONT_LIBS@