x11r7: update to 7.4

Patch by Dan Lykowski <lykowdk@gmail.com>, closes #181.

Minor fixups for kdrive by me.

5 files changed, 14 insertions, 42 deletions

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
deleted file mode 100644
index 8072bcd14..000000000
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-configure.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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-tslib-fix.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-tslib-fix.patch
deleted file mode 100644
index 2ebafd2fc..000000000
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.4-tslib-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure	2008-03-18 12:07:31.000000000 -0400
-+++ b/configure	2008-03-18 16:13:03.000000000 -0400
-@@ -35720,7 +35720,7 @@ _ACEOF
- 	    ;;
-     esac
-     KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
--    KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $TSLIB_LIBS $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
-+    KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
-     KDRIVE_LIBS="$XSERVERLIBS_LIBS $KDRIVE_LOCAL_LIBS"
- 
-     # check if we can build Xephyr
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.5-servermd-add-avr32.patch
index 6fbea607f..6fbea607f 100644
--- 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.5-servermd-add-avr32.patch
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-tslib-fix.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-tslib-fix.patch
new file mode 100644
index 000000000..7f2855fd9
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.5-tslib-fix.patch
@@ -0,0 +1,11 @@
+--- 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"
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 2e9eddf27..b0e1bc3d0 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.4.2
+XSERVER_XORG_SERVER_VERSION = 1.5.2
 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
@@ -20,7 +20,7 @@ XSERVER_XORG_ENABLE_MODULAR:=--disable-xorg
 endif
 
 ifeq ($(BR2_PACKAGE_XSERVER_tinyx),y)
-XSERVER_XORG_ENABLE_KDRIVE:=--enable-kdrive --enable-xfbdev
+XSERVER_XORG_ENABLE_KDRIVE:=--enable-kdrive --enable-xfbdev --disable-glx --disable-dri
 else
 XSERVER_XORG_ENABLE_KDRIVE:=--disable-kdrive --disable-xfbdev
 endif
@@ -43,7 +43,7 @@ else
 XSERVER_XORG_AIGLX:=--disable-aiglx
 endif
 
-XSERVER_XORG_SERVER_DEPENDENCIES =  freetype xutil_util-macros xlib_libXfont libdrm xlib_libxkbui \
+XSERVER_XORG_SERVER_DEPENDENCIES =  freetype xutil_util-macros xlib_libXfont libdrm xlib_libxkbui openssl \
 									xproto_compositeproto xproto_damageproto xproto_fixesproto \
 									xproto_glproto xproto_kbproto xproto_randrproto \
 									xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXScrnSaver \