COPYING | 37 +++++------
ChangeLog | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 1
configure.ac | 44 ++++++-------
debian/changelog | 15 ++++
debian/control | 6 -
debian/copyright | 43 ++++++-------
debian/rules | 1
man/Makefile.am | 69 +++++++--------------
src/glide_driver.c | 129 +++++++++++++++++++++++-----------------
10 files changed, 343 insertions(+), 170 deletions(-)
New commits:
commit c92580bcf035f84c1141ee8d55ae0e2792554aa8
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Nov 9 13:21:55 2010 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index d24ea0b..7707c1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-glide (1.1.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-glide (1.1.0-1) experimental; urgency=low
* New upstream release.
* Symbol lookup errors are gone (Closes: #602373).
@@ -11,7 +11,7 @@ xserver-xorg-video-glide (1.1.0-1) UNRELEASED; urgency=low
+ Replace libglide2 dep with libglide3.
+ Pass --with-glide-include-dir=/usr/include/glide3 to configure.
- -- Cyril Brulebois <k...@debian.org> Tue, 09 Nov 2010 13:05:43 +0100
+ -- Cyril Brulebois <k...@debian.org> Tue, 09 Nov 2010 13:21:42 +0100
xserver-xorg-video-glide (1.0.3-3) experimental; urgency=low
commit c12e38ca16e403f67485c3e6d350a683c1899f82
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Nov 9 13:19:57 2010 +0100
Switch from glide2x to glide3x.
See be66973a for reference.
diff --git a/debian/changelog b/debian/changelog
index d545f96..d24ea0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ xserver-xorg-video-glide (1.1.0-1) UNRELEASED; urgency=low
* Symbol lookup errors are gone (Closes: #602373).
* Update debian/copyright.
* Bump xutils-dev build-dep for new macros.
+ * Switch from glide2x to glide3x:
+ + Quoting upstream: “glide3x is the newer interface and supports more
+ hardware than glide2x.”
+ + Replace libglide2-dev build-dep with libglide3-dev.
+ + Replace libglide2 dep with libglide3.
+ + Pass --with-glide-include-dir=/usr/include/glide3 to configure.
-- Cyril Brulebois <k...@debian.org> Tue, 09 Nov 2010 13:05:43 +0100
diff --git a/debian/control b/debian/control
index 2a8249c..9579e67 100644
--- a/debian/control
+++ b/debian/control
@@ -17,14 +17,14 @@ Build-Depends:
autoconf,
libtool,
xutils-dev (>= 1:7.5+4),
- libglide2-dev
+ libglide3-dev,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glide
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glide.git
Package: xserver-xorg-video-glide
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}, libglide2
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}, libglide3,
Recommends: device3dfx-source
Provides: ${xviddriver:Provides}
Description: X.Org X server -- Glide display driver
diff --git a/debian/rules b/debian/rules
index 5902393..18e2d94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,7 @@ build-stamp: $(STAMP_DIR)/patch
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
--enable-maintainer-mode \
+ --with-glide-include-dir=/usr/include/glide3 \
CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
commit 7077e280d172e5eda611a19ad55587fec5f98fe9
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Nov 9 13:09:24 2010 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index c3e41c6..d545f96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-glide (1.1.0-1) UNRELEASED; urgency=low
* New upstream release.
* Symbol lookup errors are gone (Closes: #602373).
* Update debian/copyright.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <k...@debian.org> Tue, 09 Nov 2010 13:05:43 +0100
diff --git a/debian/control b/debian/control
index ac64a46..2a8249c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
automake,
autoconf,
libtool,
- xutils-dev (>= 1:7.4+4),
+ xutils-dev (>= 1:7.5+4),
libglide2-dev
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glide
commit ad7a7dac3ba8ee7d971aab712dd6c2a9e1f97f27
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Nov 9 13:08:01 2010 +0100
Update debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 362030a..c3e41c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-glide (1.1.0-1) UNRELEASED; urgency=low
* New upstream release.
* Symbol lookup errors are gone (Closes: #602373).
+ * Update debian/copyright.
-- Cyril Brulebois <k...@debian.org> Tue, 09 Nov 2010 13:05:43 +0100
diff --git a/debian/copyright b/debian/copyright
index 13cc74c..6d7b284 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ This package was downloaded from
http://xorg.freedesktop.org/releases/individual/driver/
-Copyright 1997-2003 by The XFree86 Project, Inc.
+Copyright © 1997-2003 by The XFree86 Project, Inc.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
@@ -24,8 +24,8 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-Copyright 2005 Adam Jackson.
-Copyright 2007 Guillem Jover.
+Copyright © 2005 Adam Jackson.
+Copyright © 2007-2010 Guillem Jover.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -46,26 +46,23 @@ 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.
-Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+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.
+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 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.
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of 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.
+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.
commit 91037d5c43a7160690e138e3afd502f7052f0528
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Nov 9 13:07:27 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 7237e4f..00e81aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,171 @@
+commit d8045b0815167b2204c0a00a49ae84d1b673d8d3
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Sat Nov 6 22:51:55 2010 +0100
+
+ Bump to 1.1.0
+
+commit be66973a0851b20a38911db3ef5413d60127b2af
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Thu Oct 21 05:22:41 2010 +0200
+
+ Fix support for latest glide3x
+
+ This enables the driver to use libglide3x.so at run-time instead of
+ libglide2x.so, selectively depending on the headers specified at
+ configure time via --with-glide-include-dir.
+
+ glide3x is the newer interface and supports more hardware than glide2x.
+
+commit ef45124f827e9b851c99bb8dbe29987e765cb85e
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Thu Oct 21 05:12:37 2010 +0200
+
+ Abstract glide2x module name into a GLIDE_MODULE_NAME macro
+
+commit a30cc5587a71c0cbaedaa06b1d95274f890a1534
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Thu Oct 21 07:07:00 2010 +0200
+
+ Use malloc and free instead of deprecated xalloc and xfree
+
+commit 5e09be624bd6c064e425f2aeeb0693285a76cf9a
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Thu Oct 21 03:27:34 2010 +0200
+
+ Drop useless symbol lists
+
+ The functions are not available anymore.
+
+commit d58132f35de5140ff86cec0359f1ab9cb1709590
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Thu Oct 21 05:28:37 2010 +0200
+
+ Update copyright statements
+
+commit eeb4cbe0596e08f56e1e29c77f6ec6790eea5340
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 10:25:57 2010 +0200
+
+ build: Use LT_INIT instead of deprecated AC_PROG_LIBTOOL and
AC_DISABLE_STATIC
+
+commit 71a07200f7d1672bf6c7054cad856becf91eefd5
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 10:24:49 2010 +0200
+
+ build: Use AC_CONFIG_FILES instead of deprecated AC_OUTPUT usage
+
+commit cb3e75e3499f9ec9750a635b968f780143f2090f
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 10:24:11 2010 +0200
+
+ build: Use AC_CHECK_HEADER instead of deprecated AC_HEADER_CHECK
+
+commit 5de195b3f21c1949385fb2c23d0f214a307eb07b
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 10:19:26 2010 +0200
+
+ build: Use AS_HELP_STRING instead of deprecated AC_HELP_STRING
+
+commit 7115ac505fd94478162bc2900271e6531f568f22
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 10:18:49 2010 +0200
+
+ build: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER
+
+commit c0e8905f0438663188efd5513edc1a161b4fa428
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 09:58:31 2010 +0200
+
+ build: Remove unused fontsproto from XORG pkg-config check
+
+commit c91f519e1f6550a2382380cd2711dd1c47e19eca
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 09:51:37 2010 +0200
+
+ build: Remove checks for randrproto and renderproto extensions
+
+ Those are not used by the driver.
+
+commit b1bd24d412bbbd803184f7ed32dae56b695704fe
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 09:48:31 2010 +0200
+
+ build: Clean up man page generation
+
+ Use autoconf variables instead of autoconf subsitutions. Use the
+ destination man page filename in the driverman_DATA variable, instead
+ of generating it from the source filename.
+
+commit ac9af8454c9af4205dc2df29dee71c35e4c7931c
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 09:46:15 2010 +0200
+
+ build: Add silent rule support to man page generation
+
+commit 56d40816921ab4adf09809e0524347c58d4309ff
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 09:41:52 2010 +0200
+
+ build: Use new man page support from xorg-macros 1.8
+
+ Use MAN_SUBST and SED now set by XORG_MANPAGE_SECTIONS.
+
+commit bb02364036554a273bbcec8d7eeaee9865e9390f
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 09:30:04 2010 +0200
+
+ build: Use SED variable instead of hard-coding the command name
+
+commit 549e7f3da0c69d80e37ef1dad8926ce4df8796ec
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 09:24:36 2010 +0200
+
+ build: Remove AC_PROG_CC as it overrides AC_PROG_CC_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls AC_PROG_CC_C99.
+ This sets the compiler to C99 mode, but if the AC_PROG_CC macro is
+ called afterwards, it might reset it to C89 mode.
+
+commit af043f32f4d719ff43e77ec3110a293f2169cd4f
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 09:14:17 2010 +0200
+
+ build: Require autoconf 2.60
+
+ The minimum version required to build X.Org modules is 2.60.
+
+commit 31a03f018c5cf00b192b2220bd46d6ba596e4cb0
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 06:19:14 2010 +0200
+
+ build: Use XORG_DEFAULT_OPTIONS instead of specific macros
+
+commit bdc723c1de9c8a149bae1fe4cbffe350344d2cfb
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 06:16:14 2010 +0200
+
+ build: Quote all AC_INIT m4 arguments
+
+commit c4e18a326c5835115c00ccccd27bb310b40a4839
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Oct 20 06:13:17 2010 +0200
+
+ build: Move foreign setting from AUTOMAKE_OPTIONS to AM_INIT_AUTOMAKE
+
+commit 2abc766502164aa39988d7c759f71b908b6c6327
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Fri Feb 26 19:31:22 2010 +0100
+
+ build: Remove unused sdkdir variable setting
+
+commit 11ef3754d3577156fdf33142dd10d82b41ce8746
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Fri Jan 15 15:17:59 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
+
commit 5b9a71341522cee5984061affb1a8d38c220c414
Author: Guillem Jover <guil...@hadrons.org>
Date: Thu Aug 27 13:07:33 2009 +0300
diff --git a/debian/changelog b/debian/changelog
index e7c056c..362030a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-glide (1.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Symbol lookup errors are gone (Closes: #602373).
+
+ -- Cyril Brulebois <k...@debian.org> Tue, 09 Nov 2010 13:05:43 +0100
+
xserver-xorg-video-glide (1.0.3-3) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
commit d8045b0815167b2204c0a00a49ae84d1b673d8d3
Author: Guillem Jover <guil...@hadrons.org>
Date: Sat Nov 6 22:51:55 2010 +0100
Bump to 1.1.0
diff --git a/configure.ac b/configure.ac
index 2f8adcc..3d1f278 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-glide],
- [1.0.3],
+ [1.1.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-glide])
commit be66973a0851b20a38911db3ef5413d60127b2af
Author: Guillem Jover <guil...@hadrons.org>
Date: Thu Oct 21 05:22:41 2010 +0200
Fix support for latest glide3x
This enables the driver to use libglide3x.so at run-time instead of
libglide2x.so, selectively depending on the headers specified at
configure time via --with-glide-include-dir.
glide3x is the newer interface and supports more hardware than glide2x.
diff --git a/configure.ac b/configure.ac
index 85ad072..2f8adcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,9 @@ AC_HEADER_STDC
AC_CHECK_HEADER([glide.h], [],
[AC_MSG_ERROR([<glide.h> is required])])
+AC_CHECK_DECL([grGet], [AC_DEFINE(GLIDE3, 1, [glide3x available])], [],
+ [#include <glide.h>])
+
GLIDE_CFLAGS="-I$glideincludedir"
AC_SUBST([GLIDE_CFLAGS])
AC_SUBST([XORG_CFLAGS])
diff --git a/src/glide_driver.c b/src/glide_driver.c
index 58b65c4..4f16a06 100644
--- a/src/glide_driver.c
+++ b/src/glide_driver.c
@@ -72,6 +72,11 @@
#include <glide.h>
+/* glide3x does not define this alias anymore, so let's do it ourselves. */
+#ifndef GR_ZDEPTHVALUE_FARTHEST
+#define GR_ZDEPTHVALUE_FARTHEST 0
+#endif
+
#define TRUE 1
#define FALSE 0
@@ -88,7 +93,11 @@ typedef u8 bool;
#define GLIDEPTR(p) ((GLIDEPtr)((p)->driverPrivate))
+#if defined(GLIDE3)
+typedef FxU32 (*pgrGet_t)(FxU32 pname, FxU32 plength, FxI32 *params);
+#else
typedef FxBool (*pgrSstQueryBoards_t)(GrHwConfiguration*);
+#endif
typedef void (*pgrGlideInit_t)(void);
typedef void (*pgrSstSelect_t)(int which_sst);
typedef FxBool (*pgrSstWinOpen_t)(FxU32, GrScreenResolution_t,
GrScreenRefresh_t,
@@ -125,7 +134,11 @@ typedef struct {
OptionInfoPtr Options;
} GLIDERec, *GLIDEPtr;
+#if defined(GLIDE3)
+static pgrGet_t pgrGet;
+#else
static pgrSstQueryBoards_t pgrSstQueryBoards;
+#endif
static pgrGlideInit_t pgrGlideInit;
static pgrSstSelect_t pgrSstSelect;
static pgrSstWinOpen_t pgrSstWinOpen;
@@ -162,7 +175,11 @@ static int LoadGlide(void);
#define GLIDE_VERSION 4000
#define GLIDE_NAME "GLIDE"
#define GLIDE_DRIVER_NAME "glide"
+#ifdef GLIDE3
+#define GLIDE_MODULE_NAME "glide3x"
+#else
#define GLIDE_MODULE_NAME "glide2x"
+#endif
#define GLIDE_MAJOR_VERSION PACKAGE_VERSION_MAJOR
#define GLIDE_MINOR_VERSION PACKAGE_VERSION_MINOR
#define GLIDE_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
@@ -331,13 +348,45 @@ GLIDEIdentify(int flags)
xf86PrintChipsets(GLIDE_NAME, "driver for Glide devices (Voodoo cards)",
GLIDEChipsets);
}
+#if defined(GLIDE3)
+static int
+glide_get_num_boards(void)
+{
+ FxI32 num_sst;
+ int r;
+
+ r = pgrGet(GR_NUM_BOARDS, sizeof(num_sst), &num_sst);
+ if (!r)
+ {
+ xf86Msg(X_ERROR, "GLIDEProbe(): Error calling pgrGet(GR_NUM_BOARDS)!\n");
+ return -1;
+ }
+
+ return num_sst;
+}
+#else
+static int
+glide_get_num_boards(void)
+{
+ GrHwConfiguration hw;
+ int r;
+
+ r = pgrSstQueryBoards(&hw);
+ if (!r)
+ {
+ xf86Msg(X_ERROR, "GLIDEProbe(): Error calling pgrSstQueryBoards!\n");
+ return -1;
+ }
+
+ return hw.num_sst;
+}
+#endif
/* Mandatory */
static Bool
GLIDEProbe(DriverPtr drv, int flags)
{
- GrHwConfiguration hw;
- int i, sst, r;
+ int i, num_sst, sst;
GDevPtr *devList;
GDevPtr dev = NULL;
int numdevList;
@@ -348,21 +397,17 @@ GLIDEProbe(DriverPtr drv, int flags)
if ((numdevList = xf86MatchDevice(GLIDE_DRIVER_NAME, &devList)) <= 0)
return FALSE;
- r = pgrSstQueryBoards(&hw);
- if (!r)
- {
- xf86Msg(X_ERROR, "GLIDEProbe(): Error calling pgrSstQueryBoards!\n");
+ num_sst = glide_get_num_boards();
+ if (num_sst < 0)
goto cleanup;
- }
-
-
- /* hw.num_sst : number of Glide boards available */
- if (hw.num_sst > 0 && (flags & PROBE_DETECT)) {
+
+ /* num_sst: number of Glide boards available */
+ if (num_sst > 0 && (flags & PROBE_DETECT)) {
/* XXX Need to call xf886AddDeviceToConfigure() here */
return TRUE;
}
- for (sst = 0; sst < hw.num_sst; sst++)
+ for (sst = 0; sst < num_sst; sst++)
{
for (i = 0; i < numdevList; i++)
{
@@ -968,7 +1013,11 @@ GLIDERestore(ScrnInfoPtr pScrn, Bool Closing)
static int
LoadGlide(void)
{
+#ifdef GLIDE3
+ GLIDE_FIND_FUNC(grGet);
+#else
GLIDE_FIND_FUNC(grSstQueryBoards);
+#endif
GLIDE_FIND_FUNC(grGlideInit);
GLIDE_FIND_FUNC(grSstSelect);
GLIDE_FIND_FUNC(grSstWinOpen);
commit ef45124f827e9b851c99bb8dbe29987e765cb85e
Author: Guillem Jover <guil...@hadrons.org>
Date: Thu Oct 21 05:12:37 2010 +0200
Abstract glide2x module name into a GLIDE_MODULE_NAME macro
diff --git a/src/glide_driver.c b/src/glide_driver.c
index 6357f2f..58b65c4 100644
--- a/src/glide_driver.c
+++ b/src/glide_driver.c
@@ -162,6 +162,7 @@ static int LoadGlide(void);
#define GLIDE_VERSION 4000
#define GLIDE_NAME "GLIDE"
#define GLIDE_DRIVER_NAME "glide"
+#define GLIDE_MODULE_NAME "glide2x"
#define GLIDE_MAJOR_VERSION PACKAGE_VERSION_MAJOR
#define GLIDE_MINOR_VERSION PACKAGE_VERSION_MINOR
#define GLIDE_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
@@ -225,6 +226,7 @@ _X_EXPORT XF86ModuleData glideModuleData = { &glideVersRec,
glideSetup, NULL };
static pointer
glideSetup(pointer module, pointer opts, int *errmaj, int *errmin)
{
+ const char module_name[] = GLIDE_MODULE_NAME;
static Bool setupDone = FALSE;
pointer ret;
int errmaj2 = 0, errmin2 = 0;
@@ -236,23 +238,23 @@ glideSetup(pointer module, pointer opts, int *errmaj, int
*errmin)
* by calling LoadSubModule().
*/
- ret = LoadSubModule(module, "glide2x", NULL, NULL, EXTERN_MODULE, NULL,
+ ret = LoadSubModule(module, module_name, NULL, NULL, EXTERN_MODULE, NULL,
&errmaj2, &errmin2);
if (!ret)
{
xf86Msg(X_ERROR, "Glide driver:\n"
"\n"
-"Could not load the shared library file for Glide: \"libglide2x.so\"! \n"
+"Could not load the shared library file for Glide: \"lib%s.so\"! \n"
"\n"
"You need to have Glide installed to run the glide driver for X.Org.\n"
-"Also, you need to tell X.Org where the libglide2x.so file is placed\n"
+"Also, you need to tell X.Org where the lib%s.so file is placed\n"
"by making a soft link in the " MODULEDIR " directory that points\n"
-"to the libglide2x.so file. For example (if your libglide2x.so file is in\n"
+"to the lib%s.so file. For example (if your lib%s.so file is in\n"
"/usr/lib):\n"
"\n"
-" # ln -s /usr/lib/libglide2x.so " MODULEDIR "\n"
+" # ln -s /usr/lib/lib%s.so " MODULEDIR "\n"
"\n"
-"\n");
+"\n", module_name, module_name, module_name, module_name, module_name);
if (errmaj)
*errmaj = LDR_NOSUBENT;
if (errmin)
@@ -959,7 +961,7 @@ GLIDERestore(ScrnInfoPtr pScrn, Bool Closing)
p##x = (p##x##_t)LoaderSymbol(#x); \
if (!p##x) \
{ \
- xf86Msg(X_ERROR, "Could not find " #x "() in libglide2x.so.\n"); \
+ xf86Msg(X_ERROR, "Could not find " #x "() in lib%s.so.\n",
GLIDE_MODULE_NAME); \
return FALSE; \
}
commit a30cc5587a71c0cbaedaa06b1d95274f890a1534
Author: Guillem Jover <guil...@hadrons.org>
Date: Thu Oct 21 07:07:00 2010 +0200
Use malloc and free instead of deprecated xalloc and xfree
diff --git a/src/glide_driver.c b/src/glide_driver.c
index bebbb8f..6357f2f 100644
--- a/src/glide_driver.c
+++ b/src/glide_driver.c
@@ -311,7 +311,7 @@ GLIDEFreeRec(ScrnInfoPtr pScrn)
{
if (pScrn->driverPrivate == NULL)
return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -404,7 +404,7 @@ GLIDEProbe(DriverPtr drv, int flags)
}
cleanup:
- xfree(devList);
+ free(devList);
return foundScreen;
}
@@ -505,7 +505,8 @@ GLIDEPreInit(ScrnInfoPtr pScrn, int flags)
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(pGlide->Options = xalloc(sizeof(GLIDEOptions))))
+ pGlide->Options = malloc(sizeof(GLIDEOptions));
+ if (pGlide->Options == NULL)
return FALSE;
memcpy(pGlide->Options, GLIDEOptions, sizeof(GLIDEOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pGlide->Options);
@@ -777,7 +778,7 @@ GLIDECloseScreen(int scrnIndex, ScreenPtr pScreen)
if (pScrn->vtSema)
GLIDERestore(pScrn, TRUE);
- xfree(pGlide->ShadowPtr);
+ free(pGlide->ShadowPtr);
pScrn->vtSema = FALSE;
@@ -799,7 +800,7 @@ GLIDEFreeScreen(int scrnIndex, int flags)
* get called routinely at the end of a server generation.
*/
if (pGlide && pGlide->ShadowPtr)
- xfree(pGlide->ShadowPtr);
+ free(pGlide->ShadowPtr);
GLIDEFreeRec(xf86Screens[scrnIndex]);
}
commit 5e09be624bd6c064e425f2aeeb0693285a76cf9a
Author: Guillem Jover <guil...@hadrons.org>
Date: Thu Oct 21 03:27:34 2010 +0200
Drop useless symbol lists
The functions are not available anymore.
diff --git a/src/glide_driver.c b/src/glide_driver.c
index e88a1b5..bebbb8f 100644
--- a/src/glide_driver.c
+++ b/src/glide_driver.c
@@ -202,26 +202,6 @@ static SymTabRec GLIDEChipsets[] = {
};
-/*
- * 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 *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(glideSetup);
@@ -294,12 +274,6 @@ glideSetup(pointer module, pointer opts, int *errmaj, int
*errmin)
xf86AddDriver(&GLIDE, module, 0);
/*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(fbSymbols, shadowSymbols, NULL);
-
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -633,14 +607,11 @@ GLIDEPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
/* Load the shadow framebuffer */
if (!xf86LoadSubModule(pScrn, "shadowfb")) {
GLIDEFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
return TRUE;
}
commit d58132f35de5140ff86cec0359f1ab9cb1709590
Author: Guillem Jover <guil...@hadrons.org>
Date: Thu Oct 21 05:28:37 2010 +0200
Update copyright statements
diff --git a/COPYING b/COPYING
index 009e00c..ab7e916 100644
--- a/COPYING
+++ b/COPYING
@@ -21,7 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Copyright © 2005 Adam Jackson.
-Copyright © 2007 Guillem Jover.
+Copyright © 2007-2010 Guillem Jover.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
diff --git a/configure.ac b/configure.ac
index cb927b2..85ad072 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# Copyright © 2005 Adam Jackson.
-# Copyright © 2007 Guillem Jover.
+# Copyright © 2007-2010 Guillem Jover.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
commit eeb4cbe0596e08f56e1e29c77f6ec6790eea5340
Author: Guillem Jover <guil...@hadrons.org>
Date: Wed Oct 20 10:25:57 2010 +0200
build: Use LT_INIT instead of deprecated AC_PROG_LIBTOOL and
AC_DISABLE_STATIC
diff --git a/configure.ac b/configure.ac
index 2e98bd0..cb927b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,8 +42,7 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for programs.
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+LT_INIT([disable-static])
AH_TOP([#include "xorg-server.h"])
commit 71a07200f7d1672bf6c7054cad856becf91eefd5
Author: Guillem Jover <guil...@hadrons.org>
Date: Wed Oct 20 10:24:49 2010 +0200
build: Use AC_CONFIG_FILES instead of deprecated AC_OUTPUT usage
diff --git a/configure.ac b/configure.ac
index de9f080..2e98bd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,8 +85,9 @@ AC_SUBST([moduledir])
DRIVER_NAME=glide
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
src/Makefile
man/Makefile
])
+AC_OUTPUT
commit cb3e75e3499f9ec9750a635b968f780143f2090f
Author: Guillem Jover <guil...@hadrons.org>
Date: Wed Oct 20 10:24:11 2010 +0200
build: Use AC_CHECK_HEADER instead of deprecated AC_HEADER_CHECK
diff --git a/configure.ac b/configure.ac
index 3c4ad0c..de9f080 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71"
= "yes" ])
# Checks for header files.
CPPFLAGS="$CPPFLAGS -I$glideincludedir"
AC_HEADER_STDC
-AC_HEADER_CHECK([glide.h], [],
+AC_CHECK_HEADER([glide.h], [],
[AC_MSG_ERROR([<glide.h> is required])])
GLIDE_CFLAGS="-I$glideincludedir"
commit 5de195b3f21c1949385fb2c23d0f214a307eb07b
Author: Guillem Jover <guil...@hadrons.org>
Date: Wed Oct 20 10:19:26 2010 +0200
build: Use AS_HELP_STRING instead of deprecated AC_HELP_STRING
diff --git a/configure.ac b/configure.ac
index 1123aa5..3c4ad0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,13 +48,13 @@ AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory
[[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
AC_ARG_WITH(glide-include-dir,
- AC_HELP_STRING([--with-glide-include-dir=DIR],
+ AS_HELP_STRING([--with-glide-include-dir=DIR],
[Default Glide include directory
[[default=/usr/include/glide]]]),
[glideincludedir="$withval"],
[glideincludedir="/usr/include/glide"])
commit 7115ac505fd94478162bc2900271e6531f568f22
Author: Guillem Jover <guil...@hadrons.org>
Date: Wed Oct 20 10:18:49 2010 +0200
build: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER
diff --git a/configure.ac b/configure.ac
index 519052a..1123aa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_INIT([xf86-video-glide],
[xf86-video-glide])
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit c0e8905f0438663188efd5513edc1a161b4fa428
Author: Guillem Jover <guil...@hadrons.org>
Date: Wed Oct 20 09:58:31 2010 +0200
build: Remove unused fontsproto from XORG pkg-config check
diff --git a/configure.ac b/configure.ac
index 7848817..519052a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ AC_ARG_WITH(glide-include-dir,
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(XORG, [xorg-server >= 1.0.99.901 xproto $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")
commit c91f519e1f6550a2382380cd2711dd1c47e19eca
Author: Guillem Jover <guil...@hadrons.org>
Date: Wed Oct 20 09:51:37 2010 +0200
build: Remove checks for randrproto and renderproto extensions
Those are not used by the driver.
diff --git a/configure.ac b/configure.ac
index 6adf6f6..7848817 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,8 +60,6 @@ AC_ARG_WITH(glide-include-dir,
[glideincludedir="/usr/include/glide"])
# Checks for extensions
-XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
-XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
commit b1bd24d412bbbd803184f7ed32dae56b695704fe
Author: Guillem Jover <guil...@hadrons.org>
Date: Wed Oct 20 09:48:31 2010 +0200
build: Clean up man page generation
Use autoconf variables instead of autoconf subsitutions. Use the
destination man page filename in the driverman_DATA variable, instead
of generating it from the source filename.
diff --git a/man/Makefile.am b/man/Makefile.am
index 870791a..52648f9 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -21,12 +21,9 @@
#
drivermandir = $(DRIVER_MAN_DIR)
+driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX)
-driverman_PRE = @driver_n...@.man
-
-driverman_DATA = $(driverman_PRE:m...@driver_man_suffix@)
-
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pfnfu-000235...@alioth.debian.org
