summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/mirrors.mk6
-rw-r--r--package/bigreqsproto/Makefile14
-rw-r--r--package/compositeproto/Makefile10
-rw-r--r--package/damageproto/Makefile10
-rw-r--r--package/dri2proto/Makefile12
-rw-r--r--package/fixesproto/Makefile14
-rw-r--r--package/glproto/Makefile18
-rw-r--r--package/inputproto/Makefile14
-rw-r--r--package/kbproto/Makefile14
-rw-r--r--package/libICE/Makefile4
-rw-r--r--package/libSM/Makefile4
-rw-r--r--package/libSM/patches/patch-ltmain_sh14
-rw-r--r--package/libX11/Makefile16
-rw-r--r--package/libX11/patches/patch-ltmain_sh20
-rw-r--r--package/libX11/patches/patch-src_util_Makefile_in71
-rw-r--r--package/libXScrnSaver/Makefile4
-rw-r--r--package/libXau/Makefile6
-rw-r--r--package/libXaw/Makefile6
-rw-r--r--package/libXaw/patches/patch-ltmain_sh20
-rw-r--r--package/libXcursor/Makefile2
-rw-r--r--package/libXdamage/Makefile6
-rw-r--r--package/libXdmcp/Makefile6
-rw-r--r--package/libXdmcp/patches/patch-ltmain_sh14
-rw-r--r--package/libXext/Makefile4
-rw-r--r--package/libXext/patches/patch-ltmain_sh20
-rw-r--r--package/libXfixes/Makefile4
-rw-r--r--package/libXfont/Makefile4
-rw-r--r--package/libXfont/patches/patch-ltmain_sh20
-rw-r--r--package/libXi/Makefile4
-rw-r--r--package/libXi/patches/patch-ltmain_sh14
-rw-r--r--package/libXmu/Makefile4
-rw-r--r--package/libXmu/patches/patch-ltmain_sh20
-rw-r--r--package/libXpm/Makefile4
-rw-r--r--package/libXpm/patches/patch-ltmain_sh20
-rw-r--r--package/libXrender/Makefile4
-rw-r--r--package/libXt/Makefile5
-rw-r--r--package/libXt/patches/patch-ltmain_sh20
-rw-r--r--package/libXt/patches/patch-util_Makefile_in62
-rw-r--r--package/libXv/Makefile4
-rw-r--r--package/libXv/patches/patch-ltmain_sh20
-rw-r--r--package/libXxf86vm/Makefile6
-rw-r--r--package/libpthread-stubs/Makefile17
-rw-r--r--package/libxcb/Makefile36
-rw-r--r--package/mkfontdir/Makefile3
-rw-r--r--package/python2/patches/patch-Makefile_pre267
-rw-r--r--package/randrproto/Makefile10
-rw-r--r--package/recordproto/Makefile22
-rw-r--r--package/renderproto/Makefile14
-rw-r--r--package/scrnsaverproto/Makefile14
-rw-r--r--package/section.lst5
-rw-r--r--package/util-linux-ng/patches/patch-shlibs_blkid_src_Makefile_in11
-rw-r--r--package/videoproto/Makefile14
-rw-r--r--package/xcb-proto/Makefile14
-rw-r--r--package/xcb-proto/patches/patch-xcb-proto_pc_in10
-rw-r--r--package/xcmiscproto/Makefile14
-rw-r--r--package/xextproto/Makefile14
-rw-r--r--package/xf86-input-keyboard/Makefile4
-rw-r--r--package/xf86-input-keyboard/patches/patch-ltmain_sh14
-rw-r--r--package/xf86-input-mouse/Makefile4
-rw-r--r--package/xf86-video-cirrus/Makefile2
-rw-r--r--package/xf86-video-fbdev/Makefile6
-rw-r--r--package/xf86-video-geode/Makefile6
-rw-r--r--package/xf86-video-intel/Makefile2
-rw-r--r--package/xf86-video-siliconmotion/Makefile6
-rw-r--r--package/xf86-video-siliconmotion/patches/patch-ltmain_sh16
-rw-r--r--package/xf86dgaproto/Makefile10
-rw-r--r--package/xf86vidmodeproto/Makefile12
-rw-r--r--package/xorg-server/Makefile18
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c135
-rw-r--r--package/xorg-server/patches/patch-ltmain_sh14
-rw-r--r--package/xproto/Makefile14
-rw-r--r--package/xrdb/Makefile2
-rw-r--r--package/xset/Makefile6
-rw-r--r--package/xsetroot/Makefile2
-rw-r--r--package/xterm/Makefile4
-rw-r--r--package/xtrans/Makefile13
-rw-r--r--package/xvinfo/Makefile6
-rw-r--r--target/packages/pkg-available/development4
78 files changed, 512 insertions, 797 deletions
diff --git a/mk/mirrors.mk b/mk/mirrors.mk
index a57cb8e..f38bd7d 100644
--- a/mk/mirrors.mk
+++ b/mk/mirrors.mk
@@ -17,9 +17,9 @@ MASTER_SITE_KERNEL?= \
http://www.kernel.org/pub/linux/ \
MASTER_SITE_XORG?= \
- http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.5/src/everything/ \
- http://www.x.org/releases/X11R7.5/src/everything/ \
- http://xorg.freedesktop.org/releases/X11R7.5/src/everything/ \
+ http://www.x.org/releases/X11R7.6/src/everything/ \
+ http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.6/src/everything/ \
+ http://xorg.freedesktop.org/releases/X11R7.6/src/everything/ \
http://xorg.freedesktop.org/releases/individual/lib/ \
MASTER_SITE_GNU?= \
diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile
index 05488be..fb7cc7f 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 3b5abb4..423327d 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 e388304..ae3e008 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 a4d1192..204d27b 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 aeca110..b3a9185 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 d85612a..19a1086 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/inputproto/Makefile b/package/inputproto/Makefile
index bf22d9d..09cccad 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 f8b7bd0..764a341 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 79ab031..7502e80 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 7256e80..33c09cf 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 f011920..0d222af 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 322c190..6d7f9b6 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 d88493e..19c2fa8 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 dd3a39e..a928998 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@
- CC = @CC_FOR_BUILD@
- CCDEPMODE = @CCDEPMODE@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS =
- CHANGELOG_CMD = @CHANGELOG_CMD@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
-@@ -139,9 +139,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- KEYSYMDEF = @KEYSYMDEF@
- LAUNCHD = @LAUNCHD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS =
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS =
- LIBTOOL = @LIBTOOL@
- LIB_MAN_DIR = @LIB_MAN_DIR@
- LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
-@@ -256,7 +256,8 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
+--- libX11-1.4.0.orig/src/util/Makefile.in 2010-11-21 23:15:55.000000000 +0100
++++ libX11-1.4.0/src/util/Makefile.in 2011-01-24 16:37:00.000000000 +0100
+@@ -262,7 +262,6 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
--makekeys_CFLAGS = $(X11_CFLAGS)
-+makekeys_CFLAGS = $(HOSTCFLAGS)
-+makekeys_CPPFLAGS = $(HOSTCPPFLAGS)
- EXTRA_DIST = mkks.sh
-
- # Check source code with tools like lint & sparse
-@@ -343,20 +344,20 @@ distclean-compile:
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- makekeys-makekeys.o: makekeys.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
- @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
+ makekeys_CFLAGS = \
+- $(X11_CFLAGS) \
+ $(CWARNFLAGS)
- makekeys-makekeys.obj: makekeys.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
- @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
-
- mostlyclean-libtool:
- -rm -f *.lo
+ EXTRA_DIST = mkks.sh
diff --git a/package/libXScrnSaver/Makefile b/package/libXScrnSaver/Makefile
index 2719824..e92675c 100644
--- a/package/libXScrnSaver/Makefile
+++ b/package/libXScrnSaver/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXScrnSaver
-PKG_VERSION:= 1.2.0
+PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 72ca7f37e4a1794acbdd9ab047821e8b
+PKG_MD5SUM:= 8e459e544298caa27fc7c7e5a56e2a6d
PKG_DESCR:= X.Org XScrnSaver library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= scrnsaverproto
diff --git a/package/libXau/Makefile b/package/libXau/Makefile
index 41d6adc..b85d092 100644
--- a/package/libXau/Makefile
+++ b/package/libXau/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXau
-PKG_VERSION:= 1.0.5
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 1a421d9376f43596fe068ce209a70b84
+PKG_VERSION:= 1.0.6
+PKG_RELEASE:= 1
+PKG_MD5SUM:= ee1ee30c00d1e033cfc0237a349e1219
PKG_DESCR:= X11 authorisation library
PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index 3eed566..ba6d24f 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXaw
-PKG_VERSION:= 1.0.7
+PKG_VERSION:= 1.0.8
PKG_RELEASE:= 1
-PKG_MD5SUM:= 67662e6b2dceb2907159215c83364c5a
+PKG_MD5SUM:= ae09e00c5b7e2b12a11a7db4d4b01d73
PKG_DESCR:= X11 Athena Widget library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXext libXmu libXpm
@@ -16,8 +16,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_ARGS+= --disable-docs
-
post-install:
${INSTALL_DIR} ${IDIR_LIBXAW}/usr/lib
${CP} ${WRKINST}/usr/lib/libXaw*.so* ${IDIR_LIBXAW}/usr/lib/
diff --git a/package/libXaw/patches/patch-ltmain_sh b/package/libXaw/patches/patch-ltmain_sh
index d5ae407..71e9909 100644
--- a/package/libXaw/patches/patch-ltmain_sh
+++ b/package/libXaw/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- libXaw-1.0.7.orig/ltmain.sh 2009-10-17 07:26:21.000000000 +0200
-+++ libXaw-1.0.7/ltmain.sh 2011-01-15 22:19:32.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # @file GCC response files
+--- libXaw-1.0.8.orig/ltmain.sh 2010-10-25 19:47:33.000000000 +0200
++++ libXaw-1.0.8/ltmain.sh 2011-01-24 18:43:21.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)
-
- # 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=*)
++ -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/libXcursor/Makefile b/package/libXcursor/Makefile
index a1e4487..09c2af9 100644
--- a/package/libXcursor/Makefile
+++ b/package/libXcursor/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 55558a41d0bcf9210636858844fa4d2f
PKG_DESCR:= xcursor library
PKG_SECTION:= x11/libs
-PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile
index 8e795c2..05f3099 100644
--- a/package/libXdamage/Makefile
+++ b/package/libXdamage/Makefile
@@ -4,13 +4,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXdamage
-PKG_VERSION:= 1.1.2
+PKG_VERSION:= 1.1.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= f8f19f747c8445213d5409ae8b8b2f0a
+PKG_MD5SUM:= 5e54789fd1c56392d38d29c6b8dad142
PKG_DESCR:= X Window System client interface to the DAMAGE extension to the X protocol
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXfixes damageproto
-PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile
index 4181933..ab54761 100644
--- a/package/libXdmcp/Makefile
+++ b/package/libXdmcp/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXdmcp
-PKG_VERSION:= 1.0.3
-PKG_RELEASE:= 2
-PKG_MD5SUM:= c3f1bce1affc7dfbc222145e00e1310e
+PKG_VERSION:= 1.1.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= bd6577d65c66a971ca52ba7c251905a8
PKG_DESCR:= X11 display manager control protocol library
PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXdmcp/patches/patch-ltmain_sh b/package/libXdmcp/patches/patch-ltmain_sh
index 3000778..27bebbf 100644
--- a/package/libXdmcp/patches/patch-ltmain_sh
+++ b/package/libXdmcp/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- libXdmcp-1.0.3.orig/ltmain.sh 2009-05-18 04:20:38.000000000 +0200
-+++ libXdmcp-1.0.3/ltmain.sh 2011-01-14 00:47:12.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+--- libXdmcp-1.1.0.orig/ltmain.sh 2010-10-30 00:13:50.000000000 +0200
++++ libXdmcp-1.1.0/ltmain.sh 2011-01-24 13:16:31.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/libXext/Makefile b/package/libXext/Makefile
index ec311b0..af874c2 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXext
-PKG_VERSION:= 1.1.1
+PKG_VERSION:= 1.2.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6b61b3f657befded8ae66e04085c413e
+PKG_MD5SUM:= 9beee7f603907840de9d9e73172e74d0
PKG_DESCR:= X client interface to extensions of the X protocol
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11
diff --git a/package/libXext/patches/patch-ltmain_sh b/package/libXext/patches/patch-ltmain_sh
index c827101..8a74a50 100644
--- a/package/libXext/patches/patch-ltmain_sh
+++ b/package/libXext/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- libXext-1.1.1.orig/ltmain.sh 2009-10-17 07:26:21.000000000 +0200
-+++ libXext-1.1.1/ltmain.sh 2011-01-14 01:11:30.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # @file GCC response files
+--- libXext-1.2.0.orig/ltmain.sh 2010-10-28 08:07:34.000000000 +0200
++++ libXext-1.2.0/ltmain.sh 2011-01-24 17:32:32.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)
-
- # 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=*)
++ -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/libXfixes/Makefile b/package/libXfixes/Makefile
index 0bf1fe8..7895a0a 100644
--- a/package/libXfixes/Makefile
+++ b/package/libXfixes/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXfixes
-PKG_VERSION:= 4.0.4
+PKG_VERSION:= 4.0.5
PKG_RELEASE:= 1
-PKG_MD5SUM:= 86eb4b916cd5948c0e20d279107b3331
+PKG_MD5SUM:= 556ffa2e75f2a3b5d92d004a6b124a6d
PKG_DESCR:= X Fixes Library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= fixesproto xextproto xproto libX11
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index cc9241f..0122fb8 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXfont
-PKG_VERSION:= 1.4.1
+PKG_VERSION:= 1.4.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= bf134b9f79a7fc6507577bf5b6d4f412
+PKG_MD5SUM:= c508998fba44b2b089f2952eb4418420
PKG_DESCR:= X font Library
PKG_SECTION:= x11/libs
PKG_DEPENDS:= libfreetype
diff --git a/package/libXfont/patches/patch-ltmain_sh b/package/libXfont/patches/patch-ltmain_sh
index d901e8b..226c3e9 100644
--- a/package/libXfont/patches/patch-ltmain_sh
+++ b/package/libXfont/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- libXfont-1.4.1.orig/ltmain.sh 2009-09-11 16:54:52.000000000 +0200
-+++ libXfont-1.4.1/ltmain.sh 2011-01-15 22:27:42.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # @file GCC response files
+--- libXfont-1.4.3.orig/ltmain.sh 2010-10-29 05:43:52.000000000 +0200
++++ libXfont-1.4.3/ltmain.sh 2011-01-24 17:02:07.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)
-
- # 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=*)
++ -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/libXi/Makefile b/package/libXi/Makefile
index de1a11f..19e9325 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXi
-PKG_VERSION:= 1.3
+PKG_VERSION:= 1.4.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 1c038312e4f9b61fe72e52d0f59a01d5
+PKG_MD5SUM:= b9dfc98b27e3770567e4c6a3365a21b7
PKG_DESCR:= X Window System client interface to the XINPUT extension to the X protocol.
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto xextproto libXext
diff --git a/package/libXi/patches/patch-ltmain_sh b/package/libXi/patches/patch-ltmain_sh
index 86a276f..74f0d3f 100644
--- a/package/libXi/patches/patch-ltmain_sh
+++ b/package/libXi/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- libXi-1.3.orig/ltmain.sh 2009-10-02 04:21:36.000000000 +0200
-+++ libXi-1.3/ltmain.sh 2011-01-14 21:38:48.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+--- libXi-1.4.0.orig/ltmain.sh 2010-09-07 07:14:27.000000000 +0200
++++ libXi-1.4.0/ltmain.sh 2011-01-24 20:03:21.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/libXmu/Makefile b/package/libXmu/Makefile
index 017065a..2d7c3cc 100644
--- a/package/libXmu/Makefile
+++ b/package/libXmu/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXmu
-PKG_VERSION:= 1.0.5
+PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= f49e3587cdc299707da0786a681f9c05
+PKG_MD5SUM:= 15e1cb9aaf97eae169bfe6944e0a541e
PKG_DESCR:= miscellaneous utility functions for X libraries
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXt
diff --git a/package/libXmu/patches/patch-ltmain_sh b/package/libXmu/patches/patch-ltmain_sh
index f748db3..9a16a4d 100644
--- a/package/libXmu/patches/patch-ltmain_sh
+++ b/package/libXmu/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- libXmu-1.0.5.orig/ltmain.sh 2009-09-11 16:54:52.000000000 +0200
-+++ libXmu-1.0.5/ltmain.sh 2011-01-15 22:16:42.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # @file GCC response files
+--- libXmu-1.1.0.orig/ltmain.sh 2010-10-30 01:58:40.000000000 +0200
++++ libXmu-1.1.0/ltmain.sh 2011-01-24 18:11:09.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)
-
- # 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=*)
++ -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/libXpm/Makefile b/package/libXpm/Makefile
index 1bdb466..5e9f033 100644
--- a/package/libXpm/Makefile
+++ b/package/libXpm/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXpm
-PKG_VERSION:= 3.5.8
+PKG_VERSION:= 3.5.9
PKG_RELEASE:= 1
-PKG_MD5SUM:= 2d81d6633e67ac5562e2fbee126b2897
+PKG_MD5SUM:= d6d4b0f76248a6b346eb42dfcdaa72a6
PKG_DESCR:= common operation for the XPM pixmap format
PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXpm/patches/patch-ltmain_sh b/package/libXpm/patches/patch-ltmain_sh
index 69f53a2..2dda1fa 100644
--- a/package/libXpm/patches/patch-ltmain_sh
+++ b/package/libXpm/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- libXpm-3.5.8.orig/ltmain.sh 2009-09-11 16:54:52.000000000 +0200
-+++ libXpm-3.5.8/ltmain.sh 2011-01-15 11:27:44.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # @file GCC response files
+--- libXpm-3.5.9.orig/ltmain.sh 2010-10-30 02:29:56.000000000 +0200
++++ libXpm-3.5.9/ltmain.sh 2011-01-24 18:41:08.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)
-
- # 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=*)
++ -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/libXrender/Makefile b/package/libXrender/Makefile
index a2fa266..ecffa3b 100644
--- a/package/libXrender/Makefile
+++ b/package/libXrender/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXrender
-PKG_VERSION:= 0.9.5
+PKG_VERSION:= 0.9.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 1791473c18a83a333a048b72d719fc55
+PKG_MD5SUM:= 5dba047cf278e5ac77cd0f19f7195fb9
PKG_DESCR:= X11 rendering library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= renderproto
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index 65335b0..b58822b 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXt
-PKG_VERSION:= 1.0.7
+PKG_VERSION:= 1.0.9
PKG_RELEASE:= 1
-PKG_MD5SUM:= 28f627c7a5ca08c2413ce91d21c177d8
+PKG_MD5SUM:= 091ed356b8ab9ca4fcbb471f738ca544
PKG_DESCR:= X Toolkit Intrinsics
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libSM
@@ -16,7 +16,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-XAKE_FLAGS+= HOSTCPPFLAGS=-I${STAGING_TARGET_DIR}/usr/include/xproto
CONFIGURE_ARGS+= --disable-malloc0returnsnull \
--disable-install-makestrs
diff --git a/package/libXt/patches/patch-ltmain_sh b/package/libXt/patches/patch-ltmain_sh
index d334685..3abdb2f 100644
--- a/package/libXt/patches/patch-ltmain_sh
+++ b/package/libXt/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- libXt-1.0.7.orig/ltmain.sh 2009-09-11 16:54:52.000000000 +0200
-+++ libXt-1.0.7/ltmain.sh 2011-01-15 00:13:20.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # @file GCC response files
+--- libXt-1.0.9.orig/ltmain.sh 2010-10-28 21:04:10.000000000 +0200
++++ libXt-1.0.9/ltmain.sh 2011-01-24 17:49:30.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)
-
- # 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=*)
++ -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/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in
index a02ec51..8b2d307 100644
--- a/package/libXt/patches/patch-util_Makefile_in
+++ b/package/libXt/patches/patch-util_Makefile_in
@@ -1,68 +1,20 @@
---- libXt-1.0.7.orig/util/Makefile.in 2009-10-09 06:51:17.000000000 +0200
-+++ libXt-1.0.7/util/Makefile.in 2010-02-05 23:31:14.324191435 +0100
-@@ -63,10 +63,10 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-+ $(LIBTOOLFLAGS) --mode=compile $(CC_FOR_BUILD) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- AM_V_CC = $(am__v_CC_$(V))
-@@ -75,7 +75,7 @@ am__v_CC_0 = @echo " CC " $@;
- AM_V_at = $(am__v_at_$(V))
- am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
- am__v_at_0 = @
--CCLD = $(CC)
-+CCLD = $(CC_FOR_BUILD)
- LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -131,7 +131,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@
+--- libXt-1.0.9.orig/util/Makefile.in 2010-10-28 21:04:12.000000000 +0200
++++ libXt-1.0.9/util/Makefile.in 2011-01-24 17:53:22.000000000 +0100
+@@ -108,7 +108,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@
CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS =
CWARNFLAGS = @CWARNFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
-@@ -253,7 +253,8 @@ top_build_prefix = @top_build_prefix@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+@@ -231,7 +231,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
-makestrs_CFLAGS = $(XT_CFLAGS)
-+makestrs_CFLAGS = $(HOSTCFLAGS)
-+makestrs_CPPFLAGS = $(HOSTCPPFLAGS)
++makestrs_CFLAGS =
makestrs_SOURCES = makestrs.c
# Man page
-@@ -393,20 +394,20 @@ distclean-compile:
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- makestrs-makestrs.o: makestrs.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makestrs-makestrs.Tpo $(DEPDIR)/makestrs-makestrs.Po
- @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
-+@am__fastdepCC_FALSE@ $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
-
- makestrs-makestrs.obj: makestrs.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makestrs-makestrs.Tpo $(DEPDIR)/makestrs-makestrs.Po
- @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
-+@am__fastdepCC_FALSE@ $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
-
- mostlyclean-libtool:
- -rm -f *.lo
diff --git a/package/libXv/Makefile b/package/libXv/Makefile
index 1440bf4..dbbda7f 100644
--- a/package/libXv/Makefile
+++ b/package/libXv/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXv
-PKG_VERSION:= 1.0.5
+PKG_VERSION:= 1.0.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6ee98790de6b3cd470074e60057d5c5c
+PKG_MD5SUM:= a7184aa3e3f405792a09ccd6447caf67
PKG_DESCR:= X11 Xvideo extensions
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 videoproto libXext
diff --git a/package/libXv/patches/patch-ltmain_sh b/package/libXv/patches/patch-ltmain_sh
index bebaeec..4c179f6 100644
--- a/package/libXv/patches/patch-ltmain_sh
+++ b/package/libXv/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- libXv-1.0.5.orig/ltmain.sh 2009-09-11 16:54:52.000000000 +0200
-+++ libXv-1.0.5/ltmain.sh 2011-01-15 22:32:11.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # @file GCC response files
+--- libXv-1.0.6.orig/ltmain.sh 2010-10-30 02:52:54.000000000 +0200
++++ libXv-1.0.6/ltmain.sh 2011-01-24 17:36:29.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)
-
- # 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=*)
++ -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/libXxf86vm/Makefile b/package/libXxf86vm/Makefile
index 3d5d6ed..e881b4b 100644
--- a/package/libXxf86vm/Makefile
+++ b/package/libXxf86vm/Makefile
@@ -4,13 +4,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libXxf86vm
-PKG_VERSION:= 1.1.0
+PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 52b49483eccbdd1566b8c560fe7f76e8
+PKG_MD5SUM:= 822a847fc4ea1b38f6c4d6f86d1e4fd9
PKG_DESCR:= an interface to the XFree86-VidModeExtension extension
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xf86vidmodeproto libXext
-PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/libpthread-stubs/Makefile b/package/libpthread-stubs/Makefile
index 58c70f5..0a0693f 100644
--- a/package/libpthread-stubs/Makefile
+++ b/package/libpthread-stubs/Makefile
@@ -4,14 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libpthread-stubs
-PKG_VERSION:= 0.1
+PKG_VERSION:= 0.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 774eabaf33440d534efe108ef9130a7d
+PKG_MD5SUM:= a09d928c4af54fe5436002345ef71138
+PKG_DESCR:= Pthread-stubs
+PKG_SECTION:= x11/devel
PKG_URL:= http://xcb.freedesktop.org/
-PKG_SITES:= http://xcb.freedesktop.org/dist/
-PKG_SUBPKGS:=
-
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBPTHREAD_STUBS,libpthread-stubs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_LIBPTHREAD_STUBS}/usr
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile
new file mode 100644
index 0000000..a0e544e
--- /dev/null
+++ b/package/libxcb/Makefile
@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= libxcb
+PKG_VERSION:= 1.7
+PKG_RELEASE:= 1
+PKG_MD5SUM:= f715e53c9c1b25f856d14d6123663d96
+PKG_DESCR:= X11 keyboard library
+PKG_SECTION:= x11/libs
+PKG_BUILDDEP:= python2 libpthread-stubs
+PKG_SITES:= ${MASTER_SITE_XORG}
+
+PKG_SUBPKGS:= LIBXCB LIBXCB_DEVEL
+
+PKGSD_LIBXCB_DEVEL:= XML-XCB protocol headers
+PKGSS_LIBXCB_DEVEL:= libxcb
+PKGSC_LIBXCB_DEVEL:= x11/devel
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXCB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXCB_DEVEL,${PKG_NAME}-devel,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBXCB_DEVEL},${PKGSD_LIBXCB_DEVEL},${PKGSC_LIBXCB_DEVEL}))
+
+include $(TOPDIR)/mk/python.mk
+
+libxcb-install:
+ ${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libxcb*.so* ${IDIR_LIBXCB}/usr/lib/
+
+libxcb-devel-install:
+ ${INSTALL_DIR} ${IDIR_LIBXCB_DEVEL}/usr/include
+ ${CP} ${WRKINST}/usr/include/xcb ${IDIR_LIBXCB_DEVEL}/usr/include
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mkfontdir/Makefile b/package/mkfontdir/Makefile
index 76bbf52..a8ed9c3 100644
--- a/package/mkfontdir/Makefile
+++ b/package/mkfontdir/Makefile
@@ -10,10 +10,11 @@ PKG_MD5SUM:= d13d01127f88eb50f5c6c3d47ae585e5
PKG_DESCR:= font utility
PKG_SECTION:= x11/apps
PKG_SITES:= http://www.x.org/releases/X11R7.6/src/everything/
+PKG_OPTS:= noscripts
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,MKFONTDIR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MKFONTDIR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
post-install:
$(INSTALL_DIR) $(IDIR_MKFONTDIR)/usr/bin
diff --git a/package/python2/patches/patch-Makefile_pre b/package/python2/patches/patch-Makefile_pre
deleted file mode 100644
index e12bc29..0000000
--- a/package/python2/patches/patch-Makefile_pre
+++ /dev/null
@@ -1,267 +0,0 @@
---- Python-2.7.1.orig/Makefile.pre 2011-01-20 22:14:19.477398102 +0100
-+++ Python-2.7.1/Makefile.pre 2011-01-20 22:11:27.957401058 +0100
-@@ -28,12 +28,12 @@ VERSION= 2.7
- srcdir= .
-
-
--CC= gcc
--CXX= g++
-+CC= /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc
-+CXX= /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++
- MAINCC= $(CC)
- LINKCC= $(PURIFY) $(MAINCC)
--AR= ar
--RANLIB= ranlib
-+AR= /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ar
-+RANLIB= /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ranlib
- SVNVERSION= svnversion $(srcdir)
-
- GNULD= yes
-@@ -57,21 +57,21 @@ INSTALL_SHARED= ${INSTALL} -m 555
- MAKESETUP= $(srcdir)/Modules/makesetup
-
- # Compiler options
--OPT= -DNDEBUG -O2 -Wall
-+OPT= -DNDEBUG -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe
- BASECFLAGS= -fno-strict-aliasing
--CFLAGS= $(BASECFLAGS) -g -O2 $(OPT) $(EXTRA_CFLAGS)
-+CFLAGS= $(BASECFLAGS) -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe $(OPT) $(EXTRA_CFLAGS)
- # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
- # be able to build extension modules using the directories specified in the
- # environment variables
--CPPFLAGS= -I. -IInclude -I$(srcdir)/Include
--LDFLAGS=
-+CPPFLAGS= -I. -IInclude -I$(srcdir)/Include -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include
-+LDFLAGS= -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib
- LDLAST=
- SGI_ABI=
- CCSHARED= -fPIC
- LINKFORSHARED= -Xlinker -export-dynamic
- ARFLAGS= rc
- # Extra C flags added for building the interpreter object files.
--CFLAGSFORSHARED=
-+CFLAGSFORSHARED=$(CCSHARED)
- # C flags used for building the interpreter object files
- PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
-
-@@ -80,7 +80,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
- MACHDEP= linux2
-
- # Install prefix for architecture-independent files
--prefix= /home/wbx/adk/openadk/host_i686_uclibc/usr
-+prefix= /usr
-
- # Install prefix for architecture-dependent files
- exec_prefix= ${prefix}
-@@ -89,9 +89,9 @@ exec_prefix= ${prefix}
- datarootdir= ${prefix}/share
-
- # Expanded directories
--BINDIR= ${exec_prefix}/bin
-+BINDIR= /usr/bin
- LIBDIR= ${exec_prefix}/lib
--MANDIR= ${datarootdir}/man
-+MANDIR= /usr/share/man
- INCLUDEDIR= ${prefix}/include
- CONFINCLUDEDIR= $(exec_prefix)/include
- SCRIPTDIR= $(prefix)/lib
-@@ -130,7 +130,7 @@ MACOSX_DEPLOYMENT_TARGET=
- OTHER_LIBTOOL_OPT=
-
- # Environment to run shared python without installed libraries
--RUNSHARED=
-+RUNSHARED= LD_LIBRARY_PATH=/home/wbx/adk/openadk/build_ibm-x40_i686_uclibc/w-python2-2.7.1-1/Python-2.7.1:
-
- # Modes for directories, executables and data files created by the
- # install process. Default to user-only-writable for all file types.
-@@ -139,7 +139,7 @@ EXEMODE= 755
- FILEMODE= 644
-
- # configure script arguments
--CONFIG_ARGS= '--without-cxx-main' '--without-threads' '--prefix=/home/wbx/adk/openadk/host_i686_uclibc/usr'
-+CONFIG_ARGS= '--build=x86_64-linux-gnu' '--host=i686-openadk-linux' '--target=i686-openadk-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--bindir=/usr/bin' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/libexec' '--localstatedir=/var' '--sysconfdir=/etc' '--disable-nls' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--with-threads' '--disable-toolbox-glue' '--with-system-ffi' '--without-cxx-main' 'build_alias=x86_64-linux-gnu' 'host_alias=i686-openadk-linux' 'target_alias=i686-openadk-linux' 'CC=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc' 'CFLAGS=-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe' 'LDFLAGS=-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib' 'LIBS=' 'CPPFLAGS=-I/home/wbx/adk/openadk/target_i686_uclibc/usr/include'
-
-
- # Subdirectories with code
-@@ -156,20 +156,20 @@ DIST= $(DISTFILES) $(DISTDIRS)
-
-
- LIBRARY= libpython$(VERSION).a
--LDLIBRARY= libpython$(VERSION).a
--BLDLIBRARY= $(LDLIBRARY)
-+LDLIBRARY= libpython$(VERSION).so
-+BLDLIBRARY= -L. -lpython$(VERSION)
- DLLLIBRARY=
- LDLIBRARYDIR=
--INSTSONAME= $(LDLIBRARY)
-+INSTSONAME= libpython$(VERSION).so.1.0
-
-
--LIBS= -ldl -lutil
-+LIBS= -lpthread -ldl -lpthread -lutil
- LIBM= -lm
- LIBC=
- SYSLIBS= $(LIBM) $(LIBC)
- SHLIBS= $(LIBS)
-
--THREADOBJ=
-+THREADOBJ= Python/thread.o
- DLINCLDIR= .
- DYNLOADFILE= dynload_shlib.o
- MACHDEP_OBJS=
-@@ -179,6 +179,7 @@ UNICODE_OBJS= Objects/unicodeobject.o
-
- PYTHON= python$(EXE)
- BUILDPYTHON= python$(BUILDEXE)
-+HOSTPYTHON?= $(BUILDPYTHON)
-
- # The task to run while instrument when building the profile-opt target
- PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
-@@ -206,11 +207,12 @@ GRAMMAR_C= $(srcdir)/Python/graminit.c
- GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
-
-
--LIBFFI_INCLUDEDIR=
-+LIBFFI_INCLUDEDIR= /home/wbx/adk/openadk/target_i686_uclibc/usr/include
-
- ##########################################################################
- # Parser
- PGEN= Parser/pgen$(EXE)
-+HOSTPGEN?= $(PGEN)$(EXE)
-
- POBJS= \
- Parser/acceler.o \
-@@ -380,7 +382,7 @@ build_all_generate_profile:
- $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
-
- run_profile_task:
-- ./$(BUILDPYTHON) $(PROFILE_TASK)
-+ $(HOSTPYTHON) $(PROFILE_TASK)
-
- build_all_use_profile:
- $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
-@@ -398,14 +400,14 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA
- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-
- platform: $(BUILDPYTHON)
-- $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-+ $(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-
-
- # Build the shared modules
- sharedmods: $(BUILDPYTHON)
- @case $$MAKEFLAGS in \
-- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
-- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
-+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
-+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
- esac
-
- # Build static library
-@@ -538,7 +540,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
-
- $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
- -@$(INSTALL) -d Include
-- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-
- $(PGEN): $(PGENOBJS)
- $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
-@@ -702,7 +704,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho
-
- TESTOPTS= -l $(EXTRATESTOPTS)
- TESTPROG= $(srcdir)/Lib/test/regrtest.py
--TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
-+TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
- test: all platform
- -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
- -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
-@@ -725,7 +727,7 @@ testuniversal: all platform
- -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
- -$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
- $(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
-- $(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) -uall $(TESTOPTS)
-+ $(RUNSHARED) /usr/libexec/oah/translate $(HOSTPYTHON) -E -tt $(TESTPROG) -uall $(TESTOPTS)
-
-
- # Like testall, but with a single pass only
-@@ -920,26 +922,26 @@ libinstall: build_all $(srcdir)/Lib/$(PL
- done; \
- done
- $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
-- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
-+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- $(DESTDIR)$(LIBDEST)
-- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
-+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- $(DESTDIR)$(LIBDEST)
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
-+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST)/site-packages -f \
- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
-+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST)/site-packages -f \
- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-- ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
-+ $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
-
- # Create the PLATDIR source directory, if one wasn't distributed..
- $(srcdir)/Lib/$(PLATDIR):
-@@ -1044,7 +1046,8 @@ libainstall: all python-config
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
- sharedinstall: sharedmods
-- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
-+ CROSS_COMPILE='$(CROSS_COMPILE)' \
-+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
- --prefix=$(prefix) \
- --install-scripts=$(BINDIR) \
- --install-platlib=$(DESTSHARED) \
-@@ -1082,7 +1085,7 @@ frameworkinstallstructure: $(LDLIBRARY)
- fi; \
- done
- $(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers
-- sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
-+ sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
- $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
- $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
- $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
-@@ -1117,7 +1120,7 @@ frameworkinstallextras:
- # This installs a few of the useful scripts in Tools/scripts
- scriptsinstall:
- SRCDIR=$(srcdir) $(RUNSHARED) \
-- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
-+ $(HOSTPYTHON) $(srcdir)/Tools/scripts/setup.py install \
- --prefix=$(prefix) \
- --install-scripts=$(BINDIR) \
- --root=/$(DESTDIR)
-@@ -1139,7 +1142,7 @@ config.status: $(srcdir)/configure
-
- # Run reindent on the library
- reindent:
-- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
-+ $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
-
- # Rerun configure with the same options as it was run last time,
- # provided the config.status script exists
-@@ -1242,7 +1245,7 @@ funny:
-
- # Perform some verification checks on any modified files.
- patchcheck:
-- $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
-+ $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
-
- # Dependencies
-
diff --git a/package/randrproto/Makefile b/package/randrproto/Makefile
index 72b576c..88d0981 100644
--- a/package/randrproto/Makefile
+++ b/package/randrproto/Makefile
@@ -7,8 +7,16 @@ PKG_NAME:= randrproto
PKG_VERSION:= 1.3.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 15266124b9e2dfcfb25ce6cba24cdd66
+PKG_DESCR:= Xrandr protcol headers
+PKG_SECTION:= x11/devel
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,RANDRPROTO,randrproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_RANDRPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_RANDRPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/recordproto/Makefile b/package/recordproto/Makefile
new file mode 100644
index 0000000..03a54e5
--- /dev/null
+++ b/package/recordproto/Makefile
@@ -0,0 +1,22 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= recordproto
+PKG_VERSION:= 1.14.1
+PKG_RELEASE:= 1
+PKG_DESCR:= X headers
+PKG_SECTION:= x11/devel
+PKG_MD5SUM:= a558e1c6f67871e3fb94d65d67eb2f3b
+PKG_SITES:= ${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,RECORDPROTO,recordproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_RECORDPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_RECORDPROTO}/usr/include
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/renderproto/Makefile b/package/renderproto/Makefile
index 1a5d77e..e24f852 100644
--- a/package/renderproto/Makefile
+++ b/package/renderproto/Makefile
@@ -4,11 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= renderproto
-PKG_VERSION:= 0.11
+PKG_VERSION:= 0.11.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 57216f25b9a5edc561b83a7484cb17e8
+PKG_DESCR:= X Rendering Extension headers
+PKG_SECTION:= x11/devel
+PKG_MD5SUM:= 9b103359123e375bb7760f7dbae3dece
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,RENDERPROTO,renderproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_RENDERPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_RENDERPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/scrnsaverproto/Makefile b/package/scrnsaverproto/Makefile
index 4549d2f..b3c8bf1 100644
--- a/package/scrnsaverproto/Makefile
+++ b/package/scrnsaverproto/Makefile
@@ -4,11 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= scrnsaverproto
-PKG_VERSION:= 1.2.0
+PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 0ed88bdd6945ba207c4f734af48e7e25
+PKG_DESCR:= X11 screensaver headers
+PKG_SECTION:= x11/devel
+PKG_MD5SUM:= c09bd61d39ad0e472b0dfd8bfadd5f2d
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,SCRNSAVERPROTO,scrnsaverproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_SCRNSAVERPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_SCRNSAVERPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/section.lst b/package/section.lst
index 5534030..36bcde6 100644
--- a/package/section.lst
+++ b/package/section.lst
@@ -40,7 +40,8 @@ utils Utilities
www HTTP / FTP
wifi Wireless
x11/apps X applications
-x11/drivers X server and drivers
-x11/server X server and drivers
+x11/drivers X drivers
+x11/server X server
x11/libs X libraries
x11/fonts X fonts
+x11/devel X headers
diff --git a/package/util-linux-ng/patches/patch-shlibs_blkid_src_Makefile_in b/package/util-linux-ng/patches/patch-shlibs_blkid_src_Makefile_in
new file mode 100644
index 0000000..ff041b5
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-shlibs_blkid_src_Makefile_in
@@ -0,0 +1,11 @@
+--- util-linux-ng-2.18.orig/shlibs/blkid/src/Makefile.in 2010-06-30 14:53:06.000000000 +0200
++++ util-linux-ng-2.18/shlibs/blkid/src/Makefile.in 2011-01-24 11:53:06.000000000 +0100
+@@ -261,7 +261,7 @@ SUID_CFLAGS = @SUID_CFLAGS@
+ SUID_LDFLAGS = @SUID_LDFLAGS@
+ USE_NLS = @USE_NLS@
+ UUID_CFLAGS = @UUID_CFLAGS@
+-UUID_LIBS = @UUID_LIBS@
++UUID_LIBS = -luuid
+ VERSION = @VERSION@
+ XGETTEXT = @XGETTEXT@
+ XSLTPROC = @XSLTPROC@
diff --git a/package/videoproto/Makefile b/package/videoproto/Makefile
index 42b9a04..3aeac6a 100644
--- a/package/videoproto/Makefile
+++ b/package/videoproto/Makefile
@@ -4,11 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= videoproto
-PKG_VERSION:= 2.3.0
+PKG_VERSION:= 2.3.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 888543493cd69c6c78002ac59c3f077f
+PKG_DESCR:= X11 video protocol headers
+PKG_SECTION:= x11/devel
+PKG_MD5SUM:= f1903057310c6b308edf0e982d33714d
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,VIDEOPROTO,videoproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_VIDEOPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_VIDEOPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index 1e36650..9a477a1 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -6,9 +6,19 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xcb-proto
PKG_VERSION:= 1.6
PKG_RELEASE:= 1
+PKG_DESCR:= XML-XCB protocol descriptions
+PKG_SECTION:= x11/devel
+PKG_BUILDDEP:= python2
PKG_MD5SUM:= 8d29695e8faf5fcdce568c66eaeaa5ee
-PKG_SITES:= http://xcb.freedesktop.org/dist/
-PKG_SUBPKGS:=
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share
+ ${CP} ${WRKINST}/usr/share/xcb ${IDIR_XCB_PROTO}/usr/share
+ ${CP} ${WRKINST}/usr/share/xcb ${STAGING_TARGET_DIR}/usr/share
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xcb-proto/patches/patch-xcb-proto_pc_in b/package/xcb-proto/patches/patch-xcb-proto_pc_in
new file mode 100644
index 0000000..b167509
--- /dev/null
+++ b/package/xcb-proto/patches/patch-xcb-proto_pc_in
@@ -0,0 +1,10 @@
+--- xcb-proto-1.6.orig/xcb-proto.pc.in 2008-08-27 10:12:22.000000000 +0200
++++ xcb-proto-1.6/xcb-proto.pc.in 2011-01-24 16:11:29.000000000 +0100
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ datarootdir=@datarootdir@
+-datadir=@datadir@
++datadir=${prefix}/../@datadir@
+ xcbincludedir=@xcbincludedir@
+ pythondir=@pythondir@
+
diff --git a/package/xcmiscproto/Makefile b/package/xcmiscproto/Makefile
index e33f78c..7bddac7 100644
--- a/package/xcmiscproto/Makefile
+++ b/package/xcmiscproto/Makefile
@@ -4,11 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xcmiscproto
-PKG_VERSION:= 1.2.0
+PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= bacfb0f3cb4d6e1a71770307bfdba129
+PKG_DESCR:= XC-MISC Extension headers
+PKG_SECTION:= x11/devel
+PKG_MD5SUM:= 9a8da85301db41e8435099ffefb4ac74
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XCMISCPROTO,xcmiscproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XCMISCPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XCMISCPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xextproto/Makefile b/package/xextproto/Makefile
index eb21715..579a79e 100644
--- a/package/xextproto/Makefile
+++ b/package/xextproto/Makefile
@@ -4,11 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xextproto
-PKG_VERSION:= 7.1.1
+PKG_VERSION:= 7.1.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6c55283718dbeb826bcf899b9e89faba
+PKG_DESCR:= X Protocol Extensions headers
+PKG_SECTION:= x11/devel
+PKG_MD5SUM:= 1e8a156cd209e66cd8290c96678e777a
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XEXTPROTO,xextproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XEXTPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XEXTPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index 49d31a1..a8cd0c2 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xf86-input-keyboard
-PKG_VERSION:= 1.4.0
+PKG_VERSION:= 1.5.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= fc836be5364d80604cb11f4daacceb23
+PKG_MD5SUM:= 32bc80a8a74ce835d77f69c8ca477192
PKG_DESCR:= X11 driver for keyboard
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
diff --git a/package/xf86-input-keyboard/patches/patch-ltmain_sh b/package/xf86-input-keyboard/patches/patch-ltmain_sh
index 754d116..f679ece 100644
--- a/package/xf86-input-keyboard/patches/patch-ltmain_sh
+++ b/package/xf86-input-keyboard/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- xf86-input-keyboard-1.4.0.orig/ltmain.sh 2009-09-14 02:35:10.000000000 +0200
-+++ xf86-input-keyboard-1.4.0/ltmain.sh 2011-01-17 17:18:30.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+--- xf86-input-keyboard-1.5.0.orig/ltmain.sh 2010-10-30 18:15:40.000000000 +0200
++++ xf86-input-keyboard-1.5.0/ltmain.sh 2011-01-24 19:31:12.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/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index 2deb251..fd9f370 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xf86-input-mouse
-PKG_VERSION:= 1.5.0
+PKG_VERSION:= 1.6.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= a662883fd9709c3dad7fb113ad8d2908
+PKG_MD5SUM:= 31bce890613901ad2692403a0ea3f7c5
PKG_DESCR:= X11 driver for mouse
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index ac28c46..1d389f9 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= X11 driver for Cirrus VGA chips
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP:= xorg-server
-PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
index 4a4ca5d..d51fdce 100644
--- a/package/xf86-video-fbdev/Makefile
+++ b/package/xf86-video-fbdev/Makefile
@@ -4,14 +4,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xf86-video-fbdev
-PKG_VERSION:= 0.4.1
+PKG_VERSION:= 0.4.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= c297e40b93b3636a72189cfac43d1a87
+PKG_MD5SUM:= a94011aac77eb9cd6d46bf0af0dbc631
PKG_DESCR:= X11 driver for Linux Framebuffer devices
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP:= xorg-server
-PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
+PKG_SITES:= ${MASTER_SITE_XORG}
PKG_CFLINE_XF86_VIDEO_FBDEV:= depends on ADK_TARGET_WITH_VGA
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
index ee65730..d94a272 100644
--- a/package/xf86-video-geode/Makefile
+++ b/package/xf86-video-geode/Makefile
@@ -4,14 +4,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xf86-video-geode
-PKG_VERSION:= 2.11.6
+PKG_VERSION:= 2.11.10
PKG_RELEASE:= 1
-PKG_MD5SUM:= a673c0f88037d12fbb96d9fefc82785b
+PKG_MD5SUM:= df78ec2c76598b9b3a3f00c7b9215414
PKG_DESCR:= X11 driver for AMD Geode VGA chip
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP:= xorg-server
-PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
+PKG_SITES:= ${MASTER_SITE_XORG}
PKG_CFLINE_XF86_VIDEO_GEODE:= depends on ADK_TARGET_WITH_VGA
diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile
index 5bcc3cc..96a8fb7 100644
--- a/package/xf86-video-intel/Makefile
+++ b/package/xf86-video-intel/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= X11 driver for Intel VGA chip
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server libdrm
PKG_BUILDDEP:= xorg-server libdrm
-PKG_SITES:= http://xorg.freedesktop.org/archive/individual/driver/
+PKG_SITES:= ${MASTER_SITE_XORG}
PKG_CFLINE:= y if (ADK_PKG_LAPTOP && ADK_TARGET_SYSTEM_IBM_X40)
diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile
index 89b137d..85768c2 100644
--- a/package/xf86-video-siliconmotion/Makefile
+++ b/package/xf86-video-siliconmotion/Makefile
@@ -4,14 +4,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xf86-video-siliconmotion
-PKG_VERSION:= 1.7.3
+PKG_VERSION:= 1.7.4
PKG_RELEASE:= 1
-PKG_MD5SUM:= 39da891cd368960443613e7a61398216
+PKG_MD5SUM:= dc45da59f3d99cd0cdcff960b12156c8
PKG_DESCR:= X11 driver for Silicon Motion VGA chips
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP:= xorg-server
-PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-siliconmotion/patches/patch-ltmain_sh b/package/xf86-video-siliconmotion/patches/patch-ltmain_sh
index 8c977ad..b68f6a3 100644
--- a/package/xf86-video-siliconmotion/patches/patch-ltmain_sh
+++ b/package/xf86-video-siliconmotion/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- xf86-video-siliconmotion-1.7.3.orig/ltmain.sh 2008-08-30 00:27:25.000000000 +0200
-+++ xf86-video-siliconmotion-1.7.3/ltmain.sh 2011-01-17 17:49:45.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
- # -F/path gives path to uninstalled frameworks, gcc on darwin
+--- xf86-video-siliconmotion-1.7.4.orig/ltmain.sh 2010-04-28 00:11:44.000000000 +0200
++++ xf86-video-siliconmotion-1.7.4/ltmain.sh 2011-01-24 19:36:46.000000000 +0100
+@@ -4765,7 +4765,7 @@ func_mode_link ()
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
# @file GCC response files
-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*|@*|-fstack-protector*|-flto*)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
diff --git a/package/xf86dgaproto/Makefile b/package/xf86dgaproto/Makefile
index ba8dda7..7582fda 100644
--- a/package/xf86dgaproto/Makefile
+++ b/package/xf86dgaproto/Makefile
@@ -6,9 +6,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xf86dgaproto
PKG_VERSION:= 2.1
PKG_RELEASE:= 1
+PKG_DESCR:= XFree86-DGA headers
+PKG_SECTION:= x11/devel
PKG_MD5SUM:= 1fe79dc07857ad3e1fb8b8f2bdd70d1b
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86DGAPROTO,xf86dgaproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XF86DGAPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XF86DGAPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86vidmodeproto/Makefile b/package/xf86vidmodeproto/Makefile
index 86e7d3a..22ba8d8 100644
--- a/package/xf86vidmodeproto/Makefile
+++ b/package/xf86vidmodeproto/Makefile
@@ -6,9 +6,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xf86vidmodeproto
PKG_VERSION:= 2.3
PKG_RELEASE:= 1
+PKG_DESCR:= XFree86-VidModeExtension extension headers
+PKG_SECTION:= x11/devel
PKG_MD5SUM:= 934b400f2f8d1bcab20bb056e0910291
-PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/
-PKG_SUBPKGS:=
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86VIDMODEPROTO,xf86vidmodeproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XF86VIDMODEPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XF86VIDMODEPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 92d5dde..37fcb2d 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -4,21 +4,21 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xorg-server
-PKG_VERSION:= 1.7.6
-PKG_RELEASE:= 2
-PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2
+PKG_VERSION:= 1.9.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= b8e364bffd87291b593726696d39b4b5
PKG_DESCR:= Xorg server
PKG_SECTION:= x11/server
PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile
PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw
PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext
-PKG_DEPENDS+= libxdmcp libxv libsm libice libx11
+PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb
PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto
PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto
PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont pixman
-PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto
+PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto recordproto
PKG_URL:= http://www.x.org/
-PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/
+PKG_SITES:= ${MASTER_SITE_XORG}
PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA
@@ -32,8 +32,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= V=1
-CONFIGURE_ARGS+= \
- --with-fontdir=/usr/share/fonts/X11 \
+CONFIGURE_ARGS+= --with-fontdir=/usr/share/fonts/X11 \
--enable-dga \
--enable-xorg \
--enable-xv \
@@ -72,7 +71,6 @@ endif
post-install:
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/etc/X11
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin
- $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
@@ -83,8 +81,6 @@ post-install:
$(IDIR_XORG_SERVER)/usr/lib/xorg/modules
${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \
$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
- ${CP} ${WRKINST}/usr/lib/xorg/modules/linux/*.so \
- $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux
${CP} ${WRKINST}/usr/lib/xorg/modules/multimedia/*.so \
$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
-$(CP) $(TOPDIR)/target/$(ADK_TARGET)/xorg.conf \
diff --git a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
deleted file mode 100644
index 771d3a1..0000000
--- a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
+++ /dev/null
@@ -1,135 +0,0 @@
---- xorg-server-1.7.6.orig/hw/xfree86/loader/sdksyms.c 2010-03-17 01:56:04.000000000 +0100
-+++ xorg-server-1.7.6/hw/xfree86/loader/sdksyms.c 2010-05-14 15:54:56.232212764 +0200
-@@ -634,7 +634,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &NewCurrentScreen,
- (void *) &PointerConfinedToScreen,
- (void *) &GetSpritePosition,
-- (void *) &XineramaGetCursorScreen,
- (void *) &GEExtensions,
- (void *) &GERegisterExtension,
- (void *) &GEInitEvent,
-@@ -724,7 +723,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &PickPointer,
- (void *) &PickKeyboard,
- (void *) &IsInterferingGrab,
-- (void *) &ReinitializeRootWindow,
- (void *) &ScreenRestructured,
- (void *) &ffs,
- (void *) &AddCallback,
-@@ -874,8 +872,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &CreateLinearGradientPicture,
- (void *) &CreateRadialGradientPicture,
- (void *) &CreateConicalGradientPicture,
-- (void *) &PanoramiXRenderInit,
-- (void *) &PanoramiXRenderReset,
- (void *) &PictTransform_from_xRenderTransform,
- (void *) &xRenderTransform_from_PictTransform,
- (void *) &PictureTransformPoint,
-@@ -977,25 +973,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &ShmSegType,
- (void *) &ShmCompletionCode,
- (void *) &BadShmSegCode,
-- (void *) &PanoramiXNumScreens,
-- (void *) &panoramiXdataPtr,
-- (void *) &PanoramiXPixWidth,
-- (void *) &PanoramiXPixHeight,
-- (void *) &PanoramiXTranslateVisualID,
-- (void *) &PanoramiXConsolidate,
-- (void *) &PanoramiXCreateConnectionBlock,
-- (void *) &PanoramiXFindIDByScrnum,
-- (void *) &XineramaRegisterConnectionBlockCallback,
-- (void *) &XineramaDeleteResource,
-- (void *) &XineramaReinitData,
-- (void *) &XineramaScreenRegions,
-- (void *) &XRC_DRAWABLE,
-- (void *) &XRT_WINDOW,
-- (void *) &XRT_PIXMAP,
-- (void *) &XRT_GC,
-- (void *) &XRT_COLORMAP,
-- (void *) &XineramaVisualsEqualPtr,
-- (void *) &XineramaGetImageData,
- (void *) &xf86CreateI2CBusRec,
- (void *) &xf86DestroyI2CBusRec,
- (void *) &xf86I2CBusInit,
-@@ -1034,31 +1011,17 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &noTestExtensions,
- (void *) &dixScreenOrigins,
- (void *) &ConnectionInfo,
-- (void *) &DPMSStandbyTime,
-- (void *) &DPMSSuspendTime,
-- (void *) &DPMSOffTime,
-- (void *) &DPMSPowerLevel,
-- (void *) &DPMSEnabled,
-- (void *) &DPMSDisabledSwitch,
-- (void *) &DPMSCapableFlag,
-- (void *) &PanoramiXExtensionDisabledHack,
- (void *) &noCompositeExtension,
- (void *) &noDamageExtension,
- (void *) &noDbeExtension,
-- (void *) &noDPMSExtension,
-- (void *) &noGlxExtension,
- (void *) &noScreenSaverExtension,
- (void *) &noMITShmExtension,
- (void *) &noRRExtension,
- (void *) &noRenderExtension,
- (void *) &noResExtension,
- (void *) &noXFree86DGAExtension,
-- (void *) &noXFree86DRIExtension,
-- (void *) &noXFree86VidModeExtension,
- (void *) &noXFixesExtension,
-- (void *) &noPanoramiXExtension,
- (void *) &noXvExtension,
-- (void *) &noDRI2Extension,
- (void *) &defaultTextFont,
- (void *) &defaultCursorFont,
- (void *) &MaxClients,
-@@ -1193,7 +1156,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &ProcRRQueryOutputProperty,
- (void *) &ProcRRConfigureOutputProperty,
- (void *) &ProcRRDeleteOutputProperty,
-- (void *) &RRXineramaExtensionInit,
- (void *) &ExtensionModuleList,
- (void *) &LoadSubModule,
- (void *) &UnloadSubModule,
-@@ -1311,8 +1273,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &xf86ReconfigureLayout,
- (void *) &xf86CVTMode,
- (void *) &xf86DPMSInit,
-- (void *) &DPMSSet,
-- (void *) &DPMSSupported,
- (void *) &DGAInit,
- (void *) &DGAReInitModes,
- (void *) &xf86SetDGAMode,
-@@ -1570,8 +1530,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &DMTModes,
- (void *) &xf86ConfigFile,
- (void *) &xf86AllowMouseOpenFail,
-- (void *) &xf86VidModeDisabled,
-- (void *) &xf86VidModeAllowNonLocal,
- (void *) &xf86fpFlag,
- (void *) &xf86sFlag,
- (void *) &xf86bsEnableFlag,
-@@ -1937,7 +1895,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &ProcGrabButton,
- (void *) &ProcUngrabButton,
- (void *) &ProcRecolorCursor,
-- (void *) &PostSyntheticMotion,
- (void *) &SetDefaultFont,
- (void *) &QueueFontWakeup,
- (void *) &RemoveFontWakeup,
-@@ -2187,15 +2144,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &SProcUngrabButton,
- (void *) &SProcUngrabKey,
- (void *) &SProcWarpPointer,
-- (void *) &XaceHooks,
-- (void *) &XaceHook,
-- (void *) &XaceHookDispatch,
-- (void *) &XaceHookPropertyAccess,
-- (void *) &XaceHookSelectionAccess,
-- (void *) &XaceHookAuditEnd,
-- (void *) &XaceGetConnectionNumber,
-- (void *) &XaceIsLocal,
-- (void *) &XaceCensorImage,
- (void *) &XkbIndentText,
- (void *) &XkbAtomText,
- (void *) &XkbKeysymText,
diff --git a/package/xorg-server/patches/patch-ltmain_sh b/package/xorg-server/patches/patch-ltmain_sh
index 779bb52..1490683 100644
--- a/package/xorg-server/patches/patch-ltmain_sh
+++ b/package/xorg-server/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- xorg-server-1.7.6.orig/ltmain.sh 2010-02-05 04:18:39.000000000 +0100
-+++ xorg-server-1.7.6/ltmain.sh 2011-01-17 16:06:33.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+--- xorg-server-1.9.3.orig/ltmain.sh 2010-12-13 20:59:07.000000000 +0100
++++ xorg-server-1.9.3/ltmain.sh 2011-01-24 17:03:34.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)
+ -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/xproto/Makefile b/package/xproto/Makefile
index d191c21..399c5d8 100644
--- a/package/xproto/Makefile
+++ b/package/xproto/Makefile
@@ -4,17 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xproto
-PKG_VERSION:= 7.0.16
+PKG_VERSION:= 7.0.20
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6e6b6510ccd568f82093ebd7ae58700b
+PKG_DESCR:= X Window System Core Protocol headers
+PKG_SECTION:= x11/devel
+PKG_MD5SUM:= 18320ab36999f3770b14463ed5a2d6cb
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
-# workaround for makekeys compile on non-Linux systems
+$(eval $(call PKG_template,XPROTO,xproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
post-install:
- ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/include/xproto
- ${CP} ${WRKINST}/usr/include/X11 ${STAGING_TARGET_DIR}/usr/include/xproto
+ ${INSTALL_DIR} ${IDIR_XPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XPROTO}/usr/include
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xrdb/Makefile b/package/xrdb/Makefile
index c64818a..a1084e9 100644
--- a/package/xrdb/Makefile
+++ b/package/xrdb/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 146c009e7abc52b611db4cac4883488e
PKG_DESCR:= X resource database management tools
PKG_SECTION:= x11/apps
-PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/xset/Makefile b/package/xset/Makefile
index d97cba4..fcba46b 100644
--- a/package/xset/Makefile
+++ b/package/xset/Makefile
@@ -4,13 +4,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xset
-PKG_VERSION:= 1.1.0
+PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 65774f3d4e7f65a7fe07294a86b8e104
+PKG_MD5SUM:= 9d8da492fc8f050c5de711d592d3c797
PKG_DESCR:= X set utility
PKG_SECTION:= x11/apps
PKG_URL:= http://xorg.freedesktop.org/
-PKG_SITES:= http://www.x.org/releases/X11R7.5/src/app/
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/xsetroot/Makefile b/package/xsetroot/Makefile
index 50a5175..8f97732 100644
--- a/package/xsetroot/Makefile
+++ b/package/xsetroot/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= set root window
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libx11 libxmu libxcursor
PKG_BUILDDEP:= xbitmaps libXcursor
-PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/xterm/Makefile b/package/xterm/Makefile
index f46431c..2ddda31 100644
--- a/package/xterm/Makefile
+++ b/package/xterm/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xterm
-PKG_VERSION:= 259
+PKG_VERSION:= 267
PKG_RELEASE:= 1
-PKG_MD5SUM:= 22037e1b794d749072310cb142800f05
+PKG_MD5SUM:= 3945ab70cfa2a9e95804157ee1b0f8e8
PKG_DESCR:= Terminal Emulator for X Windows
PKG_SECTION:= x11/apps
PKG_DEPENDS:= xorg-server libxaw
diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile
index b2715ed..bc65d64 100644
--- a/package/xtrans/Makefile
+++ b/package/xtrans/Makefile
@@ -4,14 +4,21 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xtrans
-PKG_VERSION:= 1.2.5
+PKG_VERSION:= 1.2.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= b2f47d49faf1f24e8294b624b21b9b93
+PKG_DESCR:= X11 network protocol transport library
+PKG_SECTION:= x11/devel
+PKG_MD5SUM:= b91dd22b77a350d129a81175cd8c58cc
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+$(eval $(call PKG_template,XTRANS,xtrans,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
CONFIGURE_ARGS+= --datadir=/usr/lib
+post-install:
+ ${INSTALL_DIR} ${IDIR_XTRANS}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XTRANS}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xvinfo/Makefile b/package/xvinfo/Makefile
index 002ccdf..93d5894 100644
--- a/package/xvinfo/Makefile
+++ b/package/xvinfo/Makefile
@@ -4,15 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xvinfo
-PKG_VERSION:= 1.1.0
+PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= cc00d609136ecc0b6b571dc42740a675
+PKG_MD5SUM:= 49f5a19ddff9393aaea4ecaacaedddb3
PKG_DESCR:= Print out X-Video extension adaptor information
PKG_SECTION:= x11/apps
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP:= xorg-server
PKG_URL:= http://xorg.freedesktop.org/
-PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/
+PKG_SITES:= ${MASTER_SITE_XORG}
PKG_ARCH_DEPENDS:= !cris
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development
index bf479c1..7a6c6d1 100644
--- a/target/packages/pkg-available/development
+++ b/target/packages/pkg-available/development
@@ -9,7 +9,7 @@ config ADK_PKG_DEVELOPMENT
select ADK_PACKAGE_GAWK
select ADK_PACKAGE_GCC
select ADK_PACKAGE_GIT
- #select ADK_PACKAGE_GREP
+ select ADK_PACKAGE_GREP
select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC
select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC
select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
@@ -17,7 +17,7 @@ config ADK_PKG_DEVELOPMENT
select ADK_PACKAGE_LIBNCURSES_DEV
select ADK_PACKAGE_M4
select ADK_PACKAGE_MAKE
- #select ADK_PACKAGE_PATCH
+ select ADK_PACKAGE_PATCH
select ADK_PACKAGE_PKG_CONFIG
select ADK_PACKAGE_MICROPERL
select ADK_PACKAGE_TSORT