xserver-xorg-video-voodoo: Changes to 'upstream-unstable'

[Brice Goglin <bgoglin@alioth.debian.org>]

 configure.ac        |    2 +-
 man/voodoo.man      |    2 +-
 src/voodoo_driver.c |   34 ----------------------------------
 3 files changed, 2 insertions(+), 36 deletions(-)

New commits:
commit b88c1e442fa9367ebb0addf744b759cea91a4868
Author: Adam Jackson <ajax@redhat.com>
Date:   Thu Jul 2 11:55:03 2009 -0400

    voodoo 1.2.2

diff --git a/configure.ac b/configure.ac
index ff6c1a5..919e29f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-voodoo],
-        1.2.1,
+        1.2.2,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-voodoo)
 

commit bf6571791206d7784e711abcb6f353ae06d54bd8
Author: Adam Jackson <ajax@redhat.com>
Date:   Thu May 28 15:27:48 2009 -0400

    Remove useless loader symbol lists.

diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index 2822543..f412215 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -128,34 +128,6 @@ static SymTabRec VoodooChipsets[] = {
   {-1, NULL }
 };
 
-
-/*
- * List of symbols from other modules that this module references.  This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists().  The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *fbSymbols[] = {
-  "fbScreenInit",
-  "fbPictureInit",
-  NULL
-};
-
-static const char *xaaSymbols[] = {
-    "XAACreateInfoRec",
-    "XAAInit",
-    "XAADestroyInfoRec",
-    NULL
-};
-
-static const char *shadowSymbols[] = {
-  "ShadowFBInit",
-  NULL
-};
-
 #ifdef XFree86LOADER
 
 static XF86ModuleVersionInfo voodooVersRec =
@@ -181,7 +153,6 @@ static pointer voodooSetup(pointer module, pointer opts, int *errmaj, int *errmi
   {
     setupDone = TRUE;
     xf86AddDriver(&VOODOO, module, 0);
-    LoaderRefSymLists(fbSymbols, shadowSymbols, xaaSymbols,NULL);
     return (pointer)1;    
   }
   return NULL;
@@ -583,15 +554,11 @@ VoodooPreInit(ScrnInfoPtr pScrn, int flags)
     return FALSE;
   }
 
-  xf86LoaderReqSymLists(fbSymbols, NULL);
-
   if (!xf86LoadSubModule(pScrn, "xaa")) {
     VoodooFreeRec(pScrn);
     return FALSE;
   }
   
-  xf86LoaderReqSymLists(xaaSymbols, NULL);
-  
   if(pVoo->ShadowFB)
   {
     /* Load the shadow framebuffer */
@@ -599,7 +566,6 @@ VoodooPreInit(ScrnInfoPtr pScrn, int flags)
       VoodooFreeRec(pScrn);
       return FALSE;
     }
-    xf86LoaderReqSymLists(shadowSymbols, NULL);
   }
   return TRUE;
 }

commit 46fa3eff8d2b8f17e50e575df96b02e4b8a89874
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Fri Jan 9 16:39:21 2009 -0800

    Remove xorgconfig & xorgcfg from See Also list in man page

diff --git a/man/voodoo.man b/man/voodoo.man
index 8e828df..92fb9bd 100644
--- a/man/voodoo.man
+++ b/man/voodoo.man
@@ -67,6 +67,6 @@ The driver interacts badly with the
 sstfb frame buffer driver as there is insufficient information to restore
 the chip to its previous state. 
 .SH "SEE ALSO"
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors: Alan Cox, Ghozlane Toumi, Henrik Harmsen.