XORG server: Minor update

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>

8 files changed, 74 insertions, 30 deletions

diff --git a/patches/xorg-server-1.8.2/0001-Fix-typo.patch b/patches/xorg-server-1.8.2/0001-Fix-typo.patch
deleted file mode 100644
index f4cb33ece..000000000
--- a/patches/xorg-server-1.8.2/0001-Fix-typo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7b7359f9e0b3295cf200d763b4762b84d1d4b841 Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 7 Jul 2010 13:02:15 +0200
-Subject: [PATCH] Fix typo
-
-MultiBufferDrawableResType != MultibufferDrawableResType
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Xext/mbuf.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Xext/mbuf.c b/Xext/mbuf.c
-index aacb9cf..b4c6357 100644
---- a/Xext/mbuf.c
-+++ b/Xext/mbuf.c
-@@ -468,7 +468,7 @@ MultibufferExtensionInit()
-      */
-     MultibufferDrawableResType =
- 	CreateNewResourceType(MultibufferDrawableDelete, "MultibufferDrawable");
--    if (MultiBufferDrawableResType)
-+    if (MultibufferDrawableResType)
- 	MultibufferDrawableResType |= RC_DRAWABLE;
-     MultibufferResType = CreateNewResourceType(MultibufferDelete,
- 					       "MultibufferBuffer");
--- 
-1.7.1
-
diff --git a/patches/xorg-server-1.8.2/07-xfree86-fix-build-with-xv-disabled.diff b/patches/xorg-server-1.9.3/07-xfree86-fix-build-with-xv-disabled.diff
index d240b6617..d240b6617 100644
--- a/patches/xorg-server-1.8.2/07-xfree86-fix-build-with-xv-disabled.diff
+++ b/patches/xorg-server-1.9.3/07-xfree86-fix-build-with-xv-disabled.diff
diff --git a/patches/xorg-server-1.9.3/autogen.sh b/patches/xorg-server-1.9.3/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/xorg-server-1.9.3/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/xorg-server-1.8.2/loader-when-creating-sdksyms.c-only-include-shmint.h.patch b/patches/xorg-server-1.9.3/loader-when-creating-sdksyms.c-only-include-shmint.h.patch
index 0d9845109..0d9845109 100644
--- a/patches/xorg-server-1.8.2/loader-when-creating-sdksyms.c-only-include-shmint.h.patch
+++ b/patches/xorg-server-1.9.3/loader-when-creating-sdksyms.c-only-include-shmint.h.patch
diff --git a/patches/xorg-server-1.9.3/remove_dbus_if_disabled.diff b/patches/xorg-server-1.9.3/remove_dbus_if_disabled.diff
new file mode 100644
index 000000000..50737c26d
--- /dev/null
+++ b/patches/xorg-server-1.9.3/remove_dbus_if_disabled.diff
@@ -0,0 +1,24 @@
+From: Juergen Beisert <jbe@pengutronix.de>
+Subject: Check for DBUS only, if enabled
+
+Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
+
+---
+ configure.ac |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: xorg-server-1.9.3/configure.ac
+===================================================================
+--- xorg-server-1.9.3.orig/configure.ac
++++ xorg-server-1.9.3/configure.ac
+@@ -845,8 +845,8 @@ fi
+ dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
+ dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config
+ dnl API.
+-PKG_CHECK_MODULES(DBUS, $LIBDBUS, [HAVE_DBUS=yes], [HAVE_DBUS=no])
+-if test "x$HAVE_DBUS" = xyes; then
++if test "x$HAVE_DBUS" = xyes -o "x$HAVE_DBUS" = xauto; then
++	PKG_CHECK_MODULES(DBUS, $LIBDBUS, [HAVE_DBUS=yes], [HAVE_DBUS=no])
+ 	AC_DEFINE(HAVE_DBUS, 1, [Have D-Bus support])
+ fi
+ AM_CONDITIONAL(HAVE_DBUS, [test "x$HAVE_DBUS" = xyes])
diff --git a/patches/xorg-server-1.9.3/remove_hal_if_disabled.diff b/patches/xorg-server-1.9.3/remove_hal_if_disabled.diff
new file mode 100644
index 000000000..184e2b56f
--- /dev/null
+++ b/patches/xorg-server-1.9.3/remove_hal_if_disabled.diff
@@ -0,0 +1,23 @@
+From: Juergen Beisert <jbe@pengutronix.de>
+Subject: Check for HAL only, if enabled
+
+Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
+---
+ configure.ac |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: xorg-server-1.9.3/configure.ac
+===================================================================
+--- xorg-server-1.9.3.orig/configure.ac
++++ xorg-server-1.9.3/configure.ac
+@@ -864,8 +864,8 @@ if test "x$CONFIG_DBUS_API" = xyes; then
+ fi
+ AM_CONDITIONAL(CONFIG_DBUS_API, [test "x$CONFIG_DBUS_API" = xyes])
+ 
+-PKG_CHECK_MODULES(HAL, hal, [HAVE_HAL=yes], [HAVE_HAL=no])
+-if test "x$CONFIG_HAL" = xauto; then
++if test "x$CONFIG_HAL" = xauto -o "x$CONFIG_HAL" = xyes; then
++	PKG_CHECK_MODULES(HAL, hal, [HAVE_HAL=yes], [HAVE_HAL=no])
+ 	CONFIG_HAL="$HAVE_HAL"
+ fi
+ if test "x$CONFIG_HAL" = xyes; then
diff --git a/patches/xorg-server-1.9.3/remove_udev_if_disabled.diff b/patches/xorg-server-1.9.3/remove_udev_if_disabled.diff
new file mode 100644
index 000000000..8874eb4f1
--- /dev/null
+++ b/patches/xorg-server-1.9.3/remove_udev_if_disabled.diff
@@ -0,0 +1,23 @@
+From: Juergen Beisert <jbe@pengutronix.de>
+Subject: Check for LIBUSB only, if enabled
+
+Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
+---
+ configure.ac |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: xorg-server-1.9.3/configure.ac
+===================================================================
+--- xorg-server-1.9.3.orig/configure.ac
++++ xorg-server-1.9.3/configure.ac
+@@ -828,8 +828,8 @@ if test "x$CONFIG_UDEV" = xyes &&
+ 	AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not allowed])
+ fi
+ 
+-PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
+-if test "x$CONFIG_UDEV" = xauto; then
++if test "x$CONFIG_UDEV" = xauto -o "x$CONFIG_UDEV" = xyes; then
++	PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
+ 	CONFIG_UDEV="$HAVE_LIBUDEV"
+ fi
+ AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes])
diff --git a/patches/xorg-server-1.8.2/series b/patches/xorg-server-1.9.3/series
index 5eac29fc3..aa40d1db0 100644
--- a/patches/xorg-server-1.8.2/series
+++ b/patches/xorg-server-1.9.3/series
@@ -1,4 +1,5 @@
-0001-Fix-typo.patch
 07-xfree86-fix-build-with-xv-disabled.diff
 loader-when-creating-sdksyms.c-only-include-shmint.h.patch
-
+remove_udev_if_disabled.diff
+remove_dbus_if_disabled.diff
+remove_hal_if_disabled.diff