projects / packages / xorg-xserver-server.git / blame
| Commit | Line | Data |
|---|---|---|
| 3788afaa AM |
1 | --- xorg/mi/Makefile.am~ 2007-09-06 13:40:39.000000000 +0200 |
| 2 | +++ xorg/mi/Makefile.am 2007-09-06 13:41:26.567200032 +0200 | |
| 3 | @@ -67,3 +67,6 @@ | |
| 4 | mizerarc.h \ | |
| 5 | mizerclip.c \ | |
| 6 | mizerline.c | |
| 7 | + | |
| 8 | +libmi_la_LIBADD = $(XSERVERLIBS_LIBS) | |
| 9 | + | |
| 10 | --- xorg/hw/xnest/Makefile.am~ 2007-09-06 13:40:39.000000000 +0200 | |
| 11 | +++ xorg/hw/xnest/Makefile.am 2007-09-06 13:41:58.057326203 +0200 | |
| 12 | @@ -53,6 +53,7 @@ | |
| 13 | Xnest_LDADD = $(XORG_CORE_LIBS) \ | |
| 14 | $(XNEST_LIBS) \ | |
| 15 | $(XNESTMODULES_LIBS) \ | |
| 16 | + $(XSERVERLIBS_LIBS) \ | |
| 17 | libfbcmap.a | |
| 18 | ||
| 19 | EXTRA_DIST = icon \ | |
| 20 | --- xorg/hw/dmx/dmxinit.c~ 2007-08-23 21:04:52.000000000 +0200 | |
| 21 | +++ xorg/hw/dmx/dmxinit.c 2007-09-06 13:19:29.865279423 +0200 | |
| 22 | @@ -117,6 +117,17 @@ | |
| 23 | ||
| 24 | Bool dmxAddRemoveScreens = FALSE; | |
| 25 | ||
| 26 | +int | |
| 27 | +NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) | |
| 28 | +{ | |
| 29 | + return BadValue; | |
| 30 | +} | |
| 31 | + | |
| 32 | +void | |
| 33 | +DeleteInputDeviceRequest(DeviceIntPtr dev) | |
| 34 | +{ | |
| 35 | +} | |
| 36 | + | |
| 37 | /* dmxErrorHandler catches errors that occur when calling one of the | |
| 38 | * back-end servers. Some of this code is based on _XPrintDefaultError | |
| 39 | * in xc/lib/X11/XlibInt.c */ | |
| 40 | --- xorg/hw/dmx/Makefile.am.org 2007-09-06 12:57:41.461829430 +0200 | |
| 41 | +++ xorg/hw/dmx/Makefile.am 2007-09-06 12:57:58.574980965 +0200 | |
| 42 | @@ -85,6 +85,7 @@ | |
| 43 | Xdmx_LDADD = $(XORG_CORE_LIBS) \ | |
| 44 | $(XDMX_LIBS) \ | |
| 45 | $(GLX_LIBS) \ | |
| 46 | + $(XSERVERLIBS_LIBS) \ | |
| 47 | input/libdmxinput.a \ | |
| 48 | config/libdmxconfig.a \ | |
| 49 | @DMXMODULES_LIBS@ | |
| 50 | ||
| 51 | From: Gerte Hoogewerf <g.hoogewerf@gmail.com> | |
| 52 | Date: Tue, 4 Sep 2007 23:09:38 +0000 (-0700) | |
| 53 | Subject: Add stub symbols to make xprint build. | |
| 54 | X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=d67e210f3458b62d7d4a6032aabfda0004d661c1 | |
| 55 | ||
| 56 | Add stub symbols to make xprint build. | |
| 57 | --- | |
| 58 | ||
| 59 | --- a/hw/xprint/ddxInit.c | |
| 60 | +++ b/hw/xprint/ddxInit.c | |
| 61 | @@ -310,6 +310,17 @@ ChangeDeviceControl ( | |
| 62 | return BadMatch; | |
| 63 | } | |
| 64 | ||
| 65 | +int | |
| 66 | +NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) | |
| 67 | +{ | |
| 68 | + return BadValue; | |
| 69 | +} | |
| 70 | + | |
| 71 | +void | |
| 72 | +DeleteInputDeviceRequest(DeviceIntPtr dev) | |
| 73 | +{ | |
| 74 | +} | |
| 75 | + | |
| 76 | void | |
| 77 | OpenInputDevice ( | |
| 78 | DeviceIntPtr dev, | |
| 79 | --- xorg-server-1.4/hw/xprint/Makefile.am~ 2007-08-23 21:04:54.000000000 +0200 | |
| 80 | +++ xorg-server-1.4/hw/xprint/Makefile.am 2007-09-06 13:29:49.917161431 +0200 | |
| 81 | @@ -9,7 +9,7 @@ | |
| 82 | -DXFree86Server | |
| 83 | ||
| 84 | Xprt_LDFLAGS = -L$(top_srcdir) | |
| 85 | -Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \ | |
| 86 | +Xprt_LDADD = @XPRINT_LIBS@ @XSERVERLIBS_LIBS@ ps/libps.la raster/libraster.la \ | |
| 87 | pcl/libpcl.la pcl-mono/libpcl.la $(top_builddir)/fb/libfb.la \ | |
| 88 | $(top_builddir)/render/librender.la $(top_builddir)/mi/libmi.la \ | |
| 89 | $(top_builddir)/Xext/libXext.la @FREETYPE_LIBS@ | |
| 4dfc6400 AM |
90 | @@ -41,3 +41,5 @@ |
| 91 | $(top_srcdir)/fb/fbcmap_mi.c | |
| 92 | ||
| 93 | EXTRA_DIST = ValTree.c | |
| 94 | + | |
| 95 | +CLEANFILES = miinitext-wrapper.c dpmsstubs-wrapper.c |