xserver-xorg-video-sisusb: Changes to 'upstream-experimental'
.gitignore | 70 +++++++++++++++++++++++++++++++++++++++++++++++-----
COPYING | 58 +++++++++++++++++++++++++++++++++++++------
ChangeLog | 57 ------------------------------------------
Makefile.am | 11 +++++++-
configure.ac | 18 ++++++++-----
man/.gitignore | 2 -
man/Makefile.am | 41 ++++++++++++++----------------
src/.gitignore | 6 ----
src/sisusb.h | 1
src/sisusb_driver.c | 35 +++-----------------------
10 files changed, 160 insertions(+), 139 deletions(-)
New commits:
commit 43eab862e5cf0bfa9e7c8bb570651e94c067c451
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 5 15:01:24 2010 +1000
sisusb 0.9.4
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index f866751..86c6ac5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sisusb],
- 0.9.3,
+ 0.9.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sisusb)
commit 13068db6a2180350b6e0e4159979dc7402889fce
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 11:04:56 2010 -0400
COPYING: replace stub file with actual Copyright notices.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 7f33cbf..a312c8e 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,54 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
-Please submit updated COPYING files to the Xorg bugzilla:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1) Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2) Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3) The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (C) 1998, 1999 by Alan Hourihane, Wigan, England
+Written by:
+ Alan Hourihane <alanh@fairlite.demon.co.uk>,
+ Mike Chapman <mike@paranoia.com>,
+ Juanjo Santamarta <santamarta@ctv.es>,
+ Mitani Hiroshi <hmitani@drl.mei.co.jp>,
+ David Thomas <davtom@dream.org.uk>,
+ Thomas Winischhofer <thomas@winischhofer.net>.
+
+Licensed under the following terms:
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appears in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+and that the name of the copyright holder not be used in advertising
+or publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holder makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without expressed or implied warranty.
+
+THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-http://lists.freedesktop.org/mailman/listinfo/xorg
commit fdc38b41c4aa45cc08aa8d213a9f24b6cff2d0b5
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 18 13:12:06 2010 -0400
Remove mibank.h reference
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index 86b69f6..8ba2c33 100644
--- a/src/sisusb_driver.c
+++ b/src/sisusb_driver.c
@@ -39,7 +39,6 @@
#include "shadowfb.h"
#include "fb.h"
#include "micmap.h"
-#include "mibank.h"
#include "mipointer.h"
#include "mibstore.h"
commit aae0f80542dd75cd04df59963c04bd5f2d897fcf
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 15:50:22 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index d076dc4..1b26ac2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,27 +1,24 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
#
drivermandir = $(DRIVER_MAN_DIR)
commit 53f7f85fd24679dd39e23fa7734ca51c7720078f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 22:01:02 2009 -0500
configure.ac: remove unused sdkdir=$(pkg-config...) statement
The sdkdir variable isn't use, so remove the statement.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 9cbaea4..f866751 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,6 @@ 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.
commit eb3d35736e9515841b58e767994183a29f6802ad
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 23 09:25:05 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index 9f8913c..00c154d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = src man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
INSTALL:
commit d85dbf02b359ed04a90f9d3ae576c7149e261901
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:41:41 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 49c1d74..9f8913c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
.PHONY: ChangeLog INSTALL
commit d751d92921bd9c575dde34a0bcf5a1013a7f15fb
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:09 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/Makefile.am b/Makefile.am
index ac9caf7..49c1d74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,9 +20,12 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index beeaced..9cbaea4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit d2be1820f423df7f0da0478dd04f336f41dd1719
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 12:54:22 2009 -0400
Several driver modules do not have a ChangeLog target in Makefile.am #23814
The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 98ece22..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,57 +0,0 @@
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/sisusb.h:
- Bump to 0.8.1 for Xv changes.
-
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
-
- * src/sisusb_video.c: (SISUSBPutImage):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
-
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/sisusb.h:
- Unlibcwrap. Bump server version requirement. Bump to 0.8.0.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 7052905..ac9caf7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,9 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index f2ae362..beeaced 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -74,9 +80,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=sisusb
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([
Makefile
src/Makefile
commit acf752ffe4a2d8332ee8c53f9c97e2c68cbdb3ab
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 13:04:38 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
commit 4165654f007a843443ebdfb77b7bbd4d74e3cb59
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:18 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/.gitignore b/.gitignore
index 2df4a8d..9494718 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,78 @@
-Makefile
-Makefile.in
-*.la
-*.lo
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
config.guess
config.h
config.h.in
config.log
+config-ml.in
+config.py
config.status
+config.status.lineno
config.sub
configure
+configure.scan
depcomp
+.deps/
+INSTALL
install-sh
+.libs/
libtool
+libtool.m4
ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
missing
-stamp-h1
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for xf86-video-sisusb
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
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;
commit 153b489ad561134ebdef6c4025f3b7ae5d873065
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 24 10:22:50 2009 -0500
sisusb 0.9.1
diff --git a/configure.ac b/configure.ac
index 1c5ac16..daf0295 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sisusb],
- 0.9.0,
+ 0.9.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sisusb)
Reply to: