Commit 035b4054 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'x11r77_v2' of https://bitbucket.org/baekdahl/buildroot

parents be8e32d5 96182fac

package/libdrm/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config BR2_PACKAGE_LIBDRM 
	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO

	select BR2_PACKAGE_XLIB_LIBXXF86VM

	select BR2_PACKAGE_XLIB_LIBXMU

	select BR2_PACKAGE_XLIB_LIBPCIACCESS

	select BR2_PACKAGE_XPROTO_DRI2PROTO

	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS

	# libatomic_ops is only available on a subset of the supported

package/libdrm/libdrm.mk

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# libdrm

#

#############################################################

LIBDRM_VERSION = 2.4.23

LIBDRM_VERSION = 2.4.38

LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2

LIBDRM_SITE = http://dri.freedesktop.org/libdrm/

LIBDRM_INSTALL_STAGING = YES
@@ -13,6 +13,7 @@ LIBDRM_DEPENDENCIES = \ 
	xproto_xf86vidmodeproto \

	xlib_libXxf86vm \

	xlib_libXmu \

	xlib_libpciaccess \

	xproto_dri2proto \

	xlib_libpthread-stubs \

	host-pkgconf

package/x11r7/Config.in

+0 −12
Original line number Diff line number Diff line
@@ -32,15 +32,11 @@ if BR2_PACKAGE_XORG7 
		source package/x11r7/xlib_libXext/Config.in

		source package/x11r7/xlib_libXfixes/Config.in

		source package/x11r7/xlib_libXfont/Config.in

		source package/x11r7/xlib_libXfontcache/Config.in

		source package/x11r7/xlib_libXft/Config.in

		source package/x11r7/xlib_libXi/Config.in

		source package/x11r7/xlib_libXinerama/Config.in

		source package/x11r7/xlib_libXmu/Config.in

		source package/x11r7/xlib_libXp/Config.in

		source package/x11r7/xlib_libXpm/Config.in

		source package/x11r7/xlib_libXprintAppUtil/Config.in

		source package/x11r7/xlib_libXprintUtil/Config.in

		source package/x11r7/xlib_libXrandr/Config.in

		source package/x11r7/xlib_libXrender/Config.in

		source package/x11r7/xlib_libXres/Config.in
@@ -52,9 +48,7 @@ if BR2_PACKAGE_XORG7 
		source package/x11r7/xlib_libXxf86vm/Config.in

		source package/x11r7/xlib_libdmx/Config.in

		source package/x11r7/xlib_libfontenc/Config.in

		source package/x11r7/xlib_liboldX/Config.in

		source package/x11r7/xlib_libxkbfile/Config.in

		source package/x11r7/xlib_libxkbui/Config.in

		source package/x11r7/xlib_xtrans/Config.in

		source package/x11r7/xlib_libpciaccess/Config.in

		source package/x11r7/xlib_libpthread-stubs/Config.in
@@ -109,7 +103,6 @@ if BR2_PACKAGE_XORG7 
		source package/x11r7/xapp_xgamma/Config.in

		source package/x11r7/xapp_xgc/Config.in

		source package/x11r7/xapp_xhost/Config.in

		source package/x11r7/xapp_xinit/Config.in

		source package/x11r7/xapp_xinput/Config.in

		source package/x11r7/xapp_xinput-calibrator/Config.in

		source package/x11r7/xapp_xkbcomp/Config.in
@@ -128,9 +121,7 @@ if BR2_PACKAGE_XORG7 
		source package/x11r7/xapp_xmh/Config.in

		source package/x11r7/xapp_xmodmap/Config.in

		source package/x11r7/xapp_xmore/Config.in

		source package/x11r7/xapp_xplsprinters/Config.in

		source package/x11r7/xapp_xpr/Config.in

		source package/x11r7/xapp_xprehashprinterlist/Config.in

		source package/x11r7/xapp_xprop/Config.in

		source package/x11r7/xapp_xrandr/Config.in

		source package/x11r7/xapp_xrdb/Config.in
@@ -206,7 +197,6 @@ if BR2_PACKAGE_XORG7 
		source package/x11r7/xfont_font-bh-type1/Config.in

		source package/x11r7/xfont_font-bitstream-100dpi/Config.in

		source package/x11r7/xfont_font-bitstream-75dpi/Config.in

		source package/x11r7/xfont_font-bitstream-speedo/Config.in

		source package/x11r7/xfont_font-bitstream-type1/Config.in

		source package/x11r7/xfont_font-cronyx-cyrillic/Config.in

		source package/x11r7/xfont_font-cursor-misc/Config.in
@@ -242,7 +232,6 @@ if BR2_PACKAGE_XORG7 
		source package/x11r7/xproto_glproto/Config.in

		source package/x11r7/xproto_inputproto/Config.in

		source package/x11r7/xproto_kbproto/Config.in

		source package/x11r7/xproto_printproto/Config.in

		source package/x11r7/xproto_randrproto/Config.in

		source package/x11r7/xproto_recordproto/Config.in

		source package/x11r7/xproto_renderproto/Config.in
@@ -255,7 +244,6 @@ if BR2_PACKAGE_XORG7 
		source package/x11r7/xproto_xf86bigfontproto/Config.in

		source package/x11r7/xproto_xf86dgaproto/Config.in

		source package/x11r7/xproto_xf86driproto/Config.in

		source package/x11r7/xproto_xf86rushproto/Config.in

		source package/x11r7/xproto_xf86vidmodeproto/Config.in

		source package/x11r7/xproto_xineramaproto/Config.in

		source package/x11r7/xproto_xproto/Config.in

package/x11r7/libxcb/libxcb.mk

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# libxcb

#

#############################################################

LIBXCB_VERSION = 1.7

LIBXCB_VERSION = 1.8.1

LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2

LIBXCB_SITE = http://xcb.freedesktop.org/dist/

package/x11r7/mesa3d/mesa3d.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

#############################################################



MESA3D_VERSION = 7.10.1

MESA3D_VERSION = 7.10.3

MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz

MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)

MESA3D_AUTORECONF = YES