[Buildroot] [PATCH 01/16] libdrm: bump version to 2.4.19

[Buildroot] [PATCH 01/16] libdrm: bump version to 2.4.19

[Will Wagner]

Also adds proper dependency information to stop build errors.

Signed-off-by: Paul Jones <paul@pauljones.id.au>
Acked-by: Will Wagner <willw@carallon.com>
---
 package/libdrm/Config.in |    7 +++++++
 package/libdrm/libdrm.mk |    4 +++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index 3d8a731..445eb72 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -1,5 +1,12 @@
 config BR2_PACKAGE_LIBDRM
 	bool "libdrm"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
+	select BR2_PACKAGE_XLIB_LIBXXF86VM
+	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XPROTO_DRI2PROTO
+	select BR2_PACKAGE_PTHREAD_STUBS
 	help
 	  Direct Rendering Manager
 
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index eb04867..791e67d 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -3,7 +3,7 @@
 # libdrm
 #
 #############################################################
-LIBDRM_VERSION = 2.4.11
+LIBDRM_VERSION = 2.4.19
 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
 LIBDRM_SITE = http://dri.freedesktop.org/libdrm/
 LIBDRM_AUTORECONF = NO
@@ -11,4 +11,6 @@ LIBDRM_LIBTOOL_PATCH = NO
 LIBDRM_INSTALL_STAGING = YES
 LIBDRM_INSTALL_TARGET = YES
 
+LIBDRM_DEPENDENCIES = xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xproto_dri2proto pthread-stubs
+
 $(eval $(call AUTOTARGETS,package,libdrm))
-- 
1.7.0

[Buildroot] [PATCH 02/16] pixman: bump version

[Will Wagner]

---
 package/pixman/pixman.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 087ab12..8c7a233 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -3,7 +3,7 @@
 # pixman
 #
 ################################################################################
-PIXMAN_VERSION = 0.17.4
+PIXMAN_VERSION = 0.17.6
 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
 PIXMAN_SITE = http://cairographics.org/releases/
 PIXMAN_AUTORECONF = NO
-- 
1.7.0

[Buildroot] [PATCH 02/16] pixman: bump version

[Lionel Landwerlin]

Pixman 0.18.0 has been released today. One more bump ? :)

On Thu, Apr 1, 2010 at 2:46 PM, Will Wagner <will_wagner@carallon.com> wrote:
> ---
> ?package/pixman/pixman.mk | ? ?2 +-
> ?1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
> index 087ab12..8c7a233 100644
> --- a/package/pixman/pixman.mk
> +++ b/package/pixman/pixman.mk
> @@ -3,7 +3,7 @@
> ?# pixman
> ?#
> ?################################################################################
> -PIXMAN_VERSION = 0.17.4
> +PIXMAN_VERSION = 0.17.6
> ?PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
> ?PIXMAN_SITE = http://cairographics.org/releases/
> ?PIXMAN_AUTORECONF = NO
> --
> 1.7.0
>
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>

[Buildroot] [PATCH 02/16] pixman: bump version

[Peter Korsgaard]

>>>>> "Lionel" == Lionel Landwerlin <llandwerlin@gmail.com> writes:

 Lionel> Pixman 0.18.0 has been released today. One more bump ? :)

Yes please - If it works.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 02/16] pixman: bump version

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> ---
 Will>  package/pixman/pixman.mk |    2 +-
 Will>  1 files changed, 1 insertions(+), 1 deletions(-)

Committed, thanks - Don't forget to sign off on your patches in the
future (-s option on git commit or git format-patch).

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 03/16] mesa3d: bump version and convert to autotools

[Will Wagner]

Note this version requires a recent kernel with KMS support as it is
currently configured

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/mesa3d/Config.in                    |    6 +-
 package/x11r7/mesa3d/mesa3d-gen_matypes-fix.patch |   12 ---
 package/x11r7/mesa3d/mesa3d.mk                    |   98 ++-------------------
 3 files changed, 11 insertions(+), 105 deletions(-)
 delete mode 100644 package/x11r7/mesa3d/mesa3d-gen_matypes-fix.patch

diff --git a/package/x11r7/mesa3d/Config.in b/package/x11r7/mesa3d/Config.in
index a875098..52876e3 100644
--- a/package/x11r7/mesa3d/Config.in
+++ b/package/x11r7/mesa3d/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_MESA3D
 	bool "Mesa 3D Graphics Library"
 	select BR2_PACKAGE_XPROTO_GLPROTO
-	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
 	select BR2_PACKAGE_XLIB_LIBXXF86VM
-	select BR2_PACKAGE_XLIB_LIBXMU
-	select BR2_PACKAGE_XLIB_LIBPCIACCESS
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE
+	select BR2_PACKAGE_XLIB_LIBXFIXES
+	select BR2_PACKAGE_XPROTO_DRI2PROTO
 	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_EXPAT
 	depends on BR2_PACKAGE_XSERVER_XORG_SERVER
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
diff --git a/package/x11r7/mesa3d/mesa3d-gen_matypes-fix.patch b/package/x11r7/mesa3d/mesa3d-gen_matypes-fix.patch
deleted file mode 100644
index caa8b31..0000000
--- a/package/x11r7/mesa3d/mesa3d-gen_matypes-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN Mesa-7.2.orig/src/mesa/x86/Makefile Mesa-7.2/src/mesa/x86/Makefile
---- Mesa-7.2.orig/src/mesa/x86/Makefile	2008-08-25 16:46:47.000000000 +0200
-+++ Mesa-7.2/src/mesa/x86/Makefile	2009-05-08 08:46:34.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- 
- gen_matypes: gen_matypes.c
--	$(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
-+	$(CC_FOR_BUILD) $(INCLUDE_DIRS) $(CFLAGS_FOR_BUILD) gen_matypes.c -o gen_matypes
- 
- # need some special rules here, unfortunately
- matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index a72670e..60242cd 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -3,97 +3,15 @@
 # mesa3d
 #
 #############################################################
-MESA3D_VERSION:=7.2
+MESA3D_VERSION:=7.6.1
 MESA3D_SOURCE:=MesaLib-$(MESA3D_VERSION).tar.gz
-MESA3D_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mesa3d
-MESA3D_DIR:=$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)
-MESA_TARGET:=linux-dri
+MESA3D_SITE:=ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
 
-ifeq ($(BR2_i386),y)
-MESA_TARGET:=linux-dri-x86
-endif
+MESA3D_AUTORECONF = NO
+MESA3D_CONF_OPT = --disable-egl --disable-glu --disable-glw --disable-glut --disable-gallium --with-driver=dri --with-dri-drivers=swrast
+MESA3D_INSTALL_STAGING = YES
+MESA3D_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
-ifeq ($(BR2_x86_64),y)
-MESA_TARGET:=linux-dri-x86-64
-endif
-
-ifeq ($(BR2_ppc),y)
-MESA_TARGET:=linux-dri-ppc
-endif
-
-MESA_BUILD_ENV=$(TARGET_CONFIGURE_OPTS)
-MESA_CONFIG_FILE=$(MESA3D_DIR)/configs/$(MESA_TARGET)
-
-MESA_GCCINCLUDE=$(shell $(TARGET_CC) -print-search-dirs|grep '^install:'|sed 's/^install: //')/include
-
-#MESA_DRIVERS= i810 i915 i965 mga mach64 r128 r200 r300 s3v savage sis ffb tdfx trident unichrome
-MESA_DRIVERS=
-
-$(DL_DIR)/$(MESA3D_SOURCE):
-	$(call DOWNLOAD,$(MESA3D_SITE),$(MESA3D_SOURCE))
-
-$(MESA3D_DIR)/.extracted: $(DL_DIR)/$(MESA3D_SOURCE)
-	$(ZCAT) $(DL_DIR)/$(MESA3D_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(MESA3D_DIR) package/x11r7/mesa3d/ mesa3d\*.patch
-	touch $@
-
-$(MESA3D_DIR)/.configured: $(MESA3D_DIR)/.extracted
-	( export $(TARGET_CONFIGURE_OPTS); \
-		echo "DRI_DIRS = $(MESA_DRIVERS)" && \
-		echo "OPT_FLAGS = $(TARGET_CFLAGS)" && \
-		echo "CC = $(TARGET_CC)" && \
-		echo "CXX = $(TARGET_CXX)" && \
-		echo "PIC_FLAGS = -fPIC" && \
-		echo "SRC_DIRS = glx/x11 mesa glu glut/glx" && \
-		echo "USING_EGL = 0" && \
-		echo "X11_INCLUDES = " && \
-		echo "EXTRA_LIB_PATH = " && \
-		echo "PROGRAM_DIRS =" && \
-		echo "LDFLAGS = $(TARGET_LDFLAGS)" && \
-		echo "MKDEP_OPTIONS = -fdepend -Y$(STAGING_DIR)/usr/include -I$(MESA_GCCINCLUDE)" \
-	) >> $(MESA_CONFIG_FILE)
-	touch $@
-
-$(MESA3D_DIR)/.built: $(MESA3D_DIR)/.configured
-	rm -f $(MESA3D_DIR)/config/current
-	env $(MESA_BUILD_ENV) $(MAKE1) \
-		CC=$(TARGET_CC) CXX=$(TARGET_CXX) CC_FOR_BUILD=/usr/bin/gcc \
-		-C $(MESA3D_DIR) $(MESA_TARGET)
-	touch $@
-
-$(MESA3D_DIR)/.installed: $(MESA3D_DIR)/.built
-	env $(MESA_BUILD_ENV) $(MAKE) \
-		INSTALL_DIR=$(STAGING_DIR)/usr \
-		DRI_DRIVER_INSTALL_DIR=$(STAGING_DIR)/usr/lib/dri \
-		-C $(MESA3D_DIR) install
-	env $(MESA_BUILD_ENV) $(MAKE) \
-		INSTALL_DIR=$(TARGET_DIR)/usr \
-		DRI_DRIVER_INSTALL_DIR=$(TARGET_DIR)/usr/lib/dri \
-		-C $(MESA3D_DIR) install
-	rm -Rf $(TARGET_DIR)/usr/include/GL
-	touch $@
-
-mesa3d-depends: xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xlib_libXdamage libdrm xlib_libpciaccess host-xutil_makedepend
-mesa3d-source: $(DL_DIR)/$(MESA3D_SOURCE)
-mesa3d-configure: $(MESA3D_DIR)/.configured
-mesa3d-build: $(MESA3D_DIR)/.built
-mesa3d: mesa3d-depends $(MESA3D_DIR)/.installed
-
-mesa3d-clean:
-	$(MAKE) prefix=$(STAGING_DIR)/usr -C $(MESA3D_DIR) uninstall
-	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(MESA3D_DIR) uninstall
-	-$(MAKE) -C $(MESA3D_DIR) clean
-
-mesa3d-dirclean:
-	rm -rf $(MESA3D_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_MESA3D),y)
-TARGETS+=mesa3d
-endif
-# :mode=makefile:
+MESA3D_DEPENDENCIES = xproto_glproto xlib_libXxf86vm xlib_libXdamage xlib_libXfixes xproto_dri2proto libdrm expat
 
+$(eval $(call AUTOTARGETS,package/x11r7,mesa3d))
-- 
1.7.0

[Buildroot] [PATCH 03/16] mesa3d: bump version and convert to autotools

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> Note this version requires a recent kernel with KMS support as it is
 Will> currently configured

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 04/16] correct name of xapp_xinput.mk

[Will Wagner]

---
 package/x11r7/xapp_xinput/xapp_xbacklight.mk |   13 -------------
 package/x11r7/xapp_xinput/xapp_xinput.mk     |   13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 package/x11r7/xapp_xinput/xapp_xbacklight.mk
 create mode 100644 package/x11r7/xapp_xinput/xapp_xinput.mk

diff --git a/package/x11r7/xapp_xinput/xapp_xbacklight.mk b/package/x11r7/xapp_xinput/xapp_xbacklight.mk
deleted file mode 100644
index 20d23f2..0000000
--- a/package/x11r7/xapp_xinput/xapp_xbacklight.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xapp_xinput -- xinput
-#
-################################################################################
-
-XAPP_XINPUT_VERSION = 1.5.0
-XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2
-XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XINPUT_AUTORECONF = NO
-XAPP_XINPUT_DEPENDENCIES = xlib_libX11
-
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xinput))
diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk
new file mode 100644
index 0000000..20d23f2
--- /dev/null
+++ b/package/x11r7/xapp_xinput/xapp_xinput.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xinput -- xinput
+#
+################################################################################
+
+XAPP_XINPUT_VERSION = 1.5.0
+XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2
+XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XINPUT_AUTORECONF = NO
+XAPP_XINPUT_DEPENDENCIES = xlib_libX11
+
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xinput))
-- 
1.7.0

[Buildroot] [PATCH 04/16] correct name of xapp_xinput.mk

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> ---
 Will>  package/x11r7/xapp_xinput/xapp_xbacklight.mk |   13 -------------
 Will>  package/x11r7/xapp_xinput/xapp_xinput.mk     |   13 +++++++++++++

Committed, thanks - Please use -M option to git format-patch (and -s) so
git will show it's a pure rename. That makes review easier.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 05/16] xlib_libXau: remove duplicate dependancies

[Will Wagner]

---
 package/x11r7/xlib_libXau/Config.in      |    1 -
 package/x11r7/xlib_libXau/xlib_libXau.mk |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xlib_libXau/Config.in b/package/x11r7/xlib_libXau/Config.in
index 1b7adbc..4c4e517 100644
--- a/package/x11r7/xlib_libXau/Config.in
+++ b/package/x11r7/xlib_libXau/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_XLIB_LIBXAU
 	bool "libXau"
 	select BR2_PACKAGE_XPROTO_XPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
 	select BR2_PACKAGE_XUTIL_UTIL_MACROS
 	help
 	  libXau 1.0.5
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index 71bca6c..d5f6814 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -10,7 +10,7 @@ XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXAU_AUTORECONF = NO
 XLIB_LIBXAU_LIBTOOL_PATCH = NO
 XLIB_LIBXAU_INSTALL_STAGING = YES
-XLIB_LIBXAU_DEPENDENCIES = xproto_xproto xproto_xproto xutil_util-macros
+XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto
 XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau))
-- 
1.7.0

[Buildroot] [PATCH 05/16] xlib_libXau: remove duplicate dependancies

[Thomas Petazzoni]

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

On Thu,  1 Apr 2010 13:46:35 +0100
Will Wagner <will_wagner@carallon.com> wrote:

> ---
>  package/x11r7/xlib_libXau/Config.in      |    1 -
>  package/x11r7/xlib_libXau/xlib_libXau.mk |    2 +-
>  2 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/package/x11r7/xlib_libXau/Config.in b/package/x11r7/xlib_libXau/Config.in
> index 1b7adbc..4c4e517 100644
> --- a/package/x11r7/xlib_libXau/Config.in
> +++ b/package/x11r7/xlib_libXau/Config.in
> @@ -1,7 +1,6 @@
>  config BR2_PACKAGE_XLIB_LIBXAU
>  	bool "libXau"
>  	select BR2_PACKAGE_XPROTO_XPROTO
> -	select BR2_PACKAGE_XPROTO_XPROTO
>  	select BR2_PACKAGE_XUTIL_UTIL_MACROS
>  	help
>  	  libXau 1.0.5
> diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
> index 71bca6c..d5f6814 100644
> --- a/package/x11r7/xlib_libXau/xlib_libXau.mk
> +++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
> @@ -10,7 +10,7 @@ XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
>  XLIB_LIBXAU_AUTORECONF = NO
>  XLIB_LIBXAU_LIBTOOL_PATCH = NO
>  XLIB_LIBXAU_INSTALL_STAGING = YES
> -XLIB_LIBXAU_DEPENDENCIES = xproto_xproto xproto_xproto xutil_util-macros
> +XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto
>  XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static
>  
>  $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau))


-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 05/16] xlib_libXau: remove duplicate dependancies

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> ---
 Will>  package/x11r7/xlib_libXau/Config.in      |    1 -
 Will>  package/x11r7/xlib_libXau/xlib_libXau.mk |    2 +-
 Will>  2 files changed, 1 insertions(+), 2 deletions(-)

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 06/16] pthread-stubs: bump version

[Will Wagner]

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/pthread-stubs/pthread-stubs.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/package/x11r7/pthread-stubs/pthread-stubs.mk b/package/x11r7/pthread-stubs/pthread-stubs.mk
index b62084b..f40332a 100644
--- a/package/x11r7/pthread-stubs/pthread-stubs.mk
+++ b/package/x11r7/pthread-stubs/pthread-stubs.mk
@@ -3,10 +3,11 @@
 # pthread-stubs
 #
 #############################################################
-PTHREAD_STUBS_VERSION = 0.1
+PTHREAD_STUBS_VERSION = 0.3
 PTHREAD_STUBS_SOURCE = libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2
 PTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
 
+PTHREAD_STUBS_LIBTOOL_PATCH = NO
 PTHREAD_STUBS_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs))
-- 
1.7.0

[Buildroot] [PATCH 06/16] pthread-stubs: bump version

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> Signed-off-by: Will Wagner <will_wagner@carallon.com>
 Will> ---
 Will>  package/x11r7/pthread-stubs/pthread-stubs.mk |    3 ++-
 Will>  1 files changed, 2 insertions(+), 1 deletions(-)

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 07/16] xproto_dri2proto: bump version

[Will Wagner]

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_dri2proto/Config.in           |    2 +-
 package/x11r7/xproto_dri2proto/xproto_dri2proto.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xproto_dri2proto/Config.in b/package/x11r7/xproto_dri2proto/Config.in
index 4ab5ccd..a5c82b2 100644
--- a/package/x11r7/xproto_dri2proto/Config.in
+++ b/package/x11r7/xproto_dri2proto/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_XPROTO_DRI2PROTO
 	bool "dri2proto"
 	help
-	  dri2proto 2.1
+	  dri2proto 2.3
 	  X.Org DRI2 protocol headers
diff --git a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
index 2d7de30..f3b37c9 100644
--- a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
+++ b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_DRI2PROTO_VERSION = 2.1
+XPROTO_DRI2PROTO_VERSION = 2.3
 XPROTO_DRI2PROTO_SOURCE = dri2proto-$(XPROTO_DRI2PROTO_VERSION).tar.bz2
 XPROTO_DRI2PROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_DRI2PROTO_AUTORECONF = NO
-- 
1.7.0

[Buildroot] [PATCH 07/16] xproto_dri2proto: bump version

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> Signed-off-by: Will Wagner <will_wagner@carallon.com>
 Will> ---
 Will>  package/x11r7/xproto_dri2proto/Config.in           |    2 +-
 Will>  package/x11r7/xproto_dri2proto/xproto_dri2proto.mk |    2 +-
 Will>  2 files changed, 2 insertions(+), 2 deletions(-)

Committed, thanks.

 Will> diff --git a/package/x11r7/xproto_dri2proto/Config.in b/package/x11r7/xproto_dri2proto/Config.in
 Will> index 4ab5ccd..a5c82b2 100644
 Will> --- a/package/x11r7/xproto_dri2proto/Config.in
 Will> +++ b/package/x11r7/xproto_dri2proto/Config.in
 Will> @@ -1,5 +1,5 @@
 Will>  config BR2_PACKAGE_XPROTO_DRI2PROTO
 Will>  	bool "dri2proto"
 Will>  	help
 Will> -	  dri2proto 2.1
 Will> +	  dri2proto 2.3

This is just noice without any real advantage to the users, so I removed
this.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 08/16] xproto_fontcacheproto: bump version

[Will Wagner]

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_fontcacheproto/Config.in      |    2 +-
 .../xproto_fontcacheproto/xproto_fontcacheproto.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xproto_fontcacheproto/Config.in b/package/x11r7/xproto_fontcacheproto/Config.in
index 1c47b5c..1a58863 100644
--- a/package/x11r7/xproto_fontcacheproto/Config.in
+++ b/package/x11r7/xproto_fontcacheproto/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_XPROTO_FONTCACHEPROTO
 	bool "fontcacheproto"
 	help
-	  fontcacheproto 0.1.2
+	  fontcacheproto 0.1.3
 	  X.Org Fontcache protocol headers
diff --git a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
index 27cf30b..9c2ef47 100644
--- a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
+++ b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_FONTCACHEPROTO_VERSION = 0.1.2
+XPROTO_FONTCACHEPROTO_VERSION = 0.1.3
 XPROTO_FONTCACHEPROTO_SOURCE = fontcacheproto-$(XPROTO_FONTCACHEPROTO_VERSION).tar.bz2
 XPROTO_FONTCACHEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_FONTCACHEPROTO_AUTORECONF = NO
-- 
1.7.0

[Buildroot] [PATCH 08/16] xproto_fontcacheproto: bump version

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> Signed-off-by: Will Wagner <will_wagner@carallon.com>
 Will> ---
 Will>  package/x11r7/xproto_fontcacheproto/Config.in      |    2 +-
 Will>  .../xproto_fontcacheproto/xproto_fontcacheproto.mk |    2 +-
 Will>  2 files changed, 2 insertions(+), 2 deletions(-)

Committedm thanks - And same comment about Config.in as dri2proto.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 09/16] xproto_xf86miscproto: bump version

[Will Wagner]

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_xf86miscproto/Config.in       |    2 +-
 .../xproto_xf86miscproto/xproto_xf86miscproto.mk   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xproto_xf86miscproto/Config.in b/package/x11r7/xproto_xf86miscproto/Config.in
index e0b614c..4c1c39d 100644
--- a/package/x11r7/xproto_xf86miscproto/Config.in
+++ b/package/x11r7/xproto_xf86miscproto/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_XPROTO_XF86MISCPROTO
 	bool "xf86miscproto"
 	help
-	  xf86miscproto 0.9.2
+	  xf86miscproto 0.9.3
 	  X.Org XF86Misc protocol headers
diff --git a/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk b/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk
index c4317cc..8cf8482 100644
--- a/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk
+++ b/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_XF86MISCPROTO_VERSION = 0.9.2
+XPROTO_XF86MISCPROTO_VERSION = 0.9.3
 XPROTO_XF86MISCPROTO_SOURCE = xf86miscproto-$(XPROTO_XF86MISCPROTO_VERSION).tar.bz2
 XPROTO_XF86MISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XF86MISCPROTO_AUTORECONF = NO
-- 
1.7.0

[Buildroot] [PATCH 09/16] xproto_xf86miscproto: bump version

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> Signed-off-by: Will Wagner <will_wagner@carallon.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 10/16] xlib_libpciaccess: bump version

[Will Wagner]

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libpciaccess/Config.in          |    2 +-
 .../x11r7/xlib_libpciaccess/xlib_libpciaccess.mk   |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/x11r7/xlib_libpciaccess/Config.in b/package/x11r7/xlib_libpciaccess/Config.in
index 2300822..00c0412 100644
--- a/package/x11r7/xlib_libpciaccess/Config.in
+++ b/package/x11r7/xlib_libpciaccess/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_XLIB_LIBPCIACCESS
 	bool "libpciaccess"
 	depends on BR2_LARGEFILE
 	help
-	  libpciaccess 0.10.9
+	  libpciaccess 0.11.0
 	  X.Org libpciaccess
 
 comment "libpciaccess requires a toolchain with LARGEFILE support"
diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
index 73a9642..9bb1576 100644
--- a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
+++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
@@ -4,12 +4,11 @@
 #
 ################################################################################
 
-XLIB_LIBPCIACCESS_VERSION = 0.10.9
+XLIB_LIBPCIACCESS_VERSION = 0.11.0
 XLIB_LIBPCIACCESS_SOURCE = libpciaccess-$(XLIB_LIBPCIACCESS_VERSION).tar.bz2
 XLIB_LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBPCIACCESS_AUTORECONF = NO
+XLIB_LIBPCIACCESS_LIBTOOL_PATCH = NO
 XLIB_LIBPCIACCESS_INSTALL_STAGING = YES
-XLIB_LIBPCIACCESS_DEPENDENCIES =
 XLIB_LIBPCIACCESS_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libpciaccess))
-- 
1.7.0

[Buildroot] [PATCH 10/16] xlib_libpciaccess: bump version

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> Signed-off-by: Will Wagner <will_wagner@carallon.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 11/16] xlib_libXfontcache: bump version

[Will Wagner]

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXfontcache/Config.in         |    2 +-
 .../x11r7/xlib_libXfontcache/xlib_libXfontcache.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xlib_libXfontcache/Config.in b/package/x11r7/xlib_libXfontcache/Config.in
index 50d2cce..202ae6d 100644
--- a/package/x11r7/xlib_libXfontcache/Config.in
+++ b/package/x11r7/xlib_libXfontcache/Config.in
@@ -4,5 +4,5 @@ config BR2_PACKAGE_XLIB_LIBXFONTCACHE
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XPROTO_FONTCACHEPROTO
 	help
-	  libXfontcache 1.0.4
+	  libXfontcache 1.0.5
 	  X.Org Xfontcache library
diff --git a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
index b51d61b..a0d924b 100644
--- a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
+++ b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXFONTCACHE_VERSION = 1.0.4
+XLIB_LIBXFONTCACHE_VERSION = 1.0.5
 XLIB_LIBXFONTCACHE_SOURCE = libXfontcache-$(XLIB_LIBXFONTCACHE_VERSION).tar.bz2
 XLIB_LIBXFONTCACHE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFONTCACHE_AUTORECONF = NO
-- 
1.7.0

[Buildroot] [PATCH 11/16] xlib_libXfontcache: bump version

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> Signed-off-by: Will Wagner <will_wagner@carallon.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 12/16] xkeyboard-config: bump version

[Will Wagner]

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xkeyboard-config/xkeyboard-config.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index 7128d7e..9c9c8b5 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -3,7 +3,7 @@
 # xkeyboard-config
 #
 #############################################################
-XKEYBOARD_CONFIG_VERSION = 1.2
+XKEYBOARD_CONFIG_VERSION = 1.8
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
 XKEYBOARD_CONFIG_SITE = http://xlibs.freedesktop.org/xkbdesc
 XKEYBOARD_CONFIG_AUTORECONF = NO
-- 
1.7.0

[Buildroot] [PATCH 12/16] xkeyboard-config: bump version

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> Signed-off-by: Will Wagner <will_wagner@carallon.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 13/16] xproto_evieext: bump version

[Will Wagner]

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_evieext/Config.in         |    2 +-
 package/x11r7/xproto_evieext/xproto_evieext.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xproto_evieext/Config.in b/package/x11r7/xproto_evieext/Config.in
index 3e66118..4d04b95 100644
--- a/package/x11r7/xproto_evieext/Config.in
+++ b/package/x11r7/xproto_evieext/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_XPROTO_EVIEEXT
 	bool "evieext"
 	help
-	  evieext 1.0.2
+	  evieext 1.1.0
 	  X.Org EvIE protocol headers
diff --git a/package/x11r7/xproto_evieext/xproto_evieext.mk b/package/x11r7/xproto_evieext/xproto_evieext.mk
index aa0a733..1c45f12 100644
--- a/package/x11r7/xproto_evieext/xproto_evieext.mk
+++ b/package/x11r7/xproto_evieext/xproto_evieext.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_EVIEEXT_VERSION = 1.0.2
+XPROTO_EVIEEXT_VERSION = 1.1.0
 XPROTO_EVIEEXT_SOURCE = evieext-$(XPROTO_EVIEEXT_VERSION).tar.bz2
 XPROTO_EVIEEXT_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_EVIEEXT_AUTORECONF = NO
-- 
1.7.0

[Buildroot] [PATCH 13/16] xproto_evieext: bump version

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> Signed-off-by: Will Wagner <will_wagner@carallon.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 14/16] xlib_libXxf86misc: bump version

[Will Wagner]

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXxf86misc/Config.in          |    2 +-
 .../x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xlib_libXxf86misc/Config.in b/package/x11r7/xlib_libXxf86misc/Config.in
index 3f8bac1..8e11b77 100644
--- a/package/x11r7/xlib_libXxf86misc/Config.in
+++ b/package/x11r7/xlib_libXxf86misc/Config.in
@@ -5,5 +5,5 @@ config BR2_PACKAGE_XLIB_LIBXXF86MISC
 	select BR2_PACKAGE_XPROTO_XF86MISCPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
-	  libXxf86misc 1.0.1
+	  libXxf86misc 1.0.2
 	  X.Org Xxf86misc library
diff --git a/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk b/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk
index 821170b..5f4b793 100644
--- a/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk
+++ b/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXXF86MISC_VERSION = 1.0.1
+XLIB_LIBXXF86MISC_VERSION = 1.0.2
 XLIB_LIBXXF86MISC_SOURCE = libXxf86misc-$(XLIB_LIBXXF86MISC_VERSION).tar.bz2
 XLIB_LIBXXF86MISC_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXXF86MISC_AUTORECONF = NO
-- 
1.7.0

[Buildroot] [PATCH 14/16] xlib_libXxf86misc: bump version

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> Signed-off-by: Will Wagner <will_wagner@carallon.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 15/16] xserver_xorg-server: bump version, improve option support

[Will Wagner]

Later version of xserver no longer need configure hack to say where
mesa3d is located.

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xserver_xorg-server/Config.in        |   36 ++++++++++---------
 .../xserver_xorg-server/xserver_xorg-server.mk     |   34 +++++++++++++-----
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 86909d1..2342fb5 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -1,23 +1,26 @@
 config BR2_PACKAGE_XSERVER_XORG_SERVER
 	bool "xorg-server"
-	select BR2_PACKAGE_XLIB_LIBXFONT
 	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_MCOOKIE
+	select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
-	select BR2_PACKAGE_XPROTO_DAMAGEPROTO
-	select BR2_PACKAGE_XPROTO_FIXESPROTO
-	select BR2_PACKAGE_XPROTO_GLPROTO
-	select BR2_PACKAGE_XPROTO_KBPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_PIXMAN
 	select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
 	select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
 	select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
+	select BR2_PACKAGE_XLIB_LIBPCIACCESS
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXAU
+	select BR2_PACKAGE_XLIB_LIBXCURSOR
+	select BR2_PACKAGE_XLIB_LIBXDAMAGE
 	select BR2_PACKAGE_XLIB_LIBXDMCP
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XLIB_LIBXFIXES
+	select BR2_PACKAGE_XLIB_LIBXFONT
+	select BR2_PACKAGE_XLIB_LIBXFT
 	select BR2_PACKAGE_XLIB_LIBXI
+	select BR2_PACKAGE_XLIB_LIBXINERAMA
+	select BR2_PACKAGE_XLIB_LIBXRANDR
 	select BR2_PACKAGE_XLIB_LIBXRENDER
 	select BR2_PACKAGE_XLIB_LIBXRES
 	select BR2_PACKAGE_XLIB_LIBXXF86MISC
@@ -26,9 +29,16 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XLIB_XTRANS
 	select BR2_PACKAGE_XDATA_XBITMAPS
 	select BR2_PACKAGE_XPROTO_BIGREQSPROTO
+	select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
+	select BR2_PACKAGE_XPROTO_DAMAGEPROTO
+	select BR2_PACKAGE_XPROTO_DRI2PROTO
 	select BR2_PACKAGE_XPROTO_EVIEEXT
+	select BR2_PACKAGE_XPROTO_FIXESPROTO
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_GLPROTO
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_KBPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
 	select BR2_PACKAGE_XPROTO_RESOURCEPROTO
 	select BR2_PACKAGE_XPROTO_VIDEOPROTO
@@ -41,12 +51,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_XF86RUSHPROTO
 	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
-	select BR2_PACKAGE_PIXMAN
-	select BR2_PACKAGE_XLIB_LIBXSCRNSAVER
-	select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
+	select BR2_PACKAGE_XUTIL_UTIL_MACROS
 	depends on !BR2_avr32
 	help
-	  xorg-server 1.7.1
+	  xorg-server 1.7.5
 	  No description available
 
 comment "xorg-xserver is BROKEN on AVR32"
@@ -58,12 +66,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR
     help
         Don't display root cursor.
 
-config BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
-    bool "Use Builtin Fonts"
-    depends on BR2_PACKAGE_XSERVER_XORG_SERVER
-    help
-        Enable/Use Builtin fonts.
-
 config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX
     bool "Enable AIGLX Extension"
     depends on BR2_PACKAGE_XSERVER_XORG_SERVER
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 950c2ca..ba8cf9d 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XSERVER_XORG_SERVER_VERSION = 1.7.1
+XSERVER_XORG_SERVER_VERSION = 1.7.5
 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
 XSERVER_XORG_SERVER_AUTORECONF = NO
@@ -15,11 +15,11 @@ XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install
 
 XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	xutil_util-macros 		\
+	xlib_libpciaccess		\
 	xlib_libXfont 			\
 	xlib_libX11 			\
 	xlib_libXau 			\
 	xlib_libXdmcp 			\
-	xlib_libXScrnSaver 		\
 	xlib_libXext 			\
 	xlib_libXfixes 			\
 	xlib_libXi 			\
@@ -38,6 +38,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	xproto_bigreqsproto 		\
 	xproto_compositeproto 		\
 	xproto_damageproto 		\
+	xproto_dri2proto 		\
 	xproto_evieext 			\
 	xproto_fixesproto 		\
 	xproto_fontsproto 		\
@@ -69,7 +70,7 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
 
 ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d
-XSERVER_XORG_SERVER_CONF_OPT += --with-mesa-source="$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)" --enable-xorg
+XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx
 else
 XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
 endif
@@ -86,12 +87,6 @@ else
 XSERVER_XORG_SERVER_CONF_OPT += --disable-null-root-cursor
 endif
 
-ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS),y)
-XSERVER_XORG_SERVER_CONF_OPT += --enable-builtin-fonts
-else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-builtin-fonts
-endif
-
 ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y)
 XSERVER_XORG_SERVER_CONF_OPT += --enable-aiglx
 else
@@ -111,7 +106,6 @@ endif
 
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += freetype
-XSERVER_XORG_SERVER_CONF_OPT += --enable-freetype
 endif
 
 ifeq ($(BR2_PACKAGE_XPROTO_TRAPPROTO),y)
@@ -124,9 +118,29 @@ XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto
 XSERVER_XORG_SERVER_CONF_OPT += --enable-record
 endif
 
+ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y)
+XSERVER_XORG_SERVER_CONF_OPT += --disable-xvmc
+endif
+
+ifneq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y)
+XSERVER_XORG_SERVER_CONF_OPT += --disable-composite
+endif
+
 ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto
 XSERVER_XORG_SERVER_CONF_OPT += --enable-dri2
 endif
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),y)
+XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXScrnSaver
+XSERVER_XORG_SERVER_CONF_OPT += --enable-screensaver
+else
+XSERVER_XORG_SERVER_CONF_OPT += --disable-screensaver
+endif
+
+ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y)
+XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx
+endif
+
+
 $(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))
-- 
1.7.0

[Buildroot] [PATCH 15/16] xserver_xorg-server: bump version, improve option support

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

Hi,

 Will> Later version of xserver no longer need configure hack to say where
 Will> mesa3d is located.

Thanks, but ..

 Will> --- a/package/x11r7/xserver_xorg-server/Config.in
 Will> +++ b/package/x11r7/xserver_xorg-server/Config.in
 Will> @@ -1,23 +1,26 @@
 Will>  config BR2_PACKAGE_XSERVER_XORG_SERVER
 Will>  	bool "xorg-server"
 Will> -	select BR2_PACKAGE_XLIB_LIBXFONT
 Will>  	select BR2_PACKAGE_LIBDRM
 Will> +	select BR2_PACKAGE_MCOOKIE
 Will> +	select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
 Will>  	select BR2_PACKAGE_OPENSSL
 Will> -	select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
 Will> -	select BR2_PACKAGE_XPROTO_DAMAGEPROTO
 Will> -	select BR2_PACKAGE_XPROTO_FIXESPROTO
 Will> -	select BR2_PACKAGE_XPROTO_GLPROTO
 Will> -	select BR2_PACKAGE_XPROTO_KBPROTO
 Will> -	select BR2_PACKAGE_XPROTO_RANDRPROTO

 Will> @@ -38,6 +38,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 Will>  	xproto_bigreqsproto 		\
 Will>  	xproto_compositeproto 		\
 Will>  	xproto_damageproto 		\
 Will> +	xproto_dri2proto 		\
 Will>  	xproto_evieext 			\
 Will>  	xproto_fixesproto 		\
 Will>  	xproto_fontsproto 		\

Why are you removing these selects if they are still Makefile
dependencies?

 Will> -config BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
 Will> -    bool "Use Builtin Fonts"
 Will> -    depends on BR2_PACKAGE_XSERVER_XORG_SERVER
 Will> -    help
 Will> -        Enable/Use Builtin fonts.

Is this gone? Should we select a font or 2 then so the user doesn't end
up with a broken system?
 
 Will>  ifeq ($(BR2_PACKAGE_FREETYPE),y)
 Will>  XSERVER_XORG_SERVER_DEPENDENCIES += freetype
 Will> -XSERVER_XORG_SERVER_CONF_OPT += --enable-freetype

Is this option gone? Does it still work to build without freetype?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 15/16] xserver_xorg-server: bump version, improve option support

[Will Wagner]

> Thanks, but ..
>
>   Will>  --- a/package/x11r7/xserver_xorg-server/Config.in
>   Will>  +++ b/package/x11r7/xserver_xorg-server/Config.in
>   Will>  @@ -1,23 +1,26 @@
>   Will>   config BR2_PACKAGE_XSERVER_XORG_SERVER
>   Will>   	bool "xorg-server"
>   Will>  -	select BR2_PACKAGE_XLIB_LIBXFONT
>   Will>   	select BR2_PACKAGE_LIBDRM
>   Will>  +	select BR2_PACKAGE_MCOOKIE
>   Will>  +	select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
>   Will>   	select BR2_PACKAGE_OPENSSL
>   Will>  -	select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
>   Will>  -	select BR2_PACKAGE_XPROTO_DAMAGEPROTO
>   Will>  -	select BR2_PACKAGE_XPROTO_FIXESPROTO
>   Will>  -	select BR2_PACKAGE_XPROTO_GLPROTO
>   Will>  -	select BR2_PACKAGE_XPROTO_KBPROTO
>   Will>  -	select BR2_PACKAGE_XPROTO_RANDRPROTO
>
>   Will>  @@ -38,6 +38,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
>   Will>   	xproto_bigreqsproto 		\
>   Will>   	xproto_compositeproto 		\
>   Will>   	xproto_damageproto 		\
>   Will>  +	xproto_dri2proto 		\
>   Will>   	xproto_evieext 			\
>   Will>   	xproto_fixesproto 		\
>   Will>   	xproto_fontsproto 		\
>
> Why are you removing these selects if they are still Makefile
> dependencies?
>    
They are still there, I reorganised the list of selects, as there are so 
many, so that it is alphabetical.

>   Will>  -config BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
>   Will>  -    bool "Use Builtin Fonts"
>   Will>  -    depends on BR2_PACKAGE_XSERVER_XORG_SERVER
>   Will>  -    help
>   Will>  -        Enable/Use Builtin fonts.
>
> Is this gone? Should we select a font or 2 then so the user doesn't end
> up with a broken system?
>    
Option has gone. Will investigate what happens if you try to build with 
no fonts.

>
>   Will>   ifeq ($(BR2_PACKAGE_FREETYPE),y)
>   Will>   XSERVER_XORG_SERVER_DEPENDENCIES += freetype
>   Will>  -XSERVER_XORG_SERVER_CONF_OPT += --enable-freetype
>
> Is this option gone? Does it still work to build without freetype?
>    
Option has gone. Will try to see if it still works without freetype.

Will

[Buildroot] [PATCH 15/16] xserver_xorg-server: bump version, improve option support

[Will Wagner]

On 08/04/2010 21:08, Peter Korsgaard wrote:
>>>>>> "Will" == Will Wagner<will_wagner@carallon.com>  writes:
>>>>>>              
> Hi,
>
>   Will>  Later version of xserver no longer need configure hack to say where
>   Will>  mesa3d is located.
>
> Thanks, but ..
>
>   Will>  --- a/package/x11r7/xserver_xorg-server/Config.in
>   Will>  +++ b/package/x11r7/xserver_xorg-server/Config.in
>   Will>  @@ -1,23 +1,26 @@
>   Will>   config BR2_PACKAGE_XSERVER_XORG_SERVER
>   Will>   	bool "xorg-server"
>   Will>  -	select BR2_PACKAGE_XLIB_LIBXFONT
>   Will>   	select BR2_PACKAGE_LIBDRM
>   Will>  +	select BR2_PACKAGE_MCOOKIE
>   Will>  +	select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
>   Will>   	select BR2_PACKAGE_OPENSSL
>   Will>  -	select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
>   Will>  -	select BR2_PACKAGE_XPROTO_DAMAGEPROTO
>   Will>  -	select BR2_PACKAGE_XPROTO_FIXESPROTO
>   Will>  -	select BR2_PACKAGE_XPROTO_GLPROTO
>   Will>  -	select BR2_PACKAGE_XPROTO_KBPROTO
>   Will>  -	select BR2_PACKAGE_XPROTO_RANDRPROTO
>
>   Will>  @@ -38,6 +38,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
>   Will>   	xproto_bigreqsproto 		\
>   Will>   	xproto_compositeproto 		\
>   Will>   	xproto_damageproto 		\
>   Will>  +	xproto_dri2proto 		\
>   Will>   	xproto_evieext 			\
>   Will>   	xproto_fixesproto 		\
>   Will>   	xproto_fontsproto 		\
>
> Why are you removing these selects if they are still Makefile
> dependencies?
>    

As I said previously, no dependencies are removed, there are just so 
many I have reordered them alphabetically. Also worth noting that this 
patch has the dependacy fix for libpciaccess that Paulis posted.

>   Will>  -config BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
>   Will>  -    bool "Use Builtin Fonts"
>   Will>  -    depends on BR2_PACKAGE_XSERVER_XORG_SERVER
>   Will>  -    help
>   Will>  -        Enable/Use Builtin fonts.
>
> Is this gone? Should we select a font or 2 then so the user doesn't end
> up with a broken system?
>    

This option has gone from xserver.

The package font-misc-misc gets selected, so you will always have a font.

>
>   Will>   ifeq ($(BR2_PACKAGE_FREETYPE),y)
>   Will>   XSERVER_XORG_SERVER_DEPENDENCIES += freetype
>   Will>  -XSERVER_XORG_SERVER_CONF_OPT += --enable-freetype
>
> Is this option gone? Does it still work to build without freetype?
>
>    
This option has gone from xserver.

If you selected xserver then freetype is selected for you by a number of 
packages (xlib_libXfont, xlib_libXft, fontconfig... ) so you can not 
select this without freetype.

Does that answer your queries? Can this get applied?

[Buildroot] [PATCH 15/16] xserver_xorg-server: bump version, improve option support

[Paulius Zaleckas]

On Wed, Apr 14, 2010 at 2:50 PM, Will Wagner <will_wagner@carallon.com> wrote:
> On 08/04/2010 21:08, Peter Korsgaard wrote:
>>>>>>>
>>>>>>> "Will" == Will Wagner<will_wagner@carallon.com> ?writes:
>>>>>>>
>>
>> Hi,
>>
>> ?Will> ?Later version of xserver no longer need configure hack to say
>> where
>> ?Will> ?mesa3d is located.
>>
>> Thanks, but ..
>>
>> ?Will> ?--- a/package/x11r7/xserver_xorg-server/Config.in
>> ?Will> ?+++ b/package/x11r7/xserver_xorg-server/Config.in
>> ?Will> ?@@ -1,23 +1,26 @@
>> ?Will> ? config BR2_PACKAGE_XSERVER_XORG_SERVER
>> ?Will> ? ? ? ? bool "xorg-server"
>> ?Will> ?- ? ? ?select BR2_PACKAGE_XLIB_LIBXFONT
>> ?Will> ? ? ? ? select BR2_PACKAGE_LIBDRM
>> ?Will> ?+ ? ? ?select BR2_PACKAGE_MCOOKIE
>> ?Will> ?+ ? ? ?select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
>> ?Will> ? ? ? ? select BR2_PACKAGE_OPENSSL
>> ?Will> ?- ? ? ?select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
>> ?Will> ?- ? ? ?select BR2_PACKAGE_XPROTO_DAMAGEPROTO
>> ?Will> ?- ? ? ?select BR2_PACKAGE_XPROTO_FIXESPROTO
>> ?Will> ?- ? ? ?select BR2_PACKAGE_XPROTO_GLPROTO
>> ?Will> ?- ? ? ?select BR2_PACKAGE_XPROTO_KBPROTO
>> ?Will> ?- ? ? ?select BR2_PACKAGE_XPROTO_RANDRPROTO
>>
>> ?Will> ?@@ -38,6 +38,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = ? \
>> ?Will> ? ? ? ? xproto_bigreqsproto ? ? ? ? ? ? \
>> ?Will> ? ? ? ? xproto_compositeproto ? ? ? ? ? \
>> ?Will> ? ? ? ? xproto_damageproto ? ? ? ? ? ? ?\
>> ?Will> ?+ ? ? ?xproto_dri2proto ? ? ? ? ? ? ? ?\
>> ?Will> ? ? ? ? xproto_evieext ? ? ? ? ? ? ? ? ?\
>> ?Will> ? ? ? ? xproto_fixesproto ? ? ? ? ? ? ? \
>> ?Will> ? ? ? ? xproto_fontsproto ? ? ? ? ? ? ? \
>>
>> Why are you removing these selects if they are still Makefile
>> dependencies?
>>
>
> As I said previously, no dependencies are removed, there are just so many I
> have reordered them alphabetically. Also worth noting that this patch has
> the dependacy fix for libpciaccess that Paulis posted.
>
>> ?Will> ?-config BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
>> ?Will> ?- ? ?bool "Use Builtin Fonts"
>> ?Will> ?- ? ?depends on BR2_PACKAGE_XSERVER_XORG_SERVER
>> ?Will> ?- ? ?help
>> ?Will> ?- ? ? ? ?Enable/Use Builtin fonts.
>>
>> Is this gone? Should we select a font or 2 then so the user doesn't end
>> up with a broken system?
>>
>
> This option has gone from xserver.
>
> The package font-misc-misc gets selected, so you will always have a font.
>
>>
>> ?Will> ? ifeq ($(BR2_PACKAGE_FREETYPE),y)
>> ?Will> ? XSERVER_XORG_SERVER_DEPENDENCIES += freetype
>> ?Will> ?-XSERVER_XORG_SERVER_CONF_OPT += --enable-freetype
>>
>> Is this option gone? Does it still work to build without freetype?
>>
>>
>
> This option has gone from xserver.
>
> If you selected xserver then freetype is selected for you by a number of
> packages (xlib_libXfont, xlib_libXft, fontconfig... ) so you can not select
> this without freetype.
>
> Does that answer your queries? Can this get applied?

Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>

[Buildroot] [PATCH 15/16] xserver_xorg-server: bump version, improve option support

[Paulius Zaleckas]

On Thu, Apr 1, 2010 at 3:46 PM, Will Wagner <will_wagner@carallon.com> wrote:
> Later version of xserver no longer need configure hack to say where
> mesa3d is located.
>
> Signed-off-by: Will Wagner <will_wagner@carallon.com>

Seems that my ACK was little bit too early...

> ---
> ?package/x11r7/xserver_xorg-server/Config.in ? ? ? ?| ? 36 ++++++++++---------
> ?.../xserver_xorg-server/xserver_xorg-server.mk ? ? | ? 34 +++++++++++++-----
> ?2 files changed, 43 insertions(+), 27 deletions(-)
>
> diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
> index 86909d1..2342fb5 100644
> --- a/package/x11r7/xserver_xorg-server/Config.in
> +++ b/package/x11r7/xserver_xorg-server/Config.in
> @@ -1,23 +1,26 @@
> ?config BR2_PACKAGE_XSERVER_XORG_SERVER
> ? ? ? ?bool "xorg-server"
> - ? ? ? select BR2_PACKAGE_XLIB_LIBXFONT
> ? ? ? ?select BR2_PACKAGE_LIBDRM
> + ? ? ? select BR2_PACKAGE_MCOOKIE
> + ? ? ? select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
> ? ? ? ?select BR2_PACKAGE_OPENSSL
> - ? ? ? select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
> - ? ? ? select BR2_PACKAGE_XPROTO_DAMAGEPROTO
> - ? ? ? select BR2_PACKAGE_XPROTO_FIXESPROTO
> - ? ? ? select BR2_PACKAGE_XPROTO_GLPROTO
> - ? ? ? select BR2_PACKAGE_XPROTO_KBPROTO
> - ? ? ? select BR2_PACKAGE_XPROTO_RANDRPROTO
> + ? ? ? select BR2_PACKAGE_PIXMAN
> ? ? ? ?select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
> ? ? ? ?select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
> ? ? ? ?select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
> + ? ? ? select BR2_PACKAGE_XLIB_LIBPCIACCESS
> ? ? ? ?select BR2_PACKAGE_XLIB_LIBX11
> ? ? ? ?select BR2_PACKAGE_XLIB_LIBXAU
> + ? ? ? select BR2_PACKAGE_XLIB_LIBXCURSOR
> + ? ? ? select BR2_PACKAGE_XLIB_LIBXDAMAGE
> ? ? ? ?select BR2_PACKAGE_XLIB_LIBXDMCP
> ? ? ? ?select BR2_PACKAGE_XLIB_LIBXEXT
> ? ? ? ?select BR2_PACKAGE_XLIB_LIBXFIXES
> + ? ? ? select BR2_PACKAGE_XLIB_LIBXFONT
> + ? ? ? select BR2_PACKAGE_XLIB_LIBXFT
> ? ? ? ?select BR2_PACKAGE_XLIB_LIBXI
> + ? ? ? select BR2_PACKAGE_XLIB_LIBXINERAMA
> + ? ? ? select BR2_PACKAGE_XLIB_LIBXRANDR
> ? ? ? ?select BR2_PACKAGE_XLIB_LIBXRENDER
> ? ? ? ?select BR2_PACKAGE_XLIB_LIBXRES
> ? ? ? ?select BR2_PACKAGE_XLIB_LIBXXF86MISC
> @@ -26,9 +29,16 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
> ? ? ? ?select BR2_PACKAGE_XLIB_XTRANS
> ? ? ? ?select BR2_PACKAGE_XDATA_XBITMAPS
> ? ? ? ?select BR2_PACKAGE_XPROTO_BIGREQSPROTO
> + ? ? ? select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
> + ? ? ? select BR2_PACKAGE_XPROTO_DAMAGEPROTO
> + ? ? ? select BR2_PACKAGE_XPROTO_DRI2PROTO

You have added select here...

> ? ? ? ?select BR2_PACKAGE_XPROTO_EVIEEXT
> + ? ? ? select BR2_PACKAGE_XPROTO_FIXESPROTO
> ? ? ? ?select BR2_PACKAGE_XPROTO_FONTSPROTO
> + ? ? ? select BR2_PACKAGE_XPROTO_GLPROTO
> ? ? ? ?select BR2_PACKAGE_XPROTO_INPUTPROTO
> + ? ? ? select BR2_PACKAGE_XPROTO_KBPROTO
> + ? ? ? select BR2_PACKAGE_XPROTO_RANDRPROTO
> ? ? ? ?select BR2_PACKAGE_XPROTO_RENDERPROTO
> ? ? ? ?select BR2_PACKAGE_XPROTO_RESOURCEPROTO
> ? ? ? ?select BR2_PACKAGE_XPROTO_VIDEOPROTO
> @@ -41,12 +51,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
> ? ? ? ?select BR2_PACKAGE_XPROTO_XF86RUSHPROTO
> ? ? ? ?select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
> ? ? ? ?select BR2_PACKAGE_XPROTO_XPROTO
> - ? ? ? select BR2_PACKAGE_PIXMAN
> - ? ? ? select BR2_PACKAGE_XLIB_LIBXSCRNSAVER
> - ? ? ? select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
> + ? ? ? select BR2_PACKAGE_XUTIL_UTIL_MACROS
> ? ? ? ?depends on !BR2_avr32
> ? ? ? ?help
> - ? ? ? ? xorg-server 1.7.1
> + ? ? ? ? xorg-server 1.7.5
> ? ? ? ? ?No description available
[...]

> diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> index 950c2ca..ba8cf9d 100644
> --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> @@ -4,7 +4,7 @@
> ?#
> ?################################################################################
>
> -XSERVER_XORG_SERVER_VERSION = 1.7.1
> +XSERVER_XORG_SERVER_VERSION = 1.7.5
> ?XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
> ?XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
> ?XSERVER_XORG_SERVER_AUTORECONF = NO
> @@ -15,11 +15,11 @@ XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install
>
> ?XSERVER_XORG_SERVER_DEPENDENCIES = ? ? \
> ? ? ? ?xutil_util-macros ? ? ? ? ? ? ? \
> + ? ? ? xlib_libpciaccess ? ? ? ? ? ? ? \
> ? ? ? ?xlib_libXfont ? ? ? ? ? ? ? ? ? \
> ? ? ? ?xlib_libX11 ? ? ? ? ? ? ? ? ? ? \
> ? ? ? ?xlib_libXau ? ? ? ? ? ? ? ? ? ? \
> ? ? ? ?xlib_libXdmcp ? ? ? ? ? ? ? ? ? \
> - ? ? ? xlib_libXScrnSaver ? ? ? ? ? ? ?\
> ? ? ? ?xlib_libXext ? ? ? ? ? ? ? ? ? ?\
> ? ? ? ?xlib_libXfixes ? ? ? ? ? ? ? ? ?\
> ? ? ? ?xlib_libXi ? ? ? ? ? ? ? ? ? ? ?\
> @@ -38,6 +38,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = ? ?\
> ? ? ? ?xproto_bigreqsproto ? ? ? ? ? ? \
> ? ? ? ?xproto_compositeproto ? ? ? ? ? \
> ? ? ? ?xproto_damageproto ? ? ? ? ? ? ?\
> + ? ? ? xproto_dri2proto ? ? ? ? ? ? ? ?\

And here...

> ? ? ? ?xproto_evieext ? ? ? ? ? ? ? ? ?\
> ? ? ? ?xproto_fixesproto ? ? ? ? ? ? ? \
> ? ? ? ?xproto_fontsproto ? ? ? ? ? ? ? \
> @@ -69,7 +70,7 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
>
> ?ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
> ?XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d
> -XSERVER_XORG_SERVER_CONF_OPT += --with-mesa-source="$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)" --enable-xorg
> +XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx
> ?else
> ?XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
> ?endif
> @@ -86,12 +87,6 @@ else
> ?XSERVER_XORG_SERVER_CONF_OPT += --disable-null-root-cursor
> ?endif
>
> -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS),y)
> -XSERVER_XORG_SERVER_CONF_OPT += --enable-builtin-fonts
> -else
> -XSERVER_XORG_SERVER_CONF_OPT += --disable-builtin-fonts
> -endif
> -
> ?ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y)
> ?XSERVER_XORG_SERVER_CONF_OPT += --enable-aiglx
> ?else
> @@ -111,7 +106,6 @@ endif
>
> ?ifeq ($(BR2_PACKAGE_FREETYPE),y)
> ?XSERVER_XORG_SERVER_DEPENDENCIES += freetype
> -XSERVER_XORG_SERVER_CONF_OPT += --enable-freetype
> ?endif
>
> ?ifeq ($(BR2_PACKAGE_XPROTO_TRAPPROTO),y)
> @@ -124,9 +118,29 @@ XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto
> ?XSERVER_XORG_SERVER_CONF_OPT += --enable-record
> ?endif
>
> +ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y)
> +XSERVER_XORG_SERVER_CONF_OPT += --disable-xvmc
> +endif
> +
> +ifneq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y)
> +XSERVER_XORG_SERVER_CONF_OPT += --disable-composite
> +endif
> +
> ?ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
> ?XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto
> ?XSERVER_XORG_SERVER_CONF_OPT += --enable-dri2
> ?endif

But I have added this in my previous patches! And I think it is more correct,
since not all drivers need it.

> +ifeq ($(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),y)
> +XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXScrnSaver
> +XSERVER_XORG_SERVER_CONF_OPT += --enable-screensaver
> +else
> +XSERVER_XORG_SERVER_CONF_OPT += --disable-screensaver
> +endif
> +
> +ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y)
> +XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx
> +endif
> +
> +
> ?$(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))

[Buildroot] [PATCH 15/16] xserver_xorg-server: bump version, improve option support

[Will Wagner]

On 14/04/2010 14:09, Paulius Zaleckas wrote:
> On Thu, Apr 1, 2010 at 3:46 PM, Will Wagner<will_wagner@carallon.com>  wrote:
>    
>> Later version of xserver no longer need configure hack to say where
>> mesa3d is located.
>>
>> Signed-off-by: Will Wagner<will_wagner@carallon.com>
>>      
> Seems that my ACK was little bit too early...
>
>    
>
>> +
>>   ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
>>   XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto
>>   XSERVER_XORG_SERVER_CONF_OPT += --enable-dri2
>>   endif
>>      
> But I have added this in my previous patches! And I think it is more correct,
> since not all drivers need it.
>
>    
Ok, missed that. Will fix and resubmit.

[Buildroot] [PATCH 16/16] xdriver_xf86-video-intel: bump version Signed-off-by: Will Wagner <will_wagner@carallon.com>

[Will Wagner]

---
 package/x11r7/xdriver_xf86-video-intel/Config.in   |    5 +++--
 ...ver_xf86-video-intel-2.10.0-cross-compile.patch |   11 +++++++++++
 .../xdriver_xf86-video-intel.mk                    |    6 ++++--
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.10.0-cross-compile.patch

diff --git a/package/x11r7/xdriver_xf86-video-intel/Config.in b/package/x11r7/xdriver_xf86-video-intel/Config.in
index 80678d5..b69c23a 100644
--- a/package/x11r7/xdriver_xf86-video-intel/Config.in
+++ b/package/x11r7/xdriver_xf86-video-intel/Config.in
@@ -5,7 +5,8 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
-	select BR2_PACKAGE_XPROTO_DRI2PROTO
+	select BR2_PACKAGE_XLIB_LIBPCIACCESS
+	select BR2_PACKAGE_LIBDRM
 	help
-	  xf86-video-intel 2.9.1
+	  xf86-video-intel 2.10.0
 	  Intel video driver
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.10.0-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.10.0-cross-compile.patch
new file mode 100644
index 0000000..0b020ac
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.10.0-cross-compile.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac.orig	2010-01-04 22:20:07.000000000 +0000
++++ b/configure.ac	2010-02-19 12:12:50.000000000 +0000
+@@ -103,7 +103,7 @@
+ CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
+ CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
+ AC_MSG_CHECKING([whether to include DRI support])
+-if test x$DRI != xno; then
++if test "$cross_compiling" = "no" -a test x$DRI != xno; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+         AC_CHECK_FILE([${sdkdir}/sarea.h],
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index 6bec2d6..c77b61e 100644
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -4,11 +4,13 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.9.1
+XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.10.0
 XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto xproto_dri2proto
+XDRIVER_XF86_VIDEO_INTEL_LIBTOOL_PATCH = NO
+XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = --enable-dri
+XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto libdrm xlib_libpciaccess
 XDRIVER_XF86_VIDEO_INTEL_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
 $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-intel))
-- 
1.7.0

[Buildroot] [PATCH 16/16] xdriver_xf86-video-intel: bump version Signed-off-by: Will Wagner <will_wagner@carallon.com>

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> ---
 Will>  package/x11r7/xdriver_xf86-video-intel/Config.in   |    5 +++--

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 01/16] libdrm: bump version to 2.4.19

[Will Wagner]

Still learning how to use got send-email, was hoping it would let me 
write some covering words, I'm sure it can, just need to work out the 
option.

This patch series builds on Paulius's work on x11r7.

It bumps the version of a number of patches (including Paul Jones' 
libdrm bump), but it also changes over to use Kernel Mode Settings for 
the graphics drivers. Not sure how to specify in a package that a 
certain kernel version is needed.

The patch series is also available via git at:

git://gitorious.org/willw-buildroot/willw-buildroot.git x11r75patches

Will

[Buildroot] [PATCH 01/16] libdrm: bump version to 2.4.19

[Paulius Zaleckas]

On 04/01/2010 03:51 PM, Will Wagner wrote:
> Still learning how to use got send-email, was hoping it would let me
> write some covering words, I'm sure it can, just need to work out the
> option.

I am using StGit for managing my patches. It also supports patch sending
and has option to add/edit cover letter.

> This patch series builds on Paulius's work on x11r7.
>
> It bumps the version of a number of patches (including Paul Jones'
> libdrm bump), but it also changes over to use Kernel Mode Settings for
> the graphics drivers. Not sure how to specify in a package that a
> certain kernel version is needed.
>
> The patch series is also available via git at:
>
> git://gitorious.org/willw-buildroot/willw-buildroot.git x11r75patches
>
> Will
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>

[Buildroot] [PATCH 01/16] libdrm: bump version to 2.4.19

[Thomas Petazzoni]

On Thu, 01 Apr 2010 22:08:25 +0300
Paulius Zaleckas <paulius.zaleckas@gmail.com> wrote:

> I am using StGit for managing my patches. It also supports patch sending
> and has option to add/edit cover letter.

Git also has one :

 git send-email --compose

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com