summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--TODO11
-rw-r--r--mk/mirrors.mk6
-rw-r--r--package/aufs2-util/Makefile3
-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/gtk+/Makefile1
-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/cris/Makefile6
-rw-r--r--target/mipsel/Makefile10
-rw-r--r--target/packages/pkg-available/development4
-rw-r--r--target/packages/pkg-available/laptop1
85 files changed, 530 insertions, 815 deletions
diff --git a/Makefile b/Makefile
index 27f85205c..7cb1641ea 100644
--- a/Makefile
+++ b/Makefile
@@ -216,8 +216,8 @@ NO_ERROR=0
@echo "PATH:=\$${TOPDIR}/scripts:/usr/sbin:$$PATH" >>prereq.mk
@echo "SHELL:=$$(which bash)" >>prereq.mk
@echo "BUILD_LIBIDL_CONFIG:=$$(which libIDL-config-2 2>/dev/null)" >>prereq.mk
- @echo "PKG_HOSTLIB_DIR=$$(eval pkg-config --variable pc_path pkg-config 2>/dev/null)" >/dev/null
- @echo "PKG_HOSTLIB_DIR:=$${PKG_HOSTLIB_DIR:-/usr/lib/pkgconfig}" >>prereq.mk
+ @PKGCFGDIR=$$(eval pkg-config --variable pc_path pkg-config 2>/dev/null) >/dev/null ; \
+ echo "PKG_HOSTLIB_DIR:=$${PKGCFGDIR:-/usr/lib/pkgconfig}" >>prereq.mk
@env NO_ERROR=${NO_ERROR} BASH="$$(which bash)" \
CC='${CC}' CPPFLAGS='${CPPFLAGS}' \
bash scripts/scan-tools.sh
diff --git a/TODO b/TODO
index 893a80421..0d28a888e 100644
--- a/TODO
+++ b/TODO
@@ -1,24 +1,21 @@
+- Xorg update
+- add and test brcm 2.6 wireless support
- man pages in ipkg/tgz packages (automatic)
- automate /etc handling via conffiles
- ccache support for speedup
- distcc evaluation
-- GCC SSP evaluation
- LTO GCC evaluation
-- finish qemu package
+- fix qemu package
- openssl ocf support check
-- locales support
- new package minidlna
- wget/curl/ftp download support
-- fix heimdal package
-- fix or remove bazaar package
-- check all patches for CFLAGS compliance, fhonour patch from FreeWRT
- rpath cleanup
- busybox update and SuSv3 removal
- check rtc support on foxg20
- adkinstall with NTP and hwclock support
- PKG_CONFLICTS for python/python2, is this possible with Kconfig?
- mirror only option, for no internet access
-- add and test brcm 2.6 wireless support
- help text for config/ needs adoption
- diet libc / klibc / newlib support
+- locales support
- pcc support? clang+llvm
diff --git a/mk/mirrors.mk b/mk/mirrors.mk
index a57cb8ec8..f38bd7d40 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/aufs2-util/Makefile b/package/aufs2-util/Makefile
index 83e39c26e..62166e2b9 100644
--- a/package/aufs2-util/Makefile
+++ b/package/aufs2-util/Makefile
@@ -22,11 +22,12 @@ PKG_HOST_DEPENDS:= !cygwin !freebsd !openbsd !netbsd
PKG_SUBPKGS:= AUFS2_UTIL LIBAU
PKGSD_LIBAU:= aufs2 userspace library
+PKGSC_LIBAU:= libs
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,AUFS2_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAU,libau,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBAU},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAU,libau,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBAU},${PKGSC_LIBAU}))
CONFIG_STYLE:= manual
XAKE_FLAGS+= Install=install CPPFLAGS_FOR_BUILD="-I${LINUX_HEADER_DIR}/include"
diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile
index 05488be69..fb7cc7f97 100644
--- a/package/bigreqsproto/Makefile
+++ b/package/bigreqsproto/Makefile
@@ -4,11 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= bigreqsproto
-PKG_VERSION:= 1.1.0
+PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 882d49cc3bb591dbdccdf9e680bd2e4b
+PKG_DESCR:= Big Requests Extension headers
+PKG_SECTION:= x11/devel
+PKG_MD5SUM:= 3392142c19cb5a22058cae88be3c554a
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,BIGREQSPROTO,bigreqsproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_BIGREQSPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_BIGREQSPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile
index 3b5abb435..423327db7 100644
--- a/package/compositeproto/Makefile
+++ b/package/compositeproto/Makefile
@@ -7,8 +7,16 @@ PKG_NAME:= compositeproto
PKG_VERSION:= 0.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 6994a209774fe7877fd8e0c9fafe2466
+PKG_DESCR:= X11 composite headers
+PKG_SECTION:= x11/devel
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,COMPOSITEPROTO,compositeproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_COMPOSITEPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_COMPOSITEPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile
index e3883040e..ae3e008e1 100644
--- a/package/damageproto/Makefile
+++ b/package/damageproto/Makefile
@@ -7,8 +7,16 @@ PKG_NAME:= damageproto
PKG_VERSION:= 1.2.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 423516fd64e43e8671120056b0d9f597
+PKG_DESCR:= X DAMAGE Extension headers
+PKG_SECTION:= x11/devel
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,DAMAGEPROTO,damageproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_DAMAGEPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_DAMAGEPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile
index a4d11920f..204d27bd3 100644
--- a/package/dri2proto/Makefile
+++ b/package/dri2proto/Makefile
@@ -7,8 +7,16 @@ PKG_NAME:= dri2proto
PKG_VERSION:= 2.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 2087269416782cff56f9b22d1449c192
-PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/
-PKG_SUBPKGS:=
+PKG_DESCR:= DRI protocol headers
+PKG_SECTION:= x11/devel
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,DRI2PROTO,dri2proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_DRI2PROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_DRI2PROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile
index aeca1101e..b3a9185d6 100644
--- a/package/fixesproto/Makefile
+++ b/package/fixesproto/Makefile
@@ -4,11 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= fixesproto
-PKG_VERSION:= 4.1.1
+PKG_VERSION:= 4.1.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= 95806b9b648639d4c3e5b226d10927c0
+PKG_DESCR:= XFIXES Extension headers
+PKG_SECTION:= x11/devel
+PKG_MD5SUM:= 352e7ea8278bc31a8d75b31232a61cd4
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FIXESPROTO,fixesproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_FIXESPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_FIXESPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glproto/Makefile b/package/glproto/Makefile
index d85612a22..19a1086cb 100644
--- a/package/glproto/Makefile
+++ b/package/glproto/Makefile
@@ -4,13 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= glproto
-PKG_VERSION:= 1.4.11
+PKG_VERSION:= 1.4.12
PKG_RELEASE:= 1
-PKG_MD5SUM:= 78e7c4dc7dcb74b1869fee7897e00f59
-PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/
-PKG_SUBPKGS:=
-
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+PKG_DESCR:= OpenGL headers
+PKG_SECTION:= x11/devel
+PKG_MD5SUM:= c528c5903bb836b33a35863f97613c64
+PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GLPROTO,glproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_GLPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/GL ${IDIR_GLPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index 5e0a8ead8..6393f75ed 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -31,6 +31,7 @@ CONFIGURE_ARGS+= --disable-gtk-doc-html \
--disable-xinerama \
--without-xinput \
--disable-gtk-doc \
+ --disable-cups \
--disable-papi \
--disable-introspection
CONFIGURE_ENV+= gio_can_sniff=no \
diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile
index bf22d9d9a..09cccadd3 100644
--- a/package/inputproto/Makefile
+++ b/package/inputproto/Makefile
@@ -4,11 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= inputproto
-PKG_VERSION:= 2.0
+PKG_VERSION:= 2.0.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 13d91739cf70a781f1db24d8d3677574
+PKG_DESCR:= X Input Extension headers
+PKG_SECTION:= x11/devel
+PKG_MD5SUM:= 796829adecc14a78bfef8e119e6e9c63
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,INPUTPROTO,inputproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_INPUTPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_INPUTPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile
index f8b7bd0d6..764a3417b 100644
--- a/package/kbproto/Makefile
+++ b/package/kbproto/Makefile
@@ -4,11 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= kbproto
-PKG_VERSION:= 1.0.4
+PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
-PKG_MD5SUM:= 4deef518a03bc94a7a25902bb7c98dd6
+PKG_DESCR:= X11 keyboard protocol headers
+PKG_SECTION:= x11/devel
+PKG_MD5SUM:= cb95bc6ffb2dfa27498aeb4663dee964
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,KBPROTO,kbproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_KBPROTO}/usr/include
+ ${CP} ${WRKINST}/usr/include/X11 ${IDIR_KBPROTO}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index 79ab03131..7502e80e8 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libICE
-PKG_VERSION:= 1.0.6
+PKG_VERSION:= 1.0.7
PKG_RELEASE:= 1
-PKG_MD5SUM:= 4a8f09f15fc92196b91d61e2dc9afcea
+PKG_MD5SUM:= 91ff02eb5af6073c