98N/AFrom: Alan Coopersmith <alan.coopersmith@oracle.com>

98N/ASubject: [PATCH:tigervnc-trunk] Make fb header transformations work with Xorg 1.2.1

98N/A

98N/AThe reformatting of all the Xserver sources in the 1.12.1 release changed

98N/Athe headers so now some of them have multiple instances of the C++ "and"

98N/Aand "xor" keywords on the same line, so the hack to sanitize them needs

98N/Ato use the sed "g" flag to replace all instances, not just the first.

98N/A

98N/AOtherwise, the build fails with strange errors such as:

98N/A

98N/A"fb.h", line 817: Error: Unexpected type name "FbBits" encountered.

98N/A"fb.h", line 817: Error: dst is not defined.

98N/A"fb.h", line 818: Error: Unexpected type name "FbStride" encountered.

98N/A"fb.h", line 818: Error: dstStride is not defined.

98N/A"fb.h", line 819: Error: Badly formed expression.

98N/A

98N/ASigned-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

98N/A

98N/Adiff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am

98N/Aindex 1db0155..6604a87 100644

98N/A--- a/unix/xserver/hw/vnc/Makefile.am

98N/A+++ b/unix/xserver/hw/vnc/Makefile.am

98N/A@@ -68,10 +68,10 @@ EXTRA_DIST = Xvnc.man

98N/A BUILT_SOURCES = $(nodist_Xvnc_SOURCES)

98N/A

98N/A fb.h: $(top_srcdir)/fb/fb.h

98N/A- cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h

98N/A+ cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fb.h

98N/A

98N/A pixman.h: $(includedir)/pixman-1/pixman.h

98N/A cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h

98N/A

156N/A fbrop.h: $(top_srcdir)/fb/fbrop.h

98N/A- cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h

98N/A+ cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fbrop.h

98N/A