xserver-xorg-video-newport: Changes to 'debian-unstable'
debian/changelog | 6 ++++--
src/newport_driver.c | 45 ---------------------------------------------
2 files changed, 4 insertions(+), 47 deletions(-)
New commits:
commit c1f9dbdd724b1a8c1673f669681a1b16a36dd529
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 23 14:54:57 2010 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index bba498c..7ff7729 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-newport (1:0.2.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-newport (1:0.2.3-1) unstable; urgency=low
[ Timo Aaltonen ]
* New upstream release.
@@ -11,7 +11,7 @@ xserver-xorg-video-newport (1:0.2.3-1) UNRELEASED; urgency=low
* Cherry-pick patch from upstream git to stop calling functions which don't
exist in xserver 1.7. Thanks, Bernhard R. Link!
- -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:08 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 23 Jan 2010 14:54:54 +0100
xserver-xorg-video-newport (1:0.2.2-1) unstable; urgency=low
commit 514925c99ff96fb42654d9b0980c4ad4a49c3d47
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 23 14:54:25 2010 +0100
update changelog
diff --git a/debian/changelog b/debian/changelog
index 543ed13..bba498c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ xserver-xorg-video-newport (1:0.2.3-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
+ * Cherry-pick patch from upstream git to stop calling functions which don't
+ exist in xserver 1.7. Thanks, Bernhard R. Link!
-- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:08 +0200
commit 10113d246dee68ca923ea0867a4525c144ee1919
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 23 14:46:46 2010 +0100
newport: stop using obsolete loader functions
The loader symbol list functions have been removed from the server in
1.7.
Reported-and-tested-by: Bernhard R. Link <brlink@debian.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
(cherry picked from commit 48f48e585bf542be48d7d34dc66d430d6843268f)
diff --git a/src/newport_driver.c b/src/newport_driver.c
index 64b643a..6bd7c9f 100644
--- a/src/newport_driver.c
+++ b/src/newport_driver.c
@@ -102,36 +102,6 @@ static SymTabRec NewportChipsets[] = {
{-1, NULL }
};
-/* List of Symbols from other modules that this module references */
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAGetFallbackOps",
- "XAAInit",
- NULL
-};
-
-
-#ifdef XFree86LOADER
-
static MODULESETUPPROTO(newportSetup);
static XF86ModuleVersionInfo newportVersRec =
@@ -172,14 +142,6 @@ newportSetup(pointer module, pointer opts, int *errmaj, int *errmin)
xf86AddDriver(&NEWPORT, module, 0);
/*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- *
- */
- LoaderRefSymLists( fbSymbols, ramdacSymbols, shadowSymbols, xaaSymbols, NULL);
-
-
- /*
* The return value must be non-NULL on success even though
* there is no TearDownProc.
*/
@@ -190,8 +152,6 @@ newportSetup(pointer module, pointer opts, int *errmaj, int *errmin)
}
}
-#endif /* XFree86LOADER */
-
typedef enum {
OPTION_BITPLANES,
OPTION_BUS_ID,
@@ -486,7 +446,6 @@ NewportPreInit(ScrnInfoPtr pScrn, int flags)
NewportFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists( fbSymbols, NULL);
/* Load ramdac modules */
if (pNewport->hwCursor) {
@@ -494,7 +453,6 @@ NewportPreInit(ScrnInfoPtr pScrn, int flags)
NewportFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* Load ShadowFB module */
@@ -502,7 +460,6 @@ NewportPreInit(ScrnInfoPtr pScrn, int flags)
NewportFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
return TRUE;
}
@@ -596,8 +553,6 @@ NewportScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
if (!pNewport->NoAccel) {
if (!xf86LoadSubModule(pScrn, "xaa"))
pNewport->NoAccel = TRUE;
- else
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
#if 0
if (pScrn->bitsPerPixel < 24)
Reply to: