/[gentoo-x86]/x11-base/xorg-server/files/xorg-composite.patch
Gentoo

Contents of /x11-base/xorg-server/files/xorg-composite.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Sun Aug 21 10:04:25 2005 UTC (8 years, 8 months ago) by spyderous
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Drop old versions.
(Portage version: 2.0.51.22-r2)

1 1. Make composite build for Xnest and Xorg by fixing link order
2 2. Make Xdmx link properly when building the module with composite
3 3. Fix typo of XF86MIS instead of XF86MISC
4 4. Require glproto for dmx/glxproxy and for dri+glx
5
6 Index: xorg/configure.ac
7 ===================================================================
8 RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
9 retrieving revision 1.30
10 diff -u -b -B -r1.30 configure.ac
11 --- xorg/configure.ac 27 Jul 2005 08:11:26 -0000 1.30
12 +++ xorg/configure.ac 28 Jul 2005 20:49:35 -0000
13 @@ -221,6 +221,9 @@
14 if test "$DMX" = yes; then
15 PKG_CHECK_MODULES([DMXMODULES],
16 [xmuu xext x11 xrender xfont xi dmxproto])
17 + if test "$GLX" = yes; then
18 + PKG_CHECK_MODULES([GL],[glproto])
19 + fi
20 fi
21 AM_CONDITIONAL(DMX, [test x$DMX = xyes])
22
23 @@ -404,6 +407,9 @@
24 AC_SUBST(DRIPROTO_CFLAGS)
25 PKG_CHECK_MODULES([LIBDRM], [libdrm])
26 AC_SUBST(LIBDRM_CFLAGS)
27 + if test "$GLX" = yes; then
28 + PKG_CHECK_MODULES([GL],[glproto])
29 + fi
30 fi
31 AC_DEFINE(XINPUT,1,[Support X Input extension])
32 EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/Xi/libXi.la'
33 @@ -541,7 +547,7 @@
34 if test x$XF86VIDMODE = xyes; then
35 AC_DEFINE(XF86VIDMODE,1,[Support XFree86 Video Mode extension])
36 fi
37 -if test x$XF86MIS = xyes; then
38 +if test x$XF86MISC = xyes; then
39 AC_DEFINE(XF86MISC,1,[Support XFree86 miscellaneous extensions])
40 fi
41 # must come first as it uses stuff in Shape -d
42 @@ -574,11 +574,6 @@
43 EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/damageext/libdamageext.la'
44 EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/damageext'
45
46 -if test "$COMPOSITE" = yes; then
47 - EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.la'" "'$(top_builddir)/miext/cw/libcw.la'
48 - EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/composite'
49 -fi
50 -
51 DIX_LIB='$(top_builddir)/dix/libdix.la'
52 OS_LIB='$(top_builddir)/os/libos.la'
53 MI_LIB='$(top_builddir)/mi/libmi.la'
54 @@ -598,6 +593,12 @@
55 XI_INC='-I$(top_srcdir)/Xi'
56 CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
57
58 +if test "$COMPOSITE" = yes; then
59 + EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.la'
60 + DAMAGE_LIB="$DAMAGE_LIB "'$(top_builddir)/miext/cw/libcw.la'
61 + EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/composite'" "'-I$(top_srcdir)/miext/cw'
62 +fi
63 +
64 PKG_CHECK_MODULES([XSERVER], [$REQUIRED_MODULES])
65 XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
66

  ViewVC Help
Powered by ViewVC 1.1.20