ChangeLog | 97 +++++++++++++++ README | 20 +++ configure.ac | 2 debian/README.source | 73 +++++++++++ debian/changelog | 12 + debian/control | 2 debian/xserver-xorg-video-glint.install | 1 debian/xsfbs/xsfbs.sh | 12 - man/glint.man | 2 src/Makefile.am | 2 src/glint.h | 1 src/glint_driver.c | 197 +------------------------------- src/pm3_dac.c | 1 13 files changed, 216 insertions(+), 206 deletions(-)
New commits: commit eecb91496bc942bdb555af3abe9b43927db3c572 Author: Brice Goglin <[email protected]> Date: Mon Jul 20 18:34:57 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index d813939..20092f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-glint (1:1.2.3-1) UNRELEASED; urgency=low +xserver-xorg-video-glint (1:1.2.3-1) unstable; urgency=low [ David Nusinow ] * Remove 03_gen_pci_ids.diff. The X server now uses an internal table to @@ -11,7 +11,7 @@ xserver-xorg-video-glint (1:1.2.3-1) UNRELEASED; urgency=low + Fix endianness problem causing wrong memory size detection, closes: #420738. - -- Brice Goglin <[email protected]> Mon, 20 Jul 2009 18:31:57 +0200 + -- Brice Goglin <[email protected]> Mon, 20 Jul 2009 18:34:52 +0200 xserver-xorg-video-glint (1:1.2.2-2) unstable; urgency=low commit edc44cf7d754c1bb540f651df924acfade3a3709 Author: Brice Goglin <[email protected]> Date: Mon Jul 20 18:27:44 2009 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog index 961c285..c76f137 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,100 @@ +commit 833a4f3fcc859a80b4edc9d4c45061c11f8290ab +Author: Adam Jackson <[email protected]> +Date: Thu Jul 2 11:12:21 2009 -0400 + + glint 1.2.3 + +commit 599fd0c36e38014cf4611130d2f75847af549a95 +Author: Mark Kettenis <[email protected]> +Date: Fri Jun 5 14:28:57 2009 -0600 + + Don't set the default depth to 8bpp. + + These days 24/32bpp makes much more sense. + + Signed-off-by: Matthieu Herrb <[email protected]> + +commit db324d0a4d9faf1df3a5c9be8f5a837e852e22cb +Author: Mark Kettenis <[email protected]> +Date: Fri Jun 5 14:27:55 2009 -0600 + + Disable int10 code if __sparc__. + + Signed-off-by: Matthieu Herrb <[email protected]> + +commit fc258c28f99101f7a08bac3f08a66b70ba273161 +Author: Mark Kettenis <[email protected]> +Date: Thu Jun 4 11:29:10 2009 -0600 + + Fix DDC probe. + + The driver tried to do DDC stuff without having its registers mapped. + + Signed-off-by: Matthieu Herrb <[email protected]> + +commit 2c022e126c027d20b4b060e31cccb012265cec6a +Author: Mark Kettenis <[email protected]> +Date: Thu Jun 4 11:27:07 2009 -0600 + + Only map a 64k block of registers. + + The driver tries to map a block of registers that is too large. The + mmio registers consist of two blocks of 64k. The first 64k provide a + little-endian view, the second 64k provide a big-endian view. However + the driver always tries to map 128k. And mapping 128k from the offset + where the big-endian view starts will fail on OpenBSD. + + This changes things such that the driver maps just 64k. There is no + reason to map the big-endian view on little-endian machines. + + Signed-off-by: Matthieu Herrb <[email protected]> + +commit 1b36ca0c453191e4837cea25794731b166df19f7 +Author: Mark Kettenis <[email protected]> +Date: Thu Jun 4 11:24:15 2009 -0600 + + Fix for big-endian machines. + + The problem is that the card provides a big-endian view on its + registers, which the driver uses on big-endian machines. However, the + driver uses MMIO_OUT32() and friends to access these registers. And + on sparc64, these macros do byte swapping themselves. The net result + of course is that no byte swapping gets done at all, and things fail + miserably. + + The fix is to make the macros not do byte swapping, which can be done + by defining SPARC_MMIO_IS_BE. There is a similar define for powerpc + as well. I assume these defines were accidentally dropped in the + autoconfiscation of Xorg. + + Other people came up with the same conclusion see: + + http://www.mail-archive.com/[email protected]/msg20874.html + + and + + https://bugs.freedesktop.org/show_bug.cgi?id=10742 + + Signed-off-by: Matthieu Herrb <[email protected]> + +commit 860e3c4bc40b6e130411b954f8945e8fbc42c9bb +Author: Adam Jackson <[email protected]> +Date: Thu May 28 14:58:01 2009 -0400 + + Remove useless loader symbol lists. + +commit 6b6cca87d65d062035b156485e3865e1973115e4 +Author: Alan Coopersmith <[email protected]> +Date: Fri Jan 30 20:39:18 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + +commit 4a03cf57e4c8c998bca8bd4378777cf0008764bd +Author: Alan Coopersmith <[email protected]> +Date: Fri Jan 9 16:28:39 2009 -0800 + + Remove xorgconfig & xorgcfg from See Also list in man page + commit f0b4f9629c4c11c33f8c6d382b21da99a0c52570 Author: Dave Airlie <[email protected]> Date: Mon Dec 22 14:33:28 2008 +1000 diff --git a/debian/changelog b/debian/changelog index ae9d409..d813939 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-glint (1:1.2.2-3) UNRELEASED; urgency=low +xserver-xorg-video-glint (1:1.2.3-1) UNRELEASED; urgency=low [ David Nusinow ] * Remove 03_gen_pci_ids.diff. The X server now uses an internal table to @@ -6,8 +6,12 @@ xserver-xorg-video-glint (1:1.2.2-3) UNRELEASED; urgency=low [ Brice Goglin ] * Add README.source, bump Standards-Version to 3.8.2. + * New upstream release. + + Fix crash at startup, closes: #531918. + + Fix endianness problem causing wrong memory size detection, + closes: #420738. - -- Brice Goglin <[email protected]> Mon, 20 Jul 2009 18:24:55 +0200 + -- Brice Goglin <[email protected]> Mon, 20 Jul 2009 18:31:57 +0200 xserver-xorg-video-glint (1:1.2.2-2) unstable; urgency=low commit bcc8c45a476a3575963b7af132a75c360df5f0e5 Author: Brice Goglin <[email protected]> Date: Mon Jul 20 18:26:07 2009 +0200 Don't try to install usr/share/xserver-xorg/pci/* anymore diff --git a/debian/xserver-xorg-video-glint.install b/debian/xserver-xorg-video-glint.install index 8a9f4ba..614cfb4 100644 --- a/debian/xserver-xorg-video-glint.install +++ b/debian/xserver-xorg-video-glint.install @@ -1,3 +1,2 @@ usr/lib/xorg/modules/drivers/*.so usr/share/man/man4/* -usr/share/xserver-xorg/pci/* commit 6453aa468a301816e89e35dbfbc3c19f3601ba8a Author: Brice Goglin <[email protected]> Date: Mon Jul 20 18:25:01 2009 +0200 Adding README.source means we can bump Standards-Version diff --git a/debian/changelog b/debian/changelog index e632a90..ae9d409 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ xserver-xorg-video-glint (1:1.2.2-3) UNRELEASED; urgency=low + [ David Nusinow ] * Remove 03_gen_pci_ids.diff. The X server now uses an internal table to choose a driver during autoconfiguration. - -- David Nusinow <[email protected]> Mon, 04 May 2009 21:53:31 -0400 + [ Brice Goglin ] + * Add README.source, bump Standards-Version to 3.8.2. + + -- Brice Goglin <[email protected]> Mon, 20 Jul 2009 18:24:55 +0200 xserver-xorg-video-glint (1:1.2.2-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 43eadba..b0fe0a7 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.7.3 +Standards-Version: 3.8.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glint Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glint.git commit 833a4f3fcc859a80b4edc9d4c45061c11f8290ab Author: Adam Jackson <[email protected]> Date: Thu Jul 2 11:12:21 2009 -0400 glint 1.2.3 diff --git a/configure.ac b/configure.ac index b1b24a1..98c74cc 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-glint], - 1.2.2, + 1.2.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-glint) commit 599fd0c36e38014cf4611130d2f75847af549a95 Author: Mark Kettenis <[email protected]> Date: Fri Jun 5 14:28:57 2009 -0600 Don't set the default depth to 8bpp. These days 24/32bpp makes much more sense. Signed-off-by: Matthieu Herrb <[email protected]> diff --git a/src/glint_driver.c b/src/glint_driver.c index 3724ce9..73cfd11 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -939,7 +939,6 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) pScrn->monitor = pScrn->confScreen->monitor; /* * The first thing we should figure out is the depth, bpp, etc. - * Our default depth is 8, so pass it to the helper function. * We support both 24bpp and 32bpp layouts, so indicate that. */ if (FBDevProbed) { @@ -953,7 +952,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) if (!xf86SetDepthBpp(pScrn, default_depth, default_depth, fbbpp,0)) return FALSE; } else { - if (!xf86SetDepthBpp(pScrn, 8, 0, 0, Support24bppFb | Support32bppFb + if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb | Support32bppFb /*| SupportConvert32to24 | PreferConvert32to24*/)) return FALSE; } commit db324d0a4d9faf1df3a5c9be8f5a837e852e22cb Author: Mark Kettenis <[email protected]> Date: Fri Jun 5 14:27:55 2009 -0600 Disable int10 code if __sparc__. Signed-off-by: Matthieu Herrb <[email protected]> diff --git a/src/glint_driver.c b/src/glint_driver.c index f67e627..3724ce9 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -1274,6 +1274,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) } } +#if !defined(__sparc__) /* Initialize the card through int10 interface if needed */ if (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_GAMMA && pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_GAMMA2 && @@ -1287,6 +1288,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) xf86FreeInt10(pInt); } } +#endif pGlint->FbMapSize = 0; commit fc258c28f99101f7a08bac3f08a66b70ba273161 Author: Mark Kettenis <[email protected]> Date: Thu Jun 4 11:29:10 2009 -0600 Fix DDC probe. The driver tried to do DDC stuff without having its registers mapped. Signed-off-by: Matthieu Herrb <[email protected]> diff --git a/src/glint_driver.c b/src/glint_driver.c index 26c06a3..f67e627 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -1929,9 +1929,12 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) { xf86MonPtr pMon = NULL; - if (pGlint->DDCBus) + if (pGlint->DDCBus) { + GLINTMapMem(pScrn); pMon = xf86DoEDID_DDC2(pScrn->scrnIndex, pGlint->DDCBus); - + GLINTUnmapMem(pScrn); + } + if (!pMon) /* Try DDC1 */; commit 2c022e126c027d20b4b060e31cccb012265cec6a Author: Mark Kettenis <[email protected]> Date: Thu Jun 4 11:27:07 2009 -0600 Only map a 64k block of registers. The driver tries to map a block of registers that is too large. The mmio registers consist of two blocks of 64k. The first 64k provide a little-endian view, the second 64k provide a big-endian view. However the driver always tries to map 128k. And mapping 128k from the offset where the big-endian view starts will fail on OpenBSD. This changes things such that the driver maps just 64k. There is no reason to map the big-endian view on little-endian machines. Signed-off-by: Matthieu Herrb <[email protected]> diff --git a/src/glint_driver.c b/src/glint_driver.c index 9f82fb9..26c06a3 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -2292,13 +2292,13 @@ GLINTMapMem(ScrnInfoPtr pScrn) */ #ifndef XSERVER_LIBPCIACCESS pGlint->IOBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO_32BIT, - pGlint->PciTag, pGlint->IOAddress, 0x20000); + pGlint->PciTag, pGlint->IOAddress, 0x10000); #else { void** result = (void**)&pGlint->IOBase; int err = pci_device_map_range(pGlint->PciInfo, pGlint->IOAddress, - 0x20000, + 0x10000, PCI_DEV_MAP_FLAG_WRITABLE, result); @@ -2366,9 +2366,9 @@ GLINTUnmapMem(ScrnInfoPtr pScrn) * Unmap IO registers to virtual address space */ #ifndef XSERVER_LIBPCIACCESS - xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->IOBase, 0x20000); + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->IOBase, 0x10000); #else - pci_device_unmap_range(pGlint->PciInfo, pGlint->IOBase, 0x20000); + pci_device_unmap_range(pGlint->PciInfo, pGlint->IOBase, 0x10000); #endif pGlint->IOBase = NULL; commit 1b36ca0c453191e4837cea25794731b166df19f7 Author: Mark Kettenis <[email protected]> Date: Thu Jun 4 11:24:15 2009 -0600 Fix for big-endian machines. The problem is that the card provides a big-endian view on its registers, which the driver uses on big-endian machines. However, the driver uses MMIO_OUT32() and friends to access these registers. And on sparc64, these macros do byte swapping themselves. The net result of course is that no byte swapping gets done at all, and things fail miserably. The fix is to make the macros not do byte swapping, which can be done by defining SPARC_MMIO_IS_BE. There is a similar define for powerpc as well. I assume these defines were accidentally dropped in the autoconfiscation of Xorg. Other people came up with the same conclusion see: http://www.mail-archive.com/[email protected]/msg20874.html and https://bugs.freedesktop.org/show_bug.cgi?id=10742 Signed-off-by: Matthieu Herrb <[email protected]> diff --git a/src/Makefile.am b/src/Makefile.am index 79c9e54..1e4efa8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ +AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DPPC_MMIO_IS_BE -DSPARC_MMIO_IS_BE glint_drv_la_LTLIBRARIES = glint_drv.la glint_drv_la_LDFLAGS = -module -avoid-version glint_drv_ladir = @moduledir@/drivers commit 8f72294ada477f003888b6776883c1dd98289f3f Author: Julien Cristau <[email protected]> Date: Wed Jun 3 03:37:37 2009 +0200 Kill custom readlink function This was needed for very, very old versions of debianutils. Closes: #498890 diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 197eb74..781826f 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -303,16 +303,6 @@ EOF fi } -# we require a readlink command or shell function -if ! which readlink > /dev/null 2>&1; then - message "The readlink command was not found. Please install version" \ - "1.13.1 or later of the debianutils package." - readlink () { - # returns what symlink in $1 actually points to - perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1" - } -fi - check_symlink () { # syntax: check_symlink symlink # commit 860e3c4bc40b6e130411b954f8945e8fbc42c9bb Author: Adam Jackson <[email protected]> Date: Thu May 28 14:58:01 2009 -0400 Remove useless loader symbol lists. diff --git a/src/glint.h b/src/glint.h index 54f9d18..9115b92 100644 --- a/src/glint.h +++ b/src/glint.h @@ -343,7 +343,6 @@ Bool GLINTSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); void GLINTAdjustFrame(int scrnIndex, int x, int y, int flags); extern int partprodPermedia[]; -extern const char *GLINTint10Symbols[]; Bool GLINTDGAInit(ScreenPtr pScreen); diff --git a/src/glint_driver.c b/src/glint_driver.c index fd5b34c..9f82fb9 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -229,158 +229,7 @@ static RamDacSupportedInfoRec TIRamdacs[] = { { -1 } }; -static const char *xf8_32bppSymbols[] = { - "cfb8_32ScreenInit", - "xf86Overlay8Plus32Init", - NULL -}; - -static const char *xaaSymbols[] = { - "XAACreateInfoRec", - "XAADestroyInfoRec", - "XAAInit", - "XAAPolyLines", - "XAAPolySegment", - NULL -}; - -static const char *fbSymbols[] = { - "fbBres", - "fbPictureInit", - "fbScreenInit", - NULL -}; - -static const char *ddcSymbols[] = { - "xf86PrintEDID", - "xf86DoEDID_DDC2", - "xf86SetDDCproperties", - NULL -}; - -static const char *i2cSymbols[] = { - "xf86CreateI2CBusRec", - "xf86DestroyI2CBusRec", - "xf86DestroyI2CDevRec", - "xf86I2CBusInit", - "xf86I2CDevInit", - "xf86I2CProbeAddress", - "xf86I2CWriteByte", - "xf86I2CWriteVec", - NULL -}; - -static const char *shadowSymbols[] = { - "ShadowFBInit", - NULL -}; - #ifdef XFree86LOADER -static const char *vbeSymbols[] = { - "VBEInit", - "vbeDoEDID", - "vbeFree", - NULL -}; -#endif - -static const char *ramdacSymbols[] = { - "IBMramdac526CalculateMNPCForClock", - "IBMramdac640CalculateMNPCForClock", - "IBMramdacProbe", - "RamDacCreateInfoRec", - "RamDacDestroyInfoRec", - "RamDacFreeRec", - "RamDacGetHWIndex", - "RamDacHandleColormaps", - "RamDacInit", - "TIramdacCalculateMNPForClock", - "TIramdacLoadPalette", - "TIramdacLoadPaletteWeak", - "TIramdacProbe", - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - "xf86InitCursor", - NULL -}; - - -static const char *fbdevHWSymbols[] = { - "fbdevHWFreeRec", - "fbdevHWInit", - "fbdevHWProbe", - "fbdevHWUseBuildinMode", - - "fbdevHWGetDepth", - "fbdevHWGetVidmem", - - /* colormap */ - "fbdevHWLoadPaletteWeak", - - /* ScrnInfo hooks */ - "fbdevHWAdjustFrameWeak", - "fbdevHWEnterVT", - "fbdevHWLeaveVTWeak", - "fbdevHWMapMMIO", - "fbdevHWMapVidmem", - "fbdevHWModeInit", - "fbdevHWRestore", - "fbdevHWSave", - "fbdevHWSwitchMode", - "fbdevHWUnmapMMIO", - "fbdevHWUnmapVidmem", - "fbdevHWValidModeWeak", - - NULL -}; - -const char *GLINTint10Symbols[] = { - "xf86FreeInt10", - "xf86InitInt10", - NULL -}; - -#ifdef XFree86LOADER - -#ifdef XF86DRI_DEVEL -static const char *drmSymbols[] = { - "drmAddBufs", - "drmAddMap", - "drmAgpAcquire", - "drmAgpAlloc", - "drmAgpBind", - "drmAgpEnable", - "drmAgpFree", - "drmAgpGetMode", - "drmAgpRelease", - "drmAgpUnbind", - "drmCommandWrite", - "drmCtlInstHandler", - "drmFreeBufs", - "drmFreeVersion", - "drmGetInterruptFromBusID", - "drmGetLibVersion", - "drmGetVersion", - "drmMap", - "drmMapBufs", - "drmUnmap", - "drmUnmapBufs", - NULL -}; - -static const char *driSymbols[] = { - "DRICloseScreen", - "DRICreateInfoRec", - "DRIDestroyInfoRec", - "DRIFinishScreenInit", - "DRIGetDrawableIndex", - "DRIQueryVersion", - "DRIScreenInit", - "GlxSetVisualConfigs", - "DRICreatePCIBusID", - NULL -}; -#endif static MODULESETUPPROTO(glintSetup); @@ -408,14 +257,6 @@ glintSetup(pointer module, pointer opts, int *errmaj, int *errmin) if (!setupDone) { setupDone = TRUE; xf86AddDriver(&GLINT, module, 0); - LoaderRefSymLists(fbSymbols, ddcSymbols, i2cSymbols, - xaaSymbols, xf8_32bppSymbols, - shadowSymbols, fbdevHWSymbols, GLINTint10Symbols, - vbeSymbols, ramdacSymbols, -#ifdef XF86DRI_DEVEL - drmSymbols, driSymbols, -#endif - NULL); return (pointer)TRUE; } @@ -663,8 +504,6 @@ GLINTProbe(DriverPtr drv, int flags) if (!xf86LoadDrvSubModule(drv, "fbdevhw")) return FALSE; - xf86LoaderReqSymLists(fbdevHWSymbols, NULL); - for (i = 0; i < numDevSections; i++) { dev = xf86FindOptionValue(devSections[i]->options,"fbdev"); if (devSections[i]->busID) { @@ -986,7 +825,6 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) ClockRangePtr clockRanges; char *mod = NULL; const char *s; - const char **syms = NULL; TRACE_ENTER("GLINTPreInit"); @@ -1239,8 +1077,6 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - xf86LoaderReqSymLists(fbdevHWSymbols, NULL); - if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(pGlint->pEnt->device->options,"fbdev"))) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbdevHWInit failed!\n"); @@ -1446,7 +1282,6 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) if ( xf86LoadSubModule(pScrn, "int10")){ xf86Int10InfoPtr pInt; - xf86LoaderReqSymLists(GLINTint10Symbols, NULL); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n"); pInt = xf86InitInt10(pGlint->pEnt->index); xf86FreeInt10(pInt); @@ -1677,8 +1512,6 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) if (!xf86LoadSubModule(pScrn, "ramdac")) return FALSE; - xf86LoaderReqSymLists(ramdacSymbols, NULL); - /* Let's check what type of DAC we have and reject if necessary */ switch (pGlint->Chipset) { case PCI_VENDOR_TI_CHIP_PERMEDIA2: @@ -2054,7 +1887,6 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) GLINTFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(ddcSymbols, NULL); /* Load I2C if needed */ if ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2) || (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V) || @@ -2065,7 +1897,6 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) if (xf86LoadSubModule(pScrn, "i2c")) { I2CBusPtr pBus; - xf86LoaderReqSymLists(i2cSymbols, NULL); if ((pBus = xf86CreateI2CBusRec())) { pBus->BusName = "DDC"; pBus->scrnIndex = pScrn->scrnIndex; @@ -2395,15 +2226,12 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) case 16: case 24: mod = "fb"; - syms = fbSymbols; break; case 32: if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) { mod = "xf8_32bpp"; - syms = xf8_32bppSymbols; } else { mod = "fb"; - syms = fbSymbols; } break; } @@ -2411,9 +2239,6 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) GLINTFreeRec(pScrn); return FALSE; } - if (mod && syms) { - xf86LoaderReqSymLists(syms, NULL); - } /* Load XAA if needed */ if (!pGlint->NoAccel) { @@ -2421,7 +2246,6 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) GLINTFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(xaaSymbols, NULL); } /* Load shadowfb if needed */ @@ -2430,7 +2254,6 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) GLINTFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(shadowSymbols, NULL); } TRACE_EXIT("GLINTPreInit"); diff --git a/src/pm3_dac.c b/src/pm3_dac.c index 9b1bd3b..f2dfb5e 100644 --- a/src/pm3_dac.c +++ b/src/pm3_dac.c @@ -445,7 +445,6 @@ Permedia3PreInit(ScrnInfoPtr pScrn) if (xf86LoadSubModule(pScrn, "int10")) { xf86Int10InfoPtr pInt; - xf86LoaderReqSymLists(GLINTint10Symbols, NULL); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n"); pInt = xf86InitInt10(pGlint->pEnt->index); xf86FreeInt10(pInt); commit 7deebf983f53c505bc25171ab77fdc408f250a6e Author: Julien Cristau <[email protected]> Date: Tue May 26 15:58:19 2009 +0200 xsfbs: don't run dpkg --print-installation-architecture This is deprecated in new dpkg, and had no users anyway. diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 8840ff9..197eb74 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -57,8 +57,6 @@ EOF exit $SHELL_LIB_USAGE_ERROR fi -ARCHITECTURE="$(dpkg --print-installation-architecture)" - if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then RECONFIGURE="true" else commit 4178d948cd66a938222d0d7c6353ee8d60229e40 Author: David Nusinow <[email protected]> Date: Mon May 25 20:08:50 2009 -0400 Add README.source diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..34ab4bf --- /dev/null +++ b/debian/README.source @@ -0,0 +1,73 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. + +quilt is actually invoked by the Debian X packaging through a larger +set of scripts called XSFBS. XSFBS brings some other X specific +features such as managing dependencies and conflicts due to the video +and input driver ABIs. +XSFBS itself is maintained in a separate repository at + git://git.debian.org/pkg-xorg/xsfbs.git +and it is pulled inside the other Debian X repositories when needed. + +The XSFBS patching system requires a build dependency on quilt. Also +a dependency on $(STAMP_DIR)/patch has to be added to debian/rules +so that the XSFBS patching occurs before the actual build. So the +very first target of the build (likely the one running autoreconf) +should depend on $(STAMP_DIR)/patch. It should also not depend on +anything so that parallel builds are correctly supported (nothing +should probably run while patching is being done). And finally, the +clean target should depend on the xsfclean target so that patches +are unapplied on clean. + +When the upstream sources contain some DFSG-nonfree files, they are +listed in text files in debian/prune/ in the "debian-*" branch of +the Debian repository. XSFBS' scripts then take care of removing +these listed files during the build so as to generate a modified +DFSG-free .orig.tar.gz tarball. commit 6b6cca87d65d062035b156485e3865e1973115e4 Author: Alan Coopersmith <[email protected]> Date: Fri Jan 30 20:39:18 2009 -0800 Add README with pointers to mailing list, bugzilla & git repos diff --git a/README b/README new file mode 100644 index 0000000..1dee38f --- /dev/null +++ b/README @@ -0,0 +1,20 @@ +xf86-video-glint - GLINT/Permedia video driver for the Xorg X server + +Please submit bugs & patches to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/driver/xf86-video-glint + + http://cgit.freedesktop.org/xorg/driver/xf86-video-glint + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage commit 4a03cf57e4c8c998bca8bd4378777cf0008764bd Author: Alan Coopersmith <[email protected]> Date: Fri Jan 9 16:28:39 2009 -0800 Remove xorgconfig & xorgcfg from See Also list in man page diff --git a/man/glint.man b/man/glint.man index 268916d..1a103f7 100644 --- a/man/glint.man +++ b/man/glint.man @@ -104,7 +104,7 @@ acceleration in general, but disables it for some special cases. Default: off. If you have a card of the same name, turn this on. Default: off. .TP .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) .SH AUTHORS Authors include: Alan Hourihane, Dirk Hohndel, Stefan Dirsch, Michel Dänzer, Sven Luther -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
