Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 67 insertions, 0 deletions

diff --git a/meta/packages/xorg-lib/libxfont/autofoo.patch b/meta/packages/xorg-lib/libxfont/autofoo.patch
new file mode 100644
index 0000000000..4998625c24
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont/autofoo.patch
@@ -0,0 +1,18 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libXfont-1.4.2/configure.ac~autofoo 2004-05-06 20:19:03.000000000 -0400
++++ libXfont-1.4.2/configure.ac 2005-01-16 12:14:14.042598720 -0500
+@@ -35,9 +35,9 @@
+ dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
+ dnl not possible to extract the version number here from Xfont.h
+ dnl
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
+ 
+ # Check for progs
diff --git a/meta/packages/xorg-lib/libxfont/no-scalable-crash.patch b/meta/packages/xorg-lib/libxfont/no-scalable-crash.patch
new file mode 100644
index 0000000000..90bded6fba
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont/no-scalable-crash.patch
@@ -0,0 +1,22 @@
+--- /tmp/fontdir.c      2006-08-01 16:17:22.000000000 +0200
++++ libXfont-1.2.0/src/fontfile/fontdir.c       2006-08-01 16:20:37.248306000 +0200
+@@ -695,6 +695,11 @@
+      */
+     if (isscale)
+     {
++       /* If the fontname says it is scalable, make sure that the
++        * renderer supports OpenScalable and GetInfoScalable.
++        */
++       if (renderer->OpenScalable && renderer->GetInfoScalable)
++       {
+        if (vals.values_supplied & SIZE_SPECIFY_MASK)
+        {
+            bzero((char *)&zeroVals, sizeof(zeroVals));
+@@ -794,6 +799,7 @@
+                                            bitmap->name.name);
+             }
+        }
++       }
+     }
+     return TRUE;
+ }
diff --git a/meta/packages/xorg-lib/libxfont/scalable.patch b/meta/packages/xorg-lib/libxfont/scalable.patch
new file mode 100644
index 0000000000..7f97b9a8f6
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont/scalable.patch
@@ -0,0 +1,27 @@
+Index: fontfile/fontdir.c
+===================================================================
+RCS file: /cvs/xlibs/Xfont/fontfile/fontdir.c,v
+retrieving revision 3.22
+diff -u -r3.22 fontdir.c
+--- xfont/fontfile/fontdir.c    7 Jul 2003 16:40:11 -0000       3.22
++++ xfont/fontfile/fontdir.c    30 Dec 2004 20:37:12 -0000
+@@ -699,6 +699,11 @@
+      */
+     if (isscale)
+     {
++      /* If the fontname says it is scalable, make sure that the
++       * renderer supports OpenScalable and GetInfoScalable.
++       */
++      if (renderer->OpenScalable && renderer->GetInfoScalable)
++      {
+        if (vals.values_supplied & SIZE_SPECIFY_MASK)
+        {
+            bzero((char *)&zeroVals, sizeof(zeroVals));
+@@ -798,6 +803,7 @@
+                                            bitmap->name.name);
+             }
+        }
++      }
+     }
+     return TRUE;
+ }