xserver-xorg-video-sisusb: Changes to 'upstream-unstable'
configure.ac | 6 +++++-
src/sisusb.h | 1 -
src/sisusb_driver.c | 34 +++++-----------------------------
3 files changed, 10 insertions(+), 31 deletions(-)
New commits:
commit a18b2e7643188c5b0a900680792d413ca0e9941e
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:29 2009 +1000
sisusb: bump for release 0.9.3
diff --git a/configure.ac b/configure.ac
index 63914e9..f2ae362 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sisusb],
- 0.9.2,
+ 0.9.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sisusb)
commit cf32d0b9a37137b26f2c89578b53197ba27b22a9
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:37 2009 +1000
sisusb: update for resources/RAC API removal
diff --git a/src/sisusb.h b/src/sisusb.h
index b5bb3ad..b9992ac 100644
--- a/src/sisusb.h
+++ b/src/sisusb.h
@@ -83,7 +83,6 @@
#include "compiler.h"
#include "xf86Priv.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "xf86.h"
#include "xf86Cursor.h"
#include "xf86cmap.h"
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index b6cd7f8..86b69f6 100644
--- a/src/sisusb_driver.c
+++ b/src/sisusb_driver.c
@@ -35,7 +35,6 @@
#include "sisusb.h"
-#include "xf86RAC.h"
#include "dixstruct.h"
#include "shadowfb.h"
#include "fb.h"
@@ -848,11 +847,6 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
pScrn->chipset, pSiSUSB->sisusbversion, pSiSUSB->sisusbrevision,
pSiSUSB->sisusbpatchlevel);
- /* Operations for which memory access is required */
- /* USB2VGA: We never need memory or i/o access */
- pScrn->racMemFlags = 0;
- pScrn->racIoFlags = 0;
-
/* Load ramdac module */
if(!xf86LoadSubModule(pScrn, "ramdac")) {
SISUSBErrorLog(pScrn, "Could not load ramdac module\n");
commit 35789a14c0074bb5994deb890e0f3832f1d4a067
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 11:55:36 2009 +1000
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index ec498a0..63914e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index 4424bd5..b6cd7f8 100644
--- a/src/sisusb_driver.c
+++ b/src/sisusb_driver.c
@@ -51,8 +51,13 @@
#include "globals.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
/*
* This is intentionally screen-independent. It indicates the binding
commit 89ca2b91468b13db7dda7984675013a6180feb97
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:46:26 2009 -0400
sisusb 0.9.2
diff --git a/configure.ac b/configure.ac
index daf0295..ec498a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sisusb],
- 0.9.1,
+ 0.9.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sisusb)
commit d6b8211d924ac41d878be707b79e585334d77347
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:20:00 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index 290764d..4424bd5 100644
--- a/src/sisusb_driver.c
+++ b/src/sisusb_driver.c
@@ -90,24 +90,6 @@ static SymTabRec SISUSBChipsets[] = {
{ -1, NULL }
};
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(sisusbSetup);
@@ -143,7 +125,6 @@ sisusbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if(!setupDone) {
setupDone = TRUE;
xf86AddDriver(&SISUSB, module, SISUSB_HaveDriverFuncs);
- LoaderRefSymLists(fbSymbols, shadowSymbols, ramdacSymbols, NULL);
return (pointer)TRUE;
}
@@ -874,8 +855,6 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
-
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
@@ -1444,7 +1423,6 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
SISUSBFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
/* Load shadowfb (if needed) */
if(pSiSUSB->ShadowFB) {
@@ -1454,7 +1432,6 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
SISUSBFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
pSiSUSB->UseVESA = 0;
Reply to: