Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.519 diff -u -2 -0 -r1.519 ChangeLog --- xc/ChangeLog 10 Nov 2004 03:25:26 -0000 1.519 +++ xc/ChangeLog 10 Nov 2004 07:41:42 -0000 @@ -1,20 +1,28 @@ +2004-11-09 Roland Mainz + * xc/lib/font/util/Imakefile + * xc/lib/font/util/utilbitmap.c + Bugzilla #1804 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1804): + Fix build failure (caused by missing symbols such as |TwoByteSwap|) + when linking the FreeType module and the FreeType library both + statically info the Xserver. + 2004-11-09 Alan Coopersmith * xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_cursor.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dma.h: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_xaa.c: (Bugzilla #1777) Import Mark Vojkovich's changes to NV driver since last sync with XFree86, including: Support for new NVIDIA chips. Egbert has a laptop that needs some DPMS ordering reversed. New chip support and workaround for Toshiba M30 laptop issue. PCI-Xpress chip support. Index: xc/lib/font/util/Imakefile =================================================================== RCS file: /cvs/xorg/xc/lib/font/util/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/lib/font/util/Imakefile 27 Aug 2004 19:27:11 -0000 1.3 +++ xc/lib/font/util/Imakefile 10 Nov 2004 07:42:01 -0000 @@ -2,49 +2,40 @@ XCOMM $XFree86: xc/lib/font/util/Imakefile,v 1.6 2000/12/07 16:40:30 dawes Exp $ #include INCLUDES = -I$(FONTINCSRC) -I../include HEADERS = #ifdef FontFormatDefines FORMAT_DEFS = FontFormatDefines #endif #if defined(SunArchitecture) && (OSMajorVersion == 5) && (OSMinorVersion <= 6) /* Work around a problem with __ctype being a "relocation against allocatable but non-writable section" on Solaris 2.6. Hopefully it doesn't break anything. */ SYS_DEFINES = -D__XPG4_CHAR_CLASS__ #endif -#ifndef LynxOSArchitecture -/* See xc/lib/font/FreeType/Imakefile - if we build the internal version of - * FreeType we should not implement functions already defined by it - * (see http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=513) - */ -#if !HasFreetype2 && !SharedLibFreetype2 -INTERNALDEFINES = -DUSE_INTERNAL_FREETYPE -#endif -#endif DEFINES = StrcasecmpDefines $(SYS_DEFINES) $(INTERNALDEFINES) SRCS = utilbitmap.c fontnames.c fontutil.c fontxlfd.c format.c \ fontaccel.c atom.c miscutil.c private.c patcache.c OBJS = utilbitmap.o fontnames.o fontutil.o fontxlfd.o format.o \ fontaccel.o atom.o miscutil.o private.o patcache.o #define DoNormalLib NormalLibFont #define DoSharedLib SharedLibFont #define DoDebugLib DebugLibFont #define DoProfileLib ProfileLibFont #include LibraryObjectRule() SubdirLibraryRule($(OBJS)) NormalLintTarget($(SRCS)) Index: xc/lib/font/util/utilbitmap.c =================================================================== RCS file: /cvs/xorg/xc/lib/font/util/utilbitmap.c,v retrieving revision 1.2 diff -u -2 -0 -r1.2 utilbitmap.c --- xc/lib/font/util/utilbitmap.c 23 Apr 2004 18:44:23 -0000 1.2 +++ xc/lib/font/util/utilbitmap.c 10 Nov 2004 07:42:01 -0000 @@ -10,42 +10,40 @@ 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 Open Group 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 Open Group. */ /* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.4 2001/01/17 19:43:34 dawes Exp $ */ -#ifndef USE_INTERNAL_FREETYPE - /* * Author: Keith Packard, MIT X Consortium */ #include "fontmisc.h" /* Utility functions for reformating font bitmaps */ static unsigned char _reverse_byte[0x100] = { 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2, 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, @@ -167,22 +165,21 @@ width = srcWidthBytes; if (width > dstWidthBytes) width = dstWidthBytes; pTmpSrc= pSrc; pTmpDst= pDst; for (row = 0; row < height; row++) { for (col = 0; col < width; col++) *pTmpDst++ = *pTmpSrc++; while (col < dstWidthBytes) { *pTmpDst++ = '\0'; col++; } pTmpSrc += srcWidthBytes - width; } return dstWidthBytes * height; } -#endif /* !USE_INTERNAL_FREETYPE */