andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug #5089: Die, libbitmap, die!

Browse Source
This commit is contained in:
Adam Jackson 2006-06-01 19:37:53 +00:00
parent 32be08ba72
commit 07c731a2bc
4 changed files with 9 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-06-01 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/common/xf86Init.c:
* hw/xfree86/dixmods/Makefile.am:
* hw/xfree86/dixmods/bitmapmod.c:
Bug #5089: Die, libbitmap, die!
2006-06-01 Daniel Stone <daniel@freedesktop.org>
* Xext/Makefile.am:

3
hw/xfree86/common/xf86Init.c
View File

@ -1,5 +1,5 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */
/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.35 2006/05/09 18:04:29 ajax Exp $ */
/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.36 2006/06/01 18:47:01 daniels Exp $ */
/*
* Loosely based on code bearing the following copyright:
@ -116,7 +116,6 @@ void (*xf86OSPMClose)(void) = NULL;
#ifdef XFree86LOADER
static char *baseModules[] = {
"bitmap",
"pcidata",
NULL
};

8
hw/xfree86/dixmods/Makefile.am
View File

@ -28,8 +28,7 @@ extsmodule_LTLIBRARIES = librecord.la \
$(XTRAPMOD)
fontsmoduledir = $(moduledir)/fonts
fontsmodule_LTLIBRARIES = libbitmap.la \
libfreetype.la \
fontsmodule_LTLIBRARIES = libfreetype.la \
libtype1.la
AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
@ -50,11 +49,6 @@ libafb_la_LDFLAGS = -avoid-version
libafb_la_LIBADD = $(top_builddir)/afb/libafb.la
libafb_la_SOURCES = afbmodule.c
# libbitmap is just a wrapper around the bitmap font code in Xfont.
# it doesn't even make sense to have it loadable, but, welcome to X.
libbitmap_la_SOURCES = bitmapmod.c
libbitmap_la_LDFLAGS = -avoid-version # `pkg-config --libs xfont`
libcfb_la_LDFLAGS = -avoid-version
libcfb_la_LIBADD = $(top_builddir)/cfb/libcfb.la
libcfb_la_SOURCES = cfbmodule.c

76
hw/xfree86/dixmods/bitmapmod.c
View File

@ -1,76 +0,0 @@
/*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
*
* 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 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
* XFREE86 PROJECT 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 XFree86 Project 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
* XFree86 Project.
*/
/* $XFree86: xc/lib/font/bitmap/module/bitmapmod.c,v 1.7 1999/01/26 05:53:47 dawes Exp $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <X11/Xdefs.h>
#include <X11/fonts/fontmod.h>
#include "xf86Module.h"
static MODULESETUPPROTO(bitmapSetup);
/*
* This is the module data function that is accessed when loading
* libbitmap as a module.
*/
static XF86ModuleVersionInfo VersRec =
{
"bitmap",
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_FONT, /* Font module */
ABI_FONT_VERSION,
MOD_CLASS_FONT,
{0,0,0,0} /* signature, to be patched into the file by a tool */
};
XF86ModuleData bitmapModuleData = { &VersRec, bitmapSetup, NULL };
extern void BitmapRegisterFontFileFunctions(void);
FontModule bitmapModule = {
BitmapRegisterFontFileFunctions,
"Bitmap",
NULL
};
static pointer
bitmapSetup(pointer mod, pointer opts, int *errmaj, int *errmin)
{
bitmapModule.module = mod;
LoadFont(&bitmapModule);
/* Need a non-NULL return */
return (pointer)1;
}