Commit a43dcbbc authored by Paulius Zaleckas's avatar Paulius Zaleckas
Browse files

Bump xorg-server to 1.7.1 



Signed-off-by: default avatarPaulius Zaleckas <paulius.zaleckas@gmail.com>
parent ac1dfc84

package/x11r7/xserver_xorg-server/Config.in

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER 
	select BR2_PACKAGE_XLIB_LIBXRES

	select BR2_PACKAGE_XLIB_LIBXXF86MISC

	select BR2_PACKAGE_XLIB_LIBXXF86VM

	select BR2_PACKAGE_XLIB_LIBLBXUTIL

	select BR2_PACKAGE_XLIB_LIBXKBFILE

	select BR2_PACKAGE_XLIB_XTRANS

	select BR2_PACKAGE_XDATA_XBITMAPS
@@ -47,7 +46,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER 
	select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg

	depends on !BR2_avr32

	help

	  xorg-server 1.4

	  xorg-server 1.7.1

	  No description available



comment "xorg-xserver is BROKEN on AVR32"

package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-servermd-add-avr32.patch

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
--- a/include/servermd.h.orig	2007-08-23 15:04:54.000000000 -0400

+++ b/include/servermd.h	2007-10-03 12:08:40.000000000 -0400

@@ -151,6 +151,16 @@ SOFTWARE.

 

 #endif /* __arm32__ */

 

+#ifdef __avr32__

+

+#define IMAGE_BYTE_ORDER        MSBFirst

+#define BITMAP_BIT_ORDER        MSBFirst

+#define GLYPHPADBYTES           4

+#define GETLEFTBITS_ALIGNMENT   1

+#define AVOID_MEMORY_READ

+

+#endif /* __avr32__ */ 

+

 #if defined (hpux) || defined __hppa__

 

 #define IMAGE_BYTE_ORDER	MSBFirst

package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-tslib-fix.patch

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
--- xserver_xorg-server-1.5.2.old/configure	2009-03-02 19:44:53.000000000 -0800

+++ xserver_xorg-server-1.5.2/configure	2009-03-02 19:39:55.000000000 -0800

@@ -38770,7 +38770,7 @@

 	    ;;

     esac

     KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'

-    KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"

+    KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"

     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"

     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"

     KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

+6 −2
Original line number Diff line number Diff line
@@ -4,10 +4,11 @@ 
#

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



XSERVER_XORG_SERVER_VERSION = 1.5.3

XSERVER_XORG_SERVER_VERSION = 1.7.1

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

XSERVER_XORG_SERVER_LIBTOOL_PATCH = NO

XSERVER_XORG_SERVER_INSTALL_STAGING = YES

XSERVER_XORG_SERVER_USE_CONFIG_CACHE = NO # overrides CFLAGS

XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
@@ -31,7 +32,6 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ 
	xlib_libXdamage 		\

	xlib_libXxf86misc 		\

	xlib_libXxf86vm 		\

	xlib_liblbxutil 		\

	xlib_libxkbfile 		\

	xlib_xtrans 			\

	xdata_xbitmaps 			\
@@ -124,5 +124,9 @@ XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto 
XSERVER_XORG_SERVER_CONF_OPT += --enable-record

endif



ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)

XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto

XSERVER_XORG_SERVER_CONF_OPT += --enable-dri2

endif



$(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))