Merge remote branch 'jbe/x_update_v5'

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

14 files changed, 73 insertions, 94 deletions

diff --git a/patches/font-alias-1.0.1/alias_variable_font_dir.diff b/patches/font-alias-1.0.3/alias_variable_font_dir.diff
index f78811cc1..f78811cc1 100644
--- a/patches/font-alias-1.0.1/alias_variable_font_dir.diff
+++ b/patches/font-alias-1.0.3/alias_variable_font_dir.diff
diff --git a/patches/font-alias-1.0.1/series b/patches/font-alias-1.0.3/series
index 23239fd15..23239fd15 100644
--- a/patches/font-alias-1.0.1/series
+++ b/patches/font-alias-1.0.3/series
diff --git a/patches/libXft-2.1.14/0001-xft-config-add-SYSROOT-support.patch b/patches/libXft-2.1.14/0001-xft-config-add-SYSROOT-support.patch
deleted file mode 100644
index d5191ecce..000000000
--- a/patches/libXft-2.1.14/0001-xft-config-add-SYSROOT-support.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From edec345978a5f2bb283ad35bab594ff75ea5b4c1 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Sun, 10 Jan 2010 01:04:21 +0100
-Subject: [PATCH] xft-config: add SYSROOT support
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- xft-config.in |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/xft-config.in b/xft-config.in
-index 549b73a..6f25ecc 100644
---- a/xft-config.in
-+++ b/xft-config.in
-@@ -84,14 +84,14 @@ if test "$echo_exec_prefix" = "yes" ; then
- fi
- 
- if test "$echo_cflags" = "yes" ; then
-- cflags="-I${includedir} ${freetypecflags} ${fontconfigcflags} ${xrendercflags}"
-+ cflags="-I${SYSROOT}${includedir} ${freetypecflags} ${fontconfigcflags} ${xrendercflags}"
-  echo $cflags
- fi
- 
- if test "$echo_libs" = "yes" ; then
-  libs="-lXft -lX11 ${freetypelibs} ${fontconfiglibs} ${xrenderlibs}"
-- if test "${libdir}" != "/usr/lib" ; then
--  echo -L${libdir} $libs
-+ if test "${SYSROOT}${libdir}" != "/usr/lib" ; then
-+  echo -L${SYSROOT}${libdir} $libs
-  else
-   echo $libs
-  fi
--- 
-1.6.6
-
diff --git a/patches/libXft-2.1.14/series b/patches/libXft-2.1.14/series
deleted file mode 100644
index cadd210cf..000000000
--- a/patches/libXft-2.1.14/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-xft-config-add-SYSROOT-support.patch
diff --git a/patches/xf86-video-apm-1.2.2/series b/patches/xf86-video-apm-1.2.2/series
deleted file mode 100644
index ea381a2ed..000000000
--- a/patches/xf86-video-apm-1.2.2/series
+++ /dev/null
@@ -1 +0,0 @@
-xorg-driver-video-apm-1.2.2-fix-includes.diff
diff --git a/patches/xf86-video-apm-1.2.2/xorg-driver-video-apm-1.2.2-fix-includes.diff b/patches/xf86-video-apm-1.2.2/xorg-driver-video-apm-1.2.2-fix-includes.diff
deleted file mode 100644
index 39dba1e4e..000000000
--- a/patches/xf86-video-apm-1.2.2/xorg-driver-video-apm-1.2.2-fix-includes.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: remove wrong include path.
-
-Don't use $(prefix)/include as include path. It can break things
-when cross-compiling with DESTDIR and prefix=/usr
-
-# 20091215 mol: this patch is already upstream: 8337651f91372ec6f16c1bdc7fe2c9af2d450db8
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: xf86-video-apm-1.2.2/configure.ac
-===================================================================
---- xf86-video-apm-1.2.2.orig/configure.ac
-+++ xf86-video-apm-1.2.2/configure.ac
-@@ -67,7 +67,7 @@ AC_SUBST([XF86RUSH_LIBS])
- AC_SUBST([XF86RUSH_CFLAGS])
- 
- CFLAGS="$CFLAGS $XORG_CFLAGS $XF86RUSH_CFLAGS"' -I$(top_srcdir)/src'
--INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src -I$(prefix)/include'
-+INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src'
- AC_SUBST([CFLAGS])
- AC_SUBST([INCLUDES])
- 
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/xf86-video-apm-1.2.2/autogen.sh b/patches/xorg-server-1.9.3/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/xf86-video-apm-1.2.2/autogen.sh
+++ b/patches/xorg-server-1.9.3/autogen.sh
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