xserver-xorg-video-glide: Changes to 'debian-unstable'
debian/changelog | 10 ++++++++++
debian/control | 2 +-
src/glide_driver.c | 29 -----------------------------
3 files changed, 11 insertions(+), 30 deletions(-)
New commits:
commit 43e0d819c76fce64b6eb9bd64cdcfe27e001201f
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 5 01:30:19 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 8908d6f..1cc4797 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-glide (1.0.3-2+squeeze1) UNRELEASED; urgency=high
+xserver-xorg-video-glide (1.0.3-2+squeeze1) unstable; urgency=high
* Cherry-pick 5e09be624b from upstream: “Drop useless symbol
lists”. Those functions are neither available or useful anymore, and
@@ -6,7 +6,7 @@ xserver-xorg-video-glide (1.0.3-2+squeeze1) UNRELEASED; urgency=high
* Set urgency to “high” accordingly.
* Add myself to Uploaders.
- -- Cyril Brulebois <kibi@debian.org> Fri, 05 Nov 2010 01:23:41 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 05 Nov 2010 01:30:06 +0100
xserver-xorg-video-glide (1.0.3-2) unstable; urgency=medium
commit 40d3fc6872133eac8232ea4badd92e6b2d7a07cd
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 5 01:30:03 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 76892c0..8908d6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-glide (1.0.3-2+squeeze1) UNRELEASED; urgency=high
lists”. Those functions are neither available or useful anymore, and
they cause symbol lookup error (Closes: #602373).
* Set urgency to “high” accordingly.
+ * Add myself to Uploaders.
-- Cyril Brulebois <kibi@debian.org> Fri, 05 Nov 2010 01:23:41 +0100
diff --git a/debian/control b/debian/control
index 59806eb..1850529 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-glide
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Brice Goglin <bgoglin@debian.org>
+Uploaders: Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5),
pkg-config,
commit b7c6fe1f8606f3a07249cc91ce059b7bd0880d5c
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 5 01:29:36 2010 +0100
Set urgency to “high” accordingly.
diff --git a/debian/changelog b/debian/changelog
index 3267a20..76892c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-glide (1.0.3-2+squeeze1) UNRELEASED; urgency=low
+xserver-xorg-video-glide (1.0.3-2+squeeze1) UNRELEASED; urgency=high
* Cherry-pick 5e09be624b from upstream: “Drop useless symbol
lists”. Those functions are neither available or useful anymore, and
they cause symbol lookup error (Closes: #602373).
+ * Set urgency to “high” accordingly.
-- Cyril Brulebois <kibi@debian.org> Fri, 05 Nov 2010 01:23:41 +0100
commit a946cbf1935144c296d881a15b59de3a6375d295
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 5 01:29:09 2010 +0100
Document the cherry-pick of 5e09be624b from upstream to close #602373.
diff --git a/debian/changelog b/debian/changelog
index ff0b662..3267a20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-glide (1.0.3-2+squeeze1) UNRELEASED; urgency=low
+
+ * Cherry-pick 5e09be624b from upstream: “Drop useless symbol
+ lists”. Those functions are neither available or useful anymore, and
+ they cause symbol lookup error (Closes: #602373).
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 05 Nov 2010 01:23:41 +0100
+
xserver-xorg-video-glide (1.0.3-2) unstable; urgency=medium
* Update xsfbs and use new ${xviddriver:Depends} substvar.
commit 3e4bdb848ca8a5b2c32967a4565f742923b31772
Author: Guillem Jover <guillem@hadrons.org>
Date: Thu Oct 21 03:27:34 2010 +0200
Drop useless symbol lists
The functions are not available anymore.
(cherry picked from commit 5e09be624bd6c064e425f2aeeb0693285a76cf9a)
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;
}
Reply to: