updated xorg to version 7.3 and added all of the fonts

5 files changed, 70 insertions, 15 deletions

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 4961aded4..bb2a7cb93 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -47,6 +47,8 @@ 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
 	help
-	  xorg-server 1.2.0
+	  xorg-server 1.4
 	  No description available
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.2.0-xf86ScanPci-no-optimize.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.2.0-xf86ScanPci-no-optimize.patch
deleted file mode 100644
index 145a6d54f..000000000
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.2.0-xf86ScanPci-no-optimize.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xserver_xorg-server-1.2.0/hw/xfree86/scanpci/Makefile.am.orig	2007-06-24 08:46:24.000000000 +0200
-+++ xserver_xorg-server-1.2.0/hw/xfree86/scanpci/Makefile.am	2007-06-24 08:46:26.000000000 +0200
-@@ -9,6 +9,7 @@
- INCLUDES = $(XORG_INCS)
- 
- AM_CFLAGS = $(XORG_CFLAGS)
-+CFLAGS += -O0
- 
- BUILT_SOURCES = xf86PciIds.h
- 
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-configure.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-configure.patch
new file mode 100644
index 000000000..8072bcd14
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-configure.patch
@@ -0,0 +1,28 @@
+--- a/configure.orig	2008-01-30 11:14:50.000000000 -0500
++++ b/configure	2008-01-30 11:15:25.000000000 -0500
+@@ -27686,25 +27686,6 @@ HAVE_DEFS_ENT=
+ as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
+ echo $ECHO_N "checking for $XORG_SGML_PATH/X11/defs.ent... $ECHO_C" >&6; }
+-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+-   { (exit 1); exit 1; }; }
+-if test -r "$XORG_SGML_PATH/X11/defs.ent"; then
+-  eval "$as_ac_File=yes"
+-else
+-  eval "$as_ac_File=no"
+-fi
+-fi
+-ac_res=`eval echo '${'$as_ac_File'}'`
+-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-if test `eval echo '${'$as_ac_File'}'` = yes; then
+-  HAVE_DEFS_ENT=yes
+-fi
+ 
+ 
+ # Extract the first word of "linuxdoc", so it can be a program name with args.
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-servermd-add-avr32.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-servermd-add-avr32.patch
new file mode 100644
index 000000000..6fbea607f
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-servermd-add-avr32.patch
@@ -0,0 +1,19 @@
+--- 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
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 2692a9bca..fbddfc568 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -4,12 +4,28 @@
 #
 ################################################################################
 
-XSERVER_XORG_SERVER_VERSION = 1.2.0
+XSERVER_XORG_SERVER_VERSION = 1.4
 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 = YES
+XSERVER_XORG_SERVER_AUTORECONF = NO
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
-XSERVER_XORG_SERVER_DEPENDENCIES = xutil_util-macros xlib_libXfont libdrm xlib_libxkbui xproto_compositeproto xproto_damageproto xproto_fixesproto xproto_glproto xproto_kbproto xproto_randrproto freetype xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm xlib_libXrender xlib_libXres xlib_libXtst xlib_libXft xlib_libXcursor xlib_libXinerama xlib_libXrandr xlib_libXdamage xlib_libXxf86misc xlib_libXxf86vm xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto xproto_evieext xproto_fontsproto xproto_inputproto xproto_recordproto xproto_renderproto xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto
-XSERVER_XORG_SERVER_CONF_OPT = --disable-xprint --disable-xinerama --disable-xnest --disable-xvfb --disable-dmx --disable-dri --disable-xdmcp --disable-screensaver
+XSERVER_XORG_SERVER_DEPENDENCIES =  freetype xutil_util-macros xlib_libXfont libdrm xlib_libxkbui \
+									xproto_compositeproto xproto_damageproto xproto_fixesproto \
+									xproto_glproto xproto_kbproto xproto_randrproto freetype \
+									xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXScrnSaver \
+									xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm \
+									xlib_libXrender xlib_libXres xlib_libXtst xlib_libXft xlib_libXcursor \
+									xlib_libXinerama xlib_libXrandr xlib_libXdamage xlib_libXxf86misc xlib_libXxf86vm \
+									xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto \
+									xproto_evieext xproto_fontsproto xproto_inputproto xproto_recordproto xproto_renderproto \
+									xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto \
+									xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto \
+									xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto \
+									pixman dbus mcookie 
+
+XSERVER_XORG_SERVER_CONF_OPT = --enable-kdrive --enable-xfbdev --enable-freetype --disable-kbd_mode --disable-xorg \
+								--disable-config-hal CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1"
+
+XSERVER_XORG_SERVER_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
 $(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))