--- xorg-server-1.4.1~git20080131.orig/dix/Makefile.in +++ xorg-server-1.4.1~git20080131/dix/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,7 +67,7 @@ dix_O_SOURCES = dix.c dix_O_OBJECTS = dix.$(OBJEXT) dix_O_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -155,6 +155,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -538,8 +539,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -551,8 +552,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -562,12 +563,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/dix/getevents.c +++ xorg-server-1.4.1~git20080131/dix/getevents.c @@ -344,7 +344,7 @@ for (i = first_valuator; i < final_valuator; i += 6, xv++, events++) { xv->type = DeviceValuator; xv->first_valuator = i; - xv->num_valuators = num_valuators; + xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (num_valuators - i); xv->deviceid = pDev->id; switch (final_valuator - i) { case 6: --- xorg-server-1.4.1~git20080131.orig/Makefile.in +++ xorg-server-1.4.1~git20080131/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -35,7 +35,7 @@ subdir = . DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/xorg-server.pc.in \ - $(top_srcdir)/configure COPYING ChangeLog config.guess \ + $(top_srcdir)/configure COPYING ChangeLog compile config.guess \ config.sub depcomp install-sh ltmain.sh missing ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -160,6 +160,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -604,8 +605,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -630,8 +631,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -641,12 +642,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -719,10 +721,6 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -750,8 +748,6 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -907,20 +903,19 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \ - distcheck distclean distclean-generic distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-aclocalDATA \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-aclocalDATA uninstall-am \ - uninstall-pkgconfigDATA + dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-libtool distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-aclocalDATA install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-aclocalDATA \ + uninstall-am uninstall-pkgconfigDATA .PHONY: ChangeLog --- xorg-server-1.4.1~git20080131.orig/ltmain.sh +++ xorg-server-1.4.1~git20080131/ltmain.sh @@ -43,7 +43,7 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="1.5.24 Debian 1.5.24-2" +VERSION="1.5.24 Debian 1.5.24-1" TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). --- xorg-server-1.4.1~git20080131.orig/xfixes/Makefile.in +++ xorg-server-1.4.1~git20080131/xfixes/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,7 +54,7 @@ am_libxfixes_la_OBJECTS = cursor.lo region.lo saveset.lo select.lo \ xfixes.lo libxfixes_la_OBJECTS = $(am_libxfixes_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -142,6 +142,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -457,8 +458,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -470,8 +471,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -481,12 +482,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/config/Makefile.in +++ xorg-server-1.4.1~git20080131/config/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,7 @@ am_libconfig_a_OBJECTS = config.$(OBJEXT) $(am__objects_1) \ $(am__objects_2) $(am__objects_3) libconfig_a_OBJECTS = $(am_libconfig_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -163,6 +163,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -486,8 +487,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -499,8 +500,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -510,12 +511,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/randr/Makefile.in +++ xorg-server-1.4.1~git20080131/randr/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ rrinfo.lo rrmode.lo rroutput.lo rrpointer.lo rrproperty.lo \ rrscreen.lo rrsdispatch.lo $(am__objects_2) librandr_la_OBJECTS = $(am_librandr_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -161,6 +161,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -496,8 +497,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -509,8 +510,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -520,12 +521,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/cfb32/Makefile.in +++ xorg-server-1.4.1~git20080131/cfb32/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,7 +67,7 @@ cfbply1rctC.lo cfbply1rctG.lo am_libcfb32_la_OBJECTS = $(am__objects_1) $(am__objects_2) libcfb32_la_OBJECTS = $(am_libcfb32_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -155,6 +155,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -707,8 +708,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -720,8 +721,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -731,12 +732,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/composite/Makefile.in +++ xorg-server-1.4.1~git20080131/composite/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,7 +54,7 @@ am_libcomposite_la_OBJECTS = compalloc.lo compext.lo compinit.lo \ compwindow.lo libcomposite_la_OBJECTS = $(am_libcomposite_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -142,6 +142,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -454,8 +455,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -467,8 +468,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -478,12 +479,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/ylwrap +++ xorg-server-1.4.1~git20080131/ylwrap @@ -1,10 +1,10 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2007-11-22.22 +scriptversion=2005-05-14.22 -# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, -# 2007 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. # # Written by Tom Tromey . # @@ -101,14 +101,14 @@ # FIXME: add hostname here for parallel makes that run commands on # other machines. But that might take us over the 14-char limit. dirname=ylwrap$$ -trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15 +trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15 mkdir $dirname || exit 1 cd $dirname case $# in - 0) "$prog" "$input" ;; - *) "$prog" "$@" "$input" ;; + 0) $prog "$input" ;; + *) $prog "$@" "$input" ;; esac ret=$? --- xorg-server-1.4.1~git20080131.orig/mfb/Makefile.in +++ xorg-server-1.4.1~git20080131/mfb/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,7 @@ mfbgetsp.lo mfbpolypnt.lo mfbcmap.lo mfbmisc.lo mfbbstore.lo \ $(am__objects_1) libmfb_la_OBJECTS = $(am_libmfb_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -163,6 +163,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -547,8 +548,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -560,8 +561,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -571,12 +572,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/render/Makefile.in +++ xorg-server-1.4.1~git20080131/render/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ miindex.lo mipict.lo mirect.lo mitrap.lo mitri.lo picture.lo \ render.lo renderedge.lo librender_la_OBJECTS = $(am_librender_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -156,6 +156,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -501,8 +502,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -514,8 +515,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -525,12 +526,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/damageext/Makefile.in +++ xorg-server-1.4.1~git20080131/damageext/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,7 +53,7 @@ libdamageext_la_LIBADD = am_libdamageext_la_OBJECTS = damageext.lo libdamageext_la_OBJECTS = $(am_libdamageext_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -141,6 +141,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -448,8 +449,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -461,8 +462,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -472,12 +473,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/Xext/Makefile.in +++ xorg-server-1.4.1~git20080131/Xext/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -144,7 +144,7 @@ @XORG_TRUE@am_libXextmodule_la_OBJECTS = $(am__objects_36) libXextmodule_la_OBJECTS = $(am_libXextmodule_la_OBJECTS) @XORG_TRUE@am_libXextmodule_la_rpath = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -247,6 +247,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -723,8 +724,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -736,8 +737,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -747,12 +748,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/mi/Makefile.in +++ xorg-server-1.4.1~git20080131/mi/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -62,7 +62,7 @@ miscrinit.lo mispans.lo misprite.lo mivaltree.lo miwideline.lo \ miwindow.lo mizerarc.lo mizerclip.lo mizerline.lo libmi_la_OBJECTS = $(am_libmi_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -162,6 +162,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -580,8 +581,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -593,8 +594,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -604,12 +605,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/configure +++ xorg-server-1.4.1~git20080131/configure @@ -907,6 +907,7 @@ FBDEVHW_FALSE FREEBSD_KLDLOAD_TRUE FREEBSD_KLDLOAD_FALSE +GLX_ARCH_DEFINES ALPHA_VIDEO_TRUE ALPHA_VIDEO_FALSE ARM_VIDEO_TRUE @@ -5277,7 +5278,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5280 "configure"' > conftest.$ac_ext + echo '#line 5281 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8309,11 +8310,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8312: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8313: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8316: \$? = $ac_status" >&5 + echo "$as_me:8317: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8599,11 +8600,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8602: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8603: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8606: \$? = $ac_status" >&5 + echo "$as_me:8607: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8703,11 +8704,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8706: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8707: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8710: \$? = $ac_status" >&5 + echo "$as_me:8711: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11065,7 +11066,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13589: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13592: \$? = $ac_status" >&5 + echo "$as_me:13593: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13689,11 +13690,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13692: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13693: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13696: \$? = $ac_status" >&5 + echo "$as_me:13697: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15266,11 +15267,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15269: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15270: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15273: \$? = $ac_status" >&5 + echo "$as_me:15274: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15370,11 +15371,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15373: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15374: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15377: \$? = $ac_status" >&5 + echo "$as_me:15378: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17570,11 +17571,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17573: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17574: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17577: \$? = $ac_status" >&5 + echo "$as_me:17578: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17860,11 +17861,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17863: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17864: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17867: \$? = $ac_status" >&5 + echo "$as_me:17868: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17964,11 +17965,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17967: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17968: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17971: \$? = $ac_status" >&5 + echo "$as_me:17972: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -26182,6 +26183,7 @@ _ACEOF ;; esac + GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee" ;; arm*) ARM_VIDEO=yes @@ -26220,6 +26222,7 @@ xorg_loader_sparcmuldiv="yes" SPARC64_VIDEO=yes BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c" + GLX_ARCH_DEFINES="-D__GLX_ALIGN64" ;; x86_64*|amd64*) use_x86_asm="yes" @@ -26246,9 +26249,17 @@ SYS_LIBS=-lamd64 ;; esac + GLX_ARCH_DEFINES="-D__GLX_ALIGN64" + ;; + ia64*) + GLX_ARCH_DEFINES="-D__GLX_ALIGN64" + ;; + s390*) + GLX_ARCH_DEFINES="-D__GLX_ALIGN64" ;; esac + if test "x$ALPHA_VIDEO" = xyes; then ALPHA_VIDEO_TRUE= ALPHA_VIDEO_FALSE='#' @@ -38646,6 +38657,7 @@ FBDEVHW_FALSE!$FBDEVHW_FALSE$ac_delim FREEBSD_KLDLOAD_TRUE!$FREEBSD_KLDLOAD_TRUE$ac_delim FREEBSD_KLDLOAD_FALSE!$FREEBSD_KLDLOAD_FALSE$ac_delim +GLX_ARCH_DEFINES!$GLX_ARCH_DEFINES$ac_delim ALPHA_VIDEO_TRUE!$ALPHA_VIDEO_TRUE$ac_delim ALPHA_VIDEO_FALSE!$ALPHA_VIDEO_FALSE$ac_delim ARM_VIDEO_TRUE!$ARM_VIDEO_TRUE$ac_delim @@ -38701,7 +38713,6 @@ COMPOSITE_TRUE!$COMPOSITE_TRUE$ac_delim COMPOSITE_FALSE!$COMPOSITE_FALSE$ac_delim MITSHM_TRUE!$MITSHM_TRUE$ac_delim -MITSHM_FALSE!$MITSHM_FALSE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -38743,6 +38754,7 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +MITSHM_FALSE!$MITSHM_FALSE$ac_delim XTRAP_TRUE!$XTRAP_TRUE$ac_delim XTRAP_FALSE!$XTRAP_FALSE$ac_delim RECORD_TRUE!$RECORD_TRUE$ac_delim @@ -38839,7 +38851,6 @@ DMXXIEXAMPLES_DEP_CFLAGS!$DMXXIEXAMPLES_DEP_CFLAGS$ac_delim DMXXIEXAMPLES_DEP_LIBS!$DMXXIEXAMPLES_DEP_LIBS$ac_delim XTSTEXAMPLES_DEP_CFLAGS!$XTSTEXAMPLES_DEP_CFLAGS$ac_delim -XTSTEXAMPLES_DEP_LIBS!$XTSTEXAMPLES_DEP_LIBS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -38881,6 +38892,7 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +XTSTEXAMPLES_DEP_LIBS!$XTSTEXAMPLES_DEP_LIBS$ac_delim XRESEXAMPLES_DEP_CFLAGS!$XRESEXAMPLES_DEP_CFLAGS$ac_delim XRESEXAMPLES_DEP_LIBS!$XRESEXAMPLES_DEP_LIBS$ac_delim X11EXAMPLES_DEP_CFLAGS!$X11EXAMPLES_DEP_CFLAGS$ac_delim @@ -38977,7 +38989,6 @@ BUILD_DARWIN_FALSE!$BUILD_DARWIN_FALSE$ac_delim XQUARTZ_TRUE!$XQUARTZ_TRUE$ac_delim XQUARTZ_FALSE!$XQUARTZ_FALSE$ac_delim -DGA_TRUE!$DGA_TRUE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -39019,6 +39030,7 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +DGA_TRUE!$DGA_TRUE$ac_delim DGA_FALSE!$DGA_FALSE$ac_delim XF86MISC_TRUE!$XF86MISC_TRUE$ac_delim XF86MISC_FALSE!$XF86MISC_FALSE$ac_delim @@ -39115,7 +39127,6 @@ PROJECTROOT!$PROJECTROOT$ac_delim XORGCONFIG_DEP_CFLAGS!$XORGCONFIG_DEP_CFLAGS$ac_delim XORGCONFIG_DEP_LIBS!$XORGCONFIG_DEP_LIBS$ac_delim -XORGCFG_DEP_CFLAGS!$XORGCFG_DEP_CFLAGS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -39157,6 +39168,7 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +XORGCFG_DEP_CFLAGS!$XORGCFG_DEP_CFLAGS$ac_delim XORGCFG_DEP_LIBS!$XORGCFG_DEP_LIBS$ac_delim APPDEFAULTDIR!$APPDEFAULTDIR$ac_delim BUILD_XORGCFG_TRUE!$BUILD_XORGCFG_TRUE$ac_delim @@ -39191,7 +39203,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -39592,22 +39604,21 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. -_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $_am_arg | $_am_arg:* ) + $ac_file | $ac_file:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$_am_arg" : 'X\(//\)[^/]' \| \ - X"$_am_arg" : 'X\(//\)$' \| \ - X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -echo X"$_am_arg" | +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| . 2>/dev/null || +echo X$ac_file | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -39644,7 +39655,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ --- xorg-server-1.4.1~git20080131.orig/install-sh +++ xorg-server-1.4.1~git20080131/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-12-25.00 +scriptversion=2006-10-14.15 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} +doit="${DOITPROG-}" if test -z "$doit"; then doit_exec=exec else @@ -58,49 +58,34 @@ # Put in absolute file names if you don't have them in your path; # or use environment vars. -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" +posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 -chgrpcmd= chmodcmd=$chmodprog chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" +chgrpcmd= stripcmd= - +rmcmd="$rmprog -f" +mvcmd="$mvprog" src= dst= dir_arg= -dst_arg= - -copy_on_change=false +dstarg= no_target_directory= -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -110,55 +95,65 @@ In the 4th, create DIRECTORIES. Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) ;; - - -C) copy_on_change=true;; + -c) shift + continue;; - -d) dir_arg=true;; + -d) dir_arg=true + shift + continue;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift + shift + continue;; --help) echo "$usage"; exit $?;; -m) mode=$2 + shift + shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - shift;; + continue;; -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - shift;; - - -T) no_target_directory=true;; + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; --version) echo "$0 $scriptversion"; exit $?;; @@ -170,22 +165,21 @@ *) break;; esac - shift done -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then +if test $# -ne 0 && test -z "$dir_arg$dstarg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dst_arg"; then + if test -n "$dstarg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" + set fnord "$@" "$dstarg" shift # fnord fi shift # arg - dst_arg=$arg + dstarg=$arg done fi @@ -230,7 +224,7 @@ do # Protect names starting with `-'. case $src in - -*) src=./$src;; + -*) src=./$src ;; esac if test -n "$dir_arg"; then @@ -248,22 +242,22 @@ exit 1 fi - if test -z "$dst_arg"; then + if test -z "$dstarg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg + dst=$dstarg # Protect names starting with `-'. case $dst in - -*) dst=./$dst;; + -*) dst=./$dst ;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 + echo "$0: $dstarg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -384,19 +378,26 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - -*) prefix='./';; - *) prefix='';; + /*) prefix=/ ;; + -*) prefix=./ ;; + *) prefix= ;; esac - eval "$initialize_posix_glob" + case $posix_glob in + '') + if (set -f) 2>/dev/null; then + posix_glob=true + else + posix_glob=false + fi ;; + esac oIFS=$IFS IFS=/ - $posix_glob set -f + $posix_glob && set -f set fnord $dstdir shift - $posix_glob set +f + $posix_glob && set +f IFS=$oIFS prefixes= @@ -458,54 +459,41 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dst"; then + $doit $rmcmd -f "$dst" 2>/dev/null \ + || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ + && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ + || { + echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + } || exit 1 trap '' 0 fi --- xorg-server-1.4.1~git20080131.orig/fb/Makefile.in +++ xorg-server-1.4.1~git20080131/fb/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -87,7 +87,7 @@ libwfb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libwfb_la_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -186,6 +186,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -1052,8 +1053,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -1065,8 +1066,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1076,12 +1077,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/afb/Makefile.in +++ xorg-server-1.4.1~git20080131/afb/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ afbpntarea.lo afbmisc.lo afbbstore.lo afbtegblt.lo \ $(am__objects_1) libafb_la_OBJECTS = $(am_libafb_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -161,6 +161,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -527,8 +528,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -540,8 +541,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -551,12 +552,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/dbe/Makefile.in +++ xorg-server-1.4.1~git20080131/dbe/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -55,7 +55,7 @@ libdbe_la_LIBADD = am_libdbe_la_OBJECTS = dbe.lo midbe.lo libdbe_la_OBJECTS = $(am_libdbe_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -153,6 +153,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -480,8 +481,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -493,8 +494,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -504,12 +505,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -138,6 +138,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -476,8 +477,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -502,8 +503,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -513,12 +514,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/mesa/main/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/mesa/main/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,7 @@ texformat.lo teximage.lo texobj.lo texrender.lo texstate.lo \ texstore.lo varray.lo $(am__objects_1) vtxfmt.lo libmain_la_OBJECTS = $(nodist_libmain_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -154,6 +154,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -599,8 +600,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -612,8 +613,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -623,12 +624,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/mesa/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/mesa/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -56,7 +56,7 @@ shader/slang/libslang.la vbo/libvbo.la X/libX.la am_libGLcore_la_OBJECTS = dummy.lo libGLcore_la_OBJECTS = $(am_libGLcore_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -154,6 +154,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -538,8 +539,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -564,8 +565,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -575,12 +576,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/mesa/X/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/mesa/X/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,7 +54,7 @@ nodist_libX_la_OBJECTS = xm_api.lo xm_buffer.lo xm_dd.lo xm_image.lo \ xm_line.lo xm_span.lo xm_tri.lo driverfuncs.lo libX_la_OBJECTS = $(nodist_libX_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -142,6 +142,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -490,8 +491,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -503,8 +504,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -514,12 +515,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/mesa/glapi/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/mesa/glapi/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,7 +53,7 @@ libglapi_la_LIBADD = nodist_libglapi_la_OBJECTS = glapi.lo glthread.lo libglapi_la_OBJECTS = $(nodist_libglapi_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -141,6 +141,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -461,8 +462,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -474,8 +475,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -485,12 +486,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/mesa/vbo/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/mesa/vbo/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ vbo_save_draw.lo vbo_save_loopback.lo vbo_split.lo \ vbo_split_copy.lo vbo_split_inplace.lo libvbo_la_OBJECTS = $(nodist_libvbo_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -493,8 +494,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -506,8 +507,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -517,12 +518,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/mesa/swrast/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/mesa/swrast/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -59,7 +59,7 @@ s_stencil.lo s_texcombine.lo s_texfilter.lo s_texstore.lo \ s_triangle.lo s_zoom.lo libswrast_la_OBJECTS = $(nodist_libswrast_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -147,6 +147,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -525,8 +526,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -538,8 +539,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -549,12 +550,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/mesa/swrast_setup/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/mesa/swrast_setup/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,7 +53,7 @@ libss_la_LIBADD = nodist_libss_la_OBJECTS = ss_context.lo ss_triangle.lo libss_la_OBJECTS = $(nodist_libss_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -141,6 +141,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -461,8 +462,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -474,8 +475,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -485,12 +486,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/mesa/math/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/mesa/math/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -55,7 +55,7 @@ m_debug_xform.lo m_eval.lo m_matrix.lo m_translate.lo \ m_vector.lo m_xform.lo libmath_la_OBJECTS = $(nodist_libmath_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -143,6 +143,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -477,8 +478,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -490,8 +491,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -501,12 +502,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/mesa/shader/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/mesa/shader/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ prog_parameter.lo prog_print.lo program.lo programopt.lo \ prog_statevars.lo shader_api.lo libshader_la_OBJECTS = $(nodist_libshader_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -155,6 +155,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -577,8 +578,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -603,8 +604,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -614,12 +615,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/mesa/shader/grammar/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/mesa/shader/grammar/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,7 +53,7 @@ libgrammar_la_LIBADD = nodist_libgrammar_la_OBJECTS = grammar_mesa.lo libgrammar_la_OBJECTS = $(nodist_libgrammar_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -141,6 +141,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -460,8 +461,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -473,8 +474,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -484,12 +485,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/mesa/shader/slang/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/mesa/shader/slang/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -60,7 +60,7 @@ slang_simplify.lo slang_storage.lo slang_typeinfo.lo \ slang_utility.lo slang_vartable.lo libslang_la_OBJECTS = $(nodist_libslang_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -148,6 +148,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -509,8 +510,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -522,8 +523,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -533,12 +534,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/mesa/tnl/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/mesa/tnl/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ t_vb_texmat.lo t_vb_vertex.lo t_vertex.lo t_vertex_generic.lo \ t_vertex_sse.lo t_vp_build.lo libtnl_la_OBJECTS = $(nodist_libtnl_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -498,8 +499,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -511,8 +512,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -522,12 +523,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/apple/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/apple/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ @HAVE_AGL_FRAMEWORK_TRUE@ x-list.$(OBJEXT) x-hash.$(OBJEXT) \ @HAVE_AGL_FRAMEWORK_TRUE@ compsize.$(OBJEXT) libAGLcore_a_OBJECTS = $(am_libAGLcore_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -151,6 +151,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -506,8 +507,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -519,8 +520,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -530,12 +531,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/GL/glx/Makefile.in +++ xorg-server-1.4.1~git20080131/GL/glx/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,7 +67,7 @@ am_libglxdri_la_OBJECTS = glxdri.lo extension_string.lo libglxdri_la_OBJECTS = $(am_libglxdri_la_OBJECTS) @AIGLX_TRUE@am_libglxdri_la_rpath = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -156,6 +156,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -383,7 +384,8 @@ -I@MESA_SOURCE@/src/mesa/glapi \ -I@MESA_SOURCE@/src/mesa/main \ -DXFree86Server \ - @GLX_DEFINES@ + @GLX_DEFINES@ \ + @GLX_ARCH_DEFINES@ # none yet @@ -568,8 +570,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -581,8 +583,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -592,12 +594,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/darwin/iokit/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/iokit/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ am_libiokit_a_OBJECTS = xfIOKit.$(OBJEXT) xfIOKitCursor.$(OBJEXT) \ xfIOKitStartup.$(OBJEXT) libiokit_a_OBJECTS = $(am_libiokit_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -455,8 +456,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -468,8 +469,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -479,12 +480,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/darwin/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -204,7 +204,7 @@ $(Xquartz_LDFLAGS) $(LDFLAGS) -o $@ macosSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(macos_SCRIPTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -318,6 +318,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -826,8 +827,8 @@ @list='$(crplugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(crpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(crplugindir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(crpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(crplugindir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(crpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(crplugindir)/$$f'"; \ + $(LIBTOOL) --mode=install $(crpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(crplugindir)/$$f"; \ else :; fi; \ done @@ -835,8 +836,8 @@ @$(NORMAL_UNINSTALL) @list='$(crplugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(crplugindir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(crplugindir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(crplugindir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(crplugindir)/$$p"; \ done clean-crpluginLTLIBRARIES: @@ -853,8 +854,8 @@ @list='$(fullscreenplugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fullscreenpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fullscreenplugindir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fullscreenpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fullscreenplugindir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(fullscreenpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fullscreenplugindir)/$$f'"; \ + $(LIBTOOL) --mode=install $(fullscreenpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fullscreenplugindir)/$$f"; \ else :; fi; \ done @@ -862,8 +863,8 @@ @$(NORMAL_UNINSTALL) @list='$(fullscreenplugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(fullscreenplugindir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(fullscreenplugindir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(fullscreenplugindir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(fullscreenplugindir)/$$p"; \ done clean-fullscreenpluginLTLIBRARIES: @@ -880,8 +881,8 @@ @list='$(glxAGLplugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(glxAGLpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(glxAGLplugindir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(glxAGLpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(glxAGLplugindir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(glxAGLpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(glxAGLplugindir)/$$f'"; \ + $(LIBTOOL) --mode=install $(glxAGLpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(glxAGLplugindir)/$$f"; \ else :; fi; \ done @@ -889,8 +890,8 @@ @$(NORMAL_UNINSTALL) @list='$(glxAGLplugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(glxAGLplugindir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(glxAGLplugindir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(glxAGLplugindir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(glxAGLplugindir)/$$p"; \ done clean-glxAGLpluginLTLIBRARIES: @@ -907,8 +908,8 @@ @list='$(glxCGLplugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(glxCGLpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(glxCGLplugindir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(glxCGLpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(glxCGLplugindir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(glxCGLpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(glxCGLplugindir)/$$f'"; \ + $(LIBTOOL) --mode=install $(glxCGLpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(glxCGLplugindir)/$$f"; \ else :; fi; \ done @@ -916,8 +917,8 @@ @$(NORMAL_UNINSTALL) @list='$(glxCGLplugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(glxCGLplugindir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(glxCGLplugindir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(glxCGLplugindir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(glxCGLplugindir)/$$p"; \ done clean-glxCGLpluginLTLIBRARIES: @@ -934,8 +935,8 @@ @list='$(glxMesaplugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(glxMesapluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(glxMesaplugindir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(glxMesapluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(glxMesaplugindir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(glxMesapluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(glxMesaplugindir)/$$f'"; \ + $(LIBTOOL) --mode=install $(glxMesapluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(glxMesaplugindir)/$$f"; \ else :; fi; \ done @@ -943,8 +944,8 @@ @$(NORMAL_UNINSTALL) @list='$(glxMesaplugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(glxMesaplugindir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(glxMesaplugindir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(glxMesaplugindir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(glxMesaplugindir)/$$p"; \ done clean-glxMesapluginLTLIBRARIES: @@ -961,8 +962,8 @@ @list='$(xprplugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xprpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xprplugindir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xprpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xprplugindir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xprpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xprplugindir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xprpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xprplugindir)/$$f"; \ else :; fi; \ done @@ -970,8 +971,8 @@ @$(NORMAL_UNINSTALL) @list='$(xprplugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xprplugindir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xprplugindir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xprplugindir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xprplugindir)/$$p"; \ done clean-xprpluginLTLIBRARIES: @@ -1003,8 +1004,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -1031,8 +1032,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(macosPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(macosdir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(macosPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(macosdir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(macosPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(macosdir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(macosPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(macosdir)/$$f" || exit 1; \ else :; fi; \ done @@ -1827,8 +1828,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -1853,8 +1854,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1864,12 +1865,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/darwin/quartz/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/quartz/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -71,7 +71,7 @@ XDarwinStartup_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(XDarwinStartup_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -168,6 +168,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -475,8 +476,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -616,8 +617,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -629,8 +630,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -640,12 +641,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/darwin/utils/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/utils/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -59,7 +59,7 @@ dumpkeymap_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(dumpkeymap_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -150,6 +150,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -414,8 +415,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -522,8 +523,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -535,8 +536,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -546,12 +547,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/darwin/bundle/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/bundle/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -154,6 +154,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -593,8 +594,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -619,8 +620,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -630,12 +631,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/darwin/bundle/Swedish.lproj/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/bundle/Swedish.lproj/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -139,6 +139,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/darwin/bundle/Spanish.lproj/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/bundle/Spanish.lproj/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -139,6 +139,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/darwin/bundle/German.lproj/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/bundle/German.lproj/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -139,6 +139,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/darwin/bundle/English.lproj/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/bundle/English.lproj/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -139,6 +139,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/darwin/bundle/Portuguese.lproj/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/bundle/Portuguese.lproj/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -139,6 +139,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/darwin/bundle/French.lproj/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/bundle/French.lproj/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -139,6 +139,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/darwin/bundle/Dutch.lproj/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/bundle/Dutch.lproj/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -139,6 +139,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/darwin/bundle/ko.lproj/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/bundle/ko.lproj/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -139,6 +139,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/darwin/bundle/Japanese.lproj/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/darwin/bundle/Japanese.lproj/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -139,6 +139,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/vfb/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/vfb/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -73,7 +73,7 @@ am__DEPENDENCIES_1 = Xvfb_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) libfbcmap.a -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -169,6 +169,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -500,8 +501,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -641,8 +642,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -654,8 +655,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -665,12 +666,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -133,6 +133,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -486,8 +487,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -512,8 +513,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -523,12 +524,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xwin/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xwin/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -131,7 +131,7 @@ XWin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(XWin_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -239,6 +239,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -657,8 +658,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -865,8 +866,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -878,8 +879,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -889,12 +890,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xnest/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xnest/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -77,7 +77,7 @@ am__DEPENDENCIES_1 = Xnest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) libfbcmap.a -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -173,6 +173,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -545,8 +546,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -700,8 +701,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -713,8 +714,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -724,12 +725,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/dmx/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/dmx/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -84,7 +84,7 @@ Xdmx_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(Xdmx_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -189,6 +189,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -539,8 +540,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -755,8 +756,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -781,8 +782,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -792,12 +793,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/dmx/input/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/dmx/input/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -75,7 +75,7 @@ am_libdmxinput_a_OBJECTS = ChkNotMaskEv.$(OBJEXT) $(am__objects_1) \ $(am__objects_2) $(am__objects_3) $(am__objects_4) libdmxinput_a_OBJECTS = $(am_libdmxinput_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -163,6 +163,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -540,8 +541,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -553,8 +554,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -564,12 +565,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/dmx/config/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/dmx/config/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -74,7 +74,7 @@ xdmxconfig_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(xdmxconfig_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -181,6 +181,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -514,8 +515,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -658,8 +659,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -671,8 +672,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -682,12 +683,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/dmx/doc/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/dmx/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/dmx/examples/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/dmx/examples/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -148,7 +148,7 @@ xtest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(xtest_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -246,6 +246,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -550,8 +551,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -886,8 +887,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -899,8 +900,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -910,12 +911,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/dmx/glxProxy/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/dmx/glxProxy/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -61,7 +61,7 @@ g_renderswap.$(OBJEXT) render2swap.$(OBJEXT) \ renderpixswap.$(OBJEXT) libglxproxy_a_OBJECTS = $(am_libglxproxy_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -149,6 +149,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -397,6 +398,7 @@ unpack.h AM_CFLAGS = \ + @GLX_ARCH_DEFINES@ \ $(DIX_CFLAGS) \ -I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/include \ @@ -503,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -516,8 +518,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -527,12 +529,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/fake/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/fake/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ PROGRAMS = $(bin_PROGRAMS) am_Xfake_OBJECTS = fakeinit.$(OBJEXT) Xfake_OBJECTS = $(am_Xfake_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -151,6 +151,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -439,8 +440,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -506,8 +507,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -519,8 +520,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -530,12 +531,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/via/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/via/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -62,7 +62,7 @@ PROGRAMS = $(bin_PROGRAMS) am_Xvia_OBJECTS = viastub.$(OBJEXT) Xvia_OBJECTS = $(am_Xvia_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -150,6 +150,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -443,8 +444,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -508,8 +509,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -521,8 +522,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -532,12 +533,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/neomagic/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/neomagic/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ am_Xneomagic_OBJECTS = neomagicstub.$(OBJEXT) Xneomagic_OBJECTS = $(am_Xneomagic_OBJECTS) am__DEPENDENCIES_1 = libneomagic.a $(FBDEV_LIBS) $(VESA_LIBS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -152,6 +152,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -450,8 +451,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -515,8 +516,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -528,8 +529,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -539,12 +540,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/src/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/src/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -70,7 +70,7 @@ libkdrivestubs_a_LIBADD = am_libkdrivestubs_a_OBJECTS = fbcmap.$(OBJEXT) libkdrivestubs_a_OBJECTS = $(am_libkdrivestubs_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -159,6 +159,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -542,8 +543,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -555,8 +556,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -566,12 +567,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -133,6 +133,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -485,8 +486,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -511,8 +512,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -522,12 +523,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/vesa/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/vesa/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ PROGRAMS = $(bin_PROGRAMS) am_Xvesa_OBJECTS = vesainit.$(OBJEXT) Xvesa_OBJECTS = $(am_Xvesa_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -151,6 +151,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -442,8 +443,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -509,8 +510,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -522,8 +523,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -533,12 +534,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/mach64/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/mach64/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ PROGRAMS = $(bin_PROGRAMS) am_Xmach64_OBJECTS = mach64stub.$(OBJEXT) Xmach64_OBJECTS = $(am_Xmach64_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -151,6 +151,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -445,8 +446,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -511,8 +512,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -524,8 +525,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -535,12 +536,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/ati/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/ati/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -80,7 +80,7 @@ am_Xati_OBJECTS = ati_stub.$(OBJEXT) Xati_OBJECTS = $(am_Xati_OBJECTS) am__DEPENDENCIES_1 = libati.a $(FBDEV_LIBS) $(VESA_LIBS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -168,6 +168,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -478,8 +479,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -549,8 +550,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -562,8 +563,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -573,12 +574,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/r128/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/r128/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ Xr128_OBJECTS = $(am_Xr128_OBJECTS) am__DEPENDENCIES_1 = libr128.a \ $(top_builddir)/hw/kdrive/vesa/libvesa.a -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -152,6 +152,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -444,8 +445,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -509,8 +510,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -522,8 +523,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -533,12 +534,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/chips/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/chips/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ Xchips_OBJECTS = $(am_Xchips_OBJECTS) am__DEPENDENCIES_1 = libchips.a \ $(top_builddir)/hw/kdrive/vesa/libvesa.a -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -152,6 +152,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -444,8 +445,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -509,8 +510,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -522,8 +523,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -533,12 +534,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/sdl/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/sdl/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -55,7 +55,7 @@ PROGRAMS = $(bin_PROGRAMS) am_Xsdl_OBJECTS = sdl.$(OBJEXT) Xsdl_OBJECTS = $(am_Xsdl_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -143,6 +143,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -412,8 +413,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -475,8 +476,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -488,8 +489,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -499,12 +500,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/ephyr/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/ephyr/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,7 +67,7 @@ PROGRAMS = $(bin_PROGRAMS) am_Xephyr_OBJECTS = ephyrinit.$(OBJEXT) Xephyr_OBJECTS = $(am_Xephyr_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -157,6 +157,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -458,8 +459,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -525,8 +526,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -538,8 +539,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -549,12 +550,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/i810/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/i810/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ am_Xi810_OBJECTS = i810stub.$(OBJEXT) Xi810_OBJECTS = $(am_Xi810_OBJECTS) am__DEPENDENCIES_1 = libi810.a -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -152,6 +152,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -446,8 +447,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -513,8 +514,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +527,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,12 +538,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/linux/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/linux/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ ps2.$(OBJEXT) $(am__objects_1) $(am__objects_2) \ $(am__objects_3) liblinux_a_OBJECTS = $(am_liblinux_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -151,6 +151,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -481,8 +482,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -494,8 +495,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -505,12 +506,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/pm2/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/pm2/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ am_Xpm2_OBJECTS = pm2stub.$(OBJEXT) Xpm2_OBJECTS = $(am_Xpm2_OBJECTS) am__DEPENDENCIES_1 = libpm2.a $(top_builddir)/hw/kdrive/vesa/libvesa.a -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -151,6 +151,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -444,8 +445,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -509,8 +510,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -522,8 +523,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -533,12 +534,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/sis300/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/sis300/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ am_Xsis_OBJECTS = sis_stub.$(OBJEXT) Xsis_OBJECTS = $(am_Xsis_OBJECTS) am__DEPENDENCIES_1 = libsis.a $(FBDEV_LIBS) $(VESA_LIBS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -151,6 +151,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -451,8 +452,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -516,8 +517,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -529,8 +530,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -540,12 +541,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/epson/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/epson/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ am_Xepson_OBJECTS = epson13806stub.$(OBJEXT) Xepson_OBJECTS = $(am_Xepson_OBJECTS) am__DEPENDENCIES_1 = libepson.a -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -151,6 +151,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -443,8 +444,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -508,8 +509,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -521,8 +522,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -532,12 +533,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/nvidia/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/nvidia/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ Xnvidia_OBJECTS = $(am_Xnvidia_OBJECTS) am__DEPENDENCIES_1 = libnvidia.a \ $(top_builddir)/hw/kdrive/vesa/libvesa.a -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -152,6 +152,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -447,8 +448,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -512,8 +513,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -525,8 +526,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -536,12 +537,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/smi/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/smi/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -65,7 +65,7 @@ am__DEPENDENCIES_1 = libsmi.a \ $(top_builddir)/hw/kdrive/fbdev/libfbdev.a \ $(top_builddir)/hw/kdrive/vesa/libvesa.a -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -153,6 +153,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -450,8 +451,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -515,8 +516,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -528,8 +529,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -539,12 +540,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/fbdev/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/fbdev/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ am__Xfbdev_SOURCES_DIST = fbinit.c @KDRIVEFBDEV_TRUE@am_Xfbdev_OBJECTS = fbinit.$(OBJEXT) Xfbdev_OBJECTS = $(am_Xfbdev_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -151,6 +151,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -436,8 +437,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -500,8 +501,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -513,8 +514,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -524,12 +525,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/kdrive/mga/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/kdrive/mga/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ am_Xmga_OBJECTS = mgastub.$(OBJEXT) Xmga_OBJECTS = $(am_Xmga_OBJECTS) am__DEPENDENCIES_1 = libmga.a $(top_builddir)/hw/kdrive/vesa/libvesa.a -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -152,6 +152,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -446,8 +447,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -512,8 +513,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -525,8 +526,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -536,12 +537,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/modes/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/modes/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -59,7 +59,7 @@ xf86cvt.$(OBJEXT) xf86DiDGA.$(OBJEXT) xf86EdidModes.$(OBJEXT) \ xf86Modes.$(OBJEXT) xf86RandR12.$(OBJEXT) xf86Rotate.$(OBJEXT) libxf86modes_a_OBJECTS = $(am_libxf86modes_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -156,6 +156,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -504,8 +505,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -517,8 +518,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -528,12 +529,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/modes/xf86EdidModes.c +++ xorg-server-1.4.1~git20080131/hw/xfree86/modes/xf86EdidModes.c @@ -60,7 +60,8 @@ { /* Belinea 10 15 55 */ if (memcmp (DDC->vendor.name, "MAX", 4) == 0 && - DDC->vendor.prod_id == 1516) + ((DDC->vendor.prod_id == 1516) || + (DDC->vendor.prod_id == 0x77e))) return TRUE; /* Acer AL1706 */ --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -78,7 +78,7 @@ Xorg_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(Xorg_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -183,6 +183,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -549,8 +550,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -700,8 +701,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -726,8 +727,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -737,12 +738,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/xaa/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/xaa/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,7 +85,7 @@ libxaa_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libxaa_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -175,6 +175,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -463,8 +464,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -472,8 +473,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -597,8 +598,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -610,8 +611,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -621,12 +622,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/loader/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/loader/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ fontsym.$(OBJEXT) misym.$(OBJEXT) xf86sym.$(OBJEXT) \ $(am__objects_1) libloader_a_OBJECTS = $(am_libloader_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -156,6 +156,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -516,8 +517,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -529,8 +530,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -540,12 +541,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/vgahw/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/vgahw/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,7 @@ libvgahw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libvgahw_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -156,6 +156,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -417,8 +418,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -426,8 +427,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -499,8 +500,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -512,8 +513,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -523,12 +524,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/xf8_32bpp/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/xf8_32bpp/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -69,7 +69,7 @@ libxf8_32bpp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libxf8_32bpp_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -159,6 +159,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -436,8 +437,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -445,8 +446,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -529,8 +530,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -542,8 +543,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -553,12 +554,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/scanpci/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/scanpci/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -70,7 +70,7 @@ libscanpci_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libscanpci_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -158,6 +158,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -432,8 +433,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -441,8 +442,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -499,8 +500,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -512,8 +513,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -523,12 +524,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/ddc/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/ddc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -59,7 +59,7 @@ interpret_edid.$(OBJEXT) print_edid.$(OBJEXT) \ ddcProperty.$(OBJEXT) libddc_a_OBJECTS = $(am_libddc_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -156,6 +156,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -481,8 +482,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -494,8 +495,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -505,12 +506,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/utils/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/utils/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -134,6 +134,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -473,8 +474,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -499,8 +500,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -510,12 +511,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/utils/xorgcfg/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/utils/xorgcfg/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -126,7 +126,7 @@ xorgcfg_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(xorgcfg_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -225,6 +225,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -620,8 +621,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -1095,8 +1096,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -1108,8 +1109,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1119,12 +1120,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/utils/scanpci/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/utils/scanpci/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -96,7 +96,7 @@ scanpci_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(scanpci_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -192,6 +192,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -504,8 +505,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -598,8 +599,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -611,8 +612,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -622,12 +623,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/utils/pcitweak/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/utils/pcitweak/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,7 +95,7 @@ pcitweak_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(pcitweak_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -191,6 +191,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -501,8 +502,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -595,8 +596,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -608,8 +609,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -619,12 +620,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/utils/ioport/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/utils/ioport/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -89,7 +89,7 @@ ioport_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(ioport_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -177,6 +177,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -447,8 +448,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -524,8 +525,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -537,8 +538,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -548,12 +549,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/utils/cvt/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/utils/cvt/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -93,7 +93,7 @@ cvt_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(cvt_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -184,6 +184,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -485,8 +486,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -622,8 +623,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -635,8 +636,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -646,12 +647,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/utils/kbd_mode/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/utils/kbd_mode/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -97,7 +97,7 @@ kbd_mode_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(kbd_mode_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -193,6 +193,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -497,8 +498,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -606,8 +607,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -619,8 +620,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -630,12 +631,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/utils/gtf/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/utils/gtf/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -93,7 +93,7 @@ gtf_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(gtf_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -189,6 +189,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -490,8 +491,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -584,8 +585,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -597,8 +598,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -608,12 +609,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/utils/xorgconfig/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/utils/xorgconfig/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -95,7 +95,7 @@ xorgconfig_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(xorgconfig_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -192,6 +192,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -513,8 +514,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -639,8 +640,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -652,8 +653,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -663,12 +664,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/int10/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/int10/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -80,7 +80,7 @@ libint10_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libint10_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -170,6 +170,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -456,8 +457,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -465,8 +466,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -561,8 +562,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -574,8 +575,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -585,12 +586,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/x86emu/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/x86emu/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ fpu.$(OBJEXT) ops2.$(OBJEXT) ops.$(OBJEXT) prim_ops.$(OBJEXT) \ sys.$(OBJEXT) libx86emu_a_OBJECTS = $(am_libx86emu_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -471,8 +472,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -484,8 +485,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -495,12 +496,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/dixmods/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/dixmods/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -142,12 +142,6 @@ libshadow_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libshadow_la_LDFLAGS) $(LDFLAGS) -o $@ -libtype1_la_LIBADD = -am_libtype1_la_OBJECTS = type1mod.lo -libtype1_la_OBJECTS = $(am_libtype1_la_OBJECTS) -libtype1_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libtype1_la_LDFLAGS) $(LDFLAGS) -o $@ libwfb_la_DEPENDENCIES = $(top_builddir)/fb/libwfb.la am_libwfb_la_OBJECTS = libwfb_la-fbcmap_mi.lo libwfb_la-fbmodule.lo libwfb_la_OBJECTS = $(am_libwfb_la_OBJECTS) @@ -164,7 +158,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libxtrap_la_LDFLAGS) $(LDFLAGS) -o $@ @XTRAP_TRUE@am_libxtrap_la_rpath = -rpath $(extsmoduledir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -182,16 +176,16 @@ $(libfb_la_SOURCES) $(libfreetype_la_SOURCES) \ $(libglx_la_SOURCES) $(libmfb_la_SOURCES) \ $(librecord_la_SOURCES) $(libshadow_la_SOURCES) \ - $(libtype1_la_SOURCES) $(libwfb_la_SOURCES) \ - $(libxorgxkb_la_SOURCES) $(libxtrap_la_SOURCES) + $(libwfb_la_SOURCES) $(libxorgxkb_la_SOURCES) \ + $(libxtrap_la_SOURCES) DIST_SOURCES = $(libGLcore_la_SOURCES) $(libafb_la_SOURCES) \ $(libcfb_la_SOURCES) $(libcfb32_la_SOURCES) \ $(libdbe_la_SOURCES) $(libdixmods_la_SOURCES) \ $(libfb_la_SOURCES) $(libfreetype_la_SOURCES) \ $(libglx_la_SOURCES) $(libmfb_la_SOURCES) \ $(librecord_la_SOURCES) $(libshadow_la_SOURCES) \ - $(libtype1_la_SOURCES) $(libwfb_la_SOURCES) \ - $(libxorgxkb_la_SOURCES) $(libxtrap_la_SOURCES) + $(libwfb_la_SOURCES) $(libxorgxkb_la_SOURCES) \ + $(libxtrap_la_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -276,6 +270,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -513,9 +508,7 @@ $(XTRAPMOD) fontsmoduledir = $(moduledir)/fonts -fontsmodule_LTLIBRARIES = libfreetype.la \ - libtype1.la - +fontsmodule_LTLIBRARIES = libfreetype.la AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ INCLUDES = @XORG_INCS@ \ -I$(top_srcdir)/dbe \ @@ -564,8 +557,6 @@ libshadow_la_SOURCES = shmodule.c libfreetype_la_LDFLAGS = -avoid-version libfreetype_la_SOURCES = ftmodule.c -libtype1_la_LDFLAGS = -avoid-version -libtype1_la_SOURCES = type1mod.c libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS) libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c @@ -612,8 +603,8 @@ @list='$(extsmodule_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(extsmoduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(extsmoduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(extsmoduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(extsmoduledir)/$$f"; \ else :; fi; \ done @@ -621,8 +612,8 @@ @$(NORMAL_UNINSTALL) @list='$(extsmodule_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(extsmoduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(extsmoduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(extsmoduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(extsmoduledir)/$$p"; \ done clean-extsmoduleLTLIBRARIES: @@ -639,8 +630,8 @@ @list='$(fontsmodule_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fontsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fontsmoduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fontsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fontsmoduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(fontsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fontsmoduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(fontsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fontsmoduledir)/$$f"; \ else :; fi; \ done @@ -648,8 +639,8 @@ @$(NORMAL_UNINSTALL) @list='$(fontsmodule_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(fontsmoduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(fontsmoduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(fontsmoduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(fontsmoduledir)/$$p"; \ done clean-fontsmoduleLTLIBRARIES: @@ -666,8 +657,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -675,8 +666,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -720,8 +711,6 @@ $(librecord_la_LINK) -rpath $(extsmoduledir) $(librecord_la_OBJECTS) $(librecord_la_LIBADD) $(LIBS) libshadow.la: $(libshadow_la_OBJECTS) $(libshadow_la_DEPENDENCIES) $(libshadow_la_LINK) -rpath $(moduledir) $(libshadow_la_OBJECTS) $(libshadow_la_LIBADD) $(LIBS) -libtype1.la: $(libtype1_la_OBJECTS) $(libtype1_la_DEPENDENCIES) - $(libtype1_la_LINK) -rpath $(fontsmoduledir) $(libtype1_la_OBJECTS) $(libtype1_la_LIBADD) $(LIBS) libwfb.la: $(libwfb_la_OBJECTS) $(libwfb_la_DEPENDENCIES) $(libwfb_la_LINK) -rpath $(moduledir) $(libwfb_la_OBJECTS) $(libwfb_la_LIBADD) $(LIBS) libxorgxkb.la: $(libxorgxkb_la_OBJECTS) $(libxorgxkb_la_DEPENDENCIES) @@ -750,7 +739,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbmodule.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recordmod.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shmodule.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/type1mod.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86XTrapModule.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xkbKillSrv.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xkbPrivate.Plo@am__quote@ @@ -893,8 +881,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -919,8 +907,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -930,12 +918,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/dixmods/extmod/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/dixmods/extmod/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -74,7 +74,7 @@ libextmod_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libextmod_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -164,6 +164,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -443,8 +444,8 @@ @list='$(extsmodule_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(extsmoduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(extsmoduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(extsmoduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(extsmoduledir)/$$f"; \ else :; fi; \ done @@ -452,8 +453,8 @@ @$(NORMAL_UNINSTALL) @list='$(extsmodule_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(extsmoduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(extsmoduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(extsmoduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(extsmoduledir)/$$p"; \ done clean-extsmoduleLTLIBRARIES: @@ -529,8 +530,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -542,8 +543,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -553,12 +554,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/vbe/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/vbe/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,7 @@ libvbe_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libvbe_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -156,6 +156,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -418,8 +419,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -427,8 +428,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -501,8 +502,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -514,8 +515,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -525,12 +526,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/xf1bpp/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/xf1bpp/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -78,7 +78,7 @@ libxf1bpp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libxf1bpp_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -168,6 +168,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -485,8 +486,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -494,8 +495,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -613,8 +614,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -626,8 +627,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -637,12 +638,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/ramdac/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/ramdac/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -59,7 +59,7 @@ xf86Cursor.$(OBJEXT) xf86HWCurs.$(OBJEXT) IBM.$(OBJEXT) \ BT.$(OBJEXT) TI.$(OBJEXT) xf86BitOrder.$(OBJEXT) libramdac_a_OBJECTS = $(am_libramdac_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -156,6 +156,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -490,8 +491,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -503,8 +504,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -514,12 +515,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/doc/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -134,6 +134,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -470,8 +471,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -496,8 +497,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -507,12 +508,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/doc/sgml/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/doc/sgml/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/doc/devel/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/doc/devel/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -125,6 +125,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/doc/man/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/doc/man/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -138,6 +138,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/fbdevhw/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/fbdevhw/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -74,7 +74,7 @@ libfbdevhw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libfbdevhw_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -166,6 +166,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -466,8 +467,8 @@ @list='$(linuxmodule_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(linuxmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(linuxmoduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(linuxmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(linuxmoduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(linuxmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(linuxmoduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(linuxmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(linuxmoduledir)/$$f"; \ else :; fi; \ done @@ -475,8 +476,8 @@ @$(NORMAL_UNINSTALL) @list='$(linuxmodule_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(linuxmoduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(linuxmoduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(linuxmoduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(linuxmoduledir)/$$p"; \ done clean-linuxmoduleLTLIBRARIES: @@ -565,8 +566,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -578,8 +579,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -589,12 +590,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/exa/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/exa/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -70,7 +70,7 @@ libexa_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libexa_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -160,6 +160,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -466,8 +467,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -475,8 +476,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -547,8 +548,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -560,8 +561,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -571,12 +572,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/xf4bpp/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/xf4bpp/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -74,7 +74,7 @@ libxf4bpp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libxf4bpp_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -164,6 +164,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -468,8 +469,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -477,8 +478,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -587,8 +588,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -600,8 +601,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -611,12 +612,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/dri/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/dri/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,7 +67,7 @@ libdri_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libdri_la_CFLAGS) \ $(CFLAGS) $(libdri_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -157,6 +157,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -435,8 +436,8 @@ @list='$(libdri_la_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libdri_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdri_ladir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libdri_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdri_ladir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(libdri_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdri_ladir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libdri_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdri_ladir)/$$f"; \ else :; fi; \ done @@ -444,8 +445,8 @@ @$(NORMAL_UNINSTALL) @list='$(libdri_la_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdri_ladir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdri_ladir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdri_ladir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdri_ladir)/$$p"; \ done clean-libdri_laLTLIBRARIES: @@ -539,8 +540,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -552,8 +553,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -563,12 +564,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/parser/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/parser/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -70,7 +70,7 @@ read.$(OBJEXT) scan.$(OBJEXT) write.$(OBJEXT) DRI.$(OBJEXT) \ Extensions.$(OBJEXT) libxf86config_a_OBJECTS = $(am_libxf86config_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -161,6 +161,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -556,8 +557,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -569,8 +570,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -580,12 +581,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/i2c/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/i2c/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -109,7 +109,7 @@ uda1380_drv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(uda1380_drv_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -205,6 +205,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -499,8 +500,8 @@ @list='$(multimedia_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(multimediaLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(multimediadir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(multimediaLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(multimediadir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(multimediaLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(multimediadir)/$$f'"; \ + $(LIBTOOL) --mode=install $(multimediaLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(multimediadir)/$$f"; \ else :; fi; \ done @@ -508,8 +509,8 @@ @$(NORMAL_UNINSTALL) @list='$(multimedia_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(multimediadir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(multimediadir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(multimediadir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(multimediadir)/$$p"; \ done clean-multimediaLTLIBRARIES: @@ -606,8 +607,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -619,8 +620,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -630,12 +631,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/xf8_16bpp/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/xf8_16bpp/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,7 @@ libxf8_16bpp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libxf8_16bpp_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -156,6 +156,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -416,8 +417,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -425,8 +426,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -497,8 +498,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -510,8 +511,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -521,12 +522,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/common/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/common/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -88,7 +88,7 @@ nodist_libcommon_la_OBJECTS = xf86DefModeSet.lo libcommon_la_OBJECTS = $(am_libcommon_la_OBJECTS) \ $(nodist_libcommon_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -191,6 +191,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -628,8 +629,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -641,8 +642,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -652,12 +653,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/os-support/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/os-support/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -56,7 +56,7 @@ bus/libbus.la misc/libmisc.la am_libxorgos_la_OBJECTS = xorgos.lo libxorgos_la_OBJECTS = $(am_libxorgos_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -162,6 +162,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -570,8 +571,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -596,8 +597,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -607,12 +608,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/os-support/solaris/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/os-support/solaris/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,7 +72,7 @@ nodist_libsolaris_la_OBJECTS = $(am__objects_3) libsolaris_la_OBJECTS = $(am_libsolaris_la_OBJECTS) \ $(nodist_libsolaris_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -175,6 +175,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -629,8 +630,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -642,8 +643,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -653,12 +654,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/os-support/hurd/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/os-support/hurd/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -56,7 +56,7 @@ libc_wrapper.lo stdResource.lo stdPci.lo sigiostubs.lo \ pm_noop.lo kmod_noop.lo agp_noop.lo libhurd_la_OBJECTS = $(am_libhurd_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -144,6 +144,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -535,8 +536,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -548,8 +549,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -559,12 +560,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/os-support/sysv/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/os-support/sysv/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -122,6 +122,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/os-support/linux/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/os-support/linux/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -82,7 +82,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(liblinuxev56_la_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @LINUX_ALPHA_TRUE@am_liblinuxev56_la_rpath = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -171,6 +171,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -617,8 +618,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -630,8 +631,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -641,12 +642,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/os-support/bus/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/os-support/bus/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -81,7 +81,7 @@ am_libbus_la_OBJECTS = Pci.lo $(am__objects_8) $(am__objects_9) \ $(am__objects_10) libbus_la_OBJECTS = $(am_libbus_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -179,6 +179,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -530,8 +531,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -543,8 +544,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -554,12 +555,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/os-support/misc/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/os-support/misc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -55,7 +55,7 @@ am__objects_2 = $(am__objects_1) am_libmisc_la_OBJECTS = xf86_Util.lo Delay.lo $(am__objects_2) libmisc_la_OBJECTS = $(am_libmisc_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -143,6 +143,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -465,8 +466,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -478,8 +479,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -489,12 +490,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/os-support/bsd/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/os-support/bsd/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -79,7 +79,7 @@ $(am__objects_1) $(am__objects_2) $(am__objects_3) \ $(am__objects_4) $(am__objects_5) libbsd_la_OBJECTS = $(am_libbsd_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -167,6 +167,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -643,8 +644,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -656,8 +657,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -667,12 +668,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/os-support/lynxos/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/os-support/lynxos/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -122,6 +122,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/os-support/usl/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/os-support/usl/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -122,6 +122,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/os-support/sco/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/os-support/sco/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -122,6 +122,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/dummylib/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/dummylib/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -78,7 +78,7 @@ xf86servisinit.$(OBJEXT) xf86verbose.$(OBJEXT) \ sigiostubs.$(OBJEXT) libdummy_nonserver_a_OBJECTS = $(am_libdummy_nonserver_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -166,6 +166,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -559,8 +560,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -572,8 +573,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -583,12 +584,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/rac/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/rac/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ librac_a_LIBADD = am_librac_a_OBJECTS = xf86RAC.$(OBJEXT) librac_a_OBJECTS = $(am_librac_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -154,6 +154,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -472,8 +473,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -485,8 +486,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -496,12 +497,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xfree86/shadowfb/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xfree86/shadowfb/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,7 @@ libshadowfb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libshadowfb_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -156,6 +156,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -416,8 +417,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -425,8 +426,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -498,8 +499,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -511,8 +512,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -522,12 +523,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,7 +67,7 @@ Xprt_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(Xprt_CFLAGS) $(CFLAGS) $(Xprt_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -165,6 +165,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -457,8 +458,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -754,8 +755,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -780,8 +781,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -791,12 +792,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -147,6 +147,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -1170,8 +1171,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -1196,8 +1197,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1207,12 +1208,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/en_US/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/en_US/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -134,6 +134,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -464,8 +465,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -490,8 +491,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -501,12 +502,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/en_US/print/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/en_US/print/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -134,6 +134,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -464,8 +465,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -490,8 +491,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -501,12 +502,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/en_US/print/attributes/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/en_US/print/attributes/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -133,6 +133,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -134,6 +134,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -464,8 +465,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -490,8 +491,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -501,12 +502,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -146,6 +146,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -514,8 +515,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -540,8 +541,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -551,12 +552,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -720,7 +722,7 @@ Xprinters.ghostscript: $(srcdir)/Xprinters - sed < $(srcdir)/Xprinters "s/#Printer xp_pdf_spooldir_tmp_Xprintjobs/Printer xp_pdf_spooldir_tmp_Xprintjobs/" > Xprinters.ghostscript + sed < $(srcdir)/Xprinters "s/#Printer xp_pdf_spooldir_HOME_Xprintjobs/Printer xp_pdf_spooldir_HOME_Xprintjobs/" > Xprinters.ghostscript # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/ddx-config/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/ddx-config/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -134,6 +134,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -464,8 +465,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -490,8 +491,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -501,12 +502,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/ddx-config/raster/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/ddx-config/raster/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -133,6 +133,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/attributes/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/attributes/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -133,6 +133,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -494,8 +495,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -520,8 +521,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -531,12 +532,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -122,6 +122,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -134,6 +134,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -475,8 +476,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -501,8 +502,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -512,12 +513,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/GSdefault/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/GSdefault/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -133,6 +133,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/PSspooldir/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/PSspooldir/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -136,6 +136,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -133,6 +133,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -494,8 +495,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -520,8 +521,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -531,12 +532,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -133,6 +133,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -494,8 +495,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -520,8 +521,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -531,12 +532,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -133,6 +133,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -494,8 +495,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -520,8 +521,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -531,12 +532,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -122,6 +122,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/PSdefault/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/PSdefault/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -494,8 +495,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -520,8 +521,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -531,12 +532,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -133,6 +133,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -136,6 +136,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -494,8 +495,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -520,8 +521,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -531,12 +532,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -122,6 +122,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/etc/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/etc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -134,6 +134,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -464,8 +465,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -490,8 +491,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -501,12 +502,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/etc/Xsession.d/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/etc/Xsession.d/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -133,6 +133,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/etc/init.d/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/etc/init.d/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -127,6 +127,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/etc/profile.d/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/etc/profile.d/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -122,6 +122,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/doc/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -137,6 +137,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/hw/xprint/ps/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/ps/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -32,8 +32,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@XP_USE_FREETYPE_TRUE@am__append_1 = -DXP_USE_FREETYPE -@XP_USE_FREETYPE_TRUE@am__append_2 = $(EXTRA_DIST) +@XP_USE_FREETYPE_TRUE@am__append_1 = -DXP_USE_FREETYPE -DUSE_FREETYPE -DXP_ONLY_BLOCKS +@XP_USE_FREETYPE_TRUE@am__append_2 = $(FREETYPE_SRCS) $(TTF2PT1SRCS) subdir = hw/xprint/ps DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -58,17 +58,21 @@ PsImageUtil.c PsInit.c PsLine.c PsMisc.c psout.c psout.h \ PsPixel.c PsPixmap.c PsPolygon.c PsPrint.c PsSpans.c PsText.c \ PsWindow.c PsFTFonts.c psout_ft.c psout_ftpstype1.c \ - psout_ftpstype3.c ttf2pt1wrap.c + psout_ftpstype3.c ft.c pt1.c runt1asm.c ttf2pt1.c am__objects_1 = PsFTFonts.lo psout_ft.lo psout_ftpstype1.lo \ - psout_ftpstype3.lo ttf2pt1wrap.lo -@XP_USE_FREETYPE_TRUE@am__objects_2 = $(am__objects_1) + psout_ftpstype3.lo +@XP_USE_FREETYPE_TRUE@am__objects_2 = ttf2pt1.lo +@XP_USE_FREETYPE_TRUE@am__objects_3 = ft.lo pt1.lo runt1asm.lo \ +@XP_USE_FREETYPE_TRUE@ $(am__objects_2) +@XP_USE_FREETYPE_TRUE@am__objects_4 = $(am__objects_1) \ +@XP_USE_FREETYPE_TRUE@ $(am__objects_3) am_libps_la_OBJECTS = PsArc.lo PsArea.lo PsAttr.lo PsAttVal.lo \ PsCache.lo PsColor.lo PsFonts.lo PsGC.lo PsImageUtil.lo \ PsInit.lo PsLine.lo PsMisc.lo psout.lo PsPixel.lo PsPixmap.lo \ PsPolygon.lo PsPrint.lo PsSpans.lo PsText.lo PsWindow.lo \ - $(am__objects_2) + $(am__objects_4) libps_la_OBJECTS = $(am_libps_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -156,6 +160,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -380,12 +385,18 @@ PsLine.c PsMisc.c psout.c psout.h PsPixel.c PsPixmap.c \ PsPolygon.c PsPrint.c PsSpans.c PsText.c PsWindow.c \ $(am__append_2) -EXTRA_DIST = PsFTFonts.c \ +FREETYPE_SRCS = PsFTFonts.c \ psout_ft.c \ psout_ftpstype1.c \ - psout_ftpstype3.c \ - ttf2pt1wrap.c + psout_ftpstype3.c +EXTRA_DIST = ttf2pt1wrap.c +@XP_USE_FREETYPE_TRUE@TTF2PT1OURCEDIR = $(top_srcdir)/hw/xprint/extras/ttf2pt1 +@XP_USE_FREETYPE_TRUE@TTF2PT1SRCFILE = ttf2pt1.c +@XP_USE_FREETYPE_TRUE@TTF2PT1OBJFILE = ttf2pt1.o +@XP_USE_FREETYPE_TRUE@TTF2PT1SRCS_EXTRA = pt1.h t1asm.c ttf.h global.h version.h +@XP_USE_FREETYPE_TRUE@TTF2PT1SRCS = ft.c pt1.c runt1asm.c $(TTF2PT1SRCFILE) +@XP_USE_FREETYPE_TRUE@TTF2PT1OBJS = ft.o pt1.o runt1asm.o $(TTF2PT1OBJFILE) all: all-am .SUFFIXES: @@ -457,11 +468,14 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PsSpans.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PsText.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PsWindow.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ft.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psout.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psout_ft.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psout_ftpstype1.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psout_ftpstype3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttf2pt1wrap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pt1.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runt1asm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttf2pt1.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -495,8 +509,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -508,8 +522,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -519,12 +533,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -665,6 +680,14 @@ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am + +@XP_USE_FREETYPE_TRUE@$(TTF2PT1SRCS_EXTRA): +@XP_USE_FREETYPE_TRUE@ -rm -f $@ +@XP_USE_FREETYPE_TRUE@ $(LN_S) $(TTF2PT1OURCEDIR)/$@ + +@XP_USE_FREETYPE_TRUE@$(TTF2PT1SRCS): $(TTF2PT1SRCS_EXTRA) +@XP_USE_FREETYPE_TRUE@ -rm -f $@ +@XP_USE_FREETYPE_TRUE@ $(LN_S) $(TTF2PT1OURCEDIR)/$@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- xorg-server-1.4.1~git20080131.orig/hw/xprint/pcl-mono/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/pcl-mono/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ PclLine.lo PclMisc.lo PclPixel.lo PclPolygon.lo PclPrint.lo \ PclSFonts.lo PclSpans.lo PclText.lo PclWindow.lo libpcl_la_OBJECTS = $(am_libpcl_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -616,8 +617,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -629,8 +630,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -640,12 +641,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/raster/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/raster/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,7 +53,7 @@ libraster_la_LIBADD = am_libraster_la_OBJECTS = RasterAttVal.lo Raster.lo libraster_la_OBJECTS = $(am_libraster_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -141,6 +141,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -450,8 +451,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -463,8 +464,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -474,12 +475,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xprint/pcl/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xprint/pcl/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ PclLine.lo PclMisc.lo PclPixel.lo PclPolygon.lo PclPrint.lo \ PclSFonts.lo PclSpans.lo PclText.lo PclWindow.lo libpcl_la_OBJECTS = $(am_libpcl_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -145,6 +145,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -616,8 +617,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -629,8 +630,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -640,12 +641,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xgl/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xgl/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -78,7 +78,7 @@ Xgl_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(Xgl_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -175,6 +175,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -510,8 +511,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -729,8 +730,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -755,8 +756,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -766,12 +767,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xgl/glx/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xgl/glx/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,7 +53,7 @@ libxglx_la_LIBADD = am_libxglx_la_OBJECTS = xglx.lo xglxorg.lo libxglx_la_OBJECTS = $(am_libxglx_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -150,6 +150,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -545,8 +546,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -571,8 +572,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -582,12 +583,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xgl/glx/module/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xgl/glx/module/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ libxglx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libxglx_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -152,6 +152,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -422,8 +423,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -431,8 +432,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -486,8 +487,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -499,8 +500,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -510,12 +511,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xgl/glxext/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xgl/glxext/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,7 +53,7 @@ libxglglxext_la_LIBADD = am_libxglglxext_la_OBJECTS = xglglxext.lo xglglxlog.lo libxglglxext_la_OBJECTS = $(am_libxglglxext_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -151,6 +151,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -541,8 +542,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -567,8 +568,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -578,12 +579,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xgl/glxext/module/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xgl/glxext/module/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -70,7 +70,7 @@ libglx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libglx_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -158,6 +158,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -431,8 +432,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -440,8 +441,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -498,8 +499,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -511,8 +512,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -522,12 +523,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xgl/egl/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xgl/egl/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,7 @@ Xegl_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(Xegl_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -163,6 +163,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -471,8 +472,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -668,8 +669,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -694,8 +695,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -705,12 +706,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/hw/xgl/egl/module/Makefile.in +++ xorg-server-1.4.1~git20080131/hw/xgl/egl/module/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,7 @@ libxegl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libxegl_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -154,6 +154,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -421,8 +422,8 @@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -430,8 +431,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ done clean-moduleLTLIBRARIES: @@ -485,8 +486,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -498,8 +499,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -509,12 +510,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/doc/Makefile.in +++ xorg-server-1.4.1~git20080131/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -138,6 +138,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ --- xorg-server-1.4.1~git20080131.orig/miext/Makefile.in +++ xorg-server-1.4.1~git20080131/miext/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -135,6 +135,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -466,8 +467,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -492,8 +493,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -503,12 +504,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/miext/rootless/Makefile.in +++ xorg-server-1.4.1~git20080131/miext/rootless/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,7 +54,7 @@ am_librootless_la_OBJECTS = rootlessCommon.lo rootlessGC.lo \ rootlessScreen.lo rootlessValTree.lo rootlessWindow.lo librootless_la_OBJECTS = $(am_librootless_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -152,6 +152,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -547,8 +548,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -573,8 +574,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -584,12 +585,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/miext/rootless/accel/Makefile.in +++ xorg-server-1.4.1~git20080131/miext/rootless/accel/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,7 +54,7 @@ am_librlAccel_la_OBJECTS = rlAccel.lo rlBlt.lo rlCopy.lo rlFill.lo \ rlFillRect.lo rlFillSpans.lo rlGlyph.lo rlSolid.lo librlAccel_la_OBJECTS = $(am_librlAccel_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -142,6 +142,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -465,8 +466,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -478,8 +479,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -489,12 +490,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/miext/rootless/safeAlpha/Makefile.in +++ xorg-server-1.4.1~git20080131/miext/rootless/safeAlpha/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,7 +53,7 @@ libsafeAlpha_la_LIBADD = am_libsafeAlpha_la_OBJECTS = safeAlphaPicture.lo safeAlphaWindow.lo libsafeAlpha_la_OBJECTS = $(am_libsafeAlpha_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -141,6 +141,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -452,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -465,8 +466,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -476,12 +477,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/miext/cw/Makefile.in +++ xorg-server-1.4.1~git20080131/miext/cw/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,7 +53,7 @@ libcw_la_LIBADD = am_libcw_la_OBJECTS = cw.lo cw_ops.lo cw_render.lo libcw_la_OBJECTS = $(am_libcw_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -141,6 +141,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -452,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -465,8 +466,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -476,12 +477,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/miext/damage/Makefile.in +++ xorg-server-1.4.1~git20080131/miext/damage/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -55,7 +55,7 @@ libdamage_la_LIBADD = am_libdamage_la_OBJECTS = damage.lo libdamage_la_OBJECTS = $(am_libdamage_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -153,6 +153,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -479,8 +480,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -492,8 +493,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -503,12 +504,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/miext/shadow/Makefile.in +++ xorg-server-1.4.1~git20080131/miext/shadow/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -60,7 +60,7 @@ shrot32pack_90.lo shrot32pack.lo shrot8pack_180.lo \ shrot8pack_270.lo shrot8pack_90.lo shrot8pack.lo shrotate.lo libshadow_la_OBJECTS = $(am_libshadow_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -158,6 +158,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -523,8 +524,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -536,8 +537,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -547,12 +548,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/exa/Makefile.in +++ xorg-server-1.4.1~git20080131/exa/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -56,7 +56,7 @@ am_libexa_la_OBJECTS = exa.lo exa_accel.lo exa_migration.lo \ exa_offscreen.lo exa_render.lo exa_unaccel.lo libexa_la_OBJECTS = $(am_libexa_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -154,6 +154,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -496,8 +497,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -509,8 +510,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -520,12 +521,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/cfb/Makefile.in +++ xorg-server-1.4.1~git20080131/cfb/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -69,7 +69,7 @@ am_libcfb_la_OBJECTS = cfb8bit.lo cfbteblt8.lo cfbglrop8.lo \ cfbpush8.lo cfbrctstp8.lo $(am__objects_1) $(am__objects_2) libcfb_la_OBJECTS = $(am_libcfb_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -166,6 +166,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -750,8 +751,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -763,8 +764,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -774,12 +775,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/debian/xdmx.install +++ xorg-server-1.4.1~git20080131/debian/xdmx.install @@ -0,0 +1,2 @@ +usr/bin/Xdmx +usr/share/man/man1/Xdmx.1 --- xorg-server-1.4.1~git20080131.orig/debian/rules +++ xorg-server-1.4.1~git20080131/debian/rules @@ -0,0 +1,212 @@ +#!/usr/bin/make -f +# debian/rules for the Debian xorg-server package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone +# Copyright © 2005 David Nusinow + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include debian/xsfbs/xsfbs.mk + +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +#ifeq ($(DEB_HOST_ARCH_OS), linux) +# build_xfbdev = --enable-xfbdev +#else + build_xfbdev = --disable-xfbdev +#endif + +BUILD_XPRINT = false +ifeq ($(BUILD_XPRINT), true) + confflags += --enable-xprint +else + confflags += --disable-xprint +endif + +INSTALL=/usr/bin/install + +VENDOR = $(shell lsb_release -i -s) + +# disable-static is so we don't get libfoo.a for modules. now if only we could +# kill the .las. +confflags += --disable-static \ + --enable-xorg \ + --with-mesa-source=/usr/share/mesa-source \ + --with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" \ + --with-serverconfig-path=/etc/X11/xserver \ + --with-rgb-path=/etc/X11/rgb \ + --enable-xtrap \ + --disable-dmx \ + --enable-vfb \ + --enable-kdrive \ + --enable-xephyr \ + --disable-xsdl \ + --disable-xfake \ + $(build_xfbdev) \ + --disable-kdrive-vesa \ + --disable-lbx \ + --enable-freetype \ + --disable-xorgconfig \ + --disable-xorgcfg \ + --with-xkb-path=/usr/share/X11/xkb \ + --with-xkb-output=/var/lib/xkb \ + --enable-xfree86-utils \ + --with-os-name="$(shell uname)" \ + --with-os-vendor="$(VENDOR) ($(SOURCE_NAME) $(SOURCE_VERSION))" \ + --with-int10=x86emu \ + --disable-type1 + +build: patch build-stamp +build-stamp: + dh_testdir + + mkdir -p obj-$(DEB_BUILD_GNU_TYPE)/GL + cd obj-$(DEB_BUILD_GNU_TYPE) && \ + ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info --sysconfdir=/etc \ + --localstatedir=/var $(confflags) CFLAGS="$(CFLAGS)" + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + + touch build-stamp + +clean: xsfclean + dh_testdir + dh_testroot + rm -f build-stamp + + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -rf obj-* + # generated file, left over in the upstream tarball + # see https://bugs.freedesktop.org/show_bug.cgi?id=9277 + rm -f hw/xfree86/common/xf86Build.h + # more generated files + rm -f include/dix-config.h include/do-not-use-config.h \ + include/xorg-config.h include/xorg-server.h + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + + # oh, yuck. + find $(CURDIR)/debian/tmp/usr/lib/xorg -type f -name '*.la' | \ + xargs rm -f + + install -m 755 debian/local/xvfb-run debian/tmp/usr/bin + install debian/local/xvfb-run.1 debian/tmp/usr/share/man/man1 + +# # something funny going on with Xprinters, will have to sort it out upstream +# mv debian/tmp/usr/lib/X11/xserver/C/print/Xprinters.ghostscript debian/tmp/usr/lib/X11/xserver/C/print/Xprinters + + +# stub to start building deb files, used by binary-indep and binary-arch +binary-initial: + dh_testdir + dh_testroot + +# stub to build deb files, used by binary-indep and binary-arch +# (cf. /usr/share/debhelper/dh_make/debianm/rules) +binary-deb: + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-initial + + dh_installdocs -a + dh_installchangelogs -a ChangeLog + dh_install -a --sourcedir=debian/tmp --list-missing -Xusr/share/man/man1/Xprt -Xusr/lib/X11/xserver -Xetc/X11/Xsession.d/92xprint-xpserverlist + $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg + $(INSTALL) -m644 $(CURDIR)/debian/videoabiver \ + $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/videoabiver + $(INSTALL) -m644 $(CURDIR)/debian/inputabiver \ + $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/inputabiver + $(INSTALL) -m644 $(CURDIR)/debian/serverminver \ + $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverminver + $(INSTALL) -m 755 -d debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core + $(INSTALL) -m 755 debian/xserver-xorg-core.bug.script debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script + dh_installdebconf -a + dh_installman -a +ifeq ($(BUILD_XPRINT), true) + $(INSTALL) -m 644 $(CURDIR)/debian/xprint-overrides $(CURDIR)/debian/xprint/usr/share/lintian/overrides/xprint + # xprint docs are linked to xprint-common + rm -rf debian/xprint/usr/share/doc/xprint +endif + + dh_link -a + dh_strip -a --exclude=usr/lib/xorg/modules \ + --dbg-package=xserver-xorg-core + for i in $$(find debian/xserver-xorg-core/usr/lib/xorg/modules -name "lib*.so"); do \ + mkdir -p $$(dirname debian/xserver-xorg-core-dbg/usr/lib/debug/$${i#*debian/xserver-xorg-core/}) && \ + objcopy --only-keep-debug $$i debian/xserver-xorg-core-dbg/usr/lib/debug/$${i#*debian/xserver-xorg-core/} && \ + objcopy --add-gnu-debuglink=debian/xserver-xorg-core-dbg/usr/lib/debug/$${i#*debian/xserver-xorg-core/} $$i; \ + done +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + find debian/xserver-xorg-core/usr/lib/xorg/modules -name "lib*.so" | \ + xargs --no-run-if-empty \ + strip --strip-debug --remove-section=.note --remove-section=.comment +endif + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-deb + + +# Build architecture-independent files here (xprint-common) +binary-indep: build install + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial + dh_install -i --sourcedir=debian/tmp --list-missing -Xusr/share/man -Xusr/include/xorg -Xusr/share/aclocal -Xusr/lib/xorg/modules -Xusr/lib/pkgconfig/xorg-server.pc -Xusr/bin -XSecurityPolicy -Xvar/lib/xkb -Xusr/lib/X11/Cards -Xusr/lib/X11/Options + +ifeq ($(BUILD_XPRINT), true) + $(INSTALL) -m 644 $(CURDIR)/debian/xprint-common-overrides $(CURDIR)/debian/xprint-common/usr/share/lintian/overrides/xprint-common + # split Xprint config files so font files do not land in /etc + # (for xprint-common only) + mv debian/xprint-common/usr/share/Xprint/xserver/C/print/attributes debian/xprint-common/etc/Xprint/C/print/attributes + mv debian/xprint-common/usr/share/Xprint/xserver/C/print/Xprinters debian/xprint-common/etc/Xprint/C/print/Xprinters + mv debian/xprint-common/usr/share/Xprint/xserver/C/print/ddx-config debian/xprint-common/etc/Xprint/C/print/ddx-config + mv debian/xprint-common/usr/share/Xprint/xserver/en_US/print/attributes debian/xprint-common/etc/Xprint/en_US/print/attributes + # dh_install cannot rename files, sigh + $(INSTALL) -m 644 $(CURDIR)/debian/xprint-common.default $(CURDIR)/debian/xprint-common/etc/default/xprint + dh_installinit -p xprint-common --name=xprint +endif + + dh_installdocs -i + dh_installchangelogs -i ChangeLog + dh_installdebconf -i + dh_link -i + + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-deb + + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xorg-server-1.4.1~git20080131.orig/debian/xprint.dirs +++ xorg-server-1.4.1~git20080131/debian/xprint.dirs @@ -0,0 +1,3 @@ +usr/share/doc +usr/bin +usr/share/lintian/overrides --- xorg-server-1.4.1~git20080131.orig/debian/control +++ xorg-server-1.4.1~git20080131/debian/control @@ -0,0 +1,261 @@ +Source: xorg-server +Section: x11 +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian X Strike Force +Uploaders: David Nusinow , Steve Langasek , Julien Cristau , Drew Parsons +# all the Build-Depends up to x11proto-xf86-dri-dev are for the normal Xorg +# server, and common dependencies for the DIX. +# x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server. +# x11proto-print-dev and libfreetype6-dev are for Xprint +# everything on is for the DMX and Xnest servers. +Build-Depends: debhelper (>= 4.0.0), lsb-release, pkg-config, bison, flex, + x11proto-bigreqs-dev, x11proto-composite-dev (>= 1:0.4), x11proto-core-dev (>= 7.0.9), + x11proto-damage-dev (>= 1.1), x11proto-evie-dev, x11proto-fixes-dev (>= 4.0), + x11proto-kb-dev (>= 1.0.3), x11proto-xinerama-dev, x11proto-randr-dev (>= 1.2), + x11proto-record-dev, x11proto-render-dev (>= 2:0.9.3), x11proto-resource-dev, + x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev, + x11proto-xcmisc-dev, x11proto-xext-dev (>= 6.9.99.0-1), + x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev, + x11proto-xf86vidmode-dev, xtrans-dev, libxau-dev (>= 1:0.99.1-1), + x11proto-input-dev (>= 1.4.2), + libxdmcp-dev (>= 1:0.99.1-1), libxfont-dev, libfontenc-dev, + libxkbfile-dev (>= 1:0.99.1-1), libpixman-1-dev (>= 0.9.4-2), + x11proto-xf86dri-dev, libdrm-dev (>= 2.3.0) [!hurd-i386], + x11proto-print-dev, libfreetype6-dev, xfonts-utils, + mesa-swx11-source (>> 7.0.1~rc2-1), + x11proto-gl-dev (>= 1.4.8), libgl1-mesa-dev (>= 6.5.1), + libxmuu-dev (>= 1:0.99.1-1), libxext-dev (>= 1:0.99.1-1), + libx11-dev (>= 1:0.99.2-1), libxrender-dev (>= 1:0.9.0-1), + libxi-dev (>= 1:0.99.1-1), x11proto-dmx-dev, quilt, libdmx-dev (>= 1:1.0.1-1), + libxpm-dev (>= 1:3.5.3-1), libxaw7-dev (>= 1:0.99.1-1), + libxt-dev (>= 1:0.99.1-1), libxmu-dev (>= 1:0.99.1-1), + libxtst-dev (>= 1:0.99.1-1), libxres-dev (>= 1:0.99.1-1), + libxfixes-dev (>= 1:3.0.0), libdbus-1-dev [!hurd-i386], libhal-dev [!hurd-i386] +Build-Conflicts: xlibs-static-dev +Standards-Version: 3.7.3 +XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server +XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git + +Package: xserver-xorg-core +Architecture: any +Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg +Recommends: xkb-data, xfonts-base +Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable +Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), + xserver-xorg-video, xserver-common, xserver-xorg-video-1.0, xserver-xorg-input, + xserver-xorg-video-1.9, xserver-xorg-input-wacom (<< 0.7.8), xkb-data (<< 0.9) +Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), + xserver-common +Provides: xserver +Description: Xorg X server - core server + The Xorg X server is an X server for several architectures and operating + systems, which is derived from the XFree86 4.x series of X servers. + . + The Xorg server supports most modern graphics hardware from most vendors, + and supersedes all XFree86 X servers. + . + The Xorg server either needs fonts installed on the local host, or needs to + know of a remote hosts that provides font services (with xfs, for instance). + The former means that fonts packages are mandatory. The latter means that + font packages may be gratuitous. To err on the side of caution, install at + least the xfonts-base, xfonts-100dpi or xfonts-75dpi, and xfonts-scalable + packages. + . + More information about X.Org can be found at: + + + + . + This package is built from the X.org xserver module. + +Package: xserver-xorg-dev +Architecture: any +Depends: ${misc:Depends}, libpixman-1-dev, x11proto-core-dev, x11proto-input-dev (>= 1.4), x11proto-xext-dev, x11proto-video-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev (>= 2:0.9.3), x11proto-fonts-dev +Description: Xorg X server - development files + This package provides development files for the X.Org ('Xorg') X server. + This is not quite the same as the DDK (Driver Development Kit) from the + XFree86 4.x and X.Org 6.7, 6.8 and 6.9 series of servers; it provides + headers and a pkg-config file for drivers using autotools to build + against. + . + Unless you are developing or building a driver, you probably want + xserver-xorg and/or xserver-xorg-core instead. + . + More information about X.Org can be found at: + + + + . + This package is built from the X.org xserver module. + +#Package: xdmx +#Architecture: any +#Depends: ${shlibs:Depends}, ${misc:Depends} +#Description: distributed multihead X server +# Xdmx is a proxy X server that uses one or more other X servers as its +# display device(s). It provides multi-head X functionality for displays that +# might be located on different machines. Xdmx functions as a front-end X server +# that acts as a proxy to a set of back-end X servers. All of the visible +# rendering is passed to the back-end X servers. Clients connect to the Xdmx +# front-end, and everything appears as it would in a regular multi-head +# configuration. If Xinerama is enabled (e.g., with +xinerama on the command +# line), the clients see a single large screen. +# . +# More information about X.Org can be found at: +# +# +# +# . +# This package is built from the X.org xserver module. +# +#Package: xdmx-tools +#Architecture: any +#Depends: xdmx, ${shlibs:Depends}, ${misc:Depends} +#Replaces: xdmx (<= 2:1.1.1-10) +#Description: Distributed Multihead X tools +# This package provides a collection of tools used for administration of +# the Xdmx server; see the xdmx package for more information. +# . +# More information about X.Org can be found at: +# +# +# +# . +# This package is built from the X.org xserver module. + +Package: xnest +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Nested X server + Xnest is a nested X server that simply relays all its requests to another + X server, where it runs as a client. This means that it appears as another + window in your current X session. Xnest relies upon its parent X server + for font services. + . + Use of the Xephyr X server instead of Xnest is recommended. + . + More information about X.Org can be found at: + + + + . + This package is built from the X.org xserver module. + +Package: xvfb +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, xauth, xfonts-base +Recommends: xbase-clients +Description: Virtual Framebuffer 'fake' X server + Xvfb provides an X server that can run on machines with no display hardware + and no physical input devices. It emulates a dumb framebuffer using virtual + memory. The primary use of this server was intended to be server testing, + but other novel uses for it have been found, including testing clients + against unusual depths and screen configurations, doing batch processing with + Xvfb as a background rendering engine, load testing, as an aid to porting the + X server to a new platform, and providing an unobtrusive way to run + applications that don't really need an X server but insist on having one + anyway. + . + This package also contains a convenience script called xvfb-run which + simplifies the automated execution of X clients in a virtual server + environment. This convenience script requires the use of the xauth + program. + . + More information about X.Org can be found at: + + + + . + This package is built from the X.org xserver module. + +Package: xserver-xephyr +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: xbase-clients, xfonts-base +Description: nested X server + Xephyr is an X server that can be run inside another X server, + much like Xnest. It is based on the kdrive X server, and as a + result it supports newer extensions than Xnest, including render and + composite. + . + More information about X.Org can be found at: + + + + . + This package is built from the X.org xserver module. + +#Package: xserver-xfbdev +#Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 sh3 sh3eb sh4 sh4eb sparc +#Depends: ${shlibs:Depends}, ${misc:Depends} +#Recommends: xbase-clients +#Description: Linux framebuffer device tiny X server +# xserver-xfbdev is a Linux framebuffer device tiny X server based on the +# kdrive X server. +# . +# More information about X.Org can be found at: +# +# +# +# . +# This package is built from the X.org xserver module. +# +#Package: xprint +#Architecture: any +#Depends: ${shlibs:Depends}, ${misc:Depends}, xprint-common, libxfont1 (>= 1:1.1) +#Recommends: xprint-utils +#Conflicts: xprt (<= 4.3.0.dfsg.1-10) +#Description: X11 print system (binary) +# Xprint is an advanced printing system which enables X11 applications +# to use devices like printers, fax or create documents in formats like +# PostScript, PDF, PCL, etc. +# . +# This package provides Xprt, the Xprint server compiled from +# xprint.mozdev.org, an X.org subproject. Xprint provides superior support +# for printing from Mozilla, including non-Latin characters and MathML. +# TrueType fonts are supported. +# . +# Xprint uses ttf2pt1 internally for some font support. +# . +# More information about X.Org can be found at: +# +# +# +# . +# This package is built from the X.org xserver module. +# +#Package: xprint-common +#Architecture: all +#Depends: xbase-clients, xfonts-encodings, x11-common (>= 1:7.0.12), ${shlibs:Depends}, ${misc:Depends} +#Recommends: xprint, xfonts-base +#Conflicts: xprt-common +#Replaces: xprt-common +#Description: Xprint - the X11 print system (configuration files) +# Xprint is an advanced printing system which enables X11 applications +# to use devices like printers, FAX or create documents in formats like +# PostScript, PDF, PCL, etc. +# . +# This package provides the configuration and Postscript definition files +# required to run Xprt, the Xprint server. Xprt is provided by xprint. +# . +# More information about X.Org can be found at: +# +# +# +# . +# This package is built from the X.org xserver module. +# +Package: xserver-xorg-core-dbg +Architecture: any +Depends: xserver-xorg-core (= ${binary:Version}) +Priority: extra +Description: Xorg - the X.Org X server (debugging symbols) + The Xorg X server is an X server for several architectures and operating + systems, which is derived from the XFree86 4.x series of X servers. + . + The Xorg server supports most modern graphics hardware from most vendors, + and supersedes all XFree86 X servers. + . + This package provides debugging symbols for the Xorg X server and associated + modules. --- xorg-server-1.4.1~git20080131.orig/debian/xprint.links +++ xorg-server-1.4.1~git20080131/debian/xprint.links @@ -0,0 +1 @@ +usr/share/doc/xprint-common usr/share/doc/xprint --- xorg-server-1.4.1~git20080131.orig/debian/inputabiver +++ xorg-server-1.4.1~git20080131/debian/inputabiver @@ -0,0 +1 @@ +2 --- xorg-server-1.4.1~git20080131.orig/debian/videoabiver +++ xorg-server-1.4.1~git20080131/debian/videoabiver @@ -0,0 +1 @@ +2 --- xorg-server-1.4.1~git20080131.orig/debian/changelog +++ xorg-server-1.4.1~git20080131/debian/changelog @@ -0,0 +1,2500 @@ +xorg-server (2:1.4.1~git20080131-1ubuntu8) hardy; urgency=low + + * debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch: + - Turn XAA Offscreen Pixmaps off by default, and use + XaaOffscreenPixmaps "true" to turn them on. This setting was an + early pre-EXA HW optimization attempt that didn't pan out; upstream is + deprecating XAA in favor of EXA generally, and for situations where + XAA is still in use recommends NOT using this optimization hack, since + they found it often just made performance worse, and sometimes created + visualization bugs. People wishing to gain added performance should be + experimenting with EXA anyway, not this setting. (closes LP: #182038) + + -- Bryce Harrington Mon, 14 Apr 2008 12:34:54 -0700 + +xorg-server (2:1.4.1~git20080131-1ubuntu7) hardy; urgency=low + + * 159_xkb_default_to_null.diff: + When copying the keymap, make sure the structs default to 0/NULL. + (LP: #184651) + * 160_default_to_intel.diff: + Default to using intel instead of i810. (LP: #158709) + * 161_fix_big_endian_cursor.diff: + Fix RandR 1.2 driver interface conversion of two colour cursors to + ARGB. (LP: #141118) + * Fixes from the upstream 1.4-branch: + - 162_cve-2007-6429.diff: + CVE-2007-6429: Always test for size+offset wrapping. + - 163_fix_untrusted_access.diff: + Security: Fix for fdo bug #14480: untrusted access broken in 7.3. + - 164_fix_context_sharing.diff: + Fix context sharing between direct/indirect contexts + + -- Timo Aaltonen Wed, 09 Apr 2008 11:06:04 +0300 + +xorg-server (2:1.4.1~git20080131-1ubuntu6) hardy; urgency=low + + * 157_fix_exa_pixmap_width.diff: + A patch from upstream to allow wider pixmaps with EXA (LP: #205599) + * 158_xkb_wrapping.diff: + A patch reviewed by upstream that prevents keys from getting stuck under + certain situations. (LP: #194214) + * 51_xkb-and-loathing.diff: + Re-enable. Ignore SIGALRM around calls to Popen()/Pclose() to fix a hang + when opening menus in OpenOffice.org. (LP: #204137) + + -- Timo Aaltonen Sun, 30 Mar 2008 19:18:32 +0300 + +xorg-server (2:1.4.1~git20080131-1ubuntu5) hardy; urgency=low + + * Add some patches from upstream 1.4-branch or proposed set: + - 109_glx_fail_if_no_texture_bound.diff + + __glXDRIbindTexImage: Fail if no texture bound to pixmap's texture + target. + - 153_exa_skip_empty_glyphs.diff + + Fix a crasher when EXA and RenderAccel is in use. + - 154_fix_rotation_for_multimon.diff + + Fix rotation for multi-monitor situation. + - 155_exa_fix_off-by-one.diff + + Fix off-by-one in polyline drawing. + - 156_resize_composite_overlay.diff + + Resize composite overlay window when the root window changes. + (LP: #199700) + + -- Timo Aaltonen Thu, 13 Mar 2008 18:21:41 +0200 + +xorg-server (2:1.4.1~git20080131-1ubuntu4) hardy; urgency=low + + * Add 152_xserver_exa_force_greedy.patch to provide a mechanism for + drivers to force greedy mode on. (LP: #177492, others) + + -- Bryce Harrington Tue, 19 Feb 2008 13:38:16 -0800 + +xorg-server (2:1.4.1~git20080131-1ubuntu3) hardy; urgency=low + + [ Bryce Harrington ] + * Add 150_edid_quirk_lp154w01.patch to fix font size on LGPhilipsLCD + LP154W01-TLAE (LP: #127827) + * Add 149_add_quirks_for_physical_screen_size_issues.patch to help + address various common EDID issues (like monitors that report in + centimeters instead of millimeters, etc.) (LP: #151311) + + [ Timo Aaltonen ] + * Add 151_x86emu_handle_cpuid.patch to fix X86EMU CPUID handling. + (LP: #180742) + + -- Timo Aaltonen Tue, 19 Feb 2008 17:48:05 +0200 + +xorg-server (2:1.4.1~git20080131-1ubuntu2) hardy; urgency=low + + * Add patch 148_dix_touchscreen_fixes.diff from Matthew Garrett to fix + touchscreen issues with DIX. + http://lists.freedesktop.org/archives/xorg-commit/2008-February/014648.html + + -- Steve Kowalik Fri, 08 Feb 2008 10:30:04 +1100 + +xorg-server (2:1.4.1~git20080131-1ubuntu1) hardy; urgency=low + + [ Timo Aaltonen ] + * Merge with Debian unstable, remaining changes: + * debian/control: + - Change maintainer address. + - set Conflicts: xkb-data (<< 0.9), since xkb-path is + different compared to Dapper. + - xvfb Depends on xauth, xfonts-base. + * debian/patches: + - 101_fedora-apm-typedefs.patch: + Temporary hack from Fedora for broken kernels that don't publish the + /dev/apm_bios types. + - 102_ubuntu_sharevts_load_cpu.patch: + Close console fd only when using --sharevts. + - 103_fedora_openchrome.patch: + Patch from Fedora to use openchrome instead of via. + - 104_fedora_init_origins_fix.patch + Multihead initialization. + - 105_reduce_wakeups_from_smart_scheduler.diff: + Patch from upstream to reduce wakeups and improve battery life. + - 106_ubuntu_fpic_libxf86config.patch + Add -fPIC to makefiles for xfree86/parser. + - 107_fedora_dont_backfill_bg_none.patch + Disable backfilling of windows created with bg=none, which + otherwise would force a framebuffer readback. + - 110_fedora_no_move_damage.patch + Disable damage notifications on move for manually redirected windows. + - 120_fedora_xserver-xaa-evict-pixmaps.patch: + New version of the hack to copy textures from video memory. Shouldn't + break EXA anymore. + - 121_only_switch_vt_when_active.diff + Add a check to prevent the X server from changing the VT when + killing GDM from the console. + - 123_no_composite_for_xvfb_run.patch + Use "-extension Composite" to fix xvfb-run crashing. + - 133_psb_auto.patch + Add automatic detection of Poulsbo hardware when running + without a Device definition. + - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch + Fixes document fontpaths shown in the man page. + - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch + Composite on 8bpp pseudocolor root windows appears to fail, so just + disable it on anything pseudocolor for safety. + - 144_fedora_xserver-1.3.0-xnest-exposures.patch: + Only collect xnest exposures for xexposes with non-zero height and width. + * 108_fedora_honor_displaysize.patch: + - Patch from upstream/Fedora to honor the DisplaySize-setting. + (LP: #135738, b.fd.o #9758) + * Drop patch 100_avoid_acpi_insanity.diff, superseded by patch 45. + + [ Bart Trojanowski, Martin-Eric Racine ] + * 146_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch + - Restrict access to I/O ports in range 0-0xFF from x86emu. + (LP: #140051) + * 147_X86EMU-pass-the-correct-bus-dev-fn-tag-to-pci-emula.patch + - Fix improper emulation of PCI access General Software BIOS. + (LP: #140051) + + -- Timo Aaltonen Tue, 05 Feb 2008 18:57:14 +0200 + +xorg-server (2:1.4.1~git20080131-1) unstable; urgency=low + + [ Brice Goglin ] + * Add 45_only_XF86_APM_CAPABILITY_CHANGED_for_video_change_acpi_events.diff + to prevent XF86_APM_CAPABILITY_CHANGED from being issued for all ACPI + events, thanks Sjoerd Simons, closes: #461463. + + [ David Nusinow ] + * Update Japanese translation from Hideki Yamane. closes: #462761 + * New upstream pull + + Fixes crashes due to absent LED's being referenced + + -- David Nusinow Thu, 31 Jan 2008 21:43:12 -0500 + +xorg-server (2:1.4.1~git20080118-1ubuntu2) hardy; urgency=low + + * Remove the DPI patch for real this time, conflicts with the upstream + commit that was pulled. + * 105_reduce_wakeups_from_smart_scheduler.diff: + Patch from upstream to reduce wakeups and improve battery life. + + -- Timo Aaltonen Sat, 19 Jan 2008 20:26:41 +0200 + +xorg-server (2:1.4.1~git20080118-1ubuntu1) hardy; urgency=low + + * Merge with Debian unstable, remaining changes: + * debian/control: + - Change maintainer address. + - set Conflicts: xkb-data (<< 0.9), since xkb-path is + different compared to Dapper. + - xvfb Depends on xauth, xfonts-base. + * debian/patches: + - 100_avoid_acpi_insanity.diff + Don't send a configuration change event just because somebody's pressed + a brightness key. + - 101_fedora-apm-typedefs.patch: + Temporary hack from Fedora for broken kernels that don't publish the + /dev/apm_bios types. + - 102_ubuntu_sharevts_load_cpu.patch: + Close console fd only when using --sharevts. + - 103_fedora_openchrome.patch: + Patch from Fedora to use openchrome instead of via. + - 104_fedora_init_origins_fix.patch + Multihead initialization. + - 106_ubuntu_fpic_libxf86config.patch + Add -fPIC to makefiles for xfree86/parser. + - 107_fedora_dont_backfill_bg_none.patch + Disable backfilling of windows created with bg=none, which + otherwise would force a framebuffer readback. + - 110_fedora_no_move_damage.patch + Disable damage notifications on move for manually redirected windows. + - 120_fedora_xserver-xaa-evict-pixmaps.patch: + New version of the hack to copy textures from video memory. Shouldn't + break EXA anymore. + - 121_only_switch_vt_when_active.diff + Add a check to prevent the X server from changing the VT when + killing GDM from the console. + - 123_no_composite_for_xvfb_run.patch + Use "-extension Composite" to fix xvfb-run crashing. + - 133_psb_auto.patch + Add automatic detection of Poulsbo hardware when running + without a Device definition. + - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch + Fixes document fontpaths shown in the man page. + - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch + Composite on 8bpp pseudocolor root windows appears to fail, so just + disable it on anything pseudocolor for safety. + - 144_fedora_xserver-1.3.0-xnest-exposures.patch: + Only collect xnest exposures for xexposes with non-zero height and width. + + -- Timo Aaltonen Sat, 19 Jan 2008 02:40:00 +0200 + +xorg-server (2:1.4.1~git20080118-1) unstable; urgency=low + + [ Brice Goglin ] + * Add 42_dont_break_grab_and_focus_for_window_when_redirecting.diff + to prevent password authentication bypass, closes: #449108. + + [ Julien Cristau ] + * New upstream snapshot + + includes the security fixes from the previous version + + fixes regression introduced by the fix for CVE-2007-6429 in the MIT-SHM + extension (closes: #461410) + + -- Brice Goglin Fri, 18 Jan 2008 22:20:32 +0100 + +xorg-server (2:1.4.1~git20080105-2) unstable; urgency=low + + [ David Nusinow ] + * Improve dpms logging patch to correctly label message type + + [ Brice Goglin ] + * Grab upstream commit db9ae863536fff80b5463d99e71dc47ae587980d + to set DEFAULT_DPI to 96 instead of 75. + + [ Julien Cristau ] + * Fix multiple security issues + + CVE-2007-6427: XInput Extension Memory Corruption + + CVE-2007-6428: TOG-CUP Extension Memory Corruption + + CVE-2007-6429: EVI Extension Integer Overflow, + MIT-SHM Extension Integer Overflow + + CVE-2007-5760: XFree86-Misc Extension Invalid Array Index + + CVE-2007-5958: file existence disclosure + + CVE-2008-0006: PCF font parser buffer overflow + * Bump Standards-Version to 3.7.3 (no changes). + + -- Julien Cristau Thu, 17 Jan 2008 15:10:03 +0100 + +xorg-server (2:1.4.1~git20080105-1ubuntu1) hardy; urgency=low + + * Merge with Debian unstable, remaining changes: + * debian/control: + - Change maintainer address. + - set Conflicts: xkb-data (<< 0.9), since xkb-path is + different compared to Dapper. + - xvfb Depends on xauth, xfonts-base. + * debian/patches: + - 100_avoid_acpi_insanity.diff + Don't send a configuration change event just because somebody's pressed + a brightness key. + - 101_fedora-apm-typedefs.patch: + Temporary hack from Fedora for broken kernels that don't publish the + /dev/apm_bios types. + - 102_ubuntu_sharevts_load_cpu.patch: + Close console fd only when using --sharevts. + - 104_fedora_init_origins_fix.patch + Multihead initialization. + - 106_ubuntu_fpic_libxf86config.patch + Add -fPIC to makefiles for xfree86/parser. + - 107_fedora_dont_backfill_bg_none.patch + Disable backfilling of windows created with bg=none, which + otherwise would force a framebuffer readback. + - 110_fedora_no_move_damage.patch + Disable damage notifications on move for manually redirected windows. + - 120_fedora_xserver-xaa-evict-pixmaps.patch: + New version of the hack to copy textures from video memory. Shouldn't + break EXA anymore. + - 121_only_switch_vt_when_active.diff + Add a check to prevent the X server from changing the VT when + killing GDM from the console. + - 123_no_composite_for_xvfb_run.patch + Use "-extension Composite" to fix xvfb-run crashing. + - 133_psb_auto.patch + Add automatic detection of Poulsbo hardware when running + without a Device definition. + - 138_fedora_xserver-1.3.0-default-dpi.patch + Changes default dpi to 96. + - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch + Fixes document fontpaths shown in the man page. + - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch + Composite on 8bpp pseudocolor root windows appears to fail, so just + disable it on anything pseudocolor for safety. + - 144_fedora_xserver-1.3.0-xnest-exposures.patch: + Only collect xnest exposures for xexposes with non-zero height and width. + * debian/patches/103_fedora_openchrome.patch: + - Patch from Fedora to use openchrome instead of via. + + -- Timo Aaltonen Tue, 08 Jan 2008 18:05:21 +0200 + +xorg-server (2:1.4.1~git20080105-1) unstable; urgency=low + + * Don't reference non-existent bug-reporting.txt file in xvfb-run.1 + * New upstream git pull, again from the server-1.4-branch + + Drop 08_xkb_infinite_loop.diff, it's upstream now + * Improve logging when DPMS is enabled implicitly + + Adds 08_better_dpms_logging.diff + + -- David Nusinow Sun, 06 Jan 2008 16:56:38 -0500 + +xorg-server (2:1.4.1~git20071212-1ubuntu2) hardy; urgency=low + + * debian/patches/101_fedora-apm-typedefs.patch: + - Temporary hack from Fedora for broken kernels that don't publish the + /dev/apm_bios types. + + -- Timo Aaltonen Mon, 17 Dec 2007 11:54:46 +0200 + +xorg-server (2:1.4.1~git20071212-1ubuntu1) hardy; urgency=low + + * Merge with Debian unstable, remaining changes: + * debian/control: + - Change maintainer address. + - set Conflicts: xkb-data (<< 0.9), since xkb-path is + different compared to Dapper. + - xvfb Depends on xauth, xfonts-base. + * debian/patches: + - 100_avoid_acpi_insanity.diff + Don't send a configuration change event just because somebody's pressed + a brightness key. + - 102_ubuntu_sharevts_load_cpu.patch: + Close console fd only when using --sharevts. + - 104_fedora_init_origins_fix.patch + Multihead initialization. + - 106_ubuntu_fpic_libxf86config.patch + Add -fPIC to makefiles for xfree86/parser. + - 107_fedora_dont_backfill_bg_none.patch + Disable backfilling of windows created with bg=none, which + otherwise would force a framebuffer readback. + - 110_fedora_no_move_damage.patch + Disable damage notifications on move for manually redirected windows. + - 120_fedora_xserver-xaa-evict-pixmaps.patch: + New version of the hack to copy textures from video memory. Shouldn't + break EXA anymore. + - 121_only_switch_vt_when_active.diff + Add a check to prevent the X server from changing the VT when + killing GDM from the console. + - 123_no_composite_for_xvfb_run.patch + Use "-extension Composite" to fix xvfb-run crashing. + - 133_psb_auto.patch + Add automatic detection of Poulsbo hardware when running + without a Device definition. + - 138_fedora_xserver-1.3.0-default-dpi.patch + Changes default dpi to 96. + - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch + Fixes document fontpaths shown in the man page. + - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch + Composite on 8bpp pseudocolor root windows appears to fail, so just + disable it on anything pseudocolor for safety. + - 144_fedora_xserver-1.3.0-xnest-exposures.patch: + Only collect xnest exposures for xexposes with non-zero height and width. + + -- Timo Aaltonen Thu, 13 Dec 2007 13:43:35 +0200 + +xorg-server (2:1.4.1~git20071212-2) unstable; urgency=low + + * Add patch 08_xkb_infinite_loop.diff from upstream bug#13511: papers over + an infinite loop in event processing (closes: #451989). + + -- Julien Cristau Sat, 22 Dec 2007 00:02:01 +0100 + +xorg-server (2:1.4.1~git20071212-1) unstable; urgency=low + + [ Julien Cristau ] + * debian/rules: Use lsb_release -i -s to get the vendor name, instead of + hardcoding "Debian". + * debian/control: build-dep on lsb-release. + * Cherry-pick commit f30abe30 from master: edid quirk for MAX 0x77e monitor. + * Add patch 44_preferredmode_infinite_loop.diff from upstream git: fixes an + infinite loop when PreferredMode is used in xorg.conf. + + [ David Nusinow ] + * New upstream version. This is based on the server-1.4-branch, and includes + all the changes in the 1.4.0.90 (pre-)release as well as additional fixes. + This is primarily a bugfix release + + Remove 12_bgPixel_fix_64bit_issue.diff. Applied upstream + + -- David Nusinow Wed, 12 Dec 2007 20:19:11 -0500 + +xorg-server (2:1.4.1~git20071119-1ubuntu1) hardy; urgency=low + + * Merge with Debian unstable, remaining changes: + * debian/control: + - Change maintainer address. + - set Conflicts: xkb-data (<< 0.9), since xkb-path is + different compared to Dapper. + - xvfb Depends on xauth, xfonts-base. + * debian/rules: + - --with-os-vendor=Ubuntu + * debian/patches: + - 100_avoid_acpi_insanity.diff + Don't send a configuration change event just because somebody's pressed + a brightness key. + - 102_ubuntu_sharevts_load_cpu.patch: + Close console fd only when using --sharevts. + - 104_fedora_init_origins_fix.patch + Multihead initialization. + - 106_ubuntu_fpic_libxf86config.patch + Add -fPIC to makefiles for xfree86/parser. + - 107_fedora_dont_backfill_bg_none.patch + Disable backfilling of windows created with bg=none, which + otherwise would force a framebuffer readback. + - 110_fedora_no_move_damage.patch + Disable damage notifications on move for manually redirected windows. + - 121_only_switch_vt_when_active.diff + Add a check to prevent the X server from changing the VT when + killing GDM from the console. + - 123_no_composite_for_xvfb_run.patch + Use "-extension Composite" to fix xvfb-run crashing. + - 133_psb_auto.patch + Add automatic detection of Poulsbo hardware when running + without a Device definition. + - 138_fedora_xserver-1.3.0-default-dpi.patch + Changes default dpi to 100. + - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch + Fixes document fontpaths shown in the man page. + - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch + Composite on 8bpp pseudocolor root windows appears to fail, so just + disable it on anything pseudocolor for safety. + - 144_fedora_xserver-1.3.0-xnest-exposures.patch: + Only collect xnest exposures for xexposes with non-zero height and width. + * Bring back old changelog entries. + * debian/patches/120_fedora_xserver-xaa-evict-pixmaps.patch: + - New version of the hack to copy textures from video memory. Shouldn't + break EXA anymore. + + -- Timo Aaltonen Tue, 20 Nov 2007 15:35:59 +0200 + +xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low + + * Ship a .orig.tar.gz that's been autoreconf'ed. Closes: #451891 + * Re-enable validation of the screen section of xorg.conf + Modify 14_default_screen_section.diff. This also fixes a problem where the + server can't find the device section when it is specified in the screen + section. Closes: #451950 + + -- David Nusinow Mon, 19 Nov 2007 20:38:04 -0500 + +xorg-server (2:1.4.1~git20071117-1) unstable; urgency=low + + [ Julien Cristau ] + * Add conflict on xserver-xorg-input-wacom (<< 0.7.8) to xserver-xorg-core. + That driver is built against the old ABI, but doesn't provide + xserver-xorg-input. + + [ David Nusinow ] + * Add 14_default_screen_section.diff. This allows you to not have a screen + section in your xorg.conf. A basic default one with a simple identifier + will be created for you in this case using all default values + + [ Christian Perrier ] + * Debconf translations: + * Galician. Closes: #444764 + * German. Closes: #444917 + * Brazilian Portuguese. Closes: #445266 + * Russian. Closes: #443859 + * Portuguese. Closes: #445051 + * Slovak. Closes: #446418, #448220 + + [ Brice Goglin ] + * Bump x11proto-core-dev build-dependency to >= 7.0.9, + thanks Max Kellermann, closes: #446869. + + [ David Nusinow ] + * New upstream stable snapshot + + fixes a bunch of input-related bugs, notably keyboard leds + (closes: #440743 and its pile of duplicates) + * Remove patches merged in this snapshot + + 08_exa_fix_exaFillRegionTiled_fallback.diff + + 11_exa_no_negative_tile_offsets.diff + + 42_fix_RemoveGeneralSocket_crash_from_dbus.diff + + 44_XKB_mapping_changes_for_all_core-sending_devices.diff + + 45_GetKeyboardEvents_reject_out-of-range_keycodes.diff + * Make xephyr recommend xfonts-base. Closes: #451542 + + -- David Nusinow Sat, 17 Nov 2007 18:54:02 -0500 + +xorg-server (2:1.4.1~git20071105-1ubuntu2) hardy; urgency=low + + * Brown paper bag release: include all the patches. + + -- Timo Aaltonen Sat, 10 Nov 2007 15:24:28 +0200 + +xorg-server (2:1.4.1~git20071105-1ubuntu1) hardy; urgency=low + + * Merge with Debian unstable, remaining changes: + * debian/control: + - Change maintainer address. + - set Conflicts: xkb-data (<< 0.9), since xkb-path is + different compared to Dapper. + - xvfb Depends on xauth, xfonts-base. + * debian/rules: + - --with-os-vendor=Ubuntu + * debian/patches: + - 100_avoid_acpi_insanity.diff + Don't send a configuration change event just because somebody's pressed + a brightness key. + - 102_ubuntu_sharevts_load_cpu.patch: + Close console fd only when using --sharevts. + - 104_fedora_init_origins_fix.patch + Multihead initialization. + - 106_ubuntu_fpic_libxf86config.patch + Add -fPIC to makefiles for xfree86/parser. + - 107_fedora_dont_backfill_bg_none.patch + Disable backfilling of windows created with bg=none, which + otherwise would force a framebuffer readback. + - 110_fedora_no_move_damage.patch + Disable damage notifications on move for manually redirected windows. + - 121_only_switch_vt_when_active.diff + Add a check to prevent the X server from changing the VT when + killing GDM from the console. + - 123_no_composite_for_xvfb_run.patch + Use "-extension Composite" to fix xvfb-run crashing. + - 133_psb_auto.patch + Add automatic detection of Poulsbo hardware when running + without a Device definition. + - 138_fedora_xserver-1.3.0-default-dpi.patch + Changes default dpi to 100. + - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch + Fixes document fontpaths shown in the man page. + - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch + Composite on 8bpp pseudocolor root windows appears to fail, so just disable + it on anything pseudocolor for safety. + - 144_fedora_xserver-1.3.0-xnest-exposures.patch: + Only collect xnest exposures for xexposes with non-zero height and width. + + -- Timo Aaltonen Sat, 10 Nov 2007 13:07:55 +0200 + +xorg-server (2:1.4-3) unstable; urgency=low + + [ David Nusinow ] + * Minor cleanups of 03_autoload_drivers.diff. Thanks to Julien for + spotting all these ugly bits + + Newline after #else when picking the driver (this is the failsafe + choice) + + Change by hacked "ids" file name suffix check to use strncmp and check + for ".ids" + + Use strncpy instead of strncat unnecessarily + * Add support for a partially configured device section + Implemented in 03_autoload_driver.diff. Now if you have a device section + but lack a driver, it'll use the settings. This will allow you to just + have a device section and enable EXA but not have to specify the driver or + anything else. + * Add 07_autoconfig_screen_with_device_section.diff + This patch allows the Screen section to not specify a device section. If + this happens, the server will automatically use the first device section + listed in the xorg.conf instead + + [ Brice Goglin ] + * Allow building the Xfbdev server in new package xserver-xfbdev, but leave + it disabled for now (see #439764). + * Add upstream commit 27ad5d74c20f01516a1bff73be283f8982fcf0fe as patch + 44_XKB_mapping_changes_for_all_core-sending_devices.diff to fix broken + xmodmap invocation in .xsession, closes: #443044. + * Add upstream commit 0e800ca4651a947ccef239e6fe7bf64aab92257c as patch + 45_GetKeyboardEvents_reject_out-of-range_keycodes.diff to fix crash + in GetKeyboardValuatorEvents, closes: #443697. + + [ Christian Perrier ] + * Debconf templates and debian/control reviewed by the debian-l10n- + english team as part of the Smith review project. Closes: #442210 + * Debconf translation updates: + - Swedish. Closes: #443047 + - Czech. Closes: #443100 + - French + - Vietnamese. Closes: #443174 + - Italian. Closes: #422414 + * New debconf translations + - Hungarian. Closes: #442956 + - Thai. Closes: #442962 + - Tamil. Closes: #443027 + - Basque. Closes: #443156 + - Hebrew. Closes: #443204 + - Bulgarian. Closes: #443226 + - Finnish. Closes: #443611 + + [ Julien Cristau ] + * Add patch backported from upstream commit + 13949f997289068354e83bc83e50d97b8232efb1 to remove the type1 module: patch + 05_kill_type1.diff replaces 48_disable_type1.diff, and is now enabled in + debian/patches/series. + * Don't build kdrive-based servers we're not shipping. + * Use ${binary:Version} instead of ${Source-Version}. + * Add 08_exa_fix_exaFillRegionTiled_fallback.diff by Michel Dänzer to punt + on fallback case not handled correctly in exaFillRegionTiled (backported + from master's c7d6d1f5); closes: #444203. + * Add 11_exa_no_negative_tile_offsets.diff by Michel Dänzer to make sure + tile offsets passed to drivers are never negative (backported from + master's 006f6525). + * Add 12_bgPixel_fix_64bit_issue.diff by Hong Liu: bgPixel (unsigned long) + is 64-bit on x86_64, so -1 != 0xffffffff (master's 9adea807). + + -- Julien Cristau Sat, 29 Sep 2007 16:14:35 +0200 + +xorg-server (2:1.4-2) unstable; urgency=low + + [ Brice Goglin ] + * Add 42_fix_RemoveGeneralSocket_crash_from_dbus.diff to fix a crash + when leaving, closes: #440547. + * Add 43_allow_override_BIOS_EDID_preferred_mode.diff to allow overriding + BIOD/EDID preferred mode with Option PreferredMode in the config file. + + [ David Nusinow ] + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 14:24:18 -0400 + +xorg-server (2:1.4-1) experimental; urgency=low + + * New upstream release (X.Org 7.3) + + RandR doesn't mark Xinerama as active when no crtcs are enabled + (closes: #431746) + * Add proper depends to xserver-xorg-dev: + x11proto-core-dev, x11proto-input-dev (>= 1.4), x11proto-xext-dev, + x11proto-video-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev (>= + 2:0.9.3), x11proto-fonts-dev + * Bump serverminver to 2:1.4, videoabiver to 2, inputabiver to 2. + + -- Julien Cristau Mon, 10 Sep 2007 14:35:38 +0200 + +xorg-server (2:1.3.99.2-1) experimental; urgency=low + + [ David Nusinow ] + * Refactor auto_load_driver patch to allow the same method to be used when + there is no xorg.conf present + * Add 04_auto_load_driver_no_config.diff to use my auto_load_driver method + when there's no xorg.conf present + + [ Brice Goglin ] + * Simplify output redirections in the reportbug script, + thanks Justin Pryzby, closes: #358390. + * Add missing URL in long descriptions, update links to the upstream + module, fix some capitalization, thanks Christian Perrier. + + [ Julien Cristau ] + * New upstream release candidate. + + bump build dep on renderproto to >= 0.9.3, and on pixman to >= 0.9.4-2. + + bump video abi version and serverminver. + * Drop the Conflict on fglrx-driver, which is taken care of by the abi + version. + + -- Julien Cristau Tue, 04 Sep 2007 17:32:19 +0200 + +xorg-server (2:1.3.99.0-2) experimental; urgency=low + + * Improve 03_auto_load_driver.diff + + Move memory cleanup and directory closing to after the end label to + prevent leaks. Thanks Julien. + + Allow a driver to claim everything from a specific vendor. It does so by + only specifying a vendor ID and leaving the latter four digits empty. + + -- David Nusinow Sun, 19 Aug 2007 16:06:54 -0400 + +xorg-server (2:1.3.99.0-1) experimental; urgency=low + + [ Julien Cristau, David Nusinow ] + * New upstream release candidate. + + X is now more tolerant of devices without a CtrlProc (closes: #269860). + + cvt(1) and gtf(1) typos fixed (closes: #432065). + + Make sure DRIScreenPrivIndex is -1 when no DRI screen private is + allocated. (closes: #413697). + + __glXDRIscreenProbe: Use drmOpen/CloseOnce (closes: #419614). + + segfault in swrast_Triangle fixed in mesa (closes: #407502). + + the Xvfb manpage doesn't refer to /usr/tmp anymore (closes: #270257). + + typos in Xserver(1) fixed (closes: #306688). + + * Remove patches that were pushed upstream + + 03_xnest_manpage_overhaul.diff + + 04_read_rom_in_chunks.diff + + 05_module_defaults.diff + + 07_stolen_from_HEAD_xorgconf_manpage.diff + + 08_s390_servermd.diff + + 12_security_policy_in_etc.diff + + 16_s390_fix.diff + + 18_execinfo_configured.patch + + 23_kfreebsd_support.diff + + 24_hurd_ioperm_fix.diff + + 32_disable_sparc_pci_bridge.diff + + 39_alpha_build_flags.patch + + 40_consolidate_portPriv_pDraw_assignments.diff + + 42_only_run_special_key_behaviours_on_non-XKB.diff + + 44_fedora-xephyr-keysym-madness.diff (different fix applied upstream) + + 45_CVE-2007-2437.diff + + 46_export-ramdac-symbols.diff + + 49_map_keyboard_driver_to_kbd.diff + + 50_alpha_no_include_asm_pci.h.diff + + 94_use_default_font_path.diff + + 125_glx_remove-stray__GLinterface.diff, + 126_glxproxy_remove-stray__GLinterface.diff and + 127_mesa-6.5.3-compat.diff (obsolete) + + * Update other patches: + + 09_debian_xserver_rtff.diff disabled (doesn't apply, and isn't even + used AFAICS; + + 11_define_XFree86Server.diff dropped, to be fixed in drivers instead; + + 13_debian_add_xkbpath_env_variable.diff refreshed; + + 21_glx_align_fixes.patch updated; + + 43_xephyr_crash_at_exit.diff dropped (doesn't apply); + + 47_fbdevhw_magic_numbers.diff disabled for now; + + 48_disable_type1.diff disabled for now; + + 51_xkb-and-loathing.diff disabled for now. + + [ Julien Cristau ] + * Add build-dep on x11proto-input-dev (>= 1.4.2), libpixman-1-dev + (>= 0.9.0), libdbus-1-dev, libhal-dev (except on hurd-i386 for the last + two). + * Bump build-dep on mesa-swx11-source to >> 7.0.1~rc2-1. + * Bump serverminver to this version, videoabiver to 1.9, inputabiver to + 0.9 (so this doesn't clash with a release and drivers have to be + rebuilt). + * Bump build-dep on compositeproto to >= 0.4. + * Install the upstream changelog. + * Disable the xprint and dmx DDX for now, they fail to build. + * xserver-xorg-dev needs a dependency on libpixman-1-dev. + * Add explanations about our tarball and upstream URL to debian/copyright. + + [ Drew Parsons ] + * Update Xprint build to include pixman. + + [ David Nusinow ] + * Add 03_auto_load_driver.diff. This patch allows the server to select a + driver and automatically create a Devices section when none is specified + in your xorg.conf. It chooses the driver based on a set of PCI ID's that + the driver itself provides in /usr/share/xserver-xorg/pci. If no driver + claims the PCI ID of your primary video card, then it will choose a + fallback based on your system. + + -- Julien Cristau Sat, 18 Aug 2007 18:28:49 +0200 + +xorg-server (2:1.3.0.0.dfsg-13) UNRELEASED; urgency=low + + [ Debconf templates translations ] + * Italian added. Closes: #422414 + * Slovak added. Closes: #438578 + + -- Christian Perrier Sun, 26 Aug 2007 12:09:52 +0200 + +xorg-server (2:1.3.0.0.dfsg-12ubuntu8) gutsy; urgency=low + + * Add 145_glx_visuals_bound_check.patch to fix issue where mesa + incorrectly counts its visuals and can free too many of them during + video mode changes (VT switch, restart, hibernate, etc.) such as + when running Compiz. (closes LP: #127101) + + -- Bryce Harrington Fri, 28 Sep 2007 15:48:08 -0700 + +xorg-server (2:1.3.0.0.dfsg-12ubuntu7) gutsy; urgency=low + + * Drop 143_fedora_xserver-1.3.0-randr12-config-hack.patch + as it causes failure to detect proper resolution on some intel + hardware. (closes LP: #144956) + + -- Bryce Harrington Tue, 25 Sep 2007 14:42:59 -0700 + +xorg-server (2:1.3.0.0.dfsg-12ubuntu6) gutsy; urgency=low + + * Drop 214_Bug_9680-_Remove_bogus_blank_length_limiting_in_xf86SetModeCrtc.patch + as it is causing black bars to appear on screen for i810 users. + (closes LP: #137604 + several dupes) + + -- Bryce Harrington Thu, 20 Sep 2007 14:35:54 -0700 + +xorg-server (2:1.3.0.0.dfsg-12ubuntu5) gutsy; urgency=low + + [ Kees Cook ] + * debian/patches/132_composite-no-clipping.diff: Adjusted WindowRec + structure order and RedirectDraw logic to avoid nvidia crashes + (fixes LP: #130325). + * debian/patches/100_security_fdo-bug-7447.diff: Composite used for + pixmap population on redirect. [CVE-2007-4730] + + -- Bryce Harrington Tue, 18 Sep 2007 17:20:14 -0700 + +xorg-server (2:1.3.0.0.dfsg-12ubuntu4) gutsy; urgency=low + + * debian/patches/133_psb_auto.patch: Add automatic detection of + Poulsbo hardware when running without a Device definition. + * Added some cherry-picked patches from fedora: + - 134_fedorda_xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch: + Fixes race condition where someone does a VT_ACTIVATE + between another ACTIVATE/WAITACTIVE by adding a fail. + (Potentially might address Ubuntu bugs 134478 and/or 134982) + - 135_fedora_xorg-x11-server-1.1.1-xkb-in-xnest.patch: Fixes issue when + starting a session in an xnest nest environment as a different user, + where keyboard map does not get preserved. Removes + NO_HW_ONLY_EXTS check to address this issue. (RedHat bug 193431; + Potentially may address Ubuntu bug 44846) + - 136_fedora_xserver-1.2.0-honor-displaysize.patch: Fixes issue if monitor + width and height have been specified, xserver would override them + with the hsize/vsize detected from DDC. + - 137_fedora_xserver-1.2.0-vfprintf.patch: Fixes typo 'vfprinf' + - 138_fedora_xserver-1.3.0-default-dpi.patch: Changes default dpi to 100. + (Addresses Ubuntu bugs 118745, 107320, many others...) + - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch: Fixes + document fontpaths shown in the man page. + - 140_fedora_xserver-1.3.0-domain-obiwan.patch: Fixes longstanding bug in + domain support. + - 141_fedora_xserver-1.3.0-edid-quirk-backports.patch: Adds quirk for + Samsung SyncMaster 225BW. + - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch: Composite on + 8bpp pseudocolor root windows appears to fail, so just disable it + on anything pseudocolor for safety. + - 143_fedora_xserver-1.3.0-randr12-config-hack.patch: Adds check to use + the screen's xrandr modes if a preferred mode was not specified. + - 144_fedora_xserver-1.3.0-xnest-exposures.patch: Only collect xnest + exposures for xexposes with non-zero height and width. + + -- Bryce Harrington Fri, 7 Sep 2007 14:23:23 -0700 + +xorg-server (2:1.3.0.0.dfsg-12ubuntu3) gutsy; urgency=low + + * Added some cherry-picked patches from xserver 1.3.99: + - 202_Add_quirk_for_Acer_AL1706_monitor_to_force_60hz_refresh.patch: + The Acer AL1706 monitor reports support for 75hz via EDID, but + does not sync when this range is given, so force it to 60hz. + - 205_Bug_10770-_Inputdevs_isnt_a_valid_config_file_keyword.patch: + Fixes typo in config file parser. + - 208_Bug_6620-_Fixed_a_missing_else_in_ATIPseudoDMAInit.patch: + Fixes issue where registers were written twice on R200, sometimes + also putting bad values in atis->cce_pri_size. + - 214_Bug_9680-_Remove_bogus_blank_length_limiting_in_xf86SetModeCrtc.patch: + Fixes situation where when a specific mode is requested by monitor + or user, xorg would tweak it to something incorrect. + - 216_Bug_9041-_Check_the_return_code_in_xf86MapDomainMemory.patch: + Fixes issue where mmap return value was being ignored and failing + to issue fatal error as it should. + - 221_ExaOffscreenMarkUsed-_Dont_crash_when_theres_no_offscreen_memory.patch: + Fixes crash when there is no offscreen memory for EXA. + - 222_Fix_a_crash_when_rotating_the_screen.patch: + Fixes crash when rotating screen with xrandr. + - 223_Fix_bug_8871-scrolling_corruption_with_a_compositing_manager.patch: + Fixes scrolling corruption with composite due to incorrectly + generated GraphicsExposes. + - 224_Fix_calculations_in_x86_emulator_for_the_long_long_case_Andreas_Schwab.patch: + Fixes long long multiplication when in x86 emulator. + - 227_Fix_sync_polarity_on_Samsung_SyncMaster_205BW_monitor.patch: + Adds quirk for Samsung SyncMaster 205BW + - 230_In___glXCreateARGBConfig_insert_the_new_GL_mode_at_the__end__of_the_linked_list.patch: + Fixes insertion order of linked list that can cause GLX clients to + fail when attempting to use the last GLX mode/visual. + - 231_In_dmxBackendMouGetInfo_initialize_the_info-minval_maxval_arrays_to_the_size_of_the_backend_display.patch: + Fixes potential issue in X input where axis clipping code in + GetPointerEvents() constrains the pointer's coordinate range to a + max of 0, causing the mouse to not move. + - 234_Reapply_patch_to_fix_AMD_CPU_detection.patch: + Fixes AMD Geode CPU detection. + - 236_Syncmaster_226_monitor_needs_60Hz_refresh_10545.patch: + Adds quirk for Samsung SyncMaster 226BW. + - 238_Update_pci.ids_to_2007-07-16_snapshot.patch: + Updates our pci ids to support more current hardware. + Remove nvidia ids in extrapci.ids that are now in pci.ids. + Add nvidia ids to extrapci.ids that are in xf86-video-nv but not pci.ids + - 241_XFree86-_Treat_evdev_and_vmmouse_as_mouse_drivers_bug_10512_10559.patch: + Fix issue where a default mouse device gets automatically added + when an evdev or vmmouse section has already been specified. + - 243_exaDriverInit-_Fail_if_pScreenInfo_or_a_member_of_it_is_invalid.patch: + Fix crash in EXA when pScreenInfo or a member of it is invalid. + - 244_fix_an_occasional_crash_in_GetWindowName_bug-_9798.patch: + Fixes crash by adding check of XmbTextPropertyToTextList()'s + return code. + - 245_regenerated_to_fix_bug_10371.patch: + Fixes issue where if DRI is disabled, GL_MAX_TEXTURE_COORDS_ARB + value is not returned correctly from glGetIntegerv(). + + -- Bryce Harrington Fri, 31 Aug 2007 18:36:22 -0700 + +xorg-server (2:1.3.0.0.dfsg-12ubuntu2) gutsy; urgency=low + + * Don't send a configuration change event just because somebody's pressed + a brightness key + + -- Matthew Garrett Sun, 26 Aug 2007 16:17:15 +0100 + +xorg-server (2:1.3.0.0.dfsg-12ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: + + set Conflicts: xkb-data (<< 0.9), since xkb-path is + different from previous releases + + do not Conflict with xserver-xorg-video + + xvfb Depends on xauth, xfonts-base + + Set Maintainer to Ubuntu Core Developers + - debian/rules: + + --with-os-vendor=Ubuntu + - debian/xserver-xorg-core.install: + + Add ioport, pcitweak, scanpci scripts & man pages + - debian/patches: + + 102_ubuntu_sharevts_load_cpu.patch: + close console fd only when ShareVTs + + 104_fedora_init_origins_fix.patch: + multihead initialization + + 106_ubuntu_fpic_libxf86config.patch: + Add -fPIC to makefiles for xfree86/parser + + 107_fedora_dont_backfill_bg_none.patch + 110_fedora_no_move_damage.patch, + 114_fedora_no_composite_in_xnest.patch, + 120_fedora_disable_offscreen_pixmaps.patch: + further aiglx support + + 119_ubuntu_enable_composite.diff: + enable composite + + 121_only_switch_vt_when_active.diff: + Add a check to prevent the X server from changing the VT when killing + GDM from the console. + + 123_no_composite_for_xvfb_run.patch: + use "-extension Composite" to fix xvfb-run crashing + + 125_glx_remove-stray__GLinterface.diff, + 126_glxproxy_remove-stray__GLinterface.diff, + 127_mesa-6.5.3-compat.diff: + Patches needed to build against newer Mesa. + + 132_composite-no-clipping.diff: + Change the semantics of manual-redirect Composite windows so that + they do not clip sibling or parent drawing. Needed by hildon-desktop + to prevent home applets from clipping. + - debian/apport.py: Add apport hook for automatically attaching + files useful for debugging X crashes: Xorg.0.log, xorg.conf, + lsmod, lspci, and /proc/version + + -- Timo Aaltonen Tue, 21 Aug 2007 22:01:38 +0300 + +xorg-server (2:1.3.0.0.dfsg-12) unstable; urgency=low + + [ Brice Goglin ] + * Add 51_xkb-and-loathing.diff to fix a hang in OpenOffice.org + when opening menus, closes: #433131. + * Install the exa(4) and fbdevhw(4) manpages. + + [ Julien Cristau ] + * Update the xorg.conf(5) manpage to get documentation for RandR 1.2 + options: + + 07_stolen_from_HEAD_xorgconf_manpage.diff: new patch; + + 07_xorgconf_manpage_overhaul.diff dropped; + + 34_xorg.conf_man_typos.patch dropped; + + 05_module_defaults.diff, 94_use_default_font_path.diff: dropped hunks + applying to hw/xfree86/doc/man/xorg.conf.man.pre. + * Add patch 11_define_XFree86Server.diff: XFree86Server needs to be defined + in xorg-server.h and exported to drivers. + * Add patches 125_glx_remove-stray__GLinterface.diff + 126_glxproxy_remove-stray__GLinterface.diff and 127_mesa-6.5.3-compat.diff + to build with mesa >= 6.5.3, and bump build-dependency on + mesa-swx11-source. + * Include the Debian package version in OSVENDOR to make it appear in the + X log. + + -- Julien Cristau Thu, 09 Aug 2007 16:32:14 +0200 + +xorg-server (2:1.3.0.0.dfsg-11) unstable; urgency=low + + * Yet another alpha build fix: also remove the asm/pci.h include from + os-support/linux/lnx_axp.c. Include "lnx.h" and instead. + + -- Julien Cristau Sat, 14 Jul 2007 20:09:35 +0200 + +xorg-server (2:1.3.0.0.dfsg-10) unstable; urgency=medium + + * hw/xfree86/common/compiler.h and declare incompatible + prototypes for outb and friends, so change the patch from -9 to not + #include and rely on declarations in lnx.h itself for the + IOBASE_* macros. + + -- Julien Cristau Sat, 14 Jul 2007 18:06:14 +0200 + +xorg-server (2:1.3.0.0.dfsg-9) unstable; urgency=medium + + * Include instead of in + hw/xfree86/os-support/linux/lnx.h, as the latter isn't exported to + userspace anymore; fixes FTBFS on alpha. Thanks, Steve Langasek! + + -- Julien Cristau Sat, 14 Jul 2007 12:17:10 +0200 + +xorg-server (2:1.3.0.0.dfsg-8) unstable; urgency=medium + + * Medium-urgency upload to get the fix for #428794 in testing faster, + hopefully. + + [ Brice Goglin ] + * Add 47_fbdevhw_magic_numbers.diff: patch by Adam Jackson to keep the + fbdev2xfree_timing() function from changing the pixel clock value if the + fbdev driver claims that it is 0. + + [ Julien Cristau ] + * Don't build the type1 font module. + * Add patch by Alan Coopersmith to map (case-insensitively) the old + "keyboard" input driver to "kbd" (addresses: #428794). I'm not + reassigning the bug to xserver-xorg-core for now so as not to break + testing by letting xserver-xorg-input-keyboard transition before the fixed + xorg-server. + + -- Julien Cristau Sat, 14 Jul 2007 01:48:20 +0200 + +xorg-server (2:1.3.0.0.dfsg-7) unstable; urgency=low + + [ Brice Goglin ] + * Add 40_consolidate_portPriv_pDraw_assignments.diff to avoid a crash + in xf86XVReputVideo (closes: #424899, #431655). + * Add 41_vbe_filter_less.diff to not reject VESA modes early since + xf86ValidateModes should handle them just fine (closes: #424684). + * Add 42_only_run_special_key_behaviours_on_non-XKB.diff to fix special + keys in Xephyr (closes: #415025). + * Add 43_xephyr_crash_at_exit.diff to avoid crashing Xephyr when first + client disconnect (closes: #420421). + + -- Julien Cristau Wed, 04 Jul 2007 23:42:40 +0200 + +xorg-server (2:1.3.0.0.dfsg-6ubuntu3) gutsy; urgency=low + + * debian/patches/series: + - Re-enable 132_composite-no-clipping.diff with fix from upstream + + -- Bryce Harrington Wed, 25 Jul 2007 16:39:29 -0700 + +xorg-server (2:1.3.0.0.dfsg-6ubuntu2) gutsy; urgency=low + + * debian/patches/series: + - don't apply 132_composite-no-clipping.diff for now, it doesn't work + correctly when using compiz + + -- Sebastien Bacher Fri, 13 Jul 2007 17:03:42 +0100 + +xorg-server (2:1.3.0.0.dfsg-6ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/control: + + set Conflicts: xkb-data (<< 0.9), since xkb-path is + different from previous releases + + do not Conflict with xserver-xorg-video + + xvfb Depends on xauth, xfonts-base + + Set Maintainer to Ubuntu Core Developers + - debian/rules: + + build using -fno-stack-protector + + --with-os-vendor=Ubuntu + - debian/xserver-xorg-core.install: + + Add ioport, pcitweak, scanpci scripts & man pages + - debian/patches: + + 102_ubuntu_sharevts_load_cpu.patch: + close console fd only when ShareVTs + + 104_fedora_init_origins_fix.patch: + multihead initialization + + 106_ubuntu_fpic_libxf86config.patch: + Add -fPIC to makefiles for xfree86/parser + + 107_fedora_dont_backfill_bg_none.patch: + Re-enable to see if it helps with performance regressions. + + 108_fedora_gl_include_inferiors.patch, + 110_fedora_no_move_damage.patch, + 114_fedora_no_composite_in_xnest.patch: + further aiglx support + + 119_ubuntu_enable_composite.diff: + enable composite + + 120_fedora_disable_offscreen_pixmaps.patch: + update to the latest version from Fedora (rev. 1.6, was 1.1) + Despite being a hack, it works and is needed for compositing + managers to work properly. + + 121_only_switch_vt_when_active.diff: + Add a check to prevent the X server from changing the VT when killing + GDM from the console. + + 123_no_composite_for_xvfb_run.patch: + use "-extension Composite" to fix xvfb-run crashing + - 125_glx_remove-stray__GLinterface.diff, + 126_glxproxy_remove-stray__GLinterface.diff, + 127_mesa-6.5.3-compat.diff: + Mesa 6.5.3 build support + * debian/apport.py: Add apport hook for automatically attaching + files useful for debugging X crashes: Xorg.0.log, xorg.conf, + lsmod, lspci, and /proc/version + * debian/patches/132_composite-no-clipping.diff: Change the + semantics of manual-redirect Composite windows so that they do not + clip sibling or parent drawing. Needed by hildon-desktop to prevent + home applets from clipping. + + -- Bryce Harrington Mon, 2 Jul 2007 12:47:44 -0700 + +xorg-server (2:1.3.0.0.dfsg-6) unstable; urgency=low + + * Change fglrx conflict to << 8.37.6 (closes: #424975). + + -- Julien Cristau Fri, 01 Jun 2007 14:58:39 +0200 + +xorg-server (2:1.3.0.0.dfsg-5) unstable; urgency=low + + [ Brice Goglin ] + * Add 24_hurd_ioperm_fix.diff to fix xf86Enable/DisableIO on Hurd with + recent GNU Mach. Thanks Samuel Thibault! + * Add 06_use_proc_instead_of_sysfs_for_pci_domains.diff since sysfs-based + PCI management code is broken at least on sparc and powerpc. + Closes: #422077, #422095. Thanks to Jim Watson for testing! + * Install the Xephyr README, closes: #395888. + * Update 07_xorgconf_manpage_overhaul.diff to drop the reference to the + xorg.conf example which we do not install since Xserver 1.3 does automatic + configuration, the manpage is very well documented, and we generate a + config file during installation. Closes: #222932. + * Fix warning in /etc/init.d/xprint when /usr/lib/X11/fonts does not exist. + Closes: #422352. Thanks Cristian Ionescu-Idbohrn! + * Pull upstream commit 9c80eda826448822328bb678a7d284cc43fffb17 to disable + RandR's fake xinerama geometry when there's more than one protocol screen + (closes: #420679). + + [ Julien Cristau ] + * Add patch to make sure that the ramdac symbols are present in the server + and drivers can use them (closes: #423129). + * xserver-xorg-core Conflicts with fglrx-driver, which broke with 1.3. + We'll need to make this versioned (or drop it) when fglrx is fixed. + + -- Julien Cristau Wed, 16 May 2007 15:17:55 +0200 + +xorg-server (2:1.3.0.0.dfsg-4ubuntu2) gutsy; urgency=low + + * Build-Depend on mesa 6.5.3 + * Apply Mandriva patches to build against mesa 6.5.3 + - 125_glx_remove-stray__GLinterface.diff + - 126_glxproxy_remove-stray__GLinterface.diff + - 127_mesa-6.5.3-compat.diff + + -- Kyle McMartin Sat, 26 May 2007 18:12:35 +0000 + +xorg-server (2:1.3.0.0.dfsg-4ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/control: + + set Conflicts: xkb-data (<< 0.9), since xkb-path is + different from previous releases + + do not Conflict with xserver-xorg-video + + xvfb Depends on xauth, xfonts-base + + Set Maintainer to Ubuntu Core Developers + - debian/rules: + + build using -fno-stack-protector + + --with-os-vendor=Ubuntu + - debian/xserver-xorg-core.install: + + Add ioport, pcitweak, scanpci scripts & man pages + - debian/patches: + + 102_ubuntu_sharevts_load_cpu.patch: + close console fd only when ShareVTs + + 104_fedora_init_origins_fix.patch: + multihead initialization + + 106_ubuntu_fpic_libxf86config.patch: + Add -fPIC to makefiles for xfree86/parser + + 107_fedora_dont_backfill_bg_none.patch: + Re-enable to see if it helps with performance regressions. + + 108_fedora_gl_include_inferiors.patch, + 110_fedora_no_move_damage.patch, + 114_fedora_no_composite_in_xnest.patch: + further aiglx support + + 119_ubuntu_enable_composite.diff: + enable composite + + 120_fedora_disable_offscreen_pixmaps.patch: + update to the latest version from Fedora (rev. 1.6, was 1.1) + Despite being a hack, it works and is needed for compositing + managers to work properly. + + 121_only_switch_vt_when_active.diff: + Add a check to prevent the X server from changing the VT when killing + GDM from the console. + + 123_no_composite_for_xvfb_run.patch: + use "-extension Composite" to fix xvfb-run crashing + * Drop 124_fix-pdripriv_null_deref.patch. Already fixed in GLX code. + See upstream FDO bug #8537 + + -- Bryce Harrington Mon, 14 May 2007 16:40:03 -0700 + +xorg-server (2:1.3.0.0.dfsg-4) unstable; urgency=low + + * Cherry-pick patch from upstream git to fix security issue in the Xrender + extension: malicious clients can cause a division by zero in the server + (closes: #422936). Reference: CVE-2007-2437. Thanks, Micah Anderson! + + -- Julien Cristau Wed, 09 May 2007 02:11:08 +0200 + +xorg-server (2:1.3.0.0.dfsg-3) unstable; urgency=low + + * Include 94_use_default_font_path.diff. This patch is like Eugene's patch + to always look in the default font path from the past, but now we provide + an option to disable looking in the default font path at runtime. This + will allow people to specify additional font paths in their xorg.conf + without losing their current paths. This will also help avoid people + having ye olde "fixed font" problem. + * Fix compilation warnings for 05_module_defaults.diff. Previously the patch + used a generic pointer for the options record, but now we use the actual + XF86OptionsPtr type. + + -- David Nusinow Thu, 26 Apr 2007 22:39:52 -0400 + +xorg-server (2:1.3.0.0.dfsg-2) unstable; urgency=low + + * Add Brice Goglin's fix for 05_module_defaults.diff, so that it also works + when there is no module section at all. Thanks to Michel Dänzer for + helping also. + + -- David Nusinow Sat, 21 Apr 2007 09:34:12 -0400 + +xorg-server (2:1.3.0.0.dfsg-1) unstable; urgency=low + + * Upload to unstable. + * Add XS-Vcs-* to debian/control. + * Remove non-free file hw/xfree86/doc/README.DRI from the upstream tarball. + * Bump serverminver to 2:1.3.0.0. + + -- Julien Cristau Fri, 20 Apr 2007 07:54:14 +0200 + +xorg-server (2:1.3.0.0-1) experimental; urgency=low + + * New upstream release + + -- David Nusinow Thu, 19 Apr 2007 22:27:05 -0400 + +xorg-server (2:1.2.99.905-3) experimental; urgency=low + + [ Julien Cristau ] + * xvfb now Recommends: xfonts-base (closes: #314598). + + [ David Nusinow ] + * Add 05_module_defaults.diff. This provides default modules loading + capabilities for the server that may be overrided easily. Previously the + server would load a set of default modules, but only if none were + specified in the xorg.conf, or if you didn't have a xorg.conf at all. This + patch provides a default set and you can add only the "Load" instructions + to xorg.conf that you want without losing the defaults. Similarly, if you + don't want to load a module that's loaded by default, you can add + "Disable modulename" to your xorg.conf (see man xorg.conf in this release + for details). See upstream bug #10541 for more. + + -- David Nusinow Sun, 15 Apr 2007 11:17:45 -0400 + +xorg-server (2:1.2.99.905-2) experimental; urgency=low + + * Install the cvt and gtf utilities and their manpages (closes: #414792). + * Build the xserver-xorg-core-dbg package, which contains debugging symbols + for Xorg and /usr/lib/xorg/modules/**/*.so + + -- Julien Cristau Mon, 09 Apr 2007 20:38:22 +0200 + +xorg-server (2:1.2.99.905-1) experimental; urgency=low + + * New upstream release candidate. + + includes fix for CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() + Memory Corruption. + + -- Julien Cristau Fri, 06 Apr 2007 12:05:40 +0200 + +xorg-server (2:1.2.99.903-1) experimental; urgency=low + + [ Drew Parsons ] + * Add exclude entries to dh_install in debian/rules. + + [ Julien Cristau ] + * Prepare packaging to ship debugging symbols for xserver-xorg-core in + xserver-xorg-core-dbg, but leave it commented out so we can get rc3 in the + archive first. + * New upstream release candidate. + + bump serverminver to 2:1.2.99.903. + + -- Julien Cristau Tue, 27 Mar 2007 07:33:29 +0200 + +xorg-server (2:1.2.99.902-1) experimental; urgency=low + + [ Drew Parsons ] + * Bring xprint back into the xorg fold. + - include existing patches: + - 91_ttf2pt1 allows Xprint to use ttf2pt1 for Type1 font handling + (but extract and apply manually the patch to + hw/xprint/ps/Makefile.am so it may be applied by autoconf) + - 91_ttf2pt1_updates brings ttf2pt1 into the modern X11R7.1 world + - 92_xprint-security-holes-fix.patch places PS/PDF file output + into the user's home directory (~/Xprintjobs), more secure than + a shared /tmp/Xprintjobs + - 93_spooltodir_check_file_exists ensures output filenames are + less than 256 characters in length + - 93_xprint_fonts_fix released references to font names after use. + - enable freetype support for Xprint. + - add descriptions to debian/control and Build-Dependency on + x11proto-print-dev + * Run autoreconf to update changes to hw/xprint/ps/Makefile.am. + + [ Brice Goglin ] + * Apply patch from adrian@smop.co.uk to our xvfb-run wrapper + to check whether Xvfb started ok and fix its cleanup + (closes: #351042). + + [ Julien Cristau ] + * New upstream release candidate. + * Bump serverminver to 2:1.2.99.902. + * Drop patch 42_build_int10_submodules.diff, and use x86emu on all + architectures instead (closes: #410879). + * Refresh patches: + + 12_security_policy_in_etc.diff + + 21_glx_align_fixes.patch + + 23_kfreebsd_support.diff + * Delete a few files generated by configure on clean, since they seem to + have been included in the tarball. + + -- Julien Cristau Thu, 15 Mar 2007 04:28:00 +0100 + +xorg-server (2:1.2.99.901-1) experimental; urgency=low + + * New upstream release candidate. + + Remove patches 24 (hurd support), 35 (randr byteswap) and 43 (set damage + version), applied upstream. + + Bump build-dep on x11proto-randr-dev to >= 1.2, and on + x11proto-damage-dev to >= 1.1. + + -- Julien Cristau Wed, 7 Mar 2007 19:58:53 +0100 + +xorg-server (2:1.2.0-6) experimental; urgency=low + + * Set videoabiver to 1.0, same as in xorg-server 1.1. + + -- Julien Cristau Fri, 2 Mar 2007 16:38:12 +0100 + +xorg-server (2:1.2.0-5) experimental; urgency=low + + * Add input ABI versioning metadata. Rename serverabiver file to + videoabiver, and add inputabiver. Bump serverminver to 2:1.2.0-5 to deal + with this change. + + -- David Nusinow Thu, 1 Mar 2007 22:09:45 -0500 + +xorg-server (2:1.2.0-4) experimental; urgency=low + + [ Julien Cristau ] + * Don't strip modules when DEB_BUILD_OPTIONS contains nostrip. Thanks, + Cyril Brulebois! + + [ David Nusinow ] + * Move serverabiver file to serverminver. Use serverabiver to store the + actual video ABI version number (1.1 right now). This will allow drivers + to automatically generate their Provides: xserver-xorg-video-* line when + built against a particular server version. The rename of the files + is to better denote what they actually are. + * Bump the serverminver to 2:1.2.0-4 because of this change + + -- David Nusinow Wed, 21 Feb 2007 21:53:51 -0500 + +xorg-server (2:1.2.0-3ubuntu8) feisty; urgency=low + + * SECURITY UPDATE: arbitrary code execution with root privs via integer + overflows in MISC-XC. + * Add debian/patches/131_misc_xc_overflows.patch: upstream fixes. + * References + CVE-2007-1003 + + -- Kees Cook Thu, 29 Mar 2007 17:46:44 -0700 + +xorg-server (2:1.2.0-3ubuntu7) feisty; urgency=low + + * debian/patches/120_fedora_disable_offscreen_pixmaps.patch + - update to the latest version from Fedora (rev. 1.6, was 1.1) + + -- Timo Aaltonen Fri, 30 Mar 2007 10:39:01 +0300 + +xorg-server (2:1.2.0-3ubuntu6) feisty; urgency=low + + * debian/{rules,xsfbs/xsfbs.mk,serverminver,inputabiver} + - Import changes from current debian package, needed for the new intel + driver. + - Rename serverabiver to videoabiver, value 1.0. + - Set serverminver as this version. + * debian/patches: + 129_remove_extra_i2c_bittimeout.patch + 130_slow_down_ddc_i2c.patch + - Patches from server-1.3 branch, which make probing the monitor more + robust. + + -- Timo Aaltonen Thu, 29 Mar 2007 00:56:17 +0300 + +xorg-server (2:1.2.0-3ubuntu5) feisty; urgency=low + + * debian/patches/120_fedora_disable_offscreen_pixmaps.diff + - Re-enable. Despite being a hack, it works and is needed for compositing + managers to work properly. (LP: #89189) + + -- Timo Aaltonen Tue, 27 Mar 2007 02:33:31 +0300 + +xorg-server (2:1.2.0-3ubuntu4) feisty; urgency=low + + * debian/patches/107_fedora_dont_backfill_bg_none.patch: + - Re-enable to see if it helps with performance regressions. + * debian/patches/127_check_for_clientgone.patch: + - A fix from upstream. (LP: #60288) + * debian/patches/128_fix_client_privates_leak.patch + - Plug a memory leak. (LP: #92882) + * debian/rules + - Fix a typo in --with-default-font-path. + + -- Timo Aaltonen Sat, 17 Mar 2007 00:38:09 +0200 + +xorg-server (2:1.2.0-3ubuntu3) feisty; urgency=low + + * debian/patches: + - Rename 019_ubuntu_enable_composite.diff to 119_* so that it is in line + with the rest of our patches + - Re-add 126_debian_always_use_default_font_path.diff. This was dropped + by Debian but needed by us since we still have legacy fontpaths in + old configurations, so new paths need to be appended to the list. + + -- Timo Aaltonen Wed, 28 Feb 2007 11:54:18 +0200 + +xorg-server (2:1.2.0-3ubuntu2) feisty; urgency=low + + * debian/control: + - xvfb Depends on xauth, xfonts-base + + -- Sebastien Bacher Tue, 27 Feb 2007 23:31:06 +0100 + +xorg-server (2:1.2.0-3ubuntu1) feisty; urgency=low + + * Don't drop 42_build_int10_submodules.diff, it's useful + * 019_ubuntu_enable_composite.diff: + - enable composite + * debian/control: + - fixed Maintainer email + * debian/xserver-xorg-core.install: + - list ioport, gtf, pcitweak and scanpci + and manpages for scanpci, gtf, pcitweak + + [ Timo Aaltonen ] + * Merge with Debian, remaining changes: + - debian/rules: + + build using -fno-stack-protector + + --with-os-vendor=Ubuntu + - debian/control: + + don't Conflict with xserver-xorg-video + - refreshed and renamed patches + 102_ubuntu_sharevts_load_cpu.patch + 104_fedora_init_origins_fix.patch + 106_ubuntu_fpic_libxf86config.patch + 114_fedora_no_composite_in_xnest.patch + 121_only_switch_vt_when_active.diff + 124_fix-pdripriv_null_deref.patch + - dropped for now: + 42_build_int10_submodules.diff - causes "some regression" + * dropped patches (comments from Michel Daenzer): + - 107_fedora_dont_backfill_bg_none.patch + "Breaks X semantics and thus can't go in upstream. Apps/toolkits + need to be fixed not to use background none windows." + - 108_fedora_gl_include_inferiors.patch + "Breaks GLX semantics and should no longer be necessary now that + the GLX compositing managers default to using the Composite + Overlay Window." + - 120_fedora_disable_offscreen_pixmaps.diff + "Last time I looked at this, it was a gross hack to work around XAA + deficiencies in offscreen pixmap handling, which makes the server + die immediately when trying to use GLX_EXT_texture_from_pixmap + with EXA, due to calling XAA functions without checking it's + active or even loaded." + * debian/control: + - set Conflicts: xkb-data (<< 0.9), since xkb-path is + different from previous releases + * debian/patches/125_randr-version-supported.diff: + - The server supports protocol 1.1, make sure we use it. + + -- Sebastien Bacher Mon, 26 Feb 2007 09:36:38 +0100 + +xorg-server (2:1.2.0-3) experimental; urgency=low + + [ Julien Cristau ] + * Pass --with-os-name and --with-os-vendor to configure. + * Bump serverabiver to 2:1.2.0-1. + * Add patch from upstream git to set the supported damage version from the + server, instead of from the damage headers. xserver 1.2.0 supports damage + 1.0, not 1.1. + + -- Julien Cristau Sat, 17 Feb 2007 12:03:03 +0100 + +xorg-server (2:1.2.0-2) experimental; urgency=low + + * Delete useless debian/substvars. + * Change my email address in debian/control. + * Fix patch 42_build_int10_submodules.diff. The definition of + xf86InitInt10() was moved to int10/helper_exec.c between 1.1.1 and 1.2.0, + so we move it to int10/helper_mem.c, which we build in the main int10 + module, not the vm86 and x86emu submodules. Thanks to Cédric Augonnet and + Brice Goglin for the report and testing. + + -- Julien Cristau Sat, 10 Feb 2007 20:57:57 +0100 + +xorg-server (2:1.2.0-1) experimental; urgency=low + + * New upstream release. + + 40_xorg-xserver-1.1.0-dbe-render.diff dropped. + + 38_GetDrawableAttributes.patch dropped. + + 37_build-mesa-mipmap.patch dropped. + + 33_Xserver_man_typos.patch dropped. + + 24_hurd_support.diff massively reduced. + + 13_debian_add_xkbpath_env_variable.diff refreshed. + + 07_xorgconf_manpage_overhaul.diff updated. + + 42_build_int10_submodules.diff updated. + * Bump build-dep on mesa-swx11-source to >= 6.5.2. + * Version build-dependencies on x11proto-composite-dev and x11proto-kb-dev + to match configure.ac. + * Add build-dep on libxfixes-dev (needed for Xdmx). + + -- Julien Cristau Fri, 9 Feb 2007 20:54:27 +0100 + +xorg-server (2:1.1.99.903-1) experimental; urgency=low + + * New upstream release candidate. + * Forward-port patches: + * 07_xorgconf_manpage_overhaul.diff: refresh + * 12_security_policy_in_etc.diff: refresh + * 21_glx_align_fixes.patch: refresh + * 23_kfreebsd_support.diff: refresh + * 24_hurd_support.diff: refresh + * 34_xorg.conf_man_typos.patch: refresh + * 36_fix_ffs.patch: remove, applied upstream + * Bump build-dependency on libdrm-dev to (>= 2.3.0) because that is the X + server's minimum requirement. + + -- Thierry Reding Sat, 2 Dec 2006 12:44:59 +0100 + +xorg-server (2:1.1.99.902-1) experimental; urgency=low + + * Update to latest upstream release candidate. + * Forward-port patches: + * 02_libvgahw_gcc4_volatile_fix.diff: update + * 04_read_rom_in_chunks.diff: update + * 05_arm_cache_flush.diff: remove, applied upstream + * 06_arm_is_not_x86_and_has_no_vga.diff: remove, applied upstream + * 07_xorgconf_manpage_overhaul.diff: update + * 08_s390_servermd.diff: update + * 09_debian_xserver_rtff.diff: update + * 12_security_policy_in_etc.diff: update + * 13_debian_add_xkbpath_env_variable.diff: update + * 15_symlink_mesa.diff: remove, fixed upstream + * 16_s390_fix.diff: update + * 17_ignoreabi.diff: remove, applied upstream + * 18_execinfo_only_for_backtrace.patch: remove, applied upstream + * 18_execinfo_configured.patch: remove, applied upstream + * 19_configurable_misc_utils.patch: remove, applied upstream + * 20_mesa_6.5.1.diff: remove, applied upstream + * 21_glx_align_fixes.patch: update + * 22_xkb_cycle_3layouts.diff: remove, applied upstream + * 23_kfreebsd_support.diff: update, partially applied upstream + * 24_hurd_support.diff: update, partially applied upstream + * 25_tfp_damage.diff: remove, applied upstream + * 26_aiglx_happy_vt_switch.diff: remove, applied upstream + * 27_aiglx_locking.diff: remove, applied upstream + * 28_mesa_copy_sub_buffer.diff: remove, applied upstream + * 29_mesa_reseed_makefile.diff: remove, fixed upstream + * 30_fix_vmode_switch.diff: remove, fixed upstream + * 31_blocksigio.diff: remove, fixed upstream + * 32_disable_sparc_pci_bridge.diff: update + * 34_xorg.conf_man_typos.patch: update + * 35_randr_byteswap.patch: update + * 36_fix_ffs.patch: update + * 37_Fix-__glXDRIbindTexImage-for-32-bpp-on-big-endian-platforms.diff: + remove, applied upstream + * Upstream no longer ships a changelog, so don't try to install it. + * Add 37_build-mesa-mipmap.patch that adds the missing mipmap.c to libmain's + sources. + * Add 38_GetDrawableAttributes.patch which readds support for the + GetDrawableAttributes extension that's needed for compiz to work properly. + + -- Thierry Reding Fri, 1 Dec 2006 20:32:34 +0100 + +xorg-server (2:1.1.1-21) unstable; urgency=emergency + + * Security update. + * Fix integer overflow in the ProcXCMiscGetXIDList() function in the XC-MISC + extension. Reference: CVE-2007-1003. + + -- Julien Cristau Wed, 04 Apr 2007 00:34:51 +0200 + +xorg-server (2:1.1.1-20) unstable; urgency=low + + * xephyr: Add patch from upstream git to fix memory leak in + ephyrScreenFini(). Thanks, Guillem Jover! + + -- Julien Cristau Tue, 6 Mar 2007 22:20:14 +0100 + +xorg-server (2:1.1.1-19) unstable; urgency=high + + [ Drew Parsons ] + * Removed spurious space in default font line + (/usr/X11R6/lib/X11/fonts/Type1 not "/usr/X11R6/lib/ X11/fonts/Type1") + + [ David Nusinow ] + * Conflict with and replace xserver-common, because that package used to + provide the SecurityPolicy file. This is an RC bugfix because it breaks + upgrades, so it gets a high urgency. Thanks Christian Tsotras and Lionel + Elie Mamane for reporting and it. Closes: #402658 + + -- David Nusinow Wed, 28 Feb 2007 21:48:19 -0500 + +xorg-server (2:1.1.1-18) unstable; urgency=medium + + * Add patch from Fedora to make xephyr work on 64bit architectures + (closes: #405928). + + -- Julien Cristau Fri, 16 Feb 2007 22:20:08 +0100 + +xorg-server (2:1.1.1-17) unstable; urgency=medium + + * Make the int10 module usable on i386 with a 64bit kernel (closes: #409730). + + New patch 42_build_int10_submodules.diff, which allows us to build vm86 + and x86emu as two separate submodules, and make the int10 module itself + fall back to loading x86emu if vm86 calls fail. + + Add workaround for https://bugs.freedesktop.org/show_bug.cgi?id=7299 to + the above patch: move definition of Int10Current from int10/xf86int10.c + to int10/helper_mem.c. + + Drop the part of 39_alpha_build_flags.patch applying to + hw/xfree86/os-support/linux/Makefile.in, and run autoreconf with all + patches applied. + + -- Julien Cristau Wed, 7 Feb 2007 20:37:19 +0100 + +xorg-server (2:1.1.1-16) unstable; urgency=medium + + * New patch 41_xfree86_linux_acpi_fix_tokenizing.diff from upstream git to + fix a crash on acpi events (closes: #409443). + + -- Julien Cristau Sat, 3 Feb 2007 22:56:04 +0100 + +xorg-server (2:1.1.1-15) unstable; urgency=high + + * High-urgency upload for security bugfix. + * New patch 40_xorg-xserver-1.1.0-dbe-render.diff to fix multiple integer + overflows in the dbe and render extensions. + CVE IDs: CVE-2006-6101 CVE-2006-6102 CVE-2006-6103 + * Add myself to Uploaders, and remove Fabio and Branden, with their + permission. They're of course welcome back when they have more time! + + -- Julien Cristau Tue, 9 Jan 2007 15:45:46 +0100 + +xorg-server (2:1.1.1-14) unstable; urgency=high + + * The "let's drop 20 years of build logic and replace it with autoconf in a + single release, trust me, what could go wrong? " release + * High-urgency upload for RC bugfix + * New patch 39_alpha_build_flags.patch: no really, when they said + lnx_ev56.c should be built with -mcpu=ev56, they really meant it. + Closes: #392500. + + -- Steve Langasek Sun, 7 Jan 2007 15:19:08 -0800 + +xorg-server (2:1.1.1-13) unstable; urgency=medium + + [ Julien Cristau ] + * xserver-xorg-core recommends xfonts-base and suggests xfonts-100dpi | + xfonts-75dpi and xfonts-scalable. Also add explanation about fonts to the + long description, stolen from the old xserver-common package (closes: + #400654). + + [ David Nusinow ] + * This is important for upgrades to etch, and has no notable risk, so bump + priority to medium. + + -- David Nusinow Fri, 29 Dec 2006 19:57:51 -0500 + +xorg-server (2:1.1.1-12) unstable; urgency=low + + [ Julien Cristau ] + * Delete hw/xfree86/common/xf86Build.h in debian/rules clean, since it's + wrongly included in the upstream tarball. + + [ David Nusinow ] + * Pull fix for the ignore_abi.diff patch. This one's a major brown bag on my + part. Thanks Michel Dänzer. + * Add 38_wait_for_something_force_timer_reset.diff which forces the server + to reset timers when they've overrun in some cases rather than wait + forever. Patch by Daniel Stone. Thanks Michel Dänzer for pointing the + changes out. Closes: #374026 + + -- David Nusinow Tue, 12 Dec 2006 21:13:20 -0500 + +xorg-server (2:1.1.1-11) unstable; urgency=low + + [ Drew Parsons ] + * Patches 33_Xserver_man_typos.patch and 34_xorg.conf_man_typos.patch + fix minor typos in Xserver and xorg.conf man pages. + Closes: #364556, #308899. + * Add patch 35_randr_byteswap.patch from upstream. Fixes a client/server + byteswapping problem. Closes: #291100. + + [ Julien Cristau ] + * Don't build-depend on libdrm-dev on hurd-i386 (closes: #358015). Thanks, + Samuel Thibault. + * Update hurd support patch (closes: #356300). Thanks, Samuel Thibault. + * Add reportbug script stolen from the monolith, to add the user's config + and log file in every bug report. + * Delete hw/xfree86/common/xf86Build.h from our source tree, so that the + build date is correctly calculated at build time, and not hardcoded to + 07 July 2006. Thanks to Jurij Smakov for noticing. + * Add patch 36_fix_ffs.patch by Jurij Smakov to fix infinite loop in ffs() + if called with an argument of 0 (closes: #395564). + * Add patch 37_Fix-__glXDRIbindTexImage-for-32-bpp-on-big-endian-platforms + from upstream git to fix color issue on big endian platforms + (closes: #392453). Thanks to Michel Dänzer for the patch! + * Fix typo in xvfb-run (closes: #337703). + * Install xdmxconfig and its manpage in xdmx-tools (closes: #393991). + * Add Replaces: xdmx (<= 2:1.1.1-10) to xdmx-tools because of the xmdxconfig + manpage move. + + -- David Nusinow Fri, 24 Nov 2006 15:44:52 -0500 + +xorg-server (2:1.1.1-10) unstable; urgency=low + + [ Denis Barbier ] + * Fix video mode switching. Closes: #391052 + * Fix FTBFS on kfreebsd-i386 and kfreebsd-amd64. Thanks Petr Salinger. + Closes: #363517 + + [ David Nusinow ] + * Add depends on xserver-xorg so that /etc/X11/X gets installed. Thanks + Frans Pop. Closes: #392295 + * Add 31_blocksigio.diff. This patch by Alan Hourihane, and it prevents a + race condition when a driver tries to set the cursor state when the server + is in the middle of switching resolution. Thanks to Frans Pop for + reporting the bug, Michel Dänzer for reading through the backtrace and + diagnosing the problem, and Alan for the final patch. Closes: #390646. + + [ Jurij Smakov ] + * Add 32_disable_sparc_pci_bridge.diff. Disable PCI bridge handling on + sparc, which is broken and causes filesystem corruption (by poking + the PCI bus in the wrong places) on some machines. Closes: #392312. + + [ Drew Parsons ] + * Use __appmansuffix__ not __mansuffix__ in + 03_xnest_manpage_overhaul.diff. Closes: #390599. + * Install upstream ChangeLog. Closes: #365274. + + -- David Nusinow Mon, 16 Oct 2006 21:59:51 -0400 + +xorg-server (2:1.1.1-9) unstable; urgency=low + + [ Jurij Smakov ] + * Add 21_glx_align_fixes.patch to reintroduce the setting of __GLX_ALIGN64 + variable, lost during the modular transition. This setting is essential + for architectures with strong alignment requirements. Patch affects + alpha, sparc, amd64, ia64 and s390, mimicking the behaviour of the + monolithic build. Closes: #388125. + + [ Denis Barbier ] + * Add 22_xkb_cycle_3layouts.diff to fix layout switching when 3 layouts + are present. Thanks Ivan Pascal for the patch. Closes: #345803 + + [ David Nusinow ] + * Add kFreeBSD support patch (23). Thanks to Robert Millan, Petr Salinger, + Daniel Stone, and Michael Banck for input and patch writing. + Closes: #363517 + * Add hurd support patch (24). Thanks Samuel Thibault, Daniel Stone, and + Michael Banck. Closes: #356300 + * Disable the explicit enabling of dri in the configure. The configure + script autodetects whether or not to use this anyway, and enabling it + explicitly breaks the build on hurd. Thanks Samuel Thibault and Michael + Banck. Closes: #358015 + * Add several patches written by Kristian Høgsberg for allowing compiz to + work with AIGLX. These patches were vetted by Theirry Reding with valuable + advice from Michel Dänzer, and feedback from Kristian himself. + - 25_tfp_damage.diff + - 26_aiglx_happy_vt_switch.diff + - 27_aiglx_locking.diff + - 28_mesa_copy_sub_buffer.diff + - 29_mesa_reseed_makefile.diff + - update of 20_mesa_6.5.1.diff + * Remove bizarre wholesale inclusion of another patch in the 23_kbsd patch + + [ Eugene Konev ] + * Use --with-default-font-path instead of --with-fontdir. + * Set RGBPath through --with-rgb-path. + * Drop 11_debian_always_use_default_font_path.diff. + * Drop 14_debian_always_look_in_our_module_path.diff. + * Ship SecurityPolicy in xserver-xorg-core. + + -- David Nusinow Thu, 28 Sep 2006 23:59:35 -0400 + +xorg-server (2:1.1.1-8) unstable; urgency=low + + * Update mesa symlink patch to the latest from HEAD + * Add 20_mesa_6.5.1.diff to allow the server to build with mesa 6.5.1 + * Bump build-dep versions on x11proto-gl to 1.4.8, and mesa to 6.5.1 + + -- David Nusinow Mon, 25 Sep 2006 22:21:37 -0400 + +xorg-server (2:1.1.1-7) unstable; urgency=low + + * Fix s390 build issue. Thanks Bastian Blank for the report and Eugene Konev + for the patch. Closes: #388628. + * Disable build of various utilities that we don't ship anyway. Patch thanks + to Eugene Konev. + + -- David Nusinow Thu, 21 Sep 2006 23:07:16 -0400 + +xorg-server (2:1.1.1-6) unstable; urgency=low + + * Upload 7.1 to unstable. + + [ Drew Parsons ] + * Added SGI FreeB licence to debian/copyright. Closes: #368563. + * Apply upstream patches 18_execinfo_only_for_backtrace.patch, to use + execinfo.h for and only for backtrace. Applied git patch + 5a3488ccac8e5dabd9fc98bc41ef178ead1b2faf directly into configure scripts, + activated with autoreconf. Closes: #363218. + * Only requires build-depends version of x11proto-gl-dev on 1.4.6. + + [ Steve Langasek ] + * Add versioned build-depends on x11proto-fixes-dev (>= 4.0), to + ensure the package is built against the right protocol version. + Closes: #383778. + + -- David Nusinow Mon, 18 Sep 2006 18:30:07 -0400 + +xorg-server (2:1.1.1-5) experimental; urgency=low + + * Fix error in 16_s390_fix.diff caused by my idiot copying. Thanks Yannick + Roehlly and Daniel Stone. + + -- David Nusinow Sun, 27 Aug 2006 23:25:21 +0000 + +xorg-server (2:1.1.1-4) experimental; urgency=low + + [ Drew Parsons ] + * Tighten dependencies between X11R7.1 server and video drivers. + xserver-xorg-core no longer Depends: xserver-xorg-video-all + | xserver-xorg-video but instead Conflicts: xserver-xorg-video. + (closes: #383873) + The dependency on xserver-xorg-video-all | xserver-xorg-video-1.0 is + managed by the xserver-xorg binary package (not included here in + order to avoid circular dependencies). (closes: #362313) + * Likewise remove Depends: xserver-xorg-input-all | xserver-xorg-input + (again, handled by xserver-xorg) to avoid circular dependency with drivers. + + [ David Nusinow ] + * Epoch bump + * Add 17_ignoreabi.diff to allow users to simply set a value in xorg.conf + rather than pass -ignoreABI to the server every time it starts + + -- David Nusinow Wed, 23 Aug 2006 22:03:06 +0000 + +xorg-server (1:1.1.1-3) unstable; urgency=low + + * Add 16_s390_fix.diff to fix FTBFS on s390. Thanks Bastian Blank. + (closes: #362641) + * Bump build-depends version of libgl1-mesa-dev to 6.5.x package we have in + experimental currently + * Bump build-depends version of x11proto-gl-dev to 1.4.7 or greater + + -- David Nusinow Tue, 22 Aug 2006 00:57:31 +0000 + +xorg-server (1:1.1.1-2) experimental; urgency=low + + [ Drew Parsons ] + * Updated mesa-swx11-source build-depends to (>> 6.5.0), required + for xserver 1.1.1. (closes: #383334) + + [ David Nusinow ] + * Enable and ship xephyr + * Hack off the 'x' manpage suffix + * Install Xnest manpage + * Bump policy version to 3.7.2.0. No changes necessary. + + -- David Nusinow Wed, 16 Aug 2006 21:14:44 +0000 + +xorg-server (1:1.1.1-1) experimental; urgency=low + + [ David Nusinow ] + * New upstream release + * Move patch target call so that we don't try and build twice + * Remove obsolete 15_security_allocate_local.diff and + 16_SECURITY_setuid.diff + * Add 15_symlink_mesa.diff + + -- David Nusinow Sun, 6 Aug 2006 16:12:25 +0000 + +xorg-server (2:1.0.2-10) unstable; urgency=low + + * Upload to unstable to fixed messed up last upload which was supposed to go + to experimental. Brown bag o' joy. + + -- David Nusinow Tue, 22 Aug 2006 19:31:08 +0000 + +xorg-server (1:1.1.1-0ubuntu14) feisty; urgency=low + + * Add 'debian/patches/38_Fix-pDRIPriv_NULL_deref.patch': NULL-init DRI + screen private data, thanks to Tormod Volden (LP: #60288). + + -- Kees Cook Sat, 10 Feb 2007 20:27:44 -0800 + +xorg-server (1:1.1.1-0ubuntu13) feisty; urgency=low + + * 19_revert_xkb_change_breaking_XkbGetKeyboard.patch: + - patch from fedora (with extra Makefile.in change), revert change that + broke XkbGetKeyboard() (Ubuntu: #58083) + * 37_Fix-__glXDRIbindTexImage-for-32-bpp-on-big-endian-platforms.diff: + - upstream patch copied from the Debian package, fix blue screen with + compiz on ppc (Ubuntu: #58373) + + -- Sebastien Bacher Fri, 12 Jan 2007 12:17:28 +0100 + +xorg-server (1:1.1.1-0ubuntu12.1) edgy-security; urgency=low + + * SECURITY UPDATE: Arbitrary code execution with root privileges via heap + overflows in DBE and Render extensions. + * Add 'debian/patches/021_ubuntu_dbe-render_overflows.diff' from + upstream + * References + CVE-2006-6101 CVE-2006-6102 CVE-2006-6103 + + -- Kees Cook Mon, 8 Jan 2007 12:45:41 -0800 + +xorg-server (1:1.1.1-0ubuntu12) edgy; urgency=low + + * debian/patches/17_no_composite_for_xvfb.patch: + - fix a crasher by not using composite for Xvfb when using -render + * debian/patches/18_no_composite_for_xvfb_run.patch: + - use "-extension Composite" to fix xvfb-run crashing + + -- Sebastien Bacher Fri, 13 Oct 2006 17:12:49 +0200 + +xorg-server (1:1.1.1-0ubuntu11) edgy; urgency=low + + * debian/patches/16_only_switch_vt_when_active.patch: + Add a check to prevent the X server from changing the VT when killing + GDM from the console. + + -- Ryan Lortie Thu, 21 Sep 2006 01:26:35 -0400 + +xorg-server (1:1.1.1-0ubuntu10) edgy; urgency=low + + * Build xserver-xephyr from xorg-server package. Malone: #57077, #57084 + + -- Tollef Fog Heen Wed, 6 Sep 2006 12:57:32 +0200 + +xorg-server (1:1.1.1-0ubuntu9) edgy; urgency=low + + * Enable composite extension by default + * Add patch from fd.o bugzilla #7916 to avoid aiglx hangs on vt + switches + + -- Matthew Garrett Sat, 26 Aug 2006 03:20:31 +0100 + +xorg-server (1:1.1.1-0ubuntu8) edgy; urgency=low + + * Steal patch from Fedora to allow compiz to trigger the disabling of + XAA off-screen pixmaps + + -- Matthew Garrett Wed, 23 Aug 2006 21:26:08 +0100 + +xorg-server (1:1.1.1-0ubuntu7) edgy; urgency=low + + * (temporarily) Removed Breaks: section from xserver-xorg-core (necessary + until apt-get properly supports this feature) + * Tightened Build-Depends: mesa-swx11-source to >= + 6.5.0.git.20060810-0ubuntu1 + * Tightened Build-Depends of libgl1-mesa-dev to >= + 6.5.0.git.20060810-0ubuntu1 + + -- Rodrigo Parra Novo Tue, 15 Aug 2006 07:26:07 -0300 + +xorg-server (1:1.1.1-0ubuntu6) edgy; urgency=low + + * Tightened Build-Depends of mesa-swx11-source to version 6.5.0.git.20060809 + * Removed patch 003_fedora_root_window_black_pattern.patch (not necessary + for Ubuntu) + + -- Rodrigo Parra Novo Fri, 11 Aug 2006 11:41:29 -0300 + +xorg-server (1:1.1.1-0ubuntu5) edgy; urgency=low + + * Renamed 003_ubuntu_sharevts_load_cpu.patch to + 002_ubuntu_sharevts_load_cpu.patch + * Added 003_fedora_root_window_black_pattern.patch (black background + pattern instead of default X background pattern. Feel free to revert if + you feel strongly against this one) + * Added 005_fdo4320_composite_fastpath.patch and + 016_fdo7482_xdmx_render_fix.patch (upstream bug fixes, bug numbers + annotated on patch names) + * Added 004_fedora_init_origins_fix.patch (multihead initialization) + * Added 006_ubuntu_fpic_libxf86config.patch + * Added 007_fedora_dont_backfill_bg_none.patch + * Added 008_fedora_gl_include_inferiors.patch, + 009_fedora_mesa_copy_sub_buffer.patch, + 010_fedora_no_move_damage.patch, + 012_fedora_tfp_damage.patch and + 014_fedora_no_composite_in_xnest.patch (further aiglx support) + * 011_fedora_pci_scan_fixes.patch (pci scan fixes - testing is needed to + check if an extra upstream patch for pci domains is also necessary) + * Added 015_fedora_sane_default_mode.patch (tweak default mode - please feel + free to revert this patch if you feel strongly against it) + * Added 017_fedora_add_missing_headers_to_sdk.patch + * Added 018_ubuntu_linux_kernel_include_fixes.patch and + 013_ubuntu_symlink_mesa_source.patch (build fixes against current + linux-kernel-modules * mesa-swx11-source - these already existed before, + but were applied directly to the source tree, instead of being quilt + patches) + * Just for reference: debian patch #02 is candidate for removal on next + upload. I'll refrain from removing it now to diminish the chances of this + being a breaks-for-everyone release + * Moved SecurityPolicy example from /usr/share/doc/examples/ to + /usr/share/doc/xserver-xorg-core/ + + -- Rodrigo Parra Novo Mon, 7 Aug 2006 17:21:05 -0300 + +xorg-server (1:1.1.1-0ubuntu4) edgy; urgency=low + + * Added new Breaks: section to xorg-server-core: + xserver-xorg-driver-all, xserver-xorg-driver-apm, + xserver-xorg-driver-ark, xserver-xorg-driver-ati, + xserver-xorg-driver-chips, xserver-xorg-driver-cirrus, + xserver-xorg-driver-cyrix, xserver-xorg-driver-dummy, + xserver-xorg-driver-fbdev, xserver-xorg-driver-glint, + xserver-xorg-driver-i128, xserver-xorg-driver-i740, + xserver-xorg-driver-i810, xserver-xorg-driver-imstt, + xserver-xorg-driver-mga, xserver-xorg-driver-neomagic, + xserver-xorg-driver-newport, xserver-xorg-driver-nsc, + xserver-xorg-driver-nv, xserver-xorg-driver-rendition, + xserver-xorg-driver-s3, xserver-xorg-driver-s3virge, + xserver-xorg-driver-savage, xserver-xorg-driver-siliconmotion, + xserver-xorg-driver-sis, xserver-xorg-driver-sisusb, + xserver-xorg-driver-tdfx, xserver-xorg-driver-tga, + xserver-xorg-driver-trident, xserver-xorg-driver-tseng, + xserver-xorg-driver-v4l, xserver-xorg-driver-vesa, + xserver-xorg-driver-vga, xserver-xorg-driver-via, + xserver-xorg-driver-vmware, xserver-xorg-driver-voodoo, + xserver-xorg-video-all (<< 7.0.22ubuntu7), + xserver-xorg-video-apm (<< 1:1.1.1-0ubuntu1), + xserver-xorg-video-ark (<< 1:0.6.0-0ubuntu1), + xserver-xorg-video-ati (<< 1:6.6.1-0ubuntu1), + xserver-xorg-video-chips (<< 1:1.1.1-0ubuntu1), + xserver-xorg-video-cirrus (<< 1:1.1.0-0ubuntu1), + xserver-xorg-video-cyrix (<< 1:1.1.0-0ubuntu1), + xserver-xorg-video-dummy (<< 1:0.2.0-0ubuntu1), + xserver-xorg-video-fbdev (<< 1:0.3.0-0ubuntu1), + xserver-xorg-video-glint (<< 1:1.1.1-0ubuntu1), + xserver-xorg-video-i128 (<< 1:1.2.0-0ubuntu1), + xserver-xorg-video-i740 (<< 1:1.1.0-0ubuntu1), + xserver-xorg-video-i810 (<< 1:1.6.1-0ubuntu1), + xserver-xorg-video-imstt (<< 1:1.1.0-0ubuntu1), + xserver-xorg-video-mga (<< 1:1.4.1-0ubuntu1), + xserver-xorg-video-neomagic (<< 1:1.1.1-0ubuntu1), + xserver-xorg-video-newport (<< 1:0.2.0-0ubuntu1), + xserver-xorg-video-nsc (<< 1:2.8.1-0ubuntu1), + xserver-xorg-video-nv (<< 1:1.2.0-0ubuntu1), + xserver-xorg-video-rendition (<< 1:4.1.0-0ubuntu1), + xserver-xorg-video-s3 (<< 1:0.4.1-0ubuntu1), + xserver-xorg-video-s3virge (<< 1:1.9.1-0ubuntu1), + xserver-xorg-video-savage (<< 1:2.1.1-0ubuntu1), + xserver-xorg-video-siliconmotion (<< 1:1.4.1-0ubuntu1), + xserver-xorg-video-sis (<< 1:0.9.1-0ubuntu1), + xserver-xorg-video-sisusb (<< 1:0.8.1-0ubuntu1), + xserver-xorg-video-tdfx (<< 1:1.2.1-0ubuntu1), + xserver-xorg-video-tga (<< 1:1.1.0-0ubuntu1), + xserver-xorg-video-trident (<< 1:1.2.1-0ubuntu1), + xserver-xorg-video-tseng (<< 1:1.1.0-0ubuntu1), + xserver-xorg-video-v4l (<< 1:0.1.1-0ubuntu1), + xserver-xorg-video-vesa (<< 1:1.2.1-0ubuntu1), + xserver-xorg-video-vga (<< 1:4.1.0-0ubuntu1), + xserver-xorg-video-via (<< 1:0.2.1-0ubuntu1), + xserver-xorg-video-vmware (<< 1:10.13.0-0ubuntu1), + xserver-xorg-video-voodoo (<< 1:1.1.0-oubuntu1) + + -- Rodrigo Parra Novo Tue, 1 Aug 2006 22:59:55 -0300 + +xorg-server (1:1.1.1-0ubuntu3) edgy; urgency=low + + * Build with -fno-stack-protector (see LP#54650) + + -- Matt Zimmerman Mon, 31 Jul 2006 16:28:59 -0700 + +xorg-server (1:1.1.1-0ubuntu2) edgy; urgency=low + + * (sparc only) removed stale inclusion of asm/kbio.h on + hw/xfree86/os-support/linux/lnx_io.c and + hw/xfree86/os-support/linux/lnx_kbd.c + * Update debian/serverabiver to 1:1.1.1 + + -- Rodrigo Parra Novo Mon, 31 Jul 2006 12:53:22 -0300 + +xorg-server (1:1.1.1-0ubuntu1) edgy; urgency=low + + * New Upstream version + * Changed Build-Depends from mesa-swrast-source to mesa-swx11-source, + following Debian package nomenclature + * Re-did 12_security_policy_in_etc.diff for 1.1.1 + * Dropped 15_security_allocate_local.diff (applied upstream) + * Dropped 16_SECURITY_setuid.diff (applied upstream) + * Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream) + * Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream) + * Updated versioned Build-Depends on mesa-swx11-source to version + 6.5.0.cvs.20060725-0ubuntu1 + * Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to + GL/symlink-mesa.sh (linked from mesa-swx11-source) + * Added arrayobj.c to default build target on GL/mesa/main + + -- Rodrigo Parra Novo Tue, 25 Jul 2006 20:06:28 -0300 + +xorg-server (2:1.0.2-10) unstable; urgency=low + + * Upload to unstable to fixed messed up last upload which was supposed to go + to experimental. Brown bag o' joy. + + -- David Nusinow Tue, 22 Aug 2006 19:31:08 +0000 + +xorg-server (1:1.0.2-9) UNRELEASED; urgency=high + + [ Denis Barbier ] + * Fix 13_debian_add_xkbpath_env_variable.diff, XKBPATH environment + variable was not always taken into account. + + [ David Nusinow ] + * Remove two Ubuntu packaging holdovers. Have xvfb recommend xbase-clients + rather than xauth, and have xserver-xorg-core recommend xkb-data rather + than xkeyboard-config. Thanks Sterling MacNay. + * Security update. Fix for setuid privledge escalation vulernabilities. + See http://lists.freedesktop.org/archives/xorg/2006-June/016146.html for + the full advisory. + + [ Jurij Smakov ] + * Stop including the non-existent asm/kbio.h header file in + hw/xfree86/os-support/linux/lnx_{io,kbd}.c to avoid the build failure + on sparc. + + -- David Nusinow Sat, 1 Jul 2006 17:20:45 -0400 + +xorg-server (1:1.0.2-8) unstable; urgency=low + + * Move xserverrc back to xbase-clients. Thanks Benjamin Mesing. + * Add 15_security_allocate_local.diff. This fixes Bug fd.o bug #6642. + Fix buffer overflow in Render. (CVE 2006-1526). Patch by Eric Anholt. + + -- David Nusinow Tue, 2 May 2006 21:47:17 -0400 + +xorg-server (1:1.0.2-7) unstable; urgency=low + + * Ship xserverrc again in /etc/X11/xinit. Thanks Bastian Kleineidam and + Vasilis Vasaitis. (closes: #357713) + + -- David Nusinow Wed, 26 Apr 2006 00:01:16 -0400 + +xorg-server (1:1.0.2-6) unstable; urgency=low + + [ David Nusinow ] + * Use -DNO_INLINE on s390. Thanks Bastian Blank and Julien Cristau. + (closes: #362641) + * Re-add xvfb-run and manpage to xvfb package. Thanks Josselin Mouette and + Jamie Wilkinson. (closes: #363494) + * Add 014_debian_always_look_in_our_module_path.diff. This will cause the + server to always look in the default module path even if they've specified + an alternate path in their xorg.conf file via the ModulePath option. A + note to users: you should remove this part of your xorg.conf unless you + need it, as the server will look in the right place for modules if you + don't specify a location. + * Run dh_install with --list-missing + * Add missing manpages all around. Thanks Roland Mas and Jan Hudec. + (closes: #362489, #364199) + * Actually install apps to xdmx-tools. Thanks Xavier Bestel. + (closes: #356813) + + [ Denis Barbier ] + * Add 13_debian_add_xkbpath_env_variable.diff so that the server takes + the XKBPATH environment variable into account. (closes: #363229) + + -- David Nusinow Sat, 22 Apr 2006 17:06:23 -0400 + +xorg-server (1:1.0.2-5) unstable; urgency=low + + * Add 11_debian_always_use_default_font_path.diff from Eugene Konev. This + patch causes the server to add the default font path to whatever the user + has specified. Right now, that's /usr/share/fonts/X11, as defined on + configure in debian/rules. Thanks Eugene, this will definitely go a long + way. + * Document how to get rid of error loading glcore (and other modules) in + NEWS.Debian. Thanks Matej Vela and others. + * Provide the virtual 'xserver' package. Thanks Steve Langasek and Daniel + Stone. (closes: #362750) + * Add 12_security_policy_in_etc.diff from Eugene Konev. This will allow us + to tell the server on configure to look in /etc/X11/xserver for the + SecurityPolicy file. Thanks Joey Hess and Eugene. (closes: #362246) + + -- David Nusinow Mon, 17 Apr 2006 00:34:08 -0400 + +xorg-server (1:1.0.2-4) unstable; urgency=low + + * Document the need to update paths in xserver-xorg-core's NEWS file. + (closes: #362077, #362244, #362431) + * Make xserver-xorg-core Architecture: any. (closes: #362150) + * Build with --with-fontdir=/usr/share/fonts/X11. Remove + --with-default-font-path option to make this work. Thanks Eugene Konev. + + -- David Nusinow Thu, 13 Apr 2006 23:54:06 -0400 + +xorg-server (1:1.0.2-3) unstable; urgency=low + + * Add build-conflicts on xlibs-static-dev. Thanks Zephaniah E. Hull. + + -- David Nusinow Tue, 11 Apr 2006 18:44:51 -0400 + +xorg-server (1:1.0.2-2) unstable; urgency=low + + * Upload to unstable + * Add versioned build-dep on libdmx-dev. Thanks Frank Lichtenheld. + (closes: #361752) + + -- David Nusinow Mon, 10 Apr 2006 19:34:04 -0400 + +xorg-server (1:1.0.2-1) experimental; urgency=low + + [ David Nusinow ] + * New upstream release. Fixes CVE-2006-0745 + + [ Denis Barbier ] + * Set XKB base path to /usr/share/X11/xkb. + + -- David Nusinow Mon, 20 Mar 2006 21:41:04 -0500 + +xorg-server (1:1.0.2-0ubuntu10) dapper; urgency=low + + * Backport a fix for Intel bridge handling: + debian/patches/002_fix_for_certain_intel_chipsets.patch + (Closes Ubuntu: #29880) + + -- Paul Sladen Sun, 14 May 2006 19:01:32 +0100 + +xorg-server (1:1.0.2-0ubuntu9) dapper; urgency=low + + * Add 1680x1050 60 and 85Hz Modelines. Thanks to Bart Verwilst for the data. + (Closes Ubuntu: #6096) + + -- Fabio M. Di Nitto Fri, 05 May 2006 12:38:22 +0200 + +xorg-server (1:1.0.2-0ubuntu8) dapper; urgency=low + + * Fix "XCB rendertest crashes server": + - Add patch 001-CVE-2006-1526.patch.dpatch. + (CVE-2006-1526) + + -- Fabio M. Di Nitto Wed, 03 May 2006 09:01:09 +0200 + +xorg-server (1:1.0.2-0ubuntu7) dapper; urgency=low + + * Ship again xorg.conf(5) + (Closes Ubuntu: #33703) + + -- Fabio M. Di Nitto Mon, 01 May 2006 13:37:40 +0200 + +xorg-server (1:1.0.2-0ubuntu6) dapper; urgency=low + + * Fix severe internal memory corruption: + - Add patch: 000-fix-read-kernel-mapping.patch.dpatch. + (freedesktop bugzilla: #6472) + + -- Fabio M. Di Nitto Fri, 21 Apr 2006 08:07:33 +0200 + +xorg-server (1:1.0.2-0ubuntu5) dapper; urgency=low + + * Fix CPU load when using -sharevts: + - Add patch: 991_sharevts-load-cpu.patch + (Thanks for the initial patch to Michael Witrant) + (Closes Ubuntu: #33611) + + -- Fabio M. Di Nitto Mon, 10 Apr 2006 13:30:26 +0200 + +xorg-server (1:1.0.2-0ubuntu4) dapper; urgency=low + + * Fix SecurityPolicy path to /etc/X11/xserver/SecurityPolicy + and ship an example. NOTE: this file is NOT installed by default, + the WARNING you see in Xorg.0.log is an harmless WARNING. + Add patch: 990_ubuntu_fix_security_policy_path.patch. + (Close Ubuntu: #31608) + + * Readd manpages to the different packages. + + * Ship again ioport, gtf, pcitweak and scanpci. + (Closes Ubuntu: #37720) + + -- Fabio M. Di Nitto Tue, 04 Apr 2006 16:33:00 +0200 + +xorg-server (1:1.0.2-0ubuntu3) dapper; urgency=low + + * What about shipping xorg-server.m4 to make developer life easier? + + -- Fabio M. Di Nitto Thu, 23 Mar 2006 10:32:55 +0100 + +xorg-server (1:1.0.2-0ubuntu2) dapper; urgency=low + + * xserver-xorg-dev Depends: x11proto-randr-dev. + (Closes Ubuntu: #35594) + + -- Fabio M. Di Nitto Wed, 22 Mar 2006 08:09:46 +0100 + +xorg-server (1:1.0.2-0ubuntu1) dapper; urgency=low + + * New upstream release: + - Drop patches: + + CVE-2006-0745 + + add-missing-sparc-include + + fix-backtrace + + fix-crash-on-null-addr + + * UVF execption granted by mdz. + + -- Fabio M. Di Nitto Tue, 21 Mar 2006 05:39:01 +0100 + +xorg-server (1:1.0.1-2) experimental; urgency=low + + [ David Nusinow ] + * Add versioned dependency on x11-common + * Remove old cruft in our patches directory + * Port patches from trunk + + 030_libvgahw_gcc4_volatile_fix.diff + + general/026_xc_programs_manpage_overhaul.diff + + arm/303_arm_cache_flush.diff + + arm/315_arm_is_not_x86_and_has_no_vga.diff + + general/099e_xorgconf_manpage_overhaul.diff + + s390/500_s390_support.diff + + debian/910_debian_Xserver_RTFF.diff + * add 04_read_rom_in_chunks.diff. This reads PCI ROM in large chunks rather + than one byte at a time. This patch by Alex Williamson and forwarded to us + by Dann Frazier. Thanks to both of them. (closes: #353168) + * Don't build xserver-xorg-core on s390. This means putting all the other + arches as being explicitly listed. Damn !s390. + * Version the conflict with xserver-xfree86 to allow for the transition + package to be installed + * Remove README.DRI, as it is non-free. Add it to prune list. + * Add 10_dont_look_in_home_for_config.diff to prevent looking in a user's + home directory for xorg.conf. Thanks Daniel Stone for the patch. + + -- David Nusinow Sun, 12 Mar 2006 16:18:13 -0500 + +xorg-server (1:1.0.1-1) experimental; urgency=low + + * First upload to Debian + * Add bison and flex to the build-depends + * Define INSTALL in debian/rules + * Add xserver-xorg-core dependency xserver-xorg-video-all | + xserver-xorg-video. The former is a metapackage that depends on all the + video drivers we ship and the latter is a virtual package that each video + driver provides. This scheme will install the metapackage by default but + will permit any single video driver to satsify the dependency. Do the same + thing for the input drivers. + * switch dpatch build-dependency to quilt + * Deal with mesa packaging rename: build-dep on mesa-swrast-source -> + mesa-swx11-source + * Change xserver-core depends to be on x11-common rather than xorg-common + * Have xserver-xorg-dev install the files in /usr/share/aclocal so we get + xorg-server.m4 + * Manually set permissions on serverabiver installation + * Set the default font path to /usr/share/fonts/X11 instead of + /usr/share/X11/fonts. Thanks Eugene Konev. + + -- David Nusinow Mon, 20 Feb 2006 00:18:45 -0500 + +xorg-server (1:1.0.1-0ubuntu8) dapper; urgency=low + + * [SECURITY] Fix CVE-2006-0745. + + -- Fabio M. Di Nitto Tue, 21 Mar 2006 05:33:50 +0100 + +xorg-server (1:1.0.1-0ubuntu7) dapper; urgency=low + + * debian/control: + - xvfb Depends on xfonts-base too, fix pointed by fabbione + + -- Sebastien Bacher Fri, 3 Mar 2006 22:21:56 +0100 + +xorg-server (1:1.0.1-0ubuntu5) dapper; urgency=low + + * Add missing include on sparc. Fix FTBFS. + + -- Fabio M. Di Nitto Wed, 01 Feb 2006 13:45:41 +0100 + +xorg-server (1:1.0.1-0ubuntu4) dapper; urgency=low + + * Backport from upstream HEAD at Daniel's request: + - Add forgotten HAVE_BACKTRACE define, so that we actually get + backtraces when Xorg segfaults. + + -- Colin Watson Fri, 27 Jan 2006 13:47:56 +0000 + +xorg-server (1:1.0.1-0ubuntu3) dapper; urgency=low + + * Depend on x11-common rather than xorg-common and xserver-common + + -- Tollef Fog Heen Wed, 18 Jan 2006 17:13:12 +0100 + +xorg-server (1:1.0.1-0ubuntu2) dapper; urgency=low + + * Add flex to build-deps, fixing FTBFS. + + -- Tollef Fog Heen Wed, 18 Jan 2006 12:34:03 +0100 + +xorg-server (1:1.0.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Fri, 6 Jan 2006 08:00:52 +1100 + +xorg-server (1:1.0.0-0ubuntu1) dapper; urgency=low + + * New upstream release. + + fbCompositeGeneral is now around 97.3% less stuffed (closes: + Ubuntu#20286). + + 'Fix' mouse issues in the DIX by adding XFree86Server defines (sigh; + closes: Ubuntu#20200). + + Fix Emulate3Buttons mouse posting (closes: Ubuntu#11308). + * Bump Build-Depends on libxt-dev (appdefaultdir), libdrm-dev (libdrm2), and + mesa-swrast-source (new files). + * Add --with-fontdir and scotch --with-default-font-path to fix font paths + for non-Xorg servers (closes: Ubuntu#20157). + * Fix path to SecurityPolicy and RGB_DB. + * Move update-linux-hardened-support call to xserver-xorg-core postinst + (from xserver-xorg postinst). + * Add patch to os/access.c so we don't crash on a null-addressed interface + (closes: Ubuntu#20414). + + -- Daniel Stone Tue, 13 Dec 2005 07:27:13 +1100 + +xorg-server (1:0.99.3-0ubuntu6) dapper; urgency=low + + * Fix xserver-xorg-dev Depends field to only depend on the headers this + this package actually uses. + * Re-add xvfb-run to xfvb (closes: Ubuntu#20157). + + -- Daniel Stone Mon, 5 Dec 2005 15:04:14 +1100 + +xorg-server (1:0.99.3-0ubuntu5) dapper; urgency=low + + * Add -ffunction-sections where needed + * Depend: xserver-common: needed for dexconf and /usr/X11R6/bin/X + + -- LaMont Jones Sat, 26 Nov 2005 05:15:36 +0000 + +xorg-server (1:0.99.3-0ubuntu4) dapper; urgency=low + + * Add two more dependencies to build the other half of the video drivers: + - x11proto-xext-dev, x11proto-video-dev + + -- Adam Conrad Fri, 25 Nov 2005 02:36:44 +1100 + +xorg-server (1:0.99.3-0ubuntu3) dapper; urgency=low + + * Add a few dependencies to xorg-server-dev as the path of least resistance + to get all the various input and video drivers to build again: + - For the video drivers: x11proto-randr-dev, x11proto-render-dev, + x11proto-fonts-dev, x11proto-xf86dri-dev, libdrm-dev + - For the input drivers: x11proto-core-dev, x11proto-input-dev, + x11proto-randr-dev (why do input drivers want randr?) + + -- Adam Conrad Thu, 24 Nov 2005 18:51:25 +1100 + +xorg-server (1:0.99.3-0ubuntu2) dapper; urgency=low + + * Add missing libfreetype6-dev build-depends. + + -- Daniel Stone Thu, 24 Nov 2005 10:26:44 +1100 + +xorg-server (1:0.99.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 21 Nov 2005 14:13:41 +1100 + +xorg-server (1:0.99.2+cvs.20051025-3) dapper; urgency=low + + * Version mesa-swrast-source Build-Dep to 6.4.0 or higher, so GLcore is a + little less crash-happy (e.g. when moving your glxgears window). + * Export /usr/share/xserver-xorg/serverabiver to xserver-xorg-dev, which + describes the relationship needed from a driver on xserver-xorg-core. + + -- Daniel Stone Fri, 28 Oct 2005 13:00:26 +1000 + +xorg-server (1:0.99.2+cvs.20051025-2) dapper; urgency=low + + * Add Build-Deps on libxaw7-dev, libxmu-dev, libxt-dev, libxpm-dev, + libx11-dev, libxtst-dev, and libxres-dev for DMX utils. + + -- Daniel Stone Wed, 26 Oct 2005 14:34:40 +1000 + +xorg-server (1:0.99.2+cvs.20051025-1) dapper; urgency=low + + * Update to new upstream version. + * All applicable patches have been committed upstream, bar #989 and #990. + + -- Daniel Stone Thu, 20 Oct 2005 10:26:33 +1000 + +xorg-server (1:0.99.0+cvs.20050901-1) breezy; urgency=low + + * First xorg-server release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xorg-server-1.4.1~git20080131.orig/debian/prune/non-free +++ xorg-server-1.4.1~git20080131/debian/prune/non-free @@ -0,0 +1 @@ +hw/xfree86/doc/README.DRI --- xorg-server-1.4.1~git20080131.orig/debian/xprint-common.install +++ xorg-server-1.4.1~git20080131/debian/xprint-common.install @@ -0,0 +1,2 @@ +usr/lib/X11/xserver usr/share/Xprint +etc/X11/Xsession.d/92xprint-xpserverlist --- xorg-server-1.4.1~git20080131.orig/debian/xprint-common.docs +++ xorg-server-1.4.1~git20080131/debian/xprint-common.docs @@ -0,0 +1,2 @@ +debian/xprint.changelog.Debian +debian/README.printing-problems --- xorg-server-1.4.1~git20080131.orig/debian/patches/05_kill_type1.diff +++ xorg-server-1.4.1~git20080131/debian/patches/05_kill_type1.diff @@ -0,0 +1,160 @@ +From 13949f997289068354e83bc83e50d97b8232efb1 Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Thu, 23 Aug 2007 11:27:33 +0200 +Subject: [PATCH] Get rid of the type1 font module. + +It is completely replaced by freetype these days. +--- + hw/xfree86/common/xf86AutoConfig.c | 1 - + hw/xfree86/common/xf86Config.c | 1 - + hw/xfree86/dixmods/Makefile.am | 6 +-- + hw/xfree86/dixmods/type1mod.c | 75 ---------------------------------- + hw/xfree86/doc/man/xorg.conf.man.pre | 4 +- + 5 files changed, 3 insertions(+), 84 deletions(-) + delete mode 100644 hw/xfree86/dixmods/type1mod.c + +Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-09-18 21:01:37.000000000 +0200 ++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-09-18 21:02:26.000000000 +0200 +@@ -49,7 +49,6 @@ + "\tLoad\t\"dbe\"\n" \ + "\tLoad\t\"glx\"\n" \ + "\tLoad\t\"freetype\"\n" \ +- "\tLoad\t\"type1\"\n" \ + "\tLoad\t\"record\"\n" \ + "\tLoad\t\"dri\"\n" \ + "EndSection\n\n" +Index: xorg-server/hw/xfree86/common/xf86Config.h +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-09-18 21:01:37.000000000 +0200 ++++ xorg-server/hw/xfree86/common/xf86Config.h 2007-09-18 21:02:26.000000000 +0200 +@@ -61,7 +61,6 @@ + {.name = "dbe", .toLoad = TRUE, .load_opt=NULL}, + {.name = "glx", .toLoad = TRUE, .load_opt=NULL}, + {.name = "freetype", .toLoad = TRUE, .load_opt=NULL}, +- {.name = "type1", .toLoad = TRUE, .load_opt=NULL}, + {.name = "record", .toLoad = TRUE, .load_opt=NULL}, + {.name = "dri", .toLoad = TRUE, .load_opt=NULL}, + {.name = NULL, .toLoad = FALSE, .load_opt=NULL} +Index: xorg-server/hw/xfree86/dixmods/Makefile.am +=================================================================== +--- xorg-server.orig/hw/xfree86/dixmods/Makefile.am 2007-09-18 20:57:33.000000000 +0200 ++++ xorg-server/hw/xfree86/dixmods/Makefile.am 2007-09-18 21:02:26.000000000 +0200 +@@ -40,8 +40,7 @@ + $(XTRAPMOD) + + fontsmoduledir = $(moduledir)/fonts +-fontsmodule_LTLIBRARIES = libfreetype.la \ +- libtype1.la ++fontsmodule_LTLIBRARIES = libfreetype.la + + AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ + INCLUDES = @XORG_INCS@ \ +@@ -104,9 +103,6 @@ + libfreetype_la_LDFLAGS = -avoid-version + libfreetype_la_SOURCES = ftmodule.c + +-libtype1_la_LDFLAGS = -avoid-version +-libtype1_la_SOURCES = type1mod.c +- + libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c + libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS) + +Index: xorg-server/hw/xfree86/dixmods/type1mod.c +=================================================================== +--- xorg-server.orig/hw/xfree86/dixmods/type1mod.c 2007-09-10 14:32:05.000000000 +0200 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,75 +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. +- */ +- +-#ifdef HAVE_XORG_CONFIG_H +-#include +-#endif +- +-#include "misc.h" +- +-#include +-#include "xf86Module.h" +- +-static MODULESETUPPROTO(type1Setup); +- +- /* +- * This is the module data function that is accessed when loading +- * libtype1 as a module. +- */ +- +-static XF86ModuleVersionInfo VersRec = +-{ +- "type1", +- MODULEVENDORSTRING, +- MODINFOSTRING1, +- MODINFOSTRING2, +- XORG_VERSION_CURRENT, +- 1, 0, 2, +- 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 */ +-}; +- +-_X_EXPORT XF86ModuleData type1ModuleData = { &VersRec, type1Setup, NULL }; +- +-extern void Type1RegisterFontFileFunctions(void); +- +-FontModule type1Module = { +- Type1RegisterFontFileFunctions, +- "Type1", +- NULL +-}; +- +-static pointer +-type1Setup(pointer module, pointer opts, int *errmaj, int *errmin) +-{ +- type1Module.module = module; +- LoadFont(&type1Module); +- +- /* Need a non-NULL return */ +- return (pointer)1; +-} +Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre +=================================================================== +--- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2007-09-18 20:51:46.000000000 +0200 ++++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2007-09-18 21:02:26.000000000 +0200 +@@ -700,10 +700,10 @@ + prefix, or the \(lq.a\(rq, \(lq.o\(rq, or \(lq.so\(rq suffixes. + .PP + .RS 7 +-Example: the Type 1 font rasteriser can be loaded with the following entry: ++Example: the FreeType font rasteriser can be loaded with the following entry: + .PP + .RS 4 +-.B "Load \*qtype1\*q" ++.B "Load \*qfreetype\*q" + .RE + .RE + .TP 7 --- xorg-server-1.4.1~git20080131.orig/debian/patches/93_spooltodir_check_file_exists +++ xorg-server-1.4.1~git20080131/debian/patches/93_spooltodir_check_file_exists @@ -0,0 +1,52 @@ +diff -ruN xorg-server-old/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh xorg-server/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh +--- xorg-server-old/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh 2006-04-14 22:14:47.000000000 +1000 ++++ xorg-server/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh 2006-04-14 22:17:05.000000000 +1000 +@@ -108,8 +108,21 @@ + # which may screw-up further processing by other shell scripts ... + filename="`echo \"${filename}\" | tr '[:blank:]' '_' | tr -c -d '[:alnum:]_.-'`" + ++# consider that the end name might be too long: ++# 1. Calculate the length of the suffix (I think we need to count in bytes) ++filename_length="`echo \"${filename_suffix}\" | wc -c`" ++# 2. remove this length from 256 ++filename_length="`echo \"256-${filename_length}\" | bc`" ++# 3. and keep only the first 256 - suffix_length bytes from the name. ++filename="`echo \"${filename}\" | cut -b-${filename_length}`" ++ + # ... add path and suffix ... +-filename="${spooldir}/${filename}${filename_suffix}" ++# ... should be unique, but check anyway ++if [ -e "${spooldir}/${filename}" ]; then ++ filename="`tempfile -d "${spooldir}" -s "_${filename}${filename_suffix}"`" ++else ++ filename="${spooldir}/${filename}${filename_suffix}" ++fi + + verbose "# File name is \"$filename\"." + +diff -ruN xorg-server-old/hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh xorg-server/hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh +--- xorg-server-old/hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh 2006-04-14 22:14:47.000000000 +1000 ++++ xorg-server/hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh 2006-04-14 22:18:06.000000000 +1000 +@@ -108,8 +108,21 @@ + # which may screw-up further processing by other shell scripts ... + filename="`echo \"${filename}\" | tr '[:blank:]' '_' | tr -c -d '[:alnum:]_.-'`" + ++# consider that the end name might be too long: ++# 1. Calculate the length of the suffix (I think we need to count in bytes) ++filename_length="`echo \"${filename_suffix}\" | wc -c`" ++# 2. remove this length from 256 ++filename_length="`echo \"256-${filename_length}\" | bc`" ++# 3. and keep only the first 256 - suffix_length bytes from the name. ++filename="`echo \"${filename}\" | cut -b-${filename_length}`" ++ + # ... add path and suffix ... +-filename="${spooldir}/${filename}${filename_suffix}" ++# ... should be unique, but check anyway ++if [ -e "${spooldir}/${filename}" ]; then ++ filename="`tempfile -d "${spooldir}" -s "_${filename}${filename_suffix}"`" ++else ++ filename="${spooldir}/${filename}${filename_suffix}" ++fi + + verbose "# File name is \"$filename\"." + --- xorg-server-1.4.1~git20080131.orig/debian/patches/148_dix_touchscreen_fixes.diff +++ xorg-server-1.4.1~git20080131/debian/patches/148_dix_touchscreen_fixes.diff @@ -0,0 +1,243 @@ +Index: xorg-server-1.4.1~git20080131/dix/getevents.c +=================================================================== +--- xorg-server-1.4.1~git20080131.orig/dix/getevents.c 2008-02-08 09:27:11.000000000 +1100 ++++ xorg-server-1.4.1~git20080131/dix/getevents.c 2008-02-08 09:27:36.000000000 +1100 +@@ -306,10 +306,13 @@ + { + AxisInfoPtr axes = pDev->valuator->axes + axisNum; + +- if (*val < axes->min_value) +- *val = axes->min_value; +- if (axes->max_value >= 0 && *val > axes->max_value) +- *val = axes->max_value; ++ /* No clipping if the value-range <= 0 */ ++ if(axes->min_value < axes->min_value) { ++ if (*val < axes->min_value) ++ *val = axes->min_value; ++ if (*val > axes->max_value) ++ *val = axes->max_value; ++ } + } + + /** +@@ -523,12 +526,10 @@ + int num_events = 0, final_valuator = 0; + CARD32 ms = 0; + deviceKeyButtonPointer *kbp = NULL; +- /* Thanks to a broken lib, we _always_ have to chase DeviceMotionNotifies +- * with DeviceValuators. */ +- Bool sendValuators = (type == MotionNotify || flags & POINTER_ABSOLUTE); + DeviceIntPtr cp = inputInfo.pointer; + int x = 0, y = 0; + Bool coreOnly = (pDev == inputInfo.pointer); ++ ScreenPtr scr = miPointerGetScreen(pDev); + + /* Sanity checks. */ + if (type != MotionNotify && type != ButtonPress && type != ButtonRelease) +@@ -551,7 +552,7 @@ + return 0; + + /* Do we need to send a DeviceValuator event? */ +- if (!coreOnly && sendValuators) { ++ if (!coreOnly && num_valuators) { + if ((((num_valuators - 1) / 6) + 1) > MAX_VALUATOR_EVENTS) + num_valuators = MAX_VALUATOR_EVENTS * 6; + num_events += ((num_valuators - 1) / 6) + 1; +@@ -572,21 +573,44 @@ + x = valuators[0]; + } + else { +- if (pDev->coreEvents) +- x = cp->valuator->lastx; +- else +- x = pDev->valuator->lastx; ++ /* If we're sending core events but didn't provide a value, ++ * translate the core value (but use the device coord if ++ * it translates to the same coord to preserve sub-pixel ++ * coord information). If we're not sending core events use ++ * whatever value we have */ ++ x = pDev->valuator->lastx; ++ if(pDev->coreEvents) { ++ int min = pDev->valuator->axes[0].min_value; ++ int max = pDev->valuator->axes[0].max_value; ++ if(min < max) { ++ if((int)((float)(x-min)*scr->width/(max-min+1)) != cp->valuator->lastx) ++ x = (int)((float)(cp->valuator->lastx)*(max-min+1)/scr->width)+min; ++ } ++ else ++ x = cp->valuator->lastx; ++ } + } + + if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) { + y = valuators[1 - first_valuator]; + } + else { +- if (pDev->coreEvents) +- y = cp->valuator->lasty; +- else +- y = pDev->valuator->lasty; +- } ++ y = pDev->valuator->lasty; ++ if(pDev->coreEvents) { ++ int min = pDev->valuator->axes[1].min_value; ++ int max = pDev->valuator->axes[1].max_value; ++ if(min < max) { ++ if((int)((float)(y-min)*scr->height/(max-min+1)) != cp->valuator->lasty) ++ y = (int)((float)(cp->valuator->lasty)*(max-min+1)/scr->height)+min; ++ } ++ else ++ y = cp->valuator->lasty; ++ } ++ } ++ ++ /* Clip both x and y to the defined limits (usually co-ord space limit). */ ++ clipAxis(pDev, 0, &x); ++ clipAxis(pDev, 1, &y); + } + else { + if (flags & POINTER_ACCELERATE) +@@ -594,53 +618,104 @@ + valuators); + + if (pDev->coreEvents) { +- if (first_valuator == 0 && num_valuators >= 1) +- x = cp->valuator->lastx + valuators[0]; ++ /* Get and convert the core pointer coordinate space into ++ * device coordinates. Use the device coords if it translates ++ * into the same position as the core to preserve relative sub- ++ * pixel movements from the device. */ ++ int min = pDev->valuator->axes[0].min_value; ++ int max = pDev->valuator->axes[0].max_value; ++ if(min < max) { ++ x = pDev->valuator->lastx; ++ if((int)((float)(x-min)*scr->width/(max-min+1)) != cp->valuator->lastx) ++ x = (int)((float)(cp->valuator->lastx)*(max-min+1)/scr->width)+min; ++ } + else + x = cp->valuator->lastx; + +- if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) +- y = cp->valuator->lasty + valuators[1 - first_valuator]; ++ min = pDev->valuator->axes[1].min_value; ++ max = pDev->valuator->axes[1].max_value; ++ if(min < max) { ++ y = pDev->valuator->lasty; ++ if((int)((float)(y-min)*scr->height/(max-min+1)) != cp->valuator->lasty) ++ y = (int)((float)(cp->valuator->lasty)*(max-min+1)/scr->height)+min; ++ } + else + y = cp->valuator->lasty; ++ ++ /* Add relative movement */ ++ if (first_valuator == 0 && num_valuators >= 1) ++ x += valuators[0]; ++ if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) ++ y += valuators[1 - first_valuator]; + } + else { ++ x = pDev->valuator->lastx; ++ y = pDev->valuator->lasty; + if (first_valuator == 0 && num_valuators >= 1) +- x = pDev->valuator->lastx + valuators[0]; +- else +- x = pDev->valuator->lastx; +- ++ x += valuators[0]; + if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) +- y = pDev->valuator->lasty + valuators[1 - first_valuator]; +- else +- y = pDev->valuator->lasty; ++ y += valuators[1 - first_valuator]; ++ ++ /* Since we're not sending core-events we must clip both x and y ++ * to the defined limits so we don't run outside the box. */ ++ clipAxis(pDev, 0, &x); ++ clipAxis(pDev, 1, &y); + } + } + +- /* Clip both x and y to the defined limits (usually co-ord space limit). */ +- clipAxis(pDev, 0, &x); +- clipAxis(pDev, 1, &y); ++ pDev->valuator->lastx = x; ++ pDev->valuator->lasty = y; ++ /* Convert the dev coord back to screen coord if we're ++ * sending core events */ ++ if (pDev->coreEvents) { ++ AxisInfoPtr ax = pDev->valuator->axes; ++ if(ax[0].min_value < ax[0].max_value) ++ x = (int)((float)(x-ax[0].min_value)*scr->width/ ++ (ax[0].max_value-ax[0].min_value+1)); ++ cp->valuator->lastx = x; ++ if(ax[1].min_value < ax[1].max_value) ++ y = (int)((float)(y-ax[1].min_value)*scr->height/ ++ (ax[1].max_value-ax[1].min_value+1)); ++ cp->valuator->lasty = y; ++ } + + /* This takes care of crossing screens for us, as well as clipping + * to the current screen. Right now, we only have one history buffer, + * so we don't set this for both the device and core.*/ + miPointerSetPosition(pDev, &x, &y, ms); + ++ if (pDev->coreEvents) { ++ /* miPointerSetPosition may have changed screen */ ++ scr = miPointerGetScreen(pDev); ++ if(x != cp->valuator->lastx) { ++ AxisInfoPtr ax = &pDev->valuator->axes[0]; ++ cp->valuator->lastx = pDev->valuator->lastx = x; ++ if(ax->min_value < ax->max_value) ++ pDev->valuator->lastx = (int)((float)(x)*(ax->max_value-ax->min_value+1)/ ++ scr->width)+ax->min_value; ++ } ++ if(y != cp->valuator->lasty) { ++ AxisInfoPtr ax = &pDev->valuator->axes[1]; ++ cp->valuator->lasty = pDev->valuator->lasty = y; ++ if(ax->min_value < ax->max_value) ++ pDev->valuator->lasty = (int)((float)(y)*(ax->max_value-ax->min_value+1)/ ++ scr->height)+ax->min_value; ++ } ++ } ++ else if (coreOnly) { ++ cp->valuator->lastx = x; ++ cp->valuator->lasty = y; ++ } ++ + /* Drop x and y back into the valuators list, if they were originally + * present. */ + if (first_valuator == 0 && num_valuators >= 1) +- valuators[0] = x; ++ valuators[0] = pDev->valuator->lastx; + if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) +- valuators[1 - first_valuator] = y; ++ valuators[1 - first_valuator] = pDev->valuator->lasty; + +- updateMotionHistory(pDev, ms, first_valuator, num_valuators, valuators); +- +- if (pDev->coreEvents) { +- cp->valuator->lastx = x; +- cp->valuator->lasty = y; +- } +- pDev->valuator->lastx = x; +- pDev->valuator->lasty = y; ++ if (type == MotionNotify) ++ updateMotionHistory(pDev, ms, first_valuator, num_valuators, valuators); + + /* for some reason inputInfo.pointer does not have coreEvents set */ + if (coreOnly || pDev->coreEvents) { +@@ -678,11 +753,11 @@ + kbp->detail = pDev->button->map[buttons]; + } + +- kbp->root_x = x; +- kbp->root_y = y; ++ kbp->root_x = pDev->valuator->lastx; ++ kbp->root_y = pDev->valuator->lasty; + + events++; +- if (sendValuators) { ++ if (num_valuators) { + kbp->deviceid |= MORE_EVENTS; + clipValuators(pDev, first_valuator, num_valuators, valuators); + events = getValuatorEvents(events, pDev, first_valuator, --- xorg-server-1.4.1~git20080131.orig/debian/patches/108_fedora_honor_displaysize.patch +++ xorg-server-1.4.1~git20080131/debian/patches/108_fedora_honor_displaysize.patch @@ -0,0 +1,21 @@ +From: Adam Jackson +Date: Sun, 28 Oct 2007 09:37:52 +0100 +Subject: [PATCH] Honor the Monitor section's DisplaySize directive. + +--- +diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.da xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c +--- xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.da 2007-09-26 17:04:02.000000000 +1000 ++++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c 2007-09-26 17:04:27.000000000 +1000 +@@ -401,8 +401,10 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr + + Monitor->DDC = DDC; + +- Monitor->widthmm = 10 * DDC->features.hsize; +- Monitor->heightmm = 10 * DDC->features.vsize; ++ if (Monitor->widthmm <= 0 && Monitor->heightmm <= 0) { ++ Monitor->widthmm = 10 * DDC->features.hsize; ++ Monitor->heightmm = 10 * DDC->features.vsize; ++ } + + /* If this is a digital display, then we can use reduced blanking */ + if (DDC->features.input_type) --- xorg-server-1.4.1~git20080131.orig/debian/patches/40_default_dpi_96.patch +++ xorg-server-1.4.1~git20080131/debian/patches/40_default_dpi_96.patch @@ -0,0 +1,21 @@ +commit db9ae863536fff80b5463d99e71dc47ae587980d +Author: Adam Jackson +Date: Sun Nov 18 11:57:01 2007 -0500 + + Bump DEFAULT_DPI to 96. + + 75 is just nonsense. + +diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h +index 3da102f..4723f5a 100644 +--- a/hw/xfree86/common/xf86Priv.h ++++ b/hw/xfree86/common/xf86Priv.h +@@ -120,7 +120,7 @@ extern RootWinPropPtr *xf86RegisteredPropertiesTable; + #define DEFAULT_LOG_VERBOSE 3 + #endif + #ifndef DEFAULT_DPI +-#define DEFAULT_DPI 75 ++#define DEFAULT_DPI 96 + #endif + + #define DEFAULT_UNRESOLVED TRUE --- xorg-server-1.4.1~git20080131.orig/debian/patches/102_ubuntu_sharevts_load_cpu.patch +++ xorg-server-1.4.1~git20080131/debian/patches/102_ubuntu_sharevts_load_cpu.patch @@ -0,0 +1,28 @@ +Index: a/hw/xfree86/os-support/linux/lnx_init.c +=================================================================== +--- a/hw/xfree86/os-support/linux/lnx_init.c 2007-01-23 07:39:16.000000000 +0200 ++++ b/xfree86/os-support/linux/lnx_init.c 2007-02-08 15:44:03.000000000 +0200 +@@ -284,9 +284,7 @@ + FatalError("Unable to set screen info\n"); + close(fbfd); + #endif +- } else { /* ShareVTs */ +- close(xf86Info.consoleFd); +- } ++ } + signal(SIGUSR2, xf86ReloadInputDevs); + } else { /* serverGeneration != 1 */ + if (!ShareVTs && VTSwitch) +@@ -315,7 +313,11 @@ + int vtno = -1; + #endif + +- if (ShareVTs) return; ++ if (ShareVTs) ++ { ++ close(xf86Info.consoleFd); ++ return; ++ } + + #if defined(DO_OS_FONTRESTORE) + if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts) < 0) --- xorg-server-1.4.1~git20080131.orig/debian/patches/160_default_to_intel.diff +++ xorg-server-1.4.1~git20080131/debian/patches/160_default_to_intel.diff @@ -0,0 +1,13 @@ +Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2008-03-31 09:57:50.000000000 +0300 ++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2008-03-31 09:57:57.000000000 +0300 +@@ -180,7 +180,7 @@ + case 0x8108: + return "psb"; + default: +- return "i810"; ++ return "intel"; + } + case 0x102b: return "mga"; + case 0x10c8: return "neomagic"; --- xorg-server-1.4.1~git20080131.orig/debian/patches/21_glx_align_fixes.patch +++ xorg-server-1.4.1~git20080131/debian/patches/21_glx_align_fixes.patch @@ -0,0 +1,63 @@ +Index: xorg-server/GL/glx/Makefile.am +=================================================================== +--- xorg-server.orig/GL/glx/Makefile.am 2007-09-06 11:39:53.000000000 +0200 ++++ xorg-server/GL/glx/Makefile.am 2007-09-06 11:42:06.000000000 +0200 +@@ -14,7 +14,8 @@ + -I@MESA_SOURCE@/src/mesa/glapi \ + -I@MESA_SOURCE@/src/mesa/main \ + -DXFree86Server \ +- @GLX_DEFINES@ ++ @GLX_DEFINES@ \ ++ @GLX_ARCH_DEFINES@ + + # none yet + #sdk_HEADERS = +Index: xorg-server/configure.ac +=================================================================== +--- xorg-server.orig/configure.ac 2007-09-06 11:39:53.000000000 +0200 ++++ xorg-server/configure.ac 2007-09-06 11:42:06.000000000 +0200 +@@ -280,6 +280,7 @@ + case $host_os in + *netbsd*) AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;; + esac ++ GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee" + ;; + arm*) + ARM_VIDEO=yes +@@ -309,6 +310,7 @@ + xorg_loader_sparcmuldiv="yes" + SPARC64_VIDEO=yes + BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c" ++ GLX_ARCH_DEFINES="-D__GLX_ALIGN64" + ;; + x86_64*|amd64*) + use_x86_asm="yes" +@@ -323,8 +325,16 @@ + SYS_LIBS=-lamd64 + ;; + esac ++ GLX_ARCH_DEFINES="-D__GLX_ALIGN64" ++ ;; ++ ia64*) ++ GLX_ARCH_DEFINES="-D__GLX_ALIGN64" ++ ;; ++ s390*) ++ GLX_ARCH_DEFINES="-D__GLX_ALIGN64" + ;; + esac ++AC_SUBST(GLX_ARCH_DEFINES) + + dnl BSD *_video.c selection + AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes]) +Index: xorg-server/hw/dmx/glxProxy/Makefile.am +=================================================================== +--- xorg-server.orig/hw/dmx/glxProxy/Makefile.am 2007-09-06 11:39:53.000000000 +0200 ++++ xorg-server/hw/dmx/glxProxy/Makefile.am 2007-09-06 11:42:06.000000000 +0200 +@@ -32,6 +32,7 @@ + unpack.h + + AM_CFLAGS = \ ++ @GLX_ARCH_DEFINES@ \ + $(DIX_CFLAGS) \ + -I$(top_srcdir)/hw/dmx \ + -I$(top_srcdir)/include \ --- xorg-server-1.4.1~git20080131.orig/debian/patches/45_only_XF86_APM_CAPABILITY_CHANGED_for_video_change_acpi_events.diff +++ xorg-server-1.4.1~git20080131/debian/patches/45_only_XF86_APM_CAPABILITY_CHANGED_for_video_change_acpi_events.diff @@ -0,0 +1,56 @@ +commit 74e84b8d891632141a60e2d29463ab46f622df3f +Author: Matthias Hopf +Date: Fri Oct 19 17:28:15 2007 +0200 + + Only issue XF86_APM_CAPABILITY_CHANGED for video change ACPI events (not e.g. brightness etc.). + +diff --git a/hw/xfree86/os-support/linux/lnx_acpi.c b/hw/xfree86/os-support/linux/lnx_acpi.c +index 9808e37..bb975cc 100644 +--- a/hw/xfree86/os-support/linux/lnx_acpi.c ++++ b/hw/xfree86/os-support/linux/lnx_acpi.c +@@ -69,9 +69,11 @@ lnxACPIGetEventFromOs(int fd, pmEvent *events, int num) + TimerSet(NULL, 0, ACPI_REOPEN_DELAY, lnxACPIReopen, NULL); + return 0; + } ++ /* FIXME: this only processes the first read ACPI event & might break ++ * with interrupted reads. */ + + /* Check that we have a video event */ +- if (strstr(ev, "video") == ev) { ++ if (!strncmp(ev, "video", 5)) { + char *video = NULL; + char *GFX = NULL; + char *notify = NULL; +@@ -97,26 +99,19 @@ lnxACPIGetEventFromOs(int fd, pmEvent *events, int num) + ErrorF("data: 0x%lx\n",data_l); + #endif + +- /* We currently don't differentiate between any event */ ++ /* Differentiate between events */ + switch (notify_l) { + case ACPI_VIDEO_NOTIFY_SWITCH: +- break; +- case ACPI_VIDEO_NOTIFY_PROBE: +- break; + case ACPI_VIDEO_NOTIFY_CYCLE: +- break; + case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT: +- break; + case ACPI_VIDEO_NOTIFY_PREV_OUTPUT: +- break; ++ events[0] = XF86_APM_CAPABILITY_CHANGED; ++ return 1; ++ case ACPI_VIDEO_NOTIFY_PROBE: ++ return 0; + default: +- break; ++ return 0; + } +- +- /* Deal with all ACPI events as a capability change */ +- events[0] = XF86_APM_CAPABILITY_CHANGED; +- +- return 1; + } + + return 0; --- xorg-server-1.4.1~git20080131.orig/debian/patches/163_fix_untrusted_access.diff +++ xorg-server-1.4.1~git20080131/debian/patches/163_fix_untrusted_access.diff @@ -0,0 +1,20 @@ +From: Eamon Walsh +Date: Fri, 15 Feb 2008 00:47:44 +0000 (-0500) +Subject: security: Fix for Bug #14480: untrusted access broken in 7.3. +X-Git-Tag: xf-3_9_16Z / xf-3_9_16d / xf-3_9_16e / xf-3_9_16f +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=74b40bba327a2e97780e8e3f995f784add2d6231 + +security: Fix for Bug #14480: untrusted access broken in 7.3. +--- + +--- a/Xext/security.c ++++ b/Xext/security.c +@@ -1014,7 +1014,7 @@ CALLBACK(SecurityCheckResourceIDAccess) + } + else /* server-owned resource - probably a default colormap or root window */ + { +- if (RT_WINDOW == rtype || RC_DRAWABLE == rtype) ++ if (RC_DRAWABLE & rtype) + { + switch (reqtype) + { /* the following operations are allowed on root windows */ --- xorg-server-1.4.1~git20080131.orig/debian/patches/91_ttf2pt1 +++ xorg-server-1.4.1~git20080131/debian/patches/91_ttf2pt1 @@ -0,0 +1,22165 @@ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/bdf.c xserver/hw/xprint/extras/ttf2pt1/bdf.c +--- xserver-old/hw/xprint/extras/ttf2pt1/bdf.c 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/bdf.c 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,660 @@ ++/* ++ * The font parser for the BDF files ++ * ++ * Copyright (c) 2001 by the TTF2PT1 project ++ * Copyright (c) 2001 by Sergey Babkin ++ * ++ * see COPYRIGHT for the full copyright notice ++ */ ++ ++#include ++#include ++#include ++#include ++#include "pt1.h" ++#include "global.h" ++ ++/* prototypes of call entries */ ++static void openfont(char *fname, char *arg); ++static void closefont( void); ++static int getnglyphs ( void); ++static int glnames( GLYPH *glyph_list); ++static void readglyphs( GLYPH *glyph_list); ++static int glenc( GLYPH *glyph_list, int *encoding, int *unimap); ++static void fnmetrics( struct font_metrics *fm); ++static void glpath( int glyphno, GLYPH *glyph_list); ++static void kerning( GLYPH *glyph_list); ++ ++/* globals */ ++ ++/* front-end descriptor */ ++struct frontsw bdf_sw = { ++ /*name*/ "bdf", ++ /*descr*/ "BDF bitmapped fonts", ++ /*suffix*/ { "bdf" }, ++ /*open*/ openfont, ++ /*close*/ closefont, ++ /*nglyphs*/ getnglyphs, ++ /*glnames*/ glnames, ++ /*glmetrics*/ readglyphs, ++ /*glenc*/ glenc, ++ /*fnmetrics*/ fnmetrics, ++ /*glpath*/ glpath, ++ /*kerning*/ kerning, ++}; ++ ++/* statics */ ++ ++#define MAXLINE 10240 /* maximal line length in the input file */ ++ ++static int lineno; /* line number */ ++ ++#define GETLEN(s) s, (sizeof(s)-1) ++#define LENCMP(str, txt) strncmp(str, txt, sizeof(txt)-1) ++ ++static FILE *bdf_file; ++static int nglyphs; ++static struct font_metrics fmet; ++ ++/* many BDF fonts are of small pixel size, so we better try ++ * to scale them by an integer to keep the dimensions in ++ * whole pixels. However if the size is too big and a non- ++ * integer scaling is needed, we use the standard ttf2pt1's ++ * scaling abilities. ++ */ ++static int pixel_size; ++static int scale; ++static int scale_external; ++ ++static char *slant; ++static char xlfdname[201]; ++static char *spacing; ++static char *charset_reg; ++static char *charset_enc; ++static char *fnwidth; ++static int is_unicode = 0; ++ ++/* tempoary storage for returning data to ttf2pt1 later on request */ ++static int maxenc = 0; ++static int *fontenc; ++static GENTRY **glpaths; ++ ++static int got_glyphs = 0; ++static GLYPH *glyphs; ++static int curgl; ++ ++static int readfile(FILE *f, int (*strfunc)(int len, char *str)); ++ ++/* ++ * Read the file and parse each string with strfunc(), ++ * until strfunc() returns !=0 or the end of file happens. ++ * Returns -1 on EOF or strfunc() returning <0, else 0 ++ */ ++ ++static int ++readfile( ++ FILE *f, ++ int (*strfunc)(int len, char *str) ++) ++{ ++ static char str[MAXLINE]; /* input line, maybe should be dynamic ? */ ++ char *s; ++ int len, c, res; ++ ++ len=0; ++ while(( c=getc(f) )!=EOF) { ++ if(c=='\n') { ++ str[len]=0; ++ ++ res = strfunc(len, str); ++ lineno++; ++ if(res<0) ++ return -1; ++ else if(res!=0) ++ return 0; ++ ++ len=0; ++ } else if(len%d)\n", lineno, MAXLINE-1); ++ exit(1); ++ } ++ } ++ return -1; /* EOF */ ++} ++ ++/* ++ * Parse the header of the font file. ++ * Stop after the line CHARS is encountered. Ignore the unknown lines. ++ */ ++ ++struct line { ++ char *name; /* property name with trailing space */ ++ int namelen; /* length of the name string */ ++ enum { ++ ALLOW_REPEAT = 0x01, /* this property may be repeated in multiple lines */ ++ IS_SEEN = 0x02, /* this property has been seen already */ ++ MUST_SEE = 0x04, /* this property must be seen */ ++ IS_LAST = 0x08 /* this is the last property to be read */ ++ } flags; ++ char *fmt; /* format string for the arguments, NULL means a string arg */ ++ int nvals; /* number of values to be read by sscanf */ ++ void *vp[4]; /* pointers to values to be read */ ++}; ++ ++static struct line header[] = { ++ { GETLEN("FONT "), 0, " %200s", 1, {&xlfdname} }, ++ { GETLEN("SIZE "), MUST_SEE, " %d", 1, {&pixel_size} }, ++ { GETLEN("FONTBOUNDINGBOX "), MUST_SEE, " %hd %hd %hd %hd", 4, ++ {&fmet.bbox[2], &fmet.bbox[3], &fmet.bbox[0], &fmet.bbox[1]} }, ++ { GETLEN("FAMILY_NAME "), MUST_SEE, NULL, 1, {&fmet.name_family} }, ++ { GETLEN("WEIGHT_NAME "), MUST_SEE, NULL, 1, {&fmet.name_style} }, ++ { GETLEN("COPYRIGHT "), 0, NULL, 1, {&fmet.name_copyright} }, ++ { GETLEN("SLANT "), MUST_SEE, NULL, 1, {&slant} }, ++ { GETLEN("SPACING "), 0, NULL, 1, {&spacing} }, ++ { GETLEN("SETWIDTH_NAME "), 0, NULL, 1, {&fnwidth} }, ++ { GETLEN("CHARSET_REGISTRY "), 0, NULL, 1, {&charset_reg} }, ++ { GETLEN("CHARSET_ENCODING "), 0, NULL, 1, {&charset_enc} }, ++ { GETLEN("FONT_ASCENT "), 0, " %hd", 1, {&fmet.ascender} }, ++ { GETLEN("FONT_DESCENT "), 0, " %hd", 1, {&fmet.descender} }, ++ ++ /* these 2 must go in this order for post-processing */ ++ { GETLEN("UNDERLINE_THICKNESS "), 0, " %hd", 1, {&fmet.underline_thickness} }, ++ { GETLEN("UNDERLINE_POSITION "), 0, " %hd", 1, {&fmet.underline_position} }, ++ ++ { GETLEN("CHARS "), MUST_SEE|IS_LAST, " %d", 1, {&nglyphs} }, ++ { NULL, 0, 0 } /* end mark: name==NULL */ ++}; ++ ++static int ++handle_header( ++ int len, ++ char *str ++) ++{ ++ struct line *cl; ++ char *s, *p; ++ int c; ++ ++#if 0 ++ fprintf(stderr, "line: %s\n", str); ++#endif ++ for(cl = header; cl->name != 0; cl++) { ++ if(strncmp(str, cl->name, cl->namelen)) ++ continue; ++#if 0 ++ fprintf(stderr, "match: %s\n", cl->name); ++#endif ++ if(cl->flags & IS_SEEN) { ++ if(cl->flags & ALLOW_REPEAT) ++ continue; ++ ++ fprintf(stderr, "**** input line %d redefines the property %s\n", lineno, cl->name); ++ exit(1); ++ } ++ cl->flags |= IS_SEEN; ++ if(cl->fmt == 0) { ++ s = malloc(len - cl->namelen + 1); ++ if(s == 0) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ *((char **)(cl->vp[0])) = s; ++ ++ /* skip until a quote */ ++ for(p = str+cl->namelen; (c = *p)!=0; p++) { ++ if(c == '"') { ++ p++; ++ break; ++ } ++ } ++ for(; (c = *p)!=0; p++) { ++ if(c == '"') { ++ c = *++p; ++ if(c == '"') ++ *s++ = c; ++ else ++ break; ++ } else ++ *s++ = c; ++ } ++ *s = 0; /* end of line */ ++ } else { ++ c = sscanf(str+cl->namelen, cl->fmt, cl->vp[0], cl->vp[1], cl->vp[2], cl->vp[3]); ++ if(c != cl->nvals) { ++ fprintf(stderr, "**** property %s at input line %d must have %d arguments\n", ++ cl->name, lineno, cl->nvals); ++ exit(1); ++ } ++ } ++ if(cl->flags & IS_LAST) ++ return 1; ++ else ++ return 0; ++ } ++ return 0; ++} ++ ++/* ++ * Parse the description of the glyphs ++ */ ++ ++static int ++handle_glyphs( ++ int len, ++ char *str ++) ++{ ++ static int inbmap=0; ++ static char *bmap; ++ static int xsz, ysz, xoff, yoff; ++ static int curln; ++ int i, c; ++ char *p, *plim, *psz; ++ ++ if(!LENCMP(str, "ENDFONT")) { ++ if(curgl < nglyphs) { ++ fprintf(stderr, "**** unexpected end of font file after %d glyphs\n", curgl); ++ exit(1); ++ } else ++ return 1; ++ } ++ if(curgl >= nglyphs) { ++ fprintf(stderr, "**** file contains more glyphs than advertised (%d)\n", nglyphs); ++ exit(1); ++ } ++ if(!LENCMP(str, "STARTCHAR")) { ++ /* sizeof will count \0 instead of ' ' */ ++ for(i=sizeof("STARTCHAR"); str[i] == ' '; i++) ++ {} ++ ++ glyphs[curgl].name = strdup(str + i); ++ if(glyphs[curgl].name == 0) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ } else if(!LENCMP(str, "ENCODING")) { ++ if(sscanf(str, "ENCODING %d", &fontenc[curgl])!=1) { ++ fprintf(stderr,"**** weird ENCODING statement at line %d\n", lineno); ++ exit(1); ++ } ++ if(fontenc[curgl] == -1) /* compatibility format */ ++ sscanf(str, "ENCODING -1 %d", &fontenc[curgl]); ++ if(fontenc[curgl] > maxenc) ++ maxenc = fontenc[curgl]; ++ } else if(!LENCMP(str, "DWIDTH")) { ++ if(sscanf(str, "DWIDTH %d %d", &xsz, &ysz)!=2) { ++ fprintf(stderr,"**** weird DWIDTH statement at line %d\n", lineno); ++ exit(1); ++ } ++ glyphs[curgl].width = xsz*scale; ++ } else if(!LENCMP(str, "BBX")) { ++ if(sscanf(str, "BBX %d %d %d %d", &xsz, &ysz, &xoff, &yoff)!=4) { ++ fprintf(stderr,"**** weird BBX statement at line %d\n", lineno); ++ exit(1); ++ } ++ bmap=malloc(xsz*ysz); ++ if(bmap==0) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ glyphs[curgl].lsb = -xoff*scale; ++ glyphs[curgl].xMin = -xoff*scale; ++ glyphs[curgl].xMax = (xsz-xoff)*scale; ++ glyphs[curgl].yMin = -yoff*scale; ++ glyphs[curgl].yMax = (ysz-xoff)*scale; ++ } else if(!LENCMP(str, "BITMAP")) { ++ inbmap=1; ++ curln=ysz-1; /* the lowest line has index 0 */ ++ } else if(!LENCMP(str, "ENDCHAR")) { ++ inbmap=0; ++ if(bmap) { ++ glyphs[curgl].lastentry = 0; ++ glyphs[curgl].path = 0; ++ glyphs[curgl].entries = 0; ++ bmp_outline(&glyphs[curgl], scale, bmap, xsz, ysz, xoff, yoff); ++ free(bmap); ++ /* remember in a static table or it will be erased */ ++ glpaths[curgl] = glyphs[curgl].entries; ++ glyphs[curgl].entries = 0; ++ ++ if(glpaths[curgl]) ++ glyphs[curgl].ttf_pathlen = 1; ++ else ++ glyphs[curgl].ttf_pathlen = 0; ++ } ++ curgl++; ++ } else if(inbmap) { ++ if(curln<0) { ++ fprintf(stderr,"**** bitmap is longer than %d lines at line %d\n", ysz, lineno); ++ exit(1); ++ } ++ ++ i=0; ++ p=&bmap[curln*xsz]; psz=p+xsz; ++ while(ilsb = 0; ++ g->width = fmet.bbox[2]; ++ g->xMin = 0; ++ g->yMin = 0; ++ } ++ g = &glyphs[0]; ++ g->name = ".notdef"; ++ g->xMax = fmet.bbox[2]*4/5; ++ g->yMax = fmet.bbox[3]*4/5; ++ g->entries = g->path = g->lastentry = 0; ++ /* make it look as a black square */ ++ fg_rmoveto(g, 0.0, 0.0); ++ fg_rlineto(g, 0.0, (double)g->yMax); ++ fg_rlineto(g, (double)g->xMax, (double)g->yMax); ++ fg_rlineto(g, (double)g->xMax, 0.0); ++ fg_rlineto(g, 0.0, 0.0); ++ g_closepath(g); ++ glpaths[0] = g->entries; ++ g->entries = 0; ++ g->ttf_pathlen = 4; ++ ++ g = &glyphs[1]; ++ g->name = ".null"; ++ g->xMax = g->yMax = 0; ++ g->ttf_pathlen = 0; ++ ++ if(readfile(bdf_file, handle_glyphs) < 0) { ++ fprintf(stderr, "**** file does not contain the ENDFONT line\n"); ++ exit(1); ++ } ++ got_glyphs = 1; ++} ++ ++/* ++ * Open font and prepare to return information to the main driver. ++ * May print error and warning messages. ++ * Exit on error. ++ */ ++ ++static void ++openfont( ++ char *fname, ++ char *arg /* unused now */ ++) ++{ ++ struct line *cl; ++ int i, l; ++ ++ if ((bdf_file = fopen(fname, "r")) == NULL) { ++ fprintf(stderr, "**** Cannot open file '%s'\n", fname); ++ exit(1); ++ } else { ++ WARNING_2 fprintf(stderr, "Processing file %s\n", fname); ++ } ++ ++ lineno = 1; ++ ++ for(cl = header; cl->name != 0; cl++) ++ cl->flags &= ~IS_SEEN; ++ if(readfile(bdf_file, handle_header) < 0) { ++ fprintf(stderr, "**** file does not contain the CHARS definition\n"); ++ exit(1); ++ } ++ for(cl = header; cl->name != 0; cl++) { ++ if( (cl->flags & MUST_SEE) && !(cl->flags & IS_SEEN) ) { ++ fprintf(stderr, "**** mandatory property %sis not found in the input line\n", ++ cl->name); /* cl->name has a space at the end */ ++ exit(1); ++ } ++ ++ /* set a few defaults */ ++ if( !(cl->flags & IS_SEEN) ) { ++ if(cl->vp[0] == &fmet.underline_thickness) { ++ fmet.underline_thickness = 1; ++ } else if(cl->vp[0] == &fmet.underline_position) { ++ fmet.underline_position = fmet.bbox[1] + fmet.underline_thickness ++ - (pixel_size - fmet.bbox[3]); ++ } else if(cl->vp[0] == &fmet.ascender) { ++ fmet.ascender = fmet.bbox[2] + fmet.bbox[0]; ++ } else if(cl->vp[0] == &fmet.descender) { ++ fmet.descender = fmet.bbox[0]; ++ } ++ } ++ } ++ ++ nglyphs += 2; /* add empty glyph and .notdef */ ++ ++ /* postprocessing to compensate for the differences in the metric formats */ ++ fmet.bbox[2] += fmet.bbox[0]; ++ fmet.bbox[3] += fmet.bbox[1]; ++ ++ scale = 1000/pixel_size; /* XXX ? */ ++ if(scale*pixel_size < 950) { ++ scale = 1; ++ scale_external = 1; ++ fmet.units_per_em = pixel_size; ++ } else { ++ scale_external = 0; ++ fmet.units_per_em = scale*pixel_size; ++ ++ fmet.underline_position *= scale; ++ fmet.underline_thickness *= scale; ++ fmet.ascender *= scale; ++ fmet.descender *= scale; ++ for(i=0; i<4; i++) ++ fmet.bbox[i] *= scale; ++ } ++ ++ fmet.italic_angle = 0.0; ++ if(spacing == 0 /* possibly an old font */ ++ || toupper(spacing[0]) != 'P') /* or anything non-proportional */ ++ fmet.is_fixed_pitch = 1; ++ else ++ fmet.is_fixed_pitch = 0; ++ ++ if(fmet.name_copyright==NULL) ++ fmet.name_copyright = ""; ++ ++ /* create the full name */ ++ l = strlen(fmet.name_family) ++ + (fmet.name_style? strlen(fmet.name_style) : 0) ++ + (fnwidth? strlen(fnwidth) : 0) ++ + strlen("Oblique") + 1; ++ ++ if(( fmet.name_full = malloc(l) )==NULL) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ strcpy(fmet.name_full, fmet.name_family); ++ if(fnwidth && strcmp(fnwidth, "Normal")) { ++ strcat(fmet.name_full, fnwidth); ++ } ++ if(fmet.name_style && strcmp(fmet.name_style, "Medium")) { ++ strcat(fmet.name_full, fmet.name_style); ++ } ++ switch(toupper(slant[0])) { ++ case 'O': ++ strcat(fmet.name_full, "Oblique"); ++ break; ++ case 'I': ++ strcat(fmet.name_full, "Italic"); ++ break; ++ } ++ ++ fmet.name_ps = fmet.name_full; ++ fmet.name_version = "1.0"; ++ ++ if(charset_reg && charset_enc ++ && !strcmp(charset_reg, "iso10646") && !strcmp(charset_enc, "1")) ++ is_unicode = 1; ++ ++ if(( fontenc = calloc(nglyphs, sizeof *fontenc) )==NULL) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ for(i=0; i=0 && e 255) ++ return 2; ++ else ++ return 0; ++} ++ ++/* ++ * Get the font metrics ++ */ ++static void ++fnmetrics( ++ struct font_metrics *fm ++) ++{ ++ *fm = fmet; ++} ++ ++/* ++ * Get the path of contrours for a glyph. ++ */ ++ ++static void ++glpath( ++ int glyphno, ++ GLYPH *glyf_list ++) ++{ ++ readglyphs(glyf_list); ++ glyf_list[glyphno].entries = glpaths[glyphno]; ++ glpaths[glyphno] = 0; ++} ++ ++/* ++ * Get the kerning data. ++ */ ++ ++static void ++kerning( ++ GLYPH *glyph_list ++) ++{ ++ return; /* no kerning in BDF */ ++} +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/bitmap.c xserver/hw/xprint/extras/ttf2pt1/bitmap.c +--- xserver-old/hw/xprint/extras/ttf2pt1/bitmap.c 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/bitmap.c 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,2633 @@ ++/* ++ * Handling of the bitmapped glyphs ++ * ++ * Copyright (c) 2001 by the TTF2PT1 project ++ * Copyright (c) 2001 by Sergey Babkin ++ * ++ * see COPYRIGHT for the full copyright notice ++ */ ++ ++#include ++#include ++#include ++#include "pt1.h" ++#include "global.h" ++ ++/* possible values of limits */ ++#define L_NONE 0 /* nothing here */ ++#define L_ON 1 /* black is on up/right */ ++#define L_OFF 2 /* black is on down/left */ ++ ++static int warnedhints = 0; ++ ++ ++#ifdef USE_AUTOTRACE ++#include ++ ++/* ++ * Produce an autotraced outline from a bitmap. ++ * scale - factor to scale the sizes ++ * bmap - array of dots by lines, xsz * ysz ++ * xoff, yoff - offset of the bitmap's lower left corner ++ * from the logical position (0,0) ++ */ ++ ++static void ++autotraced_bmp_outline( ++ GLYPH *g, ++ int scale, ++ char *bmap, ++ int xsz, ++ int ysz, ++ int xoff, ++ int yoff ++) ++{ ++ at_bitmap_type atb; ++ at_splines_type *atsp; ++ at_fitting_opts_type *atoptsp; ++ at_spline_list_type *slp; ++ at_spline_type *sp; ++ int i, j, k; ++ double lastx, lasty; ++ double fscale; ++ char *xbmap; ++ ++ fscale = (double)scale; ++ ++ /* provide a white margin around the bitmap */ ++ xbmap = malloc((ysz+2)*(xsz+2)); ++ if(xbmap == 0) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ memset(xbmap, 0, xsz+2); /* top margin */ ++ for(i=0, j=xsz+2; ilength; i++) { ++ slp = &atsp->data[i]; ++#if 0 ++ fprintf(stderr, "%s: contour %d: %d entries clockwise=%d color=%02X%02X%02X\n", ++ g->name, i, slp->length, slp->clockwise, slp->color.r, slp->color.g, slp->color.b); ++#endif ++ if(slp->length == 0) ++ continue; ++#if 0 ++ if(slp->color.r + slp->color.g + slp->color.b == 0) ++ continue; ++#endif ++ fg_rmoveto(g, fscale*(slp->data[0].v[0].x+xoff), fscale*(slp->data[0].v[0].y+yoff)); ++ for(j=0; jlength; j++) { ++#if 0 ++ fprintf(stderr, " "); ++ for(k=0; k<4; k++) ++ fprintf(stderr, "(%g %g) ", ++ fscale*(slp->data[j].v[k].x+xoff), ++ fscale*(ysz-slp->data[j].v[k].y+yoff) ++ ); ++ fprintf(stderr, "\n"); ++#endif ++ fg_rrcurveto(g, ++ fscale*(slp->data[j].v[1].x+xoff), fscale*(slp->data[j].v[1].y+yoff), ++ fscale*(slp->data[j].v[2].x+xoff), fscale*(slp->data[j].v[2].y+yoff), ++ fscale*(slp->data[j].v[3].x+xoff), fscale*(slp->data[j].v[3].y+yoff) ); ++ } ++ g_closepath(g); ++ } ++ ++ at_splines_free(atsp); ++ at_fitting_opts_free(atoptsp); ++ free(xbmap); ++} ++ ++#endif /*USE_AUTOTRACE*/ ++ ++/* an extension of gentry for description of the fragments */ ++typedef struct gex_frag GEX_FRAG; ++struct gex_frag { ++ /* indexes to len, the exact values and order are important */ ++#define GEXFI_NONE -1 ++#define GEXFI_CONVEX 0 ++#define GEXFI_CONCAVE 1 ++#define GEXFI_LINE 2 /* a line with steps varying by +-1 pixel */ ++#define GEXFI_EXACTLINE 3 /* a line with exactly the same steps */ ++#define GEXFI_SERIF 4 /* small serifs at the ends of stemsi - must be last */ ++#define GEXFI_COUNT 5 /* maximal index + 1 */ ++ unsigned short len[GEXFI_COUNT]; /* length of various fragment types starting here */ ++ unsigned short lenback[GEXFI_COUNT]; /* length back to the start of curve */ ++ ++ signed char ixstart; /* index of the frag type that starts here */ ++ signed char ixcont; /* index of the frag type that continues here */ ++ ++ short flags; ++#define GEXFF_HLINE 0x0001 /* the exact line is longer in "horizontal" dimension */ ++#define GEXFF_EXTR 0x0002 /* this gentry is an extremum in some direction */ ++#define GEXFF_CIRC 0x0004 /* the joint at this gentry is for a circular curve */ ++#define GEXFF_DRAWCURVE 0x0008 /* vect[] describes a curve to draw */ ++#define GEXFF_DRAWLINE 0x0010 /* vect[] describes a line to draw */ ++#define GEXFF_SPLIT 0x0020 /* is a result of splitting a line */ ++#define GEXFF_SYMNEXT 0x0040 /* this subfrag is symmetric with next one */ ++#define GEXFF_DONE 0x0080 /* this subfrag has been vectorized */ ++#define GEXFF_LONG 0x0100 /* this gentry is longer than 1 pixel */ ++ ++ unsigned short aidx; /* index of gentry in the array representing the contour */ ++ ++ unsigned short vectlen; /* number of gentries represented by vect[] */ ++ ++ /* coordinates for vectored replacement of this fragment */ ++ /* (already scaled because it's needed for curve approximation) */ ++ double vect[4 /*ref.points*/][2 /*X,Y*/]; ++ ++ double bbox[2 /*X,Y*/]; /* absolute sizes of bounding box of a subfragment */ ++ ++ /* used when splitting the curved frags into subfrags */ ++ GENTRY *prevsub; /* to gentries describing neighboring subfrags */ ++ GENTRY *nextsub; ++ GENTRY *ordersub; /* single-linked list describing the order of calculation */ ++ ++ int sublen; /* length of this subfrag */ ++ /* the symmetry across the subfrags */ ++ int symaxis; /* the symmetry axis, with next subfrag */ ++ int symxlen; /* min length of adjacent symmetric frags */ ++ /* the symmetry within this subfrag (the axis is always diagonal) */ ++ GENTRY *symge; /* symge->i{x,y}3 is the symmetry point of symge==0 if none */ ++ ++}; ++#define X_FRAG(ge) ((GEX_FRAG *)((ge)->ext)) ++ ++/* various interesting tables related to GEX_FRAG */ ++static char *gxf_name[GEXFI_COUNT] = {"Convex", "Concave", "Line", "ExLine", "Serif"}; ++static int gxf_cvk[2] = {-1, 1}; /* coefficients of concaveness */ ++ ++/* ++ * Dump the contents of X_EXT()->len and ->lenback for a contour ++ */ ++static void ++gex_dump_contour( ++ GENTRY *ge, ++ int clen ++) ++{ ++ int i, j; ++ ++ for(j = 0; j < GEXFI_COUNT; j++) { ++ fprintf(stderr, "%-8s", gxf_name[j]); ++ for(i = 0; i < clen; i++, ge = ge->frwd) ++ fprintf(stderr, " %2d", X_FRAG(ge)->len[j]); ++ fprintf(stderr, " %p\n (back) ", ge); ++ for(i = 0; i < clen; i++, ge = ge->frwd) ++ fprintf(stderr, " %2d", X_FRAG(ge)->lenback[j]); ++ fprintf(stderr, "\n"); ++ } ++} ++ ++/* ++ * Calculate values of X_EXT()->lenback[] for all entries in ++ * a contour. The contour is identified by: ++ * ge - any gentry of the contour ++ * clen - contour length ++ */ ++ ++static void ++gex_calc_lenback( ++ GENTRY *ge, ++ int clen ++) ++{ ++ int i, j; ++ int end; ++ GEX_FRAG *f; ++ int len[GEXFI_COUNT]; /* length of the most recent fragment */ ++ int count[GEXFI_COUNT]; /* steps since beginning of the fragment */ ++ ++ for(j = 0; j < GEXFI_COUNT; j++) ++ len[j] = count[j] = 0; ++ ++ end = clen; ++ for(i = 0; i < end; i++, ge = ge->frwd) { ++ f = X_FRAG(ge); ++ for(j = 0; j < GEXFI_COUNT; j++) { ++ if(len[j] != count[j]) { ++ f->lenback[j] = count[j]++; ++ } else ++ f->lenback[j] = 0; ++ if(f->len[j] != 0) { ++ len[j] = f->len[j]; ++ count[j] = 1; /* start with the next gentry */ ++ /* if the fragment will wrap over the start, process to its end */ ++ if(i < clen && i + len[j] > end) ++ end = i + len[j]; ++ } ++ } ++ } ++ gex_dump_contour(ge, clen); ++} ++ ++/* Limit a curve to not exceed the given coordinates ++ * at its given side ++ */ ++ ++static void ++limcurve( ++ double curve[4][2 /*X,Y*/], ++ double lim[2 /*X,Y*/], ++ int where /* 0 - start, 3 - end */ ++) ++{ ++ int other = 3-where; /* the other end */ ++ int sgn[2 /*X,Y*/]; /* sign for comparison */ ++ double t, from, to, nt, t2, nt2, tt[4]; ++ double val[2 /*X,Y*/]; ++ int i; ++ ++ for(i=0; i<2; i++) ++ sgn[i] = fsign(curve[other][i] - curve[where][i]); ++ ++#if 0 ++ fprintf(stderr, " limit (%g,%g)-(%g,%g) at %d by (%g,%g), sgn(%d,%d)\n", ++ curve[0][0], curve[0][1], curve[3][0], curve[3][1], ++ where, lim[0], lim[1], sgn[0], sgn[1]); ++#endif ++ /* a common special case */ ++ if( sgn[0]*(curve[where][0] - lim[0]) >= 0. ++ && sgn[1]*(curve[where][1] - lim[1]) >= 0. ) ++ return; /* nothing to do */ ++ ++ if(other==0) { ++ from = 0.; ++ to = 1.; ++ } else { ++ from = 1.; ++ to = 0.; ++ } ++#if 0 ++ fprintf(stderr, "t="); ++#endif ++ while( fabs(from-to) > 0.00001 ) { ++ t = 0.5 * (from+to); ++ t2 = t*t; ++ nt = 1.-t; ++ nt2 = nt*nt; ++ tt[0] = nt2*nt; ++ tt[1] = 3*nt2*t; ++ tt[2] = 3*nt*t2; ++ tt[3] = t*t2; ++ for(i=0; i<2; i++) ++ val[i] = curve[0][i]*tt[0] + curve[1][i]*tt[1] ++ + curve[2][i]*tt[2] + curve[3][i]*tt[3]; ++#if 0 ++ fprintf(stderr, "%g(%g,%g) ", t, val[0], val[1]); ++#endif ++ if(fabs(val[0] - lim[0]) < 0.1 ++ || fabs(val[1] - lim[1]) < 0.1) ++ break; ++ ++ if(sgn[0] * (val[0] - lim[0]) < 0. ++ || sgn[1] * (val[1] - lim[1]) < 0.) ++ to = t; ++ else ++ from = t; ++ } ++ /* now t is the point of splitting */ ++#define SPLIT(pt1, pt2) ( (pt1) + t*((pt2)-(pt1)) ) /* order is important! */ ++ for(i=0; i<2; i++) { ++ double v11, v12, v13, v21, v22, v31; /* intermediate points */ ++ ++ v11 = SPLIT(curve[0][i], curve[1][i]); ++ v12 = SPLIT(curve[1][i], curve[2][i]); ++ v13 = SPLIT(curve[2][i], curve[3][i]); ++ v21 = SPLIT(v11, v12); ++ v22 = SPLIT(v12, v13); ++ v31 = SPLIT(v21, v22); ++ if(other==0) { ++ curve[1][i] = v11; ++ curve[2][i] = v21; ++ curve[3][i] = fabs(v31 - lim[i]) < 0.1 ? lim[i] : v31; ++ } else { ++ curve[0][i] = fabs(v31 - lim[i]) < 0.1 ? lim[i] : v31; ++ curve[1][i] = v22; ++ curve[2][i] = v13; ++ } ++ } ++#undef SPLIT ++#if 0 ++ fprintf(stderr, "\n"); ++#endif ++} ++ ++/* ++ * Vectorize a subfragment of a curve fragment. All the data has been already ++ * collected by this time ++ */ ++ ++static void ++dosubfrag( ++ GLYPH *g, ++ int fti, /* fragment type index */ ++ GENTRY *firstge, /* first gentry of fragment */ ++ GENTRY *ge, /* first gentry of subfragment */ ++ double fscale ++) ++{ ++ GENTRY *gel, *gei; /* last gentry of this subfrag */ ++ GEX_FRAG *f, *ff, *lf, *pf, *xf; ++ /* maximal amount of space that can be used at the beginning and the end */ ++ double fixfront[2], fixend[2]; /* fixed points - used to show direction */ ++ double mvfront[2], mvend[2]; /* movable points */ ++ double limfront[2], limend[2]; /* limit of movement for movabel points */ ++ double sympt; ++ int outfront, outend; /* the beginning/end is going outwards */ ++ int symfront, symend; /* a ready symmetric fragment is present at front/end */ ++ int drnd[2 /*X,Y*/]; /* size of the round part */ ++ int i, j, a1, a2, ndots; ++ double avg2, max2; /* squared distances */ ++ struct dot_dist *dots, *usedots; ++ ++ ff = X_FRAG(firstge); ++ f = X_FRAG(ge); ++ gel = f->nextsub; ++ lf = X_FRAG(gel); ++ if(f->prevsub != 0) ++ pf = X_FRAG(f->prevsub); ++ else ++ pf = 0; ++ ++ for(i=0; i<2; i++) ++ drnd[i] = gel->bkwd->ipoints[i][2] - ge->ipoints[i][2]; ++ ++ if(f->prevsub==0 && f->ixcont == GEXFI_NONE) { ++ /* nothing to join with : may use the whole length */ ++ for(i = 0; i < 2; i++) ++ limfront[i] = ge->bkwd->ipoints[i][2]; ++ } else { ++ /* limit to a half */ ++ for(i = 0; i < 2; i++) ++ limfront[i] = 0.5 * (ge->ipoints[i][2] + ge->bkwd->ipoints[i][2]); ++ } ++ if( (ge->ix3 == ge->bkwd->ix3) /* vert */ ++ ^ (isign(ge->bkwd->ix3 - ge->frwd->ix3)==isign(ge->bkwd->iy3 - ge->frwd->iy3)) ++ ^ (fti == GEXFI_CONCAVE) /* counter-clockwise */ ) { ++ /* the beginning is not a flat 90-degree end */ ++ outfront = 1; ++ for(i = 0; i < 2; i++) ++ fixfront[i] = ge->frwd->ipoints[i][2]; ++ } else { ++ outfront = 0; ++ for(i = 0; i < 2; i++) ++ fixfront[i] = ge->ipoints[i][2]; ++ } ++ ++ if(lf->nextsub==0 && lf->ixstart == GEXFI_NONE) { ++ /* nothing to join with : may use the whole length */ ++ for(i = 0; i < 2; i++) ++ limend[i] = gel->ipoints[i][2]; ++ } else { ++ /* limit to a half */ ++ for(i = 0; i < 2; i++) ++ limend[i] = 0.5 * (gel->ipoints[i][2] + gel->bkwd->ipoints[i][2]); ++ } ++ gei = gel->bkwd->bkwd; ++ if( (gel->ix3 == gel->bkwd->ix3) /* vert */ ++ ^ (isign(gel->ix3 - gei->ix3)==isign(gel->iy3 - gei->iy3)) ++ ^ (fti == GEXFI_CONVEX) /* clockwise */ ) { ++ /* the end is not a flat 90-degree end */ ++ outend = 1; ++ for(i = 0; i < 2; i++) ++ fixend[i] = gel->bkwd->bkwd->ipoints[i][2]; ++ } else { ++ outend = 0; ++ for(i = 0; i < 2; i++) ++ fixend[i] = gel->bkwd->ipoints[i][2]; ++ } ++ ++ for(i = 0; i < 2; i++) { ++ fixfront[i] *= fscale; ++ limfront[i] *= fscale; ++ fixend[i] *= fscale; ++ limend[i] *= fscale; ++ } ++ ++ fprintf(stderr, " %d out(%d[%d %d %d],%d[%d %d %d]) drnd(%d, %d)\n", ++ fti, ++ outfront, ++ (ge->ix3 == ge->bkwd->ix3), ++ (isign(ge->bkwd->ix3 - ge->frwd->ix3)==isign(ge->bkwd->iy3 - ge->frwd->iy3)), ++ (fti == GEXFI_CONCAVE), ++ outend, ++ (gel->ix3 == gel->bkwd->ix3), ++ (isign(gel->ix3 - gei->ix3)==isign(gel->iy3 - gei->iy3)), ++ (fti == GEXFI_CONVEX), ++ drnd[0], drnd[1]); ++ ++ /* prepare to calculate the distances */ ++ ndots = f->sublen - 1; ++ dots = malloc(sizeof(*dots) * ndots); ++ if(dots == 0) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ for(i = 0, gei = ge; i < ndots; i++, gei = gei->frwd) { ++ for(a1 = 0; a1 < 2; a1++) ++ dots[i].p[a1] = fscale * gei->ipoints[a1][2]; ++ } ++ ++ /* see if we can mirror a ready symmetric curve */ ++ ++ /* check symmetry with the fragment before this */ ++ symfront = (pf != 0 && (pf->flags & GEXFF_SYMNEXT) && (pf->flags & GEXFF_DONE) ++ && ( outend && f->sublen <= pf->sublen ++ || ( pf->sublen == f->sublen ++ && (lf->sublen == 0 ++ || ( abs(limfront[0]-limend[0]) >= abs(pf->vect[0][0]-pf->vect[3][0]) ++ && abs(limfront[1]-limend[1]) >= abs(pf->vect[0][1]-pf->vect[3][1]) )) ++ ) ++ ) ++ ); ++ /* check symmetry with the fragment after this */ ++ symend = ( (f->flags & GEXFF_SYMNEXT) && (lf->flags & GEXFF_DONE) ++ && ( outfront && f->sublen <= lf->sublen ++ || ( lf->sublen == f->sublen ++ && (pf == 0 ++ || ( abs(limfront[0]-limend[0]) >= abs(lf->vect[0][0]-lf->vect[3][0]) ++ && abs(limfront[1]-limend[1]) >= abs(lf->vect[0][1]-lf->vect[3][1]) )) ++ ) ++ ) ++ ); ++ if(symfront || symend) { ++ /* mirror the symmetric neighbour subfrag */ ++ if(symfront) { ++ a1 = (ge->ix3 != ge->bkwd->ix3); /* the symmetry axis */ ++ a2 = !a1; /* the other axis (goes along the extremum gentry) */ ++ ++ /* the symmetry point on a2 */ ++ sympt = fscale * 0.5 * (ge->ipoints[a2][2] + ge->bkwd->ipoints[a2][2]); ++ xf = pf; /* the symmetric fragment */ ++ } else { ++ a1 = (gel->ix3 != gel->bkwd->ix3); /* the symmetry axis */ ++ a2 = !a1; /* the other axis (goes along the extremum gentry) */ ++ ++ /* the symmetry point on a2 */ ++ sympt = fscale * 0.5 * (gel->ipoints[a2][2] + gel->bkwd->ipoints[a2][2]); ++ xf = lf; /* the symmetric fragment */ ++ } ++ fprintf(stderr, " sym with %p f=%d(%p) e=%d(%p) a1=%c a2=%c sympt=%g\n", ++ xf, symfront, pf, symend, lf, ++ a1 ? 'Y': 'X', a2 ? 'Y': 'X', sympt ++ ); ++ for(i=0; i<4; i++) { ++ f->vect[3-i][a1] = xf->vect[i][a1]; ++ f->vect[3-i][a2] = sympt - (xf->vect[i][a2]-sympt); ++ } ++ if(symfront) { ++ if(outend || lf->sublen==0) ++ limcurve(f->vect, limend, 3); ++ } else { ++ if(outfront || pf == 0) ++ limcurve(f->vect, limfront, 0); ++ } ++ avg2 = fdotcurvdist2(f->vect, dots, ndots, &max2); ++ fprintf(stderr, " avg=%g max=%g fscale=%g\n", sqrt(avg2), sqrt(max2), fscale); ++ if(max2 <= fscale*fscale) { ++ f->flags |= (GEXFF_DONE | GEXFF_DRAWCURVE); ++ f->vectlen = f->sublen; ++ free(dots); ++ return; ++ } ++ } ++ ++ if( !outfront && !outend && f->symge != 0) { ++ /* a special case: try a circle segment as an approximation */ ++ double lenfront, lenend, len, maxlen; ++ ++ /* coefficient for a Bezier approximation of a circle */ ++#define CIRCLE_FRAC 0.55 ++ ++ a1 = (ge->ix3 == ge->bkwd->ix3); /* get the axis along the front */ ++ a2 = !a1; /* axis along the end */ ++ ++ lenfront = fixfront[a1] - limfront[a1]; ++ lenend = fixend[a2] - limend[a2]; ++ if(fabs(lenfront) < fabs(lenend)) ++ len = fabs(lenfront); ++ else ++ len = fabs(lenend); ++ ++ /* make it go close to the round shape */ ++ switch(f->sublen) { ++ case 2: ++ maxlen = fscale; ++ break; ++ case 4: ++ case 6: ++ maxlen = fscale * 2.; ++ break; ++ default: ++ maxlen = fscale * abs(ge->frwd->frwd->ipoints[a1][2] ++ - ge->ipoints[a1][2]); ++ break; ++ } ++ if(len > maxlen) ++ len = maxlen; ++ ++ mvfront[a1] = fixfront[a1] - fsign(lenfront) * len; ++ mvfront[a2] = limfront[a2]; ++ mvend[a2] = fixend[a2] - fsign(lenend) * len; ++ mvend[a1] = limend[a1]; ++ ++ for(i=0; i<2; i++) { ++ f->vect[0][i] = mvfront[i]; ++ f->vect[3][i] = mvend[i]; ++ } ++ f->vect[1][a1] = mvfront[a1] + CIRCLE_FRAC*(mvend[a1]-mvfront[a1]); ++ f->vect[1][a2] = mvfront[a2]; ++ f->vect[2][a1] = mvend[a1]; ++ f->vect[2][a2] = mvend[a2] + CIRCLE_FRAC*(mvfront[a2]-mvend[a2]); ++ ++ avg2 = fdotcurvdist2(f->vect, dots, ndots, &max2); ++ fprintf(stderr, " avg=%g max=%g fscale=%g\n", sqrt(avg2), sqrt(max2), fscale); ++ if(max2 <= fscale*fscale) { ++ f->flags |= (GEXFF_DONE | GEXFF_DRAWCURVE); ++ f->vectlen = f->sublen; ++ free(dots); ++ return; ++ } ++#undef CIRCLE_FRAC ++ } ++ for(i=0; i<2; i++) { ++ f->vect[0][i] = limfront[i]; ++ f->vect[1][i] = fixfront[i]; ++ f->vect[2][i] = fixend[i]; ++ f->vect[3][i] = limend[i]; ++ } ++ usedots = dots; ++ if(outfront) { ++ usedots++; ndots--; ++ } ++ if(outend) ++ ndots--; ++ if( fcrossrayscv(f->vect, NULL, NULL) == 0) { ++ fprintf(stderr, "**** Internal error: rays must cross but don't at %p-%p\n", ++ ge, gel); ++ fprintf(stderr, " (%g, %g) (%g, %g) (%g, %g) (%g, %g)\n", ++ limfront[0], limfront[1], ++ fixfront[0], fixfront[1], ++ fixend[0], fixend[1], ++ limend[0], limend[1] ++ ); ++ dumppaths(g, NULL, NULL); ++ exit(1); ++ } else { ++ if(ndots != 0) ++ fapproxcurve(f->vect, usedots, ndots); ++ f->flags |= (GEXFF_DONE | GEXFF_DRAWCURVE); ++ f->vectlen = f->sublen; ++ } ++ free(dots); ++} ++ ++/* ++ * Subtract a list of gentries (covered by a fragment of higher ++ * priority) from the set of fragments of a given ++ * type. ++ * ++ * An example is subtraction of the long exact line fragments ++ * from the curve fragments which get overridden. ++ */ ++ ++static void ++frag_subtract( ++ GLYPH *g, ++ GENTRY **age, /* array of gentries for this contour */ ++ int clen, /* length of the contour */ ++ GENTRY *ge, /* first gentry to be subtracted */ ++ int slen, /* number of gentries in the list to be subtracted */ ++ int d /* type of fragments from which to subtract, as in GEXFI_... */ ++) ++{ ++ GENTRY *pge; ++ GEX_FRAG *f, *pf; ++ int len, i, j; ++ ++ f = X_FRAG(ge); ++ len = slen; ++ ++ /* check if we overlap the end of some fragment */ ++ if(f->lenback[d]) { ++ /* chop off the end of conflicting fragment */ ++ len = f->lenback[d]; ++ pge = age[(f->aidx + clen - len)%clen]; ++ pf = X_FRAG(pge); ++ if(pf->len[d] == clen+1 && pf->flags & GEXFF_CIRC) { ++ /* the conflicting fragment is self-connected */ ++ ++ pf->len[d] = 0; ++ /* calculate the new value for lenback */ ++ len = clen+1 - slen; ++ for(pge = ge; len > 0; pge = pge->bkwd, len--) ++ X_FRAG(pge)->lenback[d] = len; ++ /* now pge points to the last entry of the line, ++ * which is also the new first entry of the curve ++ */ ++ X_FRAG(pge)->len[d] = clen+2 - slen; ++ /* clean lenback of gentries covered by the line */ ++ for(pge = ge->frwd, j = slen-1; j > 0; pge = pge->frwd, j--) ++ X_FRAG(pge)->lenback[d] = 0; ++ fprintf(stderr, " cut %s circular frag to %p-%p\n", ++ gxf_name[d], pge, ge); ++ gex_dump_contour(ge, clen); ++ } else { ++ /* when we chop off a piece of fragment, we leave the remaining ++ * piece(s) overlapping with the beginning and possibly the end ++ * of the line fragment under consideration ++ */ ++ fprintf(stderr, " cut %s frag at %p from len=%d to len=%d (end %p)\n", ++ gxf_name[d], pge, pf->len[d], len+1, ge); ++ j = pf->len[d] - len - 1; /* how many gentries are chopped off */ ++ pf->len[d] = len + 1; ++ i = slen - 1; ++ for(pge = ge->frwd; j > 0 && i > 0; j--, i--, pge = pge->frwd) ++ X_FRAG(pge)->lenback[d] = 0; ++ gex_dump_contour(ge, clen); ++ ++ if(j != 0) { ++ /* the conflicting fragment is split in two by this line ++ * fragment, fix up its tail ++ */ ++ ++ fprintf(stderr, " end of %s frag len=%d %p-", ++ gxf_name[d], j+1, pge->bkwd); ++ X_FRAG(pge->bkwd)->len[d] = j+1; /* the overlapping */ ++ for(i = 1; j > 0; j--, i++, pge = pge->frwd) ++ X_FRAG(pge)->lenback[d] = i; ++ fprintf(stderr, "%p\n", pge->bkwd); ++ gex_dump_contour(ge, clen); ++ } ++ } ++ } ++ /* check if we overlap the beginning of some fragments */ ++ i = slen-1; /* getntries remaining to consider */ ++ j = 0; /* gentries remaining in the overlapping fragment */ ++ for(pge = ge; i > 0; i--, pge = pge->frwd) { ++ if(j > 0) { ++ X_FRAG(pge)->lenback[d] = 0; ++ j--; ++ } ++ /* the beginning of one fragment may be the end of another ++ * fragment, in this case if j-- above results in 0, that will ++ * cause it to check the same gentry for the beginning ++ */ ++ if(j == 0) { ++ pf = X_FRAG(pge); ++ j = pf->len[d]; ++ if(j != 0) { ++ fprintf(stderr, " removed %s frag at %p len=%d\n", ++ gxf_name[d], pge, j); ++ gex_dump_contour(ge, clen); ++ pf->len[d] = 0; ++ j--; ++ } ++ } ++ } ++ /* pge points at the last gentry of the line fragment */ ++ if(j > 1) { /* we have the tail of a fragment left */ ++ fprintf(stderr, " end of %s frag len=%d %p-", ++ gxf_name[d], j, pge); ++ X_FRAG(pge)->len[d] = j; /* the overlapping */ ++ for(i = 0; j > 0; j--, i++, pge = pge->frwd) ++ X_FRAG(pge)->lenback[d] = i; ++ fprintf(stderr, "%p\n", pge->bkwd); ++ gex_dump_contour(ge, clen); ++ } else if(j == 1) { ++ X_FRAG(pge)->lenback[d] = 0; ++ } ++} ++ ++/* ++ * Produce an outline from a bitmap. ++ * scale - factor to scale the sizes ++ * bmap - array of dots by lines, xsz * ysz ++ * xoff, yoff - offset of the bitmap's lower left corner ++ * from the logical position (0,0) ++ */ ++ ++void ++bmp_outline( ++ GLYPH *g, ++ int scale, ++ char *bmap, ++ int xsz, ++ int ysz, ++ int xoff, ++ int yoff ++) ++{ ++ char *hlm, *vlm; /* arrays of the limits of outlines */ ++ char *amp; /* map of ambiguous points */ ++ int x, y; ++ char *ip, *op; ++ double fscale; ++ ++ if(xsz==0 || ysz==0) ++ return; ++ ++#ifdef USE_AUTOTRACE ++ if(use_autotrace) { ++ autotraced_bmp_outline(g, scale, bmap, xsz, ysz, xoff, yoff); ++ return; ++ } ++#endif /*USE_AUTOTRACE*/ ++ ++ fscale = (double)scale; ++ g->flags &= ~GF_FLOAT; /* build it as int first */ ++ ++ if(!warnedhints) { ++ warnedhints = 1; ++ if(hints && subhints) { ++ WARNING_2 fprintf(stderr, ++ "Use of hint substitution on bitmap fonts is not recommended\n"); ++ } ++ } ++ ++#if 0 ++ printbmap(bmap, xsz, ysz, xoff, yoff); ++#endif ++ ++ /* now find the outlines */ ++ hlm=calloc( xsz, ysz+1 ); /* horizontal limits */ ++ vlm=calloc( xsz+1, ysz ); /* vertical limits */ ++ amp=calloc( xsz, ysz ); /* ambiguous points */ ++ ++ if(hlm==0 || vlm==0 || amp==0) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ ++ /* ++ * hlm and vlm represent a grid of horisontal and ++ * vertical lines. Each pixel is surrounded by the grid ++ * from all the sides. The values of [hv]lm mark the ++ * parts of grid where the pixel value switches from white ++ * to black and back. ++ */ ++ ++ /* find the horizontal limits */ ++ ip=bmap; op=hlm; ++ /* 1st row */ ++ for(x=0; x0; y--) ++ for(x=xsz-1; x>0; x--) { ++ if(bmap[y*xsz+x]) { ++ if( !bmap[y*xsz+x-1] && !bmap[y*xsz-xsz+x] && bmap[y*xsz-xsz+x-1] ) ++ amp[y*xsz+x]=1; ++ } else { ++ if( bmap[y*xsz+x-1] && bmap[y*xsz-xsz+x] && !bmap[y*xsz-xsz+x-1] ) ++ amp[y*xsz+x]=1; ++ } ++ } ++ ++#if 0 ++ printlimits(hlm, vlm, amp, xsz, ysz); ++#endif ++ ++ /* generate the vectored (stepping) outline */ ++ ++ while(1) { ++ int found = 0; ++ int outer; /* flag: this is an outer contour */ ++ int hor, newhor; /* flag: the current contour direction is horizontal */ ++ int dir; /* previous direction of the coordinate, 1 - L_ON, 0 - L_OFF */ ++ int startx, starty; /* start of a contour */ ++ int firstx, firsty; /* start of the current line */ ++ int newx, newy; /* new coordinates to try */ ++ char *lm, val; ++ int maxx, maxy, xor; ++ ++ for(y=ysz; !found && y>0; y--) ++ for(x=0; x L_NONE) ++ goto foundcontour; ++ break; /* have no contours left */ ++ ++ foundcontour: ++ ig_rmoveto(g, x+xoff, y+yoff); /* intermediate as int */ ++ ++ startx = firstx = x; ++ starty = firsty = y; ++ ++ if(hlm[y*xsz+x] == L_OFF) { ++ outer = 1; dir = 0; ++ hlm[y*xsz+x] = -hlm[y*xsz+x]; /* mark as seen */ ++ hor = 1; x++; ++ } else { ++ outer = 0; dir = 0; ++ hor = 0; y--; ++ vlm[y*(xsz+1)+x] = -vlm[y*(xsz+1)+x]; /* mark as seen */ ++ } ++ ++ while(x!=startx || y!=starty) { ++#if 0 ++ printf("trace (%d, %d) outer=%d hor=%d dir=%d\n", x, y, outer, hor, dir); ++#endif ++ ++ /* initialization common for try1 and try2 */ ++ if(hor) { ++ lm = vlm; maxx = xsz+1; maxy = ysz; newhor = 0; ++ } else { ++ lm = hlm; maxx = xsz; maxy = ysz+1; newhor = 1; ++ } ++ xor = (outer ^ hor ^ dir); ++ ++ try1: ++ /* first we try to change axis, to keep the ++ * contour as long as possible ++ */ ++ ++ newx = x; newy = y; ++ if(!hor && (!outer ^ dir)) ++ newx--; ++ if(hor && (!outer ^ dir)) ++ newy--; ++ ++ if(newx < 0 || newx >= maxx || newy < 0 || newy >= maxy) ++ goto try2; ++ ++ if(!xor) ++ val = L_ON; ++ else ++ val = L_OFF; ++#if 0 ++ printf("try 1, want %d have %d at %c(%d, %d)\n", val, lm[newy*maxx + newx], ++ (newhor ? 'h':'v'), newx, newy); ++#endif ++ if( lm[newy*maxx + newx] == val ) ++ goto gotit; ++ ++ try2: ++ /* try to change the axis anyway */ ++ ++ newx = x; newy = y; ++ if(!hor && (outer ^ dir)) ++ newx--; ++ if(hor && (outer ^ dir)) ++ newy--; ++ ++ if(newx < 0 || newx >= maxx || newy < 0 || newy >= maxy) ++ goto try3; ++ ++ if(xor) ++ val = L_ON; ++ else ++ val = L_OFF; ++#if 0 ++ printf("try 2, want %d have %d at %c(%d, %d)\n", val, lm[newy*maxx + newx], ++ (newhor ? 'h':'v'), newx, newy); ++#endif ++ if( lm[newy*maxx + newx] == val ) ++ goto gotit; ++ ++ try3: ++ /* try to continue in the old direction */ ++ ++ if(hor) { ++ lm = hlm; maxx = xsz; maxy = ysz+1; ++ } else { ++ lm = vlm; maxx = xsz+1; maxy = ysz; ++ } ++ newhor = hor; ++ newx = x; newy = y; ++ if(hor && dir) ++ newx--; ++ if(!hor && !dir) ++ newy--; ++ ++ if(newx < 0 || newx >= maxx || newy < 0 || newy >= maxy) ++ goto badtry; ++ ++ if(dir) ++ val = L_ON; ++ else ++ val = L_OFF; ++#if 0 ++ printf("try 3, want %d have %d at %c(%d, %d)\n", val, lm[newy*maxx + newx], ++ (newhor ? 'h':'v'), newx, newy); ++#endif ++ if( lm[newy*maxx + newx] == val ) ++ goto gotit; ++ ++ badtry: ++ fprintf(stderr, "**** Internal error in the contour detection code at (%d, %d)\n", x, y); ++ fprintf(stderr, "glyph='%s' outer=%d hor=%d dir=%d\n", g->name, outer, hor, dir); ++ fflush(stdout); ++ exit(1); ++ ++ gotit: ++ if(hor != newhor) { /* changed direction, end the previous line */ ++ ig_rlineto(g, x+xoff, y+yoff); /* intermediate as int */ ++ firstx = x; firsty = y; ++ } ++ lm[newy*maxx + newx] = -lm[newy*maxx + newx]; ++ hor = newhor; ++ dir = (val == L_ON); ++ if(newhor) ++ x -= (dir<<1)-1; ++ else ++ y += (dir<<1)-1; ++ } ++#if 0 ++ printf("trace (%d, %d) outer=%d hor=%d dir=%d\n", x, y, outer, hor, dir); ++#endif ++ ig_rlineto(g, x+xoff, y+yoff); /* intermediate as int */ ++ g_closepath(g); ++ } ++ ++ ++ /* try to vectorize the curves and sloped lines in the bitmap */ ++ if(vectorize) { ++ GENTRY *ge, *pge, *cge, *loopge; ++ int i; ++ int skip; ++ ++ dumppaths(g, NULL, NULL); ++ ++ /* allocate the extensions */ ++ for(cge=g->entries; cge!=0; cge=cge->next) { ++ cge->ext = calloc(1, sizeof(GEX_FRAG) ); ++ if(cge->ext == 0) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ } ++ ++ for(cge=g->entries; cge!=0; cge=cge->next) { ++ if(cge->type != GE_MOVE) ++ continue; ++ ++ /* we've found the beginning of a contour */ ++ { ++ int d, vert, count, stepmore, delaystop; ++ int vdir, hdir, fullvdir, fullhdir, len; ++ int dx, dy, lastdx, lastdy; ++ int k1, k2, reversal, smooth, good; ++ int line[2 /*H,V*/], maxlen[2 /*H,V*/], minlen[2 /*H,V*/]; ++ GENTRY **age; /* array of gentries in a contour */ ++ int clen; /* contour length, size of ths array */ ++ int i, j; ++ GEX_FRAG *f; ++ ++ /* we know that all the contours start at the top-left corner, ++ * so at most it might be before/after the last element of ++ * the last/first fragment ++ */ ++ ++ ge = cge->next; ++ pge = ge->bkwd; ++ if(ge->ix3 == pge->ix3) { /* a vertical line */ ++ /* we want to start always from a horizontal line because ++ * then we always start from top and that is quaranteed to be a ++ * fragment boundary, so move the start point of the contour ++ */ ++ pge->prev->next = pge->next; ++ pge->next->prev = pge->prev; ++ cge->next = pge; ++ pge->prev = cge; ++ pge->next = ge; ++ ge->prev = pge; ++ ge = pge; pge = ge->bkwd; ++ cge->ix3 = pge->ix3; cge->iy3 = pge->iy3; ++ } ++ ++ /* fill the array of gentries */ ++ clen = 1; ++ for(ge = cge->next->frwd; ge != cge->next; ge = ge->frwd) ++ clen++; ++ age = (GENTRY **)malloc(sizeof(*age) * clen); ++ ge = cge->next; ++ count = 0; ++ do { ++ age[count] = ge; ++ X_FRAG(ge)->aidx = count++; ++ ++ /* and by the way find the extremums */ ++ for(i=0; i<2; i++) { ++ if( isign(ge->frwd->ipoints[i][2] - ge->ipoints[i][2]) ++ * isign(ge->bkwd->bkwd->ipoints[i][2] - ge->bkwd->ipoints[i][2]) == 1) { ++ X_FRAG(ge)->flags |= GEXFF_EXTR; ++ fprintf(stderr, " %s extremum at %p\n", (i?"vert":"hor"), ge); ++ } ++ if(abs(ge->ipoints[i][2] - ge->bkwd->ipoints[i][2]) > 1) ++ X_FRAG(ge)->flags |= GEXFF_LONG; ++ } ++ ++ ge = ge->frwd; ++ } while(ge != cge->next); ++ ++ /* Find the serif fragments, looking as either of: ++ * -+ | ++ * | | ++ * +-+ +-+ ++ * | | ++ * +--... +--... ++ * with the thickness of serifs being 1 pixel. We make no ++ * difference between serifs on vertical and horizontal stems. ++ */ ++ ++ ge = cge->next; ++ do { ++ GENTRY *nge; ++ int pdx, pdy, ndx, ndy; ++ ++ /* two gentries of length 1 mean a potential serif */ ++ pge = ge->bkwd; ++ nge = ge->frwd; ++ ++ dx = nge->ix3 - pge->ix3; ++ dy = nge->iy3 - pge->iy3; ++ ++ if(abs(dx) != 1 || abs(dy) != 1) /* 2 small ones */ ++ continue; ++ ++ if( ++ (!(X_FRAG(ge)->flags & GEXFF_EXTR) ++ || !(X_FRAG(ge->bkwd)->flags & GEXFF_EXTR)) ++ && (!(X_FRAG(ge->frwd)->flags & GEXFF_EXTR) ++ || !(X_FRAG(ge->frwd->frwd)->flags & GEXFF_EXTR)) ++ ) ++ continue; /* either side must be a couple of extremums */ ++ ++ pdx = pge->ix3 - pge->bkwd->ix3; ++ pdy = pge->iy3 - pge->bkwd->iy3; ++ ndx = nge->frwd->ix3 - nge->ix3; ++ ndy = nge->frwd->iy3 - nge->iy3; ++ ++ if(pdx*dx + pdy*dy > 0 && ndx*dx + ndy*dy > 0) ++ continue; /* definitely not a serif but a round corner */ ++ ++ if(abs(pdx) + abs(pdy) == 1 || abs(ndx) + abs(ndy) == 1) ++ continue; ++ ++ /* we've found a serif including this and next gentry */ ++ X_FRAG(ge)->len[GEXFI_SERIF] = 2; ++ ++ } while( (ge = ge->frwd) != cge->next ); ++ ++ ++ /* Find the convex and concave fragments, defined as: ++ * convex (clockwise): dy/dx <= dy0/dx0, ++ * or a reversal: dy/dx == - dy0/dx0 && abs(dxthis) == 1 && dy/dx > 0 ++ * concave (counter-clockwise): dy/dx >= dy0/dx0, ++ * or a reversal: dy/dx == - dy0/dx0 && abs(dxthis) == 1 && dy/dx < 0 ++ * ++ * Where dx and dy are measured between the end of this gentry ++ * and the start of the previous one (dx0 and dy0 are the same ++ * thing calculated for the previous gentry and its previous one), ++ * dxthis is between the end and begginning of this gentry. ++ * ++ * A reversal is a situation when the curve changes its direction ++ * along the x axis, so it passes through a momentary vertical ++ * direction. ++ */ ++ for(d = GEXFI_CONVEX; d<= GEXFI_CONCAVE; d++) { ++ ge = cge->next; ++ pge = ge->bkwd; /* the beginning of the fragment */ ++ count = 1; ++ lastdx = pge->ix3 - pge->bkwd->bkwd->ix3; ++ lastdy = pge->iy3 - pge->bkwd->bkwd->iy3; ++ ++#define CHKCURVCONN(ge, msg) do { \ ++ dx = (ge)->ix3 - (ge)->bkwd->bkwd->ix3; \ ++ dy = (ge)->iy3 - (ge)->bkwd->bkwd->iy3; \ ++ if(0 && msg) { \ ++ fprintf(stderr, " %p: dx=%d dy=%d dx0=%d dy0=%d ", \ ++ (ge), dx, dy, lastdx, lastdy); \ ++ } \ ++ k1 = X_FRAG(ge)->flags; \ ++ k2 = X_FRAG((ge)->bkwd)->flags; \ ++ if(0 && msg) { \ ++ fprintf(stderr, "fl=%c%c%c%c ", \ ++ (k1 & GEXFF_EXTR) ? 'X' : '-', \ ++ (k1 & GEXFF_LONG) ? 'L' : '-', \ ++ (k2 & GEXFF_EXTR) ? 'X' : '-', \ ++ (k2 & GEXFF_LONG) ? 'L' : '-' \ ++ ); \ ++ } \ ++ if( (k1 & GEXFF_EXTR) && (k2 & GEXFF_LONG) \ ++ || (k2 & GEXFF_EXTR) && (k1 & GEXFF_LONG) ) { \ ++ smooth = 0; \ ++ good = reversal = -1; /* for debugging */ \ ++ } else { \ ++ k1 = dy * lastdx; \ ++ k2 = lastdy * dx; \ ++ smooth = (abs(dx)==1 || abs(dy)==1); \ ++ good = (k1 - k2)*gxf_cvk[d] >= 0; \ ++ if(smooth && !good) { \ ++ reversal = (k1 == -k2 && abs((ge)->ix3 - (ge)->bkwd->ix3)==1 \ ++ && dy*dx*gxf_cvk[d] < 0); \ ++ } else \ ++ reversal = 0; \ ++ } \ ++ if(0 && msg) { \ ++ fprintf(stderr, "k1=%d k2=%d pge=%p count=%d %s good=%d rev=%d\n", \ ++ k1, k2, pge, count, gxf_name[d], good, reversal); \ ++ } \ ++ } while(0) ++ ++ do { ++ CHKCURVCONN(ge, 1); ++ ++ if(smooth && (good || reversal) ) ++ count++; ++ else { ++ /* can't continue */ ++#if 0 ++ if(count >= 4) { /* worth remembering */ ++ fprintf(stderr, " %s frag %p-%p count=%d\n", gxf_name[d], pge, ge->bkwd, count); ++ } ++#endif ++ X_FRAG(pge)->len[d] = count; ++ if(smooth) { ++ pge = ge->bkwd; ++ count = 2; ++ } else { ++ pge = ge; ++ count = 1; ++ } ++ } ++ lastdx = dx; lastdy = dy; ++ ge = ge->frwd; ++ } while(ge != cge->next); ++ ++ /* see if we can connect the last fragment to the first */ ++ CHKCURVCONN(ge, 1); ++ ++ if(smooth && (good || reversal) ) { ++ /* -1 to avoid ge->bkwd being counted twice */ ++ if( X_FRAG(ge->bkwd)->len[d] >= 2 ) ++ count += X_FRAG(ge->bkwd)->len[d] - 1; ++ else if(count == clen+1) { ++ /* we are joining a circular (closed) curve, check whether it ++ * can be joined at any point or whether it has a discontinuity ++ * at the point where we join it now ++ */ ++ lastdx = dx; lastdy = dy; ++ CHKCURVCONN(ge->frwd, 0); ++ ++ if(smooth && (good || reversal) ) { ++ /* yes, the curve is truly a circular one and can be ++ * joined at any point ++ */ ++ ++#if 0 ++ fprintf(stderr, " found a circular joint point at %p\n", pge); ++#endif ++ /* make sure that in a circular fragment we start from an extremum */ ++ while( ! (X_FRAG(pge)->flags & GEXFF_EXTR) ) ++ pge = pge->frwd; ++ X_FRAG(pge)->flags |= GEXFF_CIRC; ++ } ++ } ++#if 0 ++ fprintf(stderr, " %s joined %p to %p count=%d bk_count=%d\n", gxf_name[d], pge, ge->bkwd, ++ count, X_FRAG(ge->bkwd)->len[d] ); ++#endif ++ X_FRAG(ge->bkwd)->len[d] = 0; ++ } ++ X_FRAG(pge)->len[d] = count; ++#if 0 ++ if(count >= 4) { /* worth remembering */ ++ fprintf(stderr, " %s last frag %p-%p count=%d\n", gxf_name[d], pge, ge->bkwd, count); ++ } ++#endif ++#undef CHKCURVCONN ++ ++ /* do postprocessing */ ++ ge = cge->next; ++ do { ++ f = X_FRAG(ge); ++ len = f->len[d]; ++#if 0 ++ fprintf(stderr, " %p %s len=%d clen=%d\n", ge, gxf_name[d], len, clen); ++#endif ++ if(len < 3) /* get rid of the fragments that are too short */ ++ f->len[d] = 0; ++ else if(len == 3) { ++ /* _ ++ * drop the |_| - shaped fragments, leave alone the _| - shaped ++ * (and even those only if not too short in pixels), ++ * those left alone are further filtered later ++ */ ++ k1 = (ge->ix3 == ge->bkwd->ix3); /* axis of the start */ ++ if(isign(ge->ipoints[k1][2] - ge->bkwd->ipoints[k1][2]) ++ != isign(ge->frwd->ipoints[k1][2] - ge->frwd->frwd->ipoints[k1][2]) ++ && abs(ge->frwd->frwd->ipoints[k1][2] - ge->bkwd->ipoints[k1][2]) > 2) { ++#if 0 ++ fprintf(stderr, " %s frag %p count=%d good shape\n", ++ gxf_name[d], ge, count); ++#endif ++ } else ++ f->len[d] = 0; ++ } else if(len == clen+1) ++ break; /* a closed fragment, nothing else interesting */ ++ else { /* only for open fragments */ ++ GENTRY *gem, *gex, *gei, *ges; ++ ++ ges = ge; /* the start entry */ ++ gem = age[(f->aidx + f->len[d])%clen]; /* entry past the end of the fragment */ ++ ++ gei = ge->frwd; ++ if( (ge->ix3 == ge->bkwd->ix3) /* vert */ ++ ^ (isign(ge->bkwd->ix3 - gei->ix3)==isign(ge->bkwd->iy3 - gei->iy3)) ++ ^ !(d == GEXFI_CONVEX) /* counter-clockwise */ ) { ++ ++#if 0 ++ fprintf(stderr, " %p: %s potential spurious start\n", ge, gxf_name[d]); ++#endif ++ /* the beginning may be a spurious entry */ ++ ++ gex = 0; /* the extremum closest to the beginning - to be found */ ++ for(gei = ge->frwd; gei != gem; gei = gei->frwd) { ++ if(X_FRAG(gei)->flags & GEXFF_EXTR) { ++ gex = gei; ++ break; ++ } ++ } ++ if(gex == 0) ++ gex = gem->bkwd; ++ ++ /* A special case: ignore the spurious ends on small curves that ++ * either enclose an 1-pixel-wide extremum or are 1-pixel deep. ++ * Any 5-or-less-pixel-long curve with extremum 2 steps away ++ * qualifies for that. ++ */ ++ ++ if(len <= 5 && gex == ge->frwd->frwd) { ++ good = 0; ++#if 0 ++ fprintf(stderr, " E"); ++#endif ++ } else { ++ good = 1; /* assume that ge is not spurious */ ++ ++ /* gei goes backwards, gex goes forwards from the extremum */ ++ gei = gex; ++ /* i is the symmetry axis, j is the other axis (X=0 Y=1) */ ++ i = (gex->ix3 != gex->bkwd->ix3); ++ j = !i; ++ for( ; gei!=ge && gex!=gem; gei=gei->bkwd, gex=gex->frwd) { ++ if( gei->bkwd->ipoints[i][2] != gex->ipoints[i][2] ++ || gei->bkwd->ipoints[j][2] - gei->ipoints[j][2] ++ != gex->bkwd->ipoints[j][2] - gex->ipoints[j][2] ++ ) { ++ good = 0; /* no symmetry - must be spurious */ ++#if 0 ++ fprintf(stderr, " M(%p,%p)(%d %d,%d)(%d %d,%d)", ++ gei, gex, ++ i, gei->bkwd->ipoints[i][2], gex->ipoints[i][2], ++ j, gei->bkwd->ipoints[j][2] - gei->ipoints[j][2], ++ gex->bkwd->ipoints[j][2] - gex->ipoints[j][2] ); ++#endif ++ break; ++ } ++ } ++ if(gex == gem) { /* oops, the other side is too short */ ++ good = 0; ++#if 0 ++ fprintf(stderr, " X"); ++#endif ++ } ++ if(good && gei == ge) { ++ if( isign(gei->bkwd->ipoints[j][2] - gei->ipoints[j][2]) ++ != isign(gex->bkwd->ipoints[j][2] - gex->ipoints[j][2]) ) { ++ good = 0; /* oops, goes into another direction */ ++#if 0 ++ fprintf(stderr, " D"); ++#endif ++ } ++ } ++ } ++ if(!good) { /* it is spurious, drop it */ ++#if 0 ++ fprintf(stderr, " %p: %s spurious start\n", ge, gxf_name[d]); ++#endif ++ f->len[d] = 0; ++ ges = ge->frwd; ++ len--; ++ X_FRAG(ges)->len[d] = len; ++ } ++ } ++ ++ gei = gem->bkwd->bkwd->bkwd; ++ if( (gem->ix3 != gem->bkwd->ix3) /* gem->bkwd is vert */ ++ ^ (isign(gem->bkwd->ix3 - gei->ix3)==isign(gem->bkwd->iy3 - gei->iy3)) ++ ^ (d == GEXFI_CONVEX) /* clockwise */ ) { ++ ++#if 0 ++ fprintf(stderr, " %p: %s potential spurious end\n", gem->bkwd, gxf_name[d]); ++#endif ++ /* the end may be a spurious entry */ ++ ++ gex = 0; /* the extremum closest to the end - to be found */ ++ for(gei = gem->bkwd->bkwd; gei != ges->bkwd; gei = gei->bkwd) { ++ if(X_FRAG(gei)->flags & GEXFF_EXTR) { ++ gex = gei; ++ break; ++ } ++ } ++ if(gex == 0) ++ gex = ges; ++ ++ good = 1; /* assume that gem->bkwd is not spurious */ ++ /* gei goes backwards, gex goes forwards from the extremum */ ++ gei = gex; ++ /* i is the symmetry axis, j is the other axis (X=0 Y=1) */ ++ i = (gex->ix3 != gex->bkwd->ix3); ++ j = !i; ++ for( ; gei!=ges->bkwd && gex!=gem->bkwd; gei=gei->bkwd, gex=gex->frwd) { ++ if( gei->bkwd->ipoints[i][2] != gex->ipoints[i][2] ++ || gei->bkwd->ipoints[j][2] - gei->ipoints[j][2] ++ != gex->bkwd->ipoints[j][2] - gex->ipoints[j][2] ++ ) { ++ good = 0; /* no symmetry - must be spurious */ ++#if 0 ++ fprintf(stderr, " M(%p,%p)(%d %d,%d)(%d %d,%d)", ++ gei, gex, ++ i, gei->bkwd->ipoints[i][2], gex->ipoints[i][2], ++ j, gei->bkwd->ipoints[j][2] - gei->ipoints[j][2], ++ gex->bkwd->ipoints[j][2] - gex->ipoints[j][2] ); ++#endif ++ break; ++ } ++ } ++ if(gei == ges->bkwd) { /* oops, the other side is too short */ ++ good = 0; ++#if 0 ++ fprintf(stderr, " X"); ++#endif ++ } ++ if(good && gex == gem->bkwd) { ++ if( isign(gei->bkwd->ipoints[j][2] - gei->ipoints[j][2]) ++ != isign(gex->bkwd->ipoints[j][2] - gex->ipoints[j][2]) ) { ++ good = 0; /* oops, goes into another direction */ ++#if 0 ++ fprintf(stderr, " D"); ++#endif ++ } ++ } ++ if(!good) { /* it is spurious, drop it */ ++#if 0 ++ fprintf(stderr, " %p: %s spurious end\n", gem->bkwd, gxf_name[d]); ++#endif ++ X_FRAG(ges)->len[d] = --len; ++ } ++ } ++ if(len < 4) { ++ X_FRAG(ges)->len[d] = 0; ++#if 0 ++ fprintf(stderr, " %p: %s frag discarded, too small now\n", ge, gxf_name[d]); ++#endif ++ } ++ if(ges != ge) { ++ if(ges == cge->next) ++ break; /* went around the loop */ ++ else { ++ ge = ges->frwd; /* don't look at this fragment twice */ ++ continue; ++ } ++ } ++ } ++ ++ ge = ge->frwd; ++ } while(ge != cge->next); ++ } ++ ++ /* Find the straight line fragments. ++ * Even though the lines are sloped, they are called ++ * "vertical" or "horizontal" according to their longer ++ * dimension. All the steps in the shother dimension must ++ * be 1 pixel long, all the steps in the longer dimension ++ * must be within the difference of 1 pixel. ++ */ ++ for(d = GEXFI_LINE; d<= GEXFI_EXACTLINE; d++) { ++ ge = cge->next; ++ pge = ge->bkwd; /* the beginning of the fragment */ ++ count = 1; ++ delaystop = 0; ++ do { ++ int h; ++ ++ stepmore = 0; ++ hdir = isign(ge->ix3 - ge->bkwd->ix3); ++ vdir = isign(ge->iy3 - ge->bkwd->iy3); ++ vert = (hdir == 0); ++ if(count==1) { ++ /* at this point pge==ge->bkwd */ ++ /* account for the previous gentry, which was !vert */ ++ if(!vert) { /* prev was vertical */ ++ maxlen[0] = minlen[0] = 0; ++ maxlen[1] = minlen[1] = abs(pge->iy3 - pge->bkwd->iy3); ++ line[0] = (maxlen[1] == 1); ++ line[1] = 1; ++ fullhdir = hdir; ++ fullvdir = isign(pge->iy3 - pge->bkwd->iy3); ++ } else { ++ maxlen[0] = minlen[0] = abs(pge->ix3 - pge->bkwd->ix3); ++ maxlen[1] = minlen[1] = 0; ++ line[0] = 1; ++ line[1] = (maxlen[0] == 1); ++ fullhdir = isign(pge->ix3 - pge->bkwd->ix3); ++ fullvdir = vdir; ++ } ++ } ++ h = line[0]; /* remember the prevalent direction */ ++#if 0 ++ fprintf(stderr, " %p: v=%d(%d) h=%d(%d) vl(%d,%d,%d) hl=(%d,%d,%d) %s count=%d ", ++ ge, vdir, fullvdir, hdir, fullhdir, ++ line[1], minlen[1], maxlen[1], ++ line[0], minlen[0], maxlen[0], ++ gxf_name[d], count); ++#endif ++ if(vert) { ++ if(vdir != fullvdir) ++ line[0] = line[1] = 0; ++ len = abs(ge->iy3 - ge->bkwd->iy3); ++ } else { ++ if(hdir != fullhdir) ++ line[0] = line[1] = 0; ++ len = abs(ge->ix3 - ge->bkwd->ix3); ++ } ++#if 0 ++ fprintf(stderr, "len=%d\n", len); ++#endif ++ if(len != 1) /* this is not a continuation in the short dimension */ ++ line[!vert] = 0; ++ ++ /* can it be a continuation in the long dimension ? */ ++ if( line[vert] ) { ++ if(maxlen[vert]==0) ++ maxlen[vert] = minlen[vert] = len; ++ else if(maxlen[vert]==minlen[vert]) { ++ if(d == GEXFI_EXACTLINE) { ++ if(len != maxlen[vert]) ++ line[vert] = 0; /* it can't */ ++ } else if(len < maxlen[vert]) { ++ if(len < minlen[vert]-1) ++ line[vert] = 0; /* it can't */ ++ else ++ minlen[vert] = len; ++ } else { ++ if(len > maxlen[vert]+1) ++ line[vert] = 0; /* it can't */ ++ else ++ maxlen[vert] = len; ++ } ++ } else if(len < minlen[vert] || len > maxlen[vert]) ++ line[vert] = 0; /* it can't */ ++ } ++ ++ if(line[0] == 0 && line[1] == 0) { ++#if 0 ++ if(count >= 3) ++ fprintf(stderr, " %s frag %p-%p count=%d\n", gxf_name[d], pge, ge->bkwd, count); ++#endif ++ X_FRAG(pge)->len[d] = count; ++ if(d == GEXFI_EXACTLINE && h) { ++ X_FRAG(pge)->flags |= GEXFF_HLINE; ++ } ++ if(count == 1) ++ pge = ge; ++ else { ++ stepmore = 1; /* may reconsider the 1st gentry */ ++ pge = ge = ge->bkwd; ++ count = 1; ++ } ++ } else ++ count++; ++ ++ ge = ge->frwd; ++ if(ge == cge->next && !stepmore) ++ delaystop = 1; /* consider the first gentry again */ ++ } while(stepmore || ge != cge->next ^ delaystop); ++ /* see if there is an unfinished line left */ ++ if(count != 1) { ++#if 0 ++ if(count >= 3) ++ fprintf(stderr, " %s frag %p-%p count=%d\n", gxf_name[d], pge, ge->bkwd, count); ++#endif ++ X_FRAG(ge->bkwd->bkwd)->len[d] = 0; ++ X_FRAG(pge)->len[d] = count; ++ } ++ } ++ ++ /* do postprocessing of the lines */ ++#if 0 ++ fprintf(stderr, "Line postprocessing\n"); ++ gex_dump_contour(cge->next, clen); ++#endif ++ ++ /* the non-exact line frags are related to exact line frags sort ++ * of like to individual gentries: two kinds of exact frags ++ * must be interleaved, with one kind having the size of 3 ++ * and the other kind having the size varying within +-2. ++ */ ++ ++ ge = cge->next; ++ do { ++ GEX_FRAG *pf, *lastf1, *lastf2; ++ int len1, len2, fraglen; ++ ++ f = X_FRAG(ge); ++ ++ fraglen = f->len[GEXFI_LINE]; ++ if(fraglen >= 4) { ++ ++ vert = 0; /* vert is a pseudo-directon */ ++ line[0] = line[1] = 1; ++ maxlen[0] = minlen[0] = maxlen[1] = minlen[1] = 0; ++ lastf2 = lastf1 = f; ++ len2 = len1 = 0; ++ for(pge = ge, i = 1; i < fraglen; i++, pge=pge->frwd) { ++ pf = X_FRAG(pge); ++ len = pf->len[GEXFI_EXACTLINE]; ++#if 0 ++ fprintf(stderr, " pge=%p i=%d of %d ge=%p exLen=%d\n", pge, i, ++ f->len[GEXFI_LINE], ge, len); ++#endif ++ len1++; len2++; ++ if(len==0) { ++ continue; ++ } ++ vert = !vert; /* alternate the pseudo-direction */ ++ if(len > 3) ++ line[!vert] = 0; ++ if(maxlen[vert] == 0) ++ maxlen[vert] = minlen[vert] = len; ++ else if(maxlen[vert]-2 >= len && minlen[vert]+2 <= len) { ++ if(len > maxlen[vert]) ++ maxlen[vert] = len; ++ else if(len < minlen[vert]) ++ minlen[vert] = len; ++ } else ++ line[vert] = 0; ++ if(line[0] == 0 && line[1] == 0) { ++#if 0 ++ fprintf(stderr, " Line breaks at %p %c(%d, %d) %c(%d, %d) len=%d fl=%d l2=%d l1=%d\n", ++ pge, (!vert)?'*':' ', minlen[0], maxlen[0], ++ vert?'*':' ', minlen[1], maxlen[1], len, fraglen, len2, len1); ++#endif ++ if(lastf2 != lastf1) { ++ lastf2->len[GEXFI_LINE] = len2-len1; ++ } ++ lastf1->len[GEXFI_LINE] = len1+1; ++ pf->len[GEXFI_LINE] = fraglen+1 - i; ++#if 0 ++ gex_dump_contour(pge, clen); ++#endif ++ ++ /* continue with the line */ ++ vert = 0; /* vert is a pseudo-directon */ ++ line[0] = line[1] = 1; ++ maxlen[0] = minlen[0] = maxlen[1] = minlen[1] = 0; ++ lastf2 = lastf1 = f; ++ len2 = len1 = 0; ++ } else { ++ lastf1 = pf; ++ len1 = 0; ++ } ++ } ++ } ++ ++ ge = ge->frwd; ++ } while(ge != cge->next); ++#if 0 ++ fprintf(stderr, "Line postprocessing part 2\n"); ++ gex_dump_contour(cge->next, clen); ++#endif ++ ++ ge = cge->next; ++ do { ++ f = X_FRAG(ge); ++ ++ if(f->len[GEXFI_LINE] >= 4) { ++ len = f->len[GEXFI_EXACTLINE]; ++ /* if a non-exact line covers precisely two exact lines, ++ * split it ++ */ ++ if(len > 0 && f->len[GEXFI_LINE] >= len+1) { ++ GEX_FRAG *pf; ++ pge = age[(f->aidx + len - 1)%clen]; /* last gentry of exact line */ ++ pf = X_FRAG(pge); ++ if(f->len[GEXFI_LINE] + 1 == len + pf->len[GEXFI_EXACTLINE]) { ++ f->len[GEXFI_LINE] = len; ++ f->flags |= GEXFF_SPLIT; ++ pf->len[GEXFI_LINE] = pf->len[GEXFI_EXACTLINE]; ++ pf->flags |= GEXFF_SPLIT; ++ } ++ } ++ } ++ ++ ge = ge->frwd; ++ } while(ge != cge->next); ++#if 0 ++ fprintf(stderr, "Line postprocessing part 2a\n"); ++ gex_dump_contour(cge->next, clen); ++#endif ++ ge = cge->next; ++ do { ++ f = X_FRAG(ge); ++ ++ /* too small lines are of no interest */ ++ if( (f->flags & GEXFF_SPLIT)==0 && f->len[GEXFI_LINE] < 4) ++ f->len[GEXFI_LINE] = 0; ++ ++ len = f->len[GEXFI_EXACTLINE]; ++ /* too small exact lines are of no interest */ ++ if(len < 3) /* exact lines may be shorter */ ++ f->len[GEXFI_EXACTLINE] = 0; ++ /* get rid of inexact additions to the end of the exact lines */ ++ else if(f->len[GEXFI_LINE] == len+1) ++ f->len[GEXFI_LINE] = len; ++ /* same at the beginning */ ++ else { ++ int diff = X_FRAG(ge->bkwd)->len[GEXFI_LINE] - len; ++ ++ if(diff == 1 || diff == 2) { ++ X_FRAG(ge->bkwd)->len[GEXFI_LINE] = 0; ++ f->len[GEXFI_LINE] = len; ++ } ++ } ++ ++ ge = ge->frwd; ++ } while(ge != cge->next); ++#if 0 ++ fprintf(stderr, "Line postprocessing is completed\n"); ++ gex_dump_contour(cge->next, clen); ++#endif ++ ++ gex_calc_lenback(cge->next, clen); /* prepare data */ ++ ++ /* resolve conflicts between lines and curves */ ++ ++ /* ++ * the short (3-gentry) curve frags must have one of the ends ++ * coinciding with another curve frag of the same type ++ */ ++ ++ for(d = GEXFI_CONVEX; d<= GEXFI_CONCAVE; d++) { ++ ge = cge->next; ++ do { ++ f = X_FRAG(ge); ++ ++ if(f->len[d] == 3) { ++ pge = age[(f->aidx + 2)%clen]; /* last gentry of this frag */ ++ if(f->lenback[d] == 0 && X_FRAG(pge)->len[d] == 0) { ++ fprintf(stderr, " discarded small %s at %p-%p\n", gxf_name[d], ge, pge); ++ f->len[d] = 0; ++ X_FRAG(ge->frwd)->lenback[d] = 0; ++ X_FRAG(ge->frwd->frwd)->lenback[d] = 0; ++ } ++ } ++ ge = ge->frwd; ++ } while(ge != cge->next); ++ } ++ ++ /* the serifs take priority over everything else */ ++ ge = cge->next; ++ do { ++ f = X_FRAG(ge); ++ ++ len = f->len[GEXFI_SERIF]; ++ if(len == 0) ++ continue; ++ ++ if(len != 2) { /* this is used in the code below */ ++ fprintf(stderr, "Internal error at %s line %d: serif frags len is %d\n", ++ __FILE__, __LINE__, len); ++ exit(1); ++ } ++ ++ for(d = 0; d < GEXFI_SERIF; d++) { ++ /* serifs may not have common ends with the other fragments, ++ * this is expressed as extending them by 1 gentry on each side ++ */ ++ frag_subtract(g, age, clen, ge->bkwd, len+2, d); ++ } ++ } while( (ge = ge->frwd) != cge->next); ++ ++ /* ++ * longer exact lines take priority over curves; shorter lines ++ * and inexact lines are resolved with convex/concave conflicts ++ */ ++ ge = cge->next; ++ do { ++ f = X_FRAG(ge); ++ ++ len = f->len[GEXFI_EXACTLINE]; ++ ++ if(len < 6) { /* line is short */ ++ ge = ge->frwd; ++ continue; ++ } ++ ++ fprintf(stderr, " line at %p len=%d\n", ge, f->len[GEXFI_EXACTLINE]); ++ for(d = GEXFI_CONVEX; d<= GEXFI_CONCAVE; d++) { ++ frag_subtract(g, age, clen, ge, len, d); ++ } ++ ++ ge = ge->frwd; ++ } while(ge != cge->next); ++ ++ /* ++ * The exact lines take priority over curves that coincide ++ * with them or extend by only one gentry on either side ++ * (but not both sides). By this time it applies only to the ++ * small exact lines. ++ * ++ * An interesting general case is when a curve matches more ++ * than one exact line going diamond-like. ++ */ ++ ++ ge = cge->next; ++ do { ++ int done, len2; ++ int sharpness; ++ GEX_FRAG *pf; ++ ++ f = X_FRAG(ge); ++ ++ /* "sharpness" shows how a group of exact line frags is connected: if the gentries ++ * of some of them overlap, the curve matching requirement is loosened: it may ++ * extend up to 1 gentry beyond each end of the group of exact line frags ++ * (sharpness=2); otherwise it may extend to only one end (sharpness=1) ++ */ ++ sharpness = 1; ++ ++ len = f->len[GEXFI_EXACTLINE]; ++ if(len >= 4) { ++ while(len < clen) { ++ done = 0; ++ pf = X_FRAG(ge->bkwd); ++ for(d = GEXFI_CONVEX; d<= GEXFI_CONCAVE; d++) { ++ if(f->len[d] == len || f->len[d] == len+1) { ++ ++ fprintf(stderr, " removed %s frag at %p len=%d linelen=%d\n", ++ gxf_name[d], ge, f->len[d], len); ++ pge = ge->frwd; ++ for(i = f->len[d]; i > 1; i--, pge = pge->frwd) ++ X_FRAG(pge)->lenback[d] = 0; ++ f->len[d] = 0; ++ gex_dump_contour(ge, clen); ++ done = 1; ++ } else if(pf->len[d] == len+1 || pf->len[d] == len+sharpness) { ++ fprintf(stderr, " removed %s frag at %p len=%d next linelen=%d\n", ++ gxf_name[d], ge->bkwd, pf->len[d], len); ++ pge = ge; ++ for(i = pf->len[d]; i > 1; i--, pge = pge->frwd) ++ X_FRAG(pge)->lenback[d] = 0; ++ pf->len[d] = 0; ++ gex_dump_contour(ge, clen); ++ done = 1; ++ } ++ } ++ if(done) ++ break; ++ ++ /* is there any chance to match a sequence of exect lines ? */ ++ if(f->len[GEXFI_CONVEX] < len && f->len[GEXFI_CONCAVE] < len ++ && pf->len[GEXFI_CONVEX] < len && pf->len[GEXFI_CONCAVE] < len) ++ break; ++ ++ done = 1; ++ /* check whether the line is connected to another exact line at an extremum */ ++ pge = age[(f->aidx + len - 1)%clen]; /* last gentry of exact line */ ++ len2 = X_FRAG(pge)->len[GEXFI_EXACTLINE]; ++ if(len2 > 0) { ++ if( len2 >= 4 && (X_FRAG(pge)->flags & GEXFF_EXTR) ) { ++ len += len2 - 1; ++ sharpness = 2; ++ done = 0; ++ } ++ } else { ++ /* see if the extremum is between two exact lines */ ++ pge = pge->frwd; ++ if(X_FRAG(pge)->flags & GEXFF_EXTR) { ++ pge = pge->frwd; ++ len2 = X_FRAG(pge)->len[GEXFI_EXACTLINE]; ++ if(len2 >= 4) { ++ len += len2 + 1; ++ done = 0; ++ } ++ } ++ } ++ if(done) ++ break; ++ } ++ } ++ ++ ge = ge->frwd; ++ } while(ge != cge->next); ++ ++ /* ++ * The lines may cover only whole curves (or otherwise empty space), ++ * so cut them where they overlap parts of the curves. If 2 or less ++ * gentries are left in the line, remove the line. ++ * If a line and a curve fully coincide, remove the line. Otherwise ++ * remove the curves that are completely covered by the lines. ++ */ ++ ++ ge = cge->next; ++ do { ++ f = X_FRAG(ge); ++ ++ reconsider_line: ++ len = f->len[GEXFI_LINE]; ++ ++ if(len == 0) { ++ ge = ge->frwd; ++ continue; ++ } ++ ++ if(f->len[GEXFI_CONVEX] >= len ++ || f->len[GEXFI_CONCAVE] >= len) { ++ line_completely_covered: ++ fprintf(stderr, " removed covered Line frag at %p len=%d\n", ++ ge, len); ++ f->len[GEXFI_LINE] = 0; ++ for(pge = ge->frwd; len > 1; len--, pge = pge->frwd) ++ X_FRAG(pge)->lenback[GEXFI_LINE] = 0; ++ gex_dump_contour(ge, clen); ++ ge = ge->frwd; ++ continue; ++ } ++ ++ k1 = 0; /* how much to cut at the front */ ++ for(d = GEXFI_CONVEX; d<= GEXFI_CONCAVE; d++) { ++ if(f->lenback[d]) { ++ pge = age[(f->aidx + clen - f->lenback[d])%clen]; ++ i = X_FRAG(pge)->len[d] - f->lenback[d] - 1; ++ if(i > k1) ++ k1 = i; ++ } ++ } ++ ++ k2 = 0; /* how much to cut at the end */ ++ pge = age[(f->aidx + len)%clen]; /* gentry after the end */ ++ for(d = GEXFI_CONVEX; d<= GEXFI_CONCAVE; d++) { ++ i = X_FRAG(pge)->lenback[d] - 1; ++ if(i > k2) ++ k2 = i; ++ } ++ ++ if(k1+k2 > 0 && k1+k2 >= len-3) { ++ fprintf(stderr, " k1=%d k2=%d\n", k1, k2); ++ goto line_completely_covered; ++ } ++ ++ ++ if(k2 != 0) { /* cut the end */ ++ len -= k2; ++ f->len[GEXFI_LINE] = len; ++ /* pge still points after the end */ ++ for(i = k2, pge = pge->bkwd; i > 0; i--, pge = pge->bkwd) ++ X_FRAG(pge)->lenback[GEXFI_LINE] = 0; ++ } ++ if(k1 != 0) { /* cut the beginning */ ++ len -= k1; ++ f->len[GEXFI_LINE] = 0; ++ for(i = 1, pge = ge->frwd; i < k1; i++, pge = pge->frwd) ++ X_FRAG(pge)->lenback[GEXFI_LINE] = 0; ++ X_FRAG(pge)->len[GEXFI_LINE] = len; ++ for(i = 0; i < len; i++, pge = pge->frwd) ++ X_FRAG(pge)->lenback[GEXFI_LINE] = i; ++ } ++ if(k1 != 0 || k2 != 0) { ++ fprintf(stderr, " cut Line frag at %p by (%d,%d) to len=%d\n", ++ ge, k1, k2, len); ++ gex_dump_contour(ge, clen); ++ ++ goto reconsider_line; /* the line may have to be cut again */ ++ } ++ pge = age[(f->aidx + k1)%clen]; /* new beginning */ ++ good = 1; /* flag: no need do do a debugging dump */ ++ for(i=1; ifrwd) ++ for(d = GEXFI_CONVEX; d<= GEXFI_CONCAVE; d++) { ++ if(X_FRAG(pge)->len[d]) { ++ fprintf(stderr, " removed %s frag at %p len=%d covered by line\n", ++ gxf_name[d], pge, X_FRAG(pge)->len[d], len); ++ good = 0; ++ } ++ X_FRAG(pge)->len[d] = 0; ++ } ++ pge = age[(f->aidx + k1 + 1)%clen]; /* next after new beginning */ ++ for(i=1; ifrwd) ++ for(d = GEXFI_CONVEX; d<= GEXFI_CONCAVE; d++) ++ X_FRAG(pge)->lenback[d] = 0; ++ if(!good) ++ gex_dump_contour(ge, clen); ++ ++ ge = ge->frwd; ++ } while(ge != cge->next); ++ ++ /* Resolve conflicts between curves */ ++ for(d = GEXFI_CONVEX; d<= GEXFI_CONCAVE; d++) { ++ dx = (GEXFI_CONVEX + GEXFI_CONCAVE) - d; /* the other type */ ++ ge = cge->next; ++ do { ++ GENTRY *sge; ++ ++ f = X_FRAG(ge); ++ len = f->len[d]; ++ if(len < 2) { ++ ge = ge->frwd; ++ continue; ++ } ++ sge = ge; /* the start of fragment */ ++ ++ i = f->len[dx]; ++ if(i != 0) { /* two curved frags starting here */ ++ /* should be i!=len because otherwise they would be ++ * covered by an exact line ++ */ ++ if(i > len) { ++ curve_completely_covered: ++ /* remove the convex frag */ ++ fprintf(stderr, " removed %s frag at %p len=%d covered by %s\n", ++ gxf_name[d], ge, len, gxf_name[dx]); ++ f->len[d] = 0; ++ for(pge = ge->frwd, j = 1; j < len; j++, pge = pge->frwd) ++ X_FRAG(pge)->lenback[d] = 0; ++ gex_dump_contour(ge, clen); ++ ++ ge = ge->frwd; /* the frag is gone, nothing more to do */ ++ continue; ++ } else { ++ /* remove the concave frag */ ++ fprintf(stderr, " removed %s frag at %p len=%d covered by %s\n", ++ gxf_name[dx], ge, i, gxf_name[d]); ++ f->len[dx] = 0; ++ for(pge = ge->frwd, j = 1; j < i; j++, pge = pge->frwd) ++ X_FRAG(pge)->lenback[dx] = 0; ++ gex_dump_contour(ge, clen); ++ } ++ } ++ ++ ++ k1 = X_FRAG(ge->frwd)->lenback[dx]; ++ if(k1 != 0) { /* conflict at the front */ ++ GENTRY *gels, *gele, *gei; ++ ++ pge = age[(f->aidx + clen - (k1-1))%clen]; /* first gentry of concave frag */ ++ k2 = X_FRAG(pge)->len[dx]; /* its length */ ++ ++ i = k2 - (k1-1); /* amount of overlap */ ++ if(i > len) ++ i = len; ++ /* i >= 2 by definition */ ++ if(i >= k2-1) { /* covers the other frag - maybe with 1 gentry showing */ ++ fprintf(stderr, " removed %s frag at %p len=%d covered by %s\n", ++ gxf_name[dx], pge, k2, gxf_name[d]); ++ X_FRAG(pge)->len[dx] = 0; ++ for(pge = pge->frwd, j = 1; j < k2; j++, pge = pge->frwd) ++ X_FRAG(pge)->lenback[dx] = 0; ++ if(i >= len-1) { /* covers our frag too - maybe with 1 gentry showing */ ++ /* our frag will be removed as well, prepare a line to replace it */ ++ gels = ge; ++ gele = age[(f->aidx + i - 1)%clen]; ++ fprintf(stderr, " new Line frag at %p-%p len=%d\n", gels, gele, i); ++ X_FRAG(gels)->len[GEXFI_LINE] = i; ++ for(gei = gels->frwd, j = 1; j < i; gei = gei->frwd, j++) ++ X_FRAG(gei)->lenback[GEXFI_LINE] = j; ++ } else { ++ gex_dump_contour(ge, clen); ++ ge = ge->frwd; ++ continue; ++ } ++ } ++ if(i >= len-1) /* covers our frag - maybe with 1 gentry showing */ ++ goto curve_completely_covered; ++ ++ /* XXX need to do something better for the case when a curve frag ++ * is actually nothing but an artifact of two other curves of ++ * the opposite type touching each other, like on the back of "3" ++ */ ++ ++ /* change the overlapping part to a line */ ++ gels = ge; ++ gele = age[(f->aidx + i - 1)%clen]; ++ /* give preference to local extremums */ ++ if(X_FRAG(gels)->flags & GEXFF_EXTR) { ++ gels = gels->frwd; ++ i--; ++ } ++ if(X_FRAG(gele)->flags & GEXFF_EXTR) { ++ gele = gele->bkwd; ++ i--; ++ } ++ if(gels->bkwd == gele) { ++ /* Oops the line became negative. Probably should ++ * never happen but I can't think of any formal reasoning ++ * leading to that, so check just in case. Restore ++ * the previous state. ++ */ ++ gels = gele; gele = gels->frwd; i = 2; ++ } ++ ++ j = X_FRAG(gels)->lenback[dx] + 1; /* new length */ ++ if(j != k2) { ++ X_FRAG(pge)->len[dx] = j; ++ fprintf(stderr, " cut %s frag at %p len=%d to %p len=%d end overlap with %s\n", ++ gxf_name[dx], pge, k2, gels, j, gxf_name[d]); ++ for(gei = gels->frwd; j < k2; gei = gei->frwd, j++) ++ X_FRAG(gei)->lenback[dx] = 0; ++ } ++ ++ if(gele != ge) { ++ sge = gele; ++ f->len[d] = 0; ++ fprintf(stderr, " cut %s frag at %p len=%d ", gxf_name[d], ge, len); ++ len--; ++ for(gei = ge->frwd; gei != gele; gei = gei->frwd, len--) ++ X_FRAG(gei)->lenback[d] = 0; ++ X_FRAG(gele)->len[d] = len; ++ X_FRAG(gele)->lenback[d] = 0; ++ fprintf(stderr, "to %p len=%d start overlap with %s\n", ++ sge, len, gxf_name[dx]); ++ for(gei = gei->frwd, j = 1; j < len; gei = gei->frwd, j++) ++ X_FRAG(gei)->lenback[d] = j; ++ ++ } ++ if(i > 1) { ++ fprintf(stderr, " new Line frag at %p-%p len=%d\n", gels, gele, i); ++ X_FRAG(gels)->len[GEXFI_LINE] = i; ++ for(gei = gels->frwd, j = 1; j < i; gei = gei->frwd, j++) ++ X_FRAG(gei)->lenback[GEXFI_LINE] = j; ++ } ++ gex_dump_contour(ge, clen); ++ } ++ ++ ge = ge->frwd; ++ } while(ge != cge->next); ++ } ++ ++ /* ++ * Assert that there are no conflicts any more and ++ * for each gentry find the fragment types that start ++ * and continue here. ++ */ ++ ge = cge->next; ++ do { ++ f = X_FRAG(ge); ++ dx = GEXFI_NONE; /* type that starts here */ ++ dy = GEXFI_NONE; /* type that goes through here */ ++ /* GEXFI_EXACTLINE and GEXFI_SERIF are auxiliary and don't ++ * generate any actual lines/curves in the result ++ */ ++ for(d = GEXFI_CONVEX; d<= GEXFI_LINE; d++) { ++ if(f->len[d]) { ++ if(dx >= 0) { ++ fprintf(stderr, "**** Internal error in vectorization\n"); ++ fprintf(stderr, "CONFLICT in %s at %p between %s and %s\n", ++ g->name, ge, gxf_name[dx], gxf_name[d]); ++ dumppaths(g, cge->next, cge->next->bkwd); ++ gex_dump_contour(ge, clen); ++ exit(1); ++ } ++ dx = d; ++ } ++ if(f->lenback[d]) { ++ if(dy >= 0) { ++ fprintf(stderr, "**** Internal error in vectorization\n"); ++ fprintf(stderr, "CONFLICT in %s at %p between %s and %s\n", ++ g->name, ge, gxf_name[dy], gxf_name[d]); ++ dumppaths(g, cge->next, cge->next->bkwd); ++ gex_dump_contour(ge, clen); ++ exit(1); ++ } ++ dy = d; ++ } ++ } ++ f->ixstart = dx; ++ f->ixcont = dy; ++ ge = ge->frwd; ++ } while(ge != cge->next); ++ ++ /* ++ * make sure that the contour does not start in the ++ * middle of a fragment ++ */ ++ ge = cge->next; /* old start of the contour */ ++ f = X_FRAG(ge); ++ if(f->ixstart == GEXFI_NONE && f->ixcont != GEXFI_NONE) { ++ /* oops, it's mid-fragment, move the start */ ++ GENTRY *xge; ++ ++ xge = ge->bkwd->next; /* entry following the contour */ ++ ++ /* find the first gentry of this frag */ ++ pge = age[(f->aidx + clen - f->lenback[f->ixcont])%clen]; ++ ++ ge->prev = ge->bkwd; ++ ge->bkwd->next = ge; ++ ++ cge->next = pge; ++ pge->prev = cge; ++ ++ pge->bkwd->next = xge; ++ if(xge) ++ xge->prev = pge->bkwd; ++ ++ cge->ix3 = pge->bkwd->ix3; cge->iy3 = pge->bkwd->iy3; ++ } ++ ++ /* vectorize each fragment separately ++ * make 2 passes: first handle the straight lines, then ++ * the curves to allow the curver to be connected smoothly ++ * to the straights ++ */ ++ ge = cge->next; ++ do { /* pass 1 */ ++ f = X_FRAG(ge); ++ switch(f->ixstart) { ++ case GEXFI_LINE: ++ len = f->len[GEXFI_LINE]; ++ pge = age[(f->aidx + len - 1)%clen]; /* last gentry */ ++ ++ if(ge->iy3 == ge->bkwd->iy3) { /* frag starts and ends horizontally */ ++ k1 = 1/*Y*/ ; /* across the direction of start */ ++ k2 = 0/*X*/ ; /* along the direction of start */ ++ } else { /* frag starts and ends vertically */ ++ k1 = 0/*X*/ ; /* across the direction of start */ ++ k2 = 1/*Y*/ ; /* along the direction of start */ ++ } ++ ++ if(len % 2) { ++ /* odd number of entries in the frag */ ++ double halfstep, halfend; ++ ++ f->vect[0][k1] = fscale * ge->ipoints[k1][2]; ++ f->vect[3][k1] = fscale * pge->ipoints[k1][2]; ++ ++ halfstep = (pge->ipoints[k2][2] - ge->bkwd->ipoints[k2][2]) ++ * 0.5 / ((len+1)/2); ++ if(f->ixcont != GEXFI_NONE) { ++ halfend = (ge->ipoints[k2][2] - ge->bkwd->ipoints[k2][2]) * 0.5; ++ if(fabs(halfstep) < fabs(halfend)) /* must be at least half gentry away */ ++ halfstep = halfend; ++ } ++ if(X_FRAG(pge)->ixstart != GEXFI_NONE) { ++ halfend = (pge->ipoints[k2][2] - pge->bkwd->ipoints[k2][2]) * 0.5; ++ if(fabs(halfstep) < fabs(halfend)) /* must be at least half gentry away */ ++ halfstep = halfend; ++ } ++ f->vect[0][k2] = fscale * (ge->bkwd->ipoints[k2][2] + halfstep); ++ f->vect[3][k2] = fscale * (pge->ipoints[k2][2] - halfstep); ++ } else { ++ /* even number of entries */ ++ double halfstep, halfend; ++ ++ f->vect[0][k1] = fscale * ge->ipoints[k1][2]; ++ halfstep = (pge->ipoints[k2][2] - ge->bkwd->ipoints[k2][2]) ++ * 0.5 / (len/2); ++ if(f->ixcont != GEXFI_NONE) { ++ halfend = (ge->ipoints[k2][2] - ge->bkwd->ipoints[k2][2]) * 0.5; ++ if(fabs(halfstep) < fabs(halfend)) /* must be at least half gentry away */ ++ halfstep = halfend; ++ } ++ f->vect[0][k2] = fscale * (ge->bkwd->ipoints[k2][2] + halfstep); ++ ++ halfstep = (pge->ipoints[k1][2] - ge->bkwd->ipoints[k1][2]) ++ * 0.5 / (len/2); ++ if(X_FRAG(pge)->ixstart != GEXFI_NONE) { ++ halfend = (pge->ipoints[k1][2] - pge->bkwd->ipoints[k1][2]) * 0.5; ++ if(fabs(halfstep) < fabs(halfend)) /* must be at least half gentry away */ ++ halfstep = halfend; ++ } ++ f->vect[3][k1] = fscale * (pge->ipoints[k1][2] - halfstep); ++ f->vect[3][k2] = fscale * pge->ipoints[k2][2]; ++ } ++ f->vectlen = len; ++ f->flags |= GEXFF_DRAWLINE; ++ break; ++ } ++ } while((ge = ge->frwd) != cge->next); ++ ++ ge = cge->next; ++ do { /* pass 2 */ ++ /* data for curves */ ++ GENTRY *firstge, *lastge, *gef, *gel, *gei, *gex; ++ GENTRY *ordhd; /* head of the order list */ ++ GENTRY **ordlast; ++ int nsub; /* number of subfrags */ ++ GEX_FRAG *ff, *lf, *xf; ++ ++ f = X_FRAG(ge); ++ switch(f->ixstart) { ++ case GEXFI_CONVEX: ++ case GEXFI_CONCAVE: ++ len = f->len[f->ixstart]; ++ firstge = ge; ++ lastge = age[(f->aidx + len - 1)%clen]; /* last gentry */ ++ ++ nsub = 0; ++ gex = firstge; ++ xf = X_FRAG(gex); ++ xf->prevsub = 0; ++ xf->sublen = 1; ++ xf->flags &= ~GEXFF_DONE; ++ for(gei = firstge->frwd; gei != lastge; gei = gei->frwd) { ++ xf->sublen++; ++ if(X_FRAG(gei)->flags & GEXFF_EXTR) { ++ xf->nextsub = gei; ++ for(i=0; i<2; i++) ++ xf->bbox[i] = abs(gei->ipoints[i][2] - gex->bkwd->ipoints[i][2]); ++ nsub++; ++ xf = X_FRAG(gei); ++ xf->prevsub = gex; ++ xf->sublen = 1; ++ xf->flags &= ~GEXFF_DONE; ++ gex = gei; ++ } ++ } ++ xf->sublen++; ++ xf->nextsub = gei; ++ for(i=0; i<2; i++) ++ xf->bbox[i] = abs(gei->ipoints[i][2] - gex->bkwd->ipoints[i][2]); ++ nsub++; ++ ff = xf; /* remember the beginning of the last subfrag */ ++ xf = X_FRAG(gei); ++ xf->prevsub = gex; ++ if(firstge != lastge) { ++ xf->nextsub = 0; ++ xf->sublen = 0; ++ ++ /* correct the bounding box of the last and first subfrags for ++ * intersections with other fragments ++ */ ++ if(xf->ixstart != GEXFI_NONE) { ++ /* ff points to the beginning of the last subfrag */ ++ for(i=0; i<2; i++) ++ ff->bbox[i] -= 0.5 * abs(lastge->ipoints[i][2] - lastge->bkwd->ipoints[i][2]); ++ } ++ ff = X_FRAG(firstge); ++ if(ff->ixcont != GEXFI_NONE) { ++ for(i=0; i<2; i++) ++ ff->bbox[i] -= 0.5 * abs(firstge->ipoints[i][2] - firstge->bkwd->ipoints[i][2]); ++ } ++ } ++ ++ fprintf(stderr, " %s frag %p%s nsub=%d\n", gxf_name[f->ixstart], ++ ge, (f->flags&GEXFF_CIRC)?" circular":"", nsub); ++ ++ /* find the symmetry between the subfragments */ ++ for(gef = firstge, count=0; count < nsub; gef = ff->nextsub, count++) { ++ ff = X_FRAG(gef); ++ gex = ff->nextsub; ++ xf = X_FRAG(gex); ++ gel = xf->nextsub; ++ if(gel == 0) { ++ ff->flags &= ~GEXFF_SYMNEXT; ++ break; /* not a circular frag */ ++ } ++ good = 1; /* assume that we have symmetry */ ++ /* gei goes backwards, gex goes forwards from the extremum */ ++ gei = gex; ++ /* i is the symmetry axis, j is the other axis (X=0 Y=1) */ ++ ff->symaxis = i = (gex->ix3 != gex->bkwd->ix3); ++ j = !i; ++ for( ; gei!=gef && gex!=gel; gei=gei->bkwd, gex=gex->frwd) { ++ if( gei->bkwd->ipoints[i][2] != gex->ipoints[i][2] ++ || gei->bkwd->ipoints[j][2] - gei->ipoints[j][2] ++ != gex->bkwd->ipoints[j][2] - gex->ipoints[j][2] ++ ) { ++ good = 0; /* no symmetry */ ++ break; ++ } ++ } ++ if(good) { ++ if( isign(gei->bkwd->ipoints[j][2] - gei->ipoints[j][2]) ++ != isign(gex->bkwd->ipoints[j][2] - gex->ipoints[j][2]) ) { ++ good = 0; /* oops, goes into another direction */ ++ } ++ } ++ if(good) ++ ff->flags |= GEXFF_SYMNEXT; ++ else ++ ff->flags &= ~GEXFF_SYMNEXT; ++ } ++ ++ for(gef = firstge, count=0; count < nsub; gef = ff->nextsub, count++) { ++ ff = X_FRAG(gef); ++ if((ff->flags & GEXFF_SYMNEXT)==0) { ++ ff->symxlen = 0; ++ continue; ++ } ++ gex = ff->prevsub; ++ if(gex == 0 || (X_FRAG(gex)->flags & GEXFF_SYMNEXT)==0) { ++ ff->symxlen = 0; ++ continue; ++ } ++ ff->symxlen = X_FRAG(gex)->sublen; ++ xf = X_FRAG(ff->nextsub); ++ if(xf->sublen < ff->symxlen) ++ ff->symxlen = xf->sublen; ++ } ++ ++ /* find the symmetry inside the subfragments */ ++ for(gef = firstge, count=0; count < nsub; gef = ff->nextsub, count++) { ++ ff = X_FRAG(gef); ++ ++ if(ff->sublen % 2) { ++ /* we must have an even number of gentries for diagonal symmetry */ ++ ff->symge = 0; ++ continue; ++ } ++ ++ /* gei goes forwards from the front */ ++ gei = gef->frwd; ++ /* gex goes backwards from the back */ ++ gex = ff->nextsub->bkwd; ++ ++ /* i is the direction of gei, j is the direction of gex */ ++ i = (gei->iy3 != gei->bkwd->iy3); ++ j = !i; ++ for( ; gei->bkwd != gex; gei=gei->frwd, gex=gex->bkwd) { ++ if( abs(gei->bkwd->ipoints[i][2] - gei->ipoints[i][2]) ++ != abs(gex->bkwd->ipoints[j][2] - gex->ipoints[j][2]) ) ++ break; /* no symmetry */ ++ i = j; ++ j = !j; ++ } ++ if(gei->bkwd == gex) ++ ff->symge = gex; ++ else ++ ff->symge = 0; /* no symmetry */ ++ } ++ ++ /* find the order of calculation: ++ * prefer to start from long fragments that have the longest ++ * neighbours symmetric with them, with all being equal prefer ++ * the fragments that have smaller physical size ++ */ ++ ordhd = 0; ++ for(gef = firstge, count=0; count < nsub; gef = ff->nextsub, count++) { ++ ff = X_FRAG(gef); ++ ++ for(ordlast = &ordhd; *ordlast != 0; ordlast = &xf->ordersub) { ++ xf = X_FRAG(*ordlast); ++ if(ff->sublen > xf->sublen) ++ break; ++ if(ff->sublen < xf->sublen) ++ continue; ++ if(ff->symxlen > xf->symxlen) ++ break; ++ if(ff->symxlen < xf->symxlen) ++ continue; ++ if(ff->bbox[0] < xf->bbox[0] || ff->bbox[1] < xf->bbox[1]) ++ break; ++ } ++ ++ ff->ordersub = *ordlast; ++ *ordlast = gef; ++ } ++ ++ /* vectorize the subfragments */ ++ for(gef = ordhd; gef != 0; gef = ff->ordersub) { ++ ++ /* debugging stuff */ ++ ff = X_FRAG(gef); ++ fprintf(stderr, " %p-%p bbox[%g,%g] sym=%p %s len=%d xlen=%d\n", ++ gef, ff->nextsub, ff->bbox[0], ff->bbox[1], ff->symge, ++ (ff->flags & GEXFF_SYMNEXT) ? "symnext" : "", ++ ff->sublen, ff->symxlen); ++ ++ dosubfrag(g, f->ixstart, firstge, gef, fscale); ++ } ++ ++ break; ++ } ++ } while((ge = ge->frwd) != cge->next); ++ ++ free(age); ++ ++ } ++ ++ } ++ ++ /* all the fragments are found, extract the vectorization */ ++ pge = g->entries; ++ g->entries = g->lastentry = 0; ++ g->flags |= GF_FLOAT; ++ loopge = 0; ++ skip = 0; ++ ++ for(ge = pge; ge != 0; ge = ge->next) { ++ GEX_FRAG *f, *pf; ++ ++ switch(ge->type) { ++ case GE_LINE: ++ f = X_FRAG(ge); ++ if(skip == 0) { ++ if(f->flags & (GEXFF_DRAWLINE|GEXFF_DRAWCURVE)) { ++ /* draw a line to the start point */ ++ fg_rlineto(g, f->vect[0][0], f->vect[0][1]); ++ /* draw the fragment */ ++ if(f->flags & GEXFF_DRAWCURVE) ++ fg_rrcurveto(g, ++ f->vect[1][0], f->vect[1][1], ++ f->vect[2][0], f->vect[2][1], ++ f->vect[3][0], f->vect[3][1]); ++ else ++ fg_rlineto(g, f->vect[3][0], f->vect[3][1]); ++ skip = f->vectlen - 2; ++ } else { ++ fg_rlineto(g, fscale * ge->ix3, fscale * ge->iy3); ++ } ++ } else ++ skip--; ++ break; ++ case GE_MOVE: ++ fg_rmoveto(g, -1e6, -1e6); /* will be fixed by GE_PATH */ ++ skip = 0; ++ /* remember the reference to update it later */ ++ loopge = g->lastentry; ++ break; ++ case GE_PATH: ++ /* update the first MOVE of this contour */ ++ if(loopge) { ++ loopge->fx3 = g->lastentry->fx3; ++ loopge->fy3 = g->lastentry->fy3; ++ loopge = 0; ++ } ++ g_closepath(g); ++ break; ++ } ++ } ++ for(ge = pge; ge != 0; ge = cge) { ++ cge = ge->next; ++ free(ge->ext); ++ free(ge); ++ } ++ dumppaths(g, NULL, NULL); ++ ++ /* end of vectorization logic */ ++ } else { ++ /* convert the data to float */ ++ GENTRY *ge; ++ double x, y; ++ ++ for(ge = g->entries; ge != 0; ge = ge->next) { ++ ge->flags |= GEF_FLOAT; ++ if(ge->type != GE_MOVE && ge->type != GE_LINE) ++ continue; ++ ++ x = fscale * ge->ix3; ++ y = fscale * ge->iy3; ++ ++ ge->fx3 = x; ++ ge->fy3 = y; ++ } ++ g->flags |= GF_FLOAT; ++ } ++ ++ free(hlm); free(vlm); free(amp); ++} ++ ++#if 0 ++/* print out the bitmap */ ++printbmap(bmap, xsz, ysz, xoff, yoff) ++ char *bmap; ++ int xsz, ysz, xoff, yoff; ++{ ++ int x, y; ++ ++ for(y=ysz-1; y>=0; y--) { ++ putchar( (y%10==0) ? y/10+'0' : ' ' ); ++ putchar( y%10+'0' ); ++ for(x=0; x=0; y--) { ++ for(x=0; x> 8))) ++#define ntohl(x) \ ++ ((ULONG)((((ULONG)(x) & 0x000000ffU) << 24) | \ ++ (((ULONG)(x) & 0x0000ff00U) << 8) | \ ++ (((ULONG)(x) & 0x00ff0000U) >> 8) | \ ++ (((ULONG)(x) & 0xff000000U) >> 24))) ++#endif +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/CHANGES.html xserver/hw/xprint/extras/ttf2pt1/CHANGES.html +--- xserver-old/hw/xprint/extras/ttf2pt1/CHANGES.html 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/CHANGES.html 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,805 @@ ++ ++ ++ ++TTF2PT1 - CHANGES history ++ ++ ++ ++

++TTF2PT1 - CHANGES history ++

++ ++ ++ ++

++3.4.4-SNAP-030526 ++

++ ++ ++New features: ++
    ++
  • Improved the auto-vectoring (-OV) alrogithm. ++
++ ++Bug fixes: ++
    ++
  • Fix to build all the features on Windows MS C++, by Tomoo Amano. ++
++ ++

++3.4.3 -- December 2, 2002 ++

++ ++ ++New features: ++
    ++
  • scripts/forceiso got an optional argument to select the ++ format of the names for glyphs without standard Latin-1 names. ++
++ ++Bug fixes: ++
    ++
  • Changed the glyph names in scripts/forceiso to match those in ttf2pt1. ++
  • Included the missing directory app/TeX. ++
++ ++

++3.4.2 -- August 30, 2002 ++

++ ++ ++New features: ++
    ++
  • New map for T2A_compat encoding (for Cyrillic LaTeX) by Mikhail ++ Umorin. ++
  • Scripts supporting font conversion for CJK-LaTeX, by Mike Fabian ++ from SuSE. ++
++ ++Bug fixes: ++
    ++
  • Explicit owner/group/permissions are used to install directories. ++
  • In scripts/convert fixed the addition of encoding name to the font ++ name for the external encoding maps, was missing "/" at the start. ++
  • Fixed the divergence between two copies of UniqueID. ++
  • Fixed the recovery after defective empty contours. ++
++ ++

++3.4.1 -- June 13, 2002 ++

++ ++ ++New features: ++
    ++
  • Added Autotrace support for the bitmap fonts (-OZ). It's horrible. ++
  • Added vectorization of bitmap fonts (-OV) - functionally the same thing as ++ autotrace but home-grown. Works mostly decently but still with large ++ space for impprovement. ++
  • Relaxed the conditions for warnings about long glyphs. ++
++ ++Bug fixes: ++
    ++
  • Fix by Rob Kolstad for a crash in the new outline smoothing ++ code (on small thin contours) and diagnostic for another crash. ++
  • Fix by Holger Huesing for a crash on degenerate contours. ++
  • Fix for bitmaps of zero dimensions. ++
  • The BDF reader does not fail on redefintion of the properties. ++
  • Fix for reading of BDF glyphs with 0 size. ++
  • Fix for a hang when guessing the boldness of some fonts. ++
  • Fix by Adriano Konzen for scaling coefficients in composite glyphs. ++
++ ++

++3.4.0 -- November 24, 2001 ++

++ ++ ++New features: ++
    ++
  • Parser for the BDF bitmap fonts. ++
  • Vastly improved the smoothing of the outlines. ++
  • The options are saved as a comment in the output file. ++
  • New script other/showdf for visual comparison of the fonts. ++
  • New option -G to select the file types to generate. ++
  • Creation of the dvips encoding files (by Rigel). ++
  • More glyphs in the Chinese maps (by Rigel). ++
  • Made the assignment of ISO8859/1 glyph names to the glyphs in the ++ fonts without PostScript names in them dependent on the original ++ encoding: no change for the 8-bit encodings, for the Unicode encoding ++ the names are assigned to the glyph with the codes 0-255 in Unicode, ++ and for the other 16-bit encodings the 8859/1 names are not assigned ++ at all. ++
++ ++Bug fixes: ++
    ++
  • Added a check for spaces in the PostScript font name in the FreeType ++ parser. ++
  • Made "-" a valid character in the glyph names. ++
  • Fixed handling of the Unicode names returned by FreeType, though ++ not perfectly. ++
  • Changed the build for FreeType-2.0.4. ++
  • Fixed the handling and printing of bad glyph names. ++
  • Fixed the bug with duplicated glyph names when more than 256 glyphs are ++ extracted from a font that has no PostScript glyph names defined. ++
  • Added ability to map a glyph to more than one code when unisng the ++ native parser (-pttf). ++
++ ++

++3.3.5 -- September 12, 2001 ++

++ ++ ++Packaged by Sergey Babkin. ++

++ ++Bug fixes: ++

    ++
  • Fixed the scaling of Ascender and Descender in the AFM file. ++
  • Fixed the brekage of "-l adobestd". ++
++ ++

++3.3.4 -- June 4, 2001 ++

++ ++ ++Packaged by Sergey Babkin. ++

++ ++New features: ++

    ++
  • Cyrillic (full set of glyphs) language tables (by Zvezdan Petkovic). ++ Now the languages "russian" and "bulgarian" are provided for compatibility ++ only, use the common language "cyrillic" instead. ++
  • More information in FONTS on using Cyrillic fonts with ++ Netscape (by Zvezdan Petkovic) ++
  • In the Netscape print filter added removal of the clipping path command: ++ otherwise Netscape tends to cut off a large piece of the rightmost column ++ of the tables. ++
  • One more script for printing from Netscape (by Zvezdan Petkovic). ++
  • Added selection of the base TTF encoding by pid/eid in the external maps. ++
  • Improved the recognition of substituted stems for intersecting contours. ++
  • Improved the substituted hints to make the horizontal positioning of ++ the points at the same height more uniform at small pixel sizes. ++
  • Made the algorithm for calculation of standard stem widths more ++ selective. ++
  • Added link to the GnuWin32 project. ++
++ ++Bug fixes: ++
    ++
  • TH: Print out metrics of un-encoded glyphs even without "-a" option. ++
  • Added missing "/" in Fontmap generation in convert (by Zvezdan Petkovic). ++
  • Removed unneccessary "\n" in messages in x2gs. ++
  • Removed the broken overoptimisation of "0 0 rmoveto". ++
  • Removed the useless warnings about multiple codes for a glyph. ++
  • Changed the FreeType2 include directory in the Makefile to match the ++ FreeType's default. ++
++ ++

++3.3.3 -- March 4, 2001 ++

++ ++ ++Packaged by Sergey Babkin. ++

++ ++New features: ++

    ++
  • TH: Added printing of front-end parser in the header of the font file. ++
  • Tested build with FreeType 2.0 Release. ++
++ ++Bug fixes: ++
    ++
  • Changed the installation script which on some versions of bash ++ copied all files into the share directory. ++
  • Fixed the close sequences of html2man comments in the HTML files, ++ now they should display correctly with lynx. ++
  • Restored the ability to include un-encoded characters into the ++ customised maps (those with codes over 255). ++
  • Fixed the Unicode mapping of the Cyrillic letters "YO" and "yo" ++ (by Yuri Shemanin). ++
  • Fixed the spurious aborts when the conversion-by-plane function ++ gets called for auto-guessing of encoding. ++
++ ++

++3.3.2 -- November 20, 2000 ++

++ ++ ++Packaged by Sergey Babkin. ++

++ ++New features: ++

    ++
  • Added generation of man pages. ++
  • Added "make install" and "make uninstall". ++
  • Added language option "-l plane". ++
  • In other/showg added better support of comparison files: ++
      ++
    • printing of the comparison file legend; ++
    • guessing of missing glyph names in a comparison file by code; ++
    • bounding boxes of all comparison files are used for page layout. ++
    ++
  • Added ability to use external t1asm instead of compiling it in. ++
  • Renamed the fonts installation guide from INSTALL*html to FONTS*html ++ to avoid confusion with installation of ttf2pt1 itself. ++
++ ++Bug fixes: ++
    ++
  • Removed erroneous extra fclose(pfa_file). ++
  • Fixed random memory corruption that manifested with crash on Linux ++ when converting fonts not containing glyph names. ++
  • Removed from the output file the comments that confused dvips. Changed ++ other/showg to work without them. ++
  • In other/showg added better checks for missing glyphs, now it ++ gives warnings about them and the output file does not crash PostScript. ++
++ ++Other: ++
    ++
  • ttf2pfa is no longer included, people interested in history ++ should look for it in the older versions. ++
++ ++

++3.3.1 -- October 22, 2000 ++

++ ++ ++Packaged by Sergey Babkin. ++

++ ++New features: ++

    ++
  • Added front-end parser based on the FreeType-2 library. See Makefile ++for build instructions. ++
  • Changed the handling of encodings to accomodate the FreeType model. ++
  • Further cleaned up the front-end parser interface. ++
++ ++Bug fixes: ++
    ++
  • Fixed a bug that caused core dump on Alpha machines. ++
  • Fixed a bug in the outline smoothing that occasionally caused core dump. ++
  • Cleaned up warnings from picky compilers ++
  • Fixed more bugs in the Windows port (by Stefan Bauer). ++
  • Fixed the RPM spec file (suggested by Brian Armstrong). ++
++

++ ++

++3.3.0 -- September 22, 2000 ++

++ ++ ++Packaged by Sergey Babkin. ++

++ ++New features: ++

    ++
  • Converted most of the outlines' processing to floating point ++arithmetic. ++
  • Added splitting of curves crossing the quadrant boundaries (no gross ++damage is done any more to the Marvosym font and others like it). ++
  • Added modular interface for front-end font parsers and option to control ++their selection at run time. ++
  • Grouped the outline processing control options into one to reduce the ++options namespace pollution. ++
  • Thomas moved the Chinese maps into a separate module, chinese-maps. ++
  • Thomas added option -V to print version number. In addition, the version ++number is put in the header of the font file. ++
  • Added long option names (suggested by Thomas). ++
  • Added support for multi-level composite glyphs. ++
  • TH: Made <fontname> command-line argument optional; default to <ttf-file> ++with suffix replaced. ++
  • In other/showg added more ways to specify glyphs and the comparison option. ++
++ ++Bug fixes: ++
    ++
  • Fixed the VC++ batch file, added batch file for Cygnus GCC on Windows. ++
  • Removed parentheses from the Version string in AFM files because it does ++not help StarOffice anyway. StarOffice 5.2 has been reported to have this ++bug fixed. Added paragraph on StarOffice in FONTS.html. ++
  • Made messages on the '?' option parameter more meaningful (by Johan Vromans). ++
  • Changed the latin1 encoding table to include the Euro sign, Z and z with ++caron (by Thomas Henlich). ++
  • Improved the smoothing code which occasionally had problems with ++joining curves. Also fixed a few minor bugs in it. ++
++ ++

++3.22 -- May 23, 2000 ++

++ ++ ++Packaged by Sergey Babkin. ++

++ ++New features: ++

    ++
  • Included windows support by Frank Siegert (somewhat amended) ++
  • Added control over verbosity of warnings. ++
  • Added arguments and initialization functions to the language ++translation routines. ++
  • Added support of planes determined by arguments to the external ++maps. ++
  • Added compact external maps format (primarily for Eastern fonts). ++
  • Added external maps for Chinese GBK and Big5 encodings (converted ++from ttf2pfb) as well as maps for other Chinese encodings by Wang Lei. ++
  • Added the idea of buckets to speed up the search in external maps. ++
  • Changed the grouping algorithm for substituted hints: now it creates ++a bit bigger files but requires smaller hint stack when being rendered. ++
  • Added maximal limit of hint stack depth, glyphs requiring bigger ++stack get generation of substituted hints disabled. This makes substituted ++hints safe to use, no more lost glyphs due to hint stack overflow. ++
  • Added the font dump program other/dumpf. ++
  • Changed the testing HTML generator other/lst.pl to use tables. ++
  • Added debugging script other/cntstems.pl to count required hint ++stack depth for the glyphs. ++
++ ++Bug fixes: ++
    ++
  • Fixed printing of UID in script/trans. Changed the auto-generated UID to ++be in range 4000000-4999999 which is reserved by Adobe for private use. ++
  • Fixed handling of "cleartomark" in built-in t1asm. ++
  • Added handling of "can't happen" case in straighten() routine ++which actually happened on strange fonts and caused failure on assertion. ++
  • Made it always include the glyph .notdef in the resulting font. ++
  • Placed the version string in AFM file in parentheses, hopefully ++that would fix the problem with StarOffice. ++
  • Improved the smoothing code which occasionally had problems with ++joining curves. ++
++ ++

++3.21 -- March 1, 2000 ++

++ ++ ++Sergey Babkin: committed the changes by Petr Titera and ++my bugfixes. ++

++ ++New features: ++

    ++
  • New Unicode map format with glyph names, by Petr Titera. ++
  • Option to force the Unicode encoding by Petr Titera ++ (I changed it to work on any MS encoding, not only Symbol). ++
  • Slightly tweaked the calculation of hints, should be better now. ++
++ ++Bug fixes: ++
    ++
  • The unicode-sample.map with description of the map formats ++ was lost in the release process, restored and enhanced. ++
  • Renamed the table ISOLatin1Encoding to Fmt3Encoding to reflect ++ the way it is used. Saved the original one for reference ++ purposes. In the new table renamed "quoteright" to "quotesingle" ++ as Thomas Henlich suggested (and he were right). ++
  • In the ISOLatinEncoding table renamed the glyph "grave" ++ at octal 0140 to "quoteleft", "quotesingle" at octal 047 to ++ "quoteright" to conform to the standard as suggested by ++ Martin Trautner). ++
  • Fixed bug in scripts/trans that corrupted the UniqueID record ++ in the translated fonts. ++
  • Fixed bug in interaction of substituted hints with BlueZones. ++ Now the fonts with hint substitution seem to be always at least ++ not worse than without it (well, when they fit in the X11 ++ file size limit). ++
++ ++ ++

++3.2 -- January 15, 2000 ++

++ ++ ++Sergey Babkin: combined my changes with the changes by ++Thomas Henlich. The result deserves a not-so-minor version ++increase. ++

++ ++New features: ++

    ++
  • Support of the external Unicode re-encoding maps ++ (by Thomas). ++
  • Support for inclusion of all the glyphs from the ++ source file into the resulting file (inspired by ++ Thomas but I re-implemented it to remove the limitation ++ of his implementation: not more than 1024 glyphs). ++
  • The hints substitution. It's an experimental feature ++ yet and needs further work. ++
  • Support for UniqueID and its auto-generation. ++
  • Support for the name-based conversions from Unicode ++ in general and the adobestd "language" in particular. ++
  • Started the split of the source code into multiple ++ files. This needs more work to do it in a cleaner ++ way. ++
  • Better framework for the debugging printout ++ in the converter. ++
  • Utilities to install the fonts in Netscape ++ Navigator/Communicator 4.x. ++
  • Patches for bigger font files in the X11 rasterizer. ++
  • Linux RPM spec-file (by Johan Vromans). ++
  • Added the COPYRIGHT file (BSD-style, as we discussed ++ on the mailing list earlier) and the CHANGES file. ++
  • Creation of the .pfb files from the convert ++ script. ++
  • Changed the .notdef-s in the built-in ++ ISOLatin1Encoding table to some valid names (by Thomas). ++ Thomas also suggested replacing `quoteright' by ++ `quotesingle' but this seems to be against the ++ Adobe ISOLatin1 table. ++
  • New aliases windows-1251 and cp-866 for ++ the Russian encodings: those are expected by Netscape ++ navigator. ++
  • The font comparison program other/cmpf. ++
  • The "magnifying glass" program for glyph outlines: ++ other/showg. ++
  • Other updates of the tools in the `other' subdirectory. ++
  • Added a link to T1LIB in README. ++
  • A few new options in convert.cfg. ++
++ ++Bux fixes: ++
    ++
  • A bug in the outline smoothing code that corrupted some ++ of the fonts (for example, Microsoft Verdana). ++
  • Added explicit `cleartomark' to the end of file, ++ this seems to be compatible with both old and new version ++ of t1asm (suggested by Thomas). ++
  • Added the FontEncoding statement to the AFM files ++ (techincally this was not a bug because this statement ++ is optional but some programs want it). ++
  • A coredump when the converter tried to print a warning ++ (rather ironically) about a weird glyph width. ++
  • Changed the underscores in the font names to dashes (this ++ has been proposed long time ago by Johan Vromans). ++
  • No more glyph names of font names staring with a digit. ++
  • The names of the fonts in font and AFM files are now the ++ same as in the generated Ghostscript Fontmap file.
    ++ Warning: the names in Fontmap have been ++ changed. ++
  • The forceiso script does not corrupt the character ++ and kerning pairs counts any more, and is optional at all. ++
  • Fix for a loop going to 254 instead of 255 (by Thomas). ++
  • Added ':' in the font header (by Thomas). ++
  • A coredump when wrong language name is given (this was ++ also fixed by Thomas but I noticed it too late, after ++ I already fixed it by myself). ++
  • Fixed the links to the Adobe documents in README. ++
++ ++ ++

++3.13 -- October 18, 1999 ++

++ ++ ++Packaged by Sergey Babkin. ++

++ ++New features: ++

    ++
  • New option -v for automatic re-scaling based on the vertical size of the font ++
  • Changed the code to use getopt() instead of a home-made version of it. ++
  • Latin2 language support by Szalay Tamas. ++
++ ++Bux fixes: ++
    ++
  • Fix for the bug that made possible calls of malloc(0). ++
  • Refinement of the option -w to prevent extra wide spacing ++
++ ++

++3.12 -- October 2, 1999 ++

++ ++ ++Packaged by Sergey Babkin. ++

++ ++New features: ++

    ++
  • Added support for the Bulgarian language (actually, for now just an alias ++of Russian). ++
  • Added option -w that tries to make sure that the character widths are not ++too narrow. ++
  • Added the concept of aliased encodings. ++
  • Now the conversion scripts create and install the .afm files too. ++
  • The conversion script removes the intermediate files after installation. ++
  • Added tunables to the conversion script. ++
  • Installation of the Ghostscript fonts can now be done automatically ++together with the X11 fonts. ++
++ ++Bux fixes: ++
    ++
  • (FINALLY!!!) A correct fix for the infamous Red Hat 6.0 stdio "feature". ++
  • A number of little bugs discovered by a picky SGI compiler (well, maybe ++some day I'll try to run it through the UnixWare lint and see what happens). ++
  • A diagnostic message about the empty encodings in the convert script was ++made less cryptic and a bug in the awk sub-script was fixed. ++
  • The .afm creation code now considers the option -t. ++
++ ++

++3.11 -- May 24, 1999 ++

++ ++ ++Packaged by Sergey Babkin. ++

++ ++New features: ++

    ++
  • It includes the Turkish (Latin5, ISO8859/9) ++language support by Turgut Uyar and Baltic (ISO8859/4) languages support by ++Rihardas Hepas. ++
  • Also the installation script got updated: the configuration parameters ++are moved to a separate file and the generated fonts.dir files should now be ++compatible with Xfsft. ++
++ ++

++3.1 -- March 28, 1999 ++

++ ++ ++Packaged by Sergey Babkin. ++

++ ++New features: ++

    ++
  • Improved the interaction of the character-level hints and font-level hints ++
++ ++ ++

++3.0 -- March 6, 1999 ++

++ ++ ++Packaged by Sergey Babkin. ++

++ ++New features: ++

    ++
  • Added HTML documents. ++
++ ++

++3.0beta2 -- February 14, 1999 ++

++ ++ ++Packaged by Sergey Babkin. ++

++ ++New features: ++

    ++
  • Added ability to print the .afm file instead of the font to STDOUT. ++
  • Added the guessing of the /ForceBold parameter that proved to be useful. ++
++ ++Bux fixes: ++
    ++
  • Removed the force-fixed option that proved to be troublesome. ++
++ ++

++3.0beta1 -- December 11, 1998 ++

++ ++ ++By Andrew Weeks. ++

++ ++New features: ++

    ++
  • Added option (passed to t1asm) to create a compressed binary ++version of the font (A PFB file). ++
++ ++Bux fixes: ++
    ++
  • Versions of handle_post and handle_cmap that deal with some ++problems with buggy fonts. ++
  • Minor Bug Fixes. ++
++ ++

++3.0beta-afm -- December 5, 1998 ++

++ ++ ++By Thomas Henlich. ++

++ ++New features: ++

    ++
  • Integration of AFM file creation. ++
++ ++

++3.0beta -- November 15, 1998 ++

++ ++ ++By Sergey Babkin. ++

++ ++New features: ++

    ++
  • Added the auto-calculation of the italic angle. ++
++ ++Bux fixes: ++
    ++
  • Fixed a couple of bugs. ++
++ ++

++3.0alpha -- October 19, 1998 ++

++ ++ ++By Sergey Babkin. ++

++ ++New features: ++

    ++
  • Improved (although still not perfect) handling of ++scaling in composite glyphs ++
  • Automatic correction of outlines to make them more ++smooth (to correct both rounding errors introduced ++during conversion and present in the original font) ++
  • Automatic generation of hints (still has lots of ++space for improvement) ++
  • Automatic generation of BlueValues etc. ++
++ ++Bux fixes: ++
    ++
  • Scaling of fonts to 1000x1000 M-square required by ++Type1 standard ++
  • Printing out the contours in reverse direction, because ++TTF directions are different from Type1 ones (that was ++the major reason why the fonts generated by ++version 2.2 were rendered so badly in small sizes) ++
++ ++

++June 22, 1998 (AKA 2.2) ++

++ ++ ++By Thomas Henlich. ++

++ ++Bux fixes: ++

    ++
  • "width" should be "short int" because otherwise: ++characters with negative widths (e.g. -4) become *very* wide (65532) ++
  • The number of /CharStrings is numglyphs and not numglyphs+1 ++
++ ++

++February 13, 1998 ++

++ ++ ++By Mark Heath. ++

++ ++Bux fixes: ++

    ++
  • An original Bug Reported by Frank, which was just incorrect syntax in the ++Type 1 header, managed to creep back into the Feb 04 Version. This has been ++Fixed in the Feb 13 Version. ++
++ ++

++February 4, 1998 ++

++ ++ ++By Mark Heath. ++

++ ++Bux fixes: ++

    ++
  • A workaround was implemented in ttf2pfa by altering the matrix. I suspect ++I will have to calculate the correct values, as matrix ops are probably not ++allowed in Type 1 format. ++
++ ++ ++

++The older history seems to be lost. ++

++ ++ ++(S.B.: The story how we got the version numbers is rather funny. Initially ++there were no version umbers, the releases were marked by dates. The version ++from June 22 1998 untarred itself into a directory "ttf2pt1-22". When I ++made my changes to it I assumed that this was the version number meaning ++version 2.2. Since Mark asked me to send him a complete archive I supposed ++that I have to bump the version number. And I bumped it to 3.0 because the ++changes were rather extensive. Mark silently agreed and released the new ++version as 3.0. And that's the end of the story about how we got this ++Microsoft-like high version number.) ++ ++ ++ ++ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/COPYRIGHT xserver/hw/xprint/extras/ttf2pt1/COPYRIGHT +--- xserver-old/hw/xprint/extras/ttf2pt1/COPYRIGHT 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/COPYRIGHT 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,87 @@ ++The following copyright notice applies to all the files provided ++in this distribution unless explicitly noted otherwise ++(the most notable exception being t1asm.c). ++ ++ Copyright (c) 1997-2002 by the AUTHORS: ++ Andrew Weeks ++ Frank M. Siegert ++ Mark Heath ++ Thomas Henlich ++ Sergey Babkin , ++ Turgut Uyar ++ Rihardas Hepas ++ Szalay Tamas ++ Johan Vromans ++ Petr Titera ++ Lei Wang ++ Chen Xiangyang ++ Zvezdan Petkovic ++ Rigel ++ All rights reserved. ++ ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions ++ are met: ++ 1. Redistributions of source code must retain the above copyright ++ notice, this list of conditions and the following disclaimer. ++ 2. Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in the ++ documentation and/or other materials provided with the distribution. ++ 3. All advertising materials mentioning features or use of this software ++ must display the following acknowledgement: ++ This product includes software developed by the TTF2PT1 Project ++ and its contributors. ++ ++ THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND ++ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE ++ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ SUCH DAMAGE. ++ ++For the approximate list of the AUTHORS' responsibilities see the ++project history. ++ ++Other contributions to the project are: ++ ++Turgut Uyar ++ The Unicode translation table for the Turkish language. ++ ++Rihardas Hepas ++ The Unicode translation table for the Baltic languages. ++ ++Szalay Tamas ++ The Unicode translation table for the Central European languages. ++ ++Johan Vromans ++ The RPM file. ++ ++Petr Titera ++ The Unicode map format with names, the forced Unicode option. ++ ++Frank M. Siegert ++ Port to Windows ++ ++Lei Wang ++Chen Xiangyang ++ Translation maps for Chinese fonts. ++ ++Zvezdan Petkovic ++ The Unicode translation tables for the Cyrillic alphabet. ++ ++Rigel ++ Generation of the dvips encoding files, modification to the Chinese maps. ++ ++I. Lee Hetherington ++ The Type1 assembler (from the package 't1utils'), its full copyright ++ notice: ++ Copyright (c) 1992 by I. Lee Hetherington, all rights reserved. ++ Permission is hereby granted to use, modify, and distribute this program ++ for any purpose provided this copyright notice and the one below remain ++ intact. ++ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/cygbuild.sh xserver/hw/xprint/extras/ttf2pt1/cygbuild.sh +--- xserver-old/hw/xprint/extras/ttf2pt1/cygbuild.sh 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/cygbuild.sh 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,8 @@ ++: ++# this file should be run from Cygnus BASH ++# file to build ttf2pt1 with Cygnus GCC on Windows ++# don't forget to copy CYGWIN1.DLL into C:\WINDOWS ++ ++gcc -o ttf2pt1 -DWINDOWS ttf2pt1.c pt1.c t1asm.c ttf.c -lm ++gcc -o t1asm -DWINDOWS -DSTANDALONE t1asm.c ++ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/FONTS.hpux.html xserver/hw/xprint/extras/ttf2pt1/FONTS.hpux.html +--- xserver-old/hw/xprint/extras/ttf2pt1/FONTS.hpux.html 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/FONTS.hpux.html 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,197 @@ ++ ++ ++ ++How to install new Type1 fonts on an HP-UX 10.20 machine ++ ++ ++ ++Sergey A. Babkin ++
++ ++<babkin@bellatlantic.net> or <sab123@hotmail.com> ++

++ ++ ++

++How to install new Type1 fonts on an HP-UX 10.20 machine ++

++ ++ ++1. Add the font files to /usr/lib/X11/fonts/type1.st/typefaces. ++

++ ++2. Add the font descriptions to ++/usr/lib/X11/fonts/type1.st/typefaces/fonts.scale. Run `mkfontdir' ++in /usr/lib/X11/fonts/type1.st/typefaces. In the descriptions ++you have to specify the font manufacturer as `misc', like: ++

++ ++ ++  -misc-courier-... ++ ++

++ ++3. Copy /usr/lib/X11/fonts/type1.st/typefaces/fonts.dir to ++/usr/lib/X11/fonts/type1.st/licenses/STSYSTEM/DISPLAYS/fonts.dir. ++Better yet, create a symbolic link. ++

++ ++4. For each font encoding you are going to use create a description ++file in /usr/lib/X11/fonts/stadmin/type1/charsets. Of course, if you ++are going to use the same fonts in several encodings, the best way ++would be to create fair descriptions of charsets and really store ++only one encoding in typefaces, all the others will be produced ++automatically. That's not difficult at all. ++But the simplest way is to just copy the file cp.iso8859-1 ++to cp.<your-encoding-name>, like cp.koi8-r. ++

++ ++5. Restart you X server and/or font server. ++

++ ++

++What if you don't have the `root' privileges ? ++

++ ++ ++You still can run the font server and configure your X server ++to get the fonts from it. ++

++ ++Further let's suppose that the name on which you are going ++to run the font server is named `somehost'. Login to it ++and configure the font server. ++

++ ++First, choose some unused port. Numbers around 9000 are a good ++choice. Verify that this port is not used by somebody else ++by entering ++

++ ++

++ netstat -naf inet |grep 9000 ++
++ ++and look what happens. If you get nothing, that's good, this ++port is unused. If you get some lines of data, try abother port. ++

++ ++Go to you home directory $HOME and create some directory for ++your font server, say, $HOME/fs. Copy the directory structure ++of /usr/lib/X11/fonts/type1.st into $HOME/fs, so that in result ++you get $HOME/fs/type1.st/<whatever was there>. Copy the directory ++structure of /usr/lib/X11/fonts/stadmin/type1/charsets into $HOME/fs, ++so that in result you get $HOME/fs/charsets/<whatever was there>. ++Install the new fonts in these directorues as described above. ++

++ ++Then create the fontserver configuration file, say, $HOME/fs/xfs.cfg. ++The sample contents (supposing that my $HOME is equal to /home/babkin) ++is: ++

++ ++ ++

++ ++# font server configuration file ++
++# $XConsortium: config.cpp,v 1.7 91/08/22 11:39:59 rws Exp $ ++
++ ++
++rasterizers = /usr/lib/X11/fs/ufstrast.sl,/usr/lib/X11/fs/iforast.sl ++
++ ++
++clone-self = off ++
++use-syslog = off ++
++catalogue = /home/babkin/fs/type1.st ++
++# in decipoints ++
++default-point-size = 120 ++
++default-resolutions = 100,100,75,75 ++
++port=9000 ++
++error-file=/home/babkin/fs/fs.err ++ ++
++ ++

++ ++Then create the script to start your font server, say, $HOME/fs/runme: ++

++ ++ ++

++ ++TYPE1_CODEPAGE_DIR=$HOME/fs/charsets ++
++export TYPE1_CODEPAGE_DIR ++
++kill `ps -ef | grep $HOME/\[f\]s/xfs.cfg | awk '{print $2}'`; ++
++nohup xfs -config $HOME/fs/xfs.cfg & ++ ++
++ ++

++ ++Don't forget to make $HOME/fs/runme executable. Then you can ++execute it manually or from you .profile. ++

++ ++After you get your font server running, just execute the following ++command (with proper host name and port number) in your X session ++

++ ++

++ xset fp+ tcp/somehost:9000 ++
++ ++to get the access to your private font server. You can add this ++information to the configuration data of your X server or just ++put it also into your .profile. In the latter case the best way ++to do that would be like: ++

++ ++ ++

++ ++... ++
++$HOME/fs/runme ++
++sleep 2 # give it some time to start ++
++xset fp+ tcp/somehost:9000 ++
++... ++ ++
++ ++

++ ++ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/FONTS.html xserver/hw/xprint/extras/ttf2pt1/FONTS.html +--- xserver-old/hw/xprint/extras/ttf2pt1/FONTS.html 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/FONTS.html 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,708 @@ ++ ++ ++ ++The ttf2pt1 font installation guide ++ ++ ++ ++Sergey A. Babkin ++
++ ++<babkin@bellatlantic.net> or <sab123@hotmail.com> ++

++ ++ ++ ++ ++

++THE FONT INSTALLATION GUIDE ++
++for the TTF to Type1 converter and fonts generated by it ++

++ ++ ++There is historically a number of problems with the support of the 8-bit ++character encodings. This installation guide pays a lot of attention ++to the 8-bit issues, because these issues are responsible for the ++most of troubles during the installation of fonts. But they are ++not the only things covered in this guide, so it's worth reading ++even if all you need is plain ASCII. For convenience of reading ++I have marked the paragraphs dealing solely with 8-bit problems ++with characters *8*. ++

++ ++To simplify this installation the distribution package of the ++converter contains a number of scripts written in shell and ++Perl. So, to run them you will need a shell interpreter (Bourne-shell, ++POSIX-shell, Korn-shell are OK, ba-shell is probably also OK but not ++tested yet). The Perl scripts were tested with Perl5 but probably ++should work with Perl4 too. All the scripts are located in the ++`scripts' subdirectory. ++

++ ++This guide considers the following issues of installation of the ++fonts: ++

++ ++ ++

++

++ ++ ++

++X11 ++

++ ++ ++ ++ ++ ++To simplify the conversion a set of scripts is provided with ttf2pt1. ++They are collected in the `scripts' subdirectory. ++

++ ++ ++`Convert' is the master conversion script provided with ttf2pt1. ++When installed into a public directory it's named `ttf2pt1_convert' ++to avoid name collisions with the other programs. ++

++ ++ ++It's called as: ++

++ ++ ++ ++ ++

++ convert [config-file] ++
++ ++ ++If the configuration file is not specified as an argument then the file ++`convert.cfg' in the current directory is used. This file contains ++a set of configuration variables. The distribution contains a sample file ++file `convert.cfg.sample'. Please copy it to `convert.cfg', ++look inside it and change the configuration variables. The more stable ++configuration variables, such as the path names of the scripts and ++encoding files are located in `convert' itself, they are ++automatically updated when installing ttf2pt1. ++

++ ++Put all the TTF fonts you want to convert into some directory (this ++may be just the directory that already contains all the Windows ++fonts on a mounted FAT filesystem). If you have fonts in different ++source encoding then put the fonts in each of the encodings ++into a separate directory. Up to 10 source directories are ++supported. If you (in a rather unlikely case) have more source ++directories then you can make two separate runs of the converter, ++converting up to 10 directories at a time. ++

++ ++The variables in the configuration file are: ++

++ ++ ++ ++SRCDIRS - the list of directories (with absolute paths) with ++ TTF fonts. Each line contains at least 3 fields: the name of the directory, ++ the language of the fonts in it (if you have fonts for different ++ languages you have to put them into the separate directories) and the ++ encoding of the fonts. Again, if you have some of the TTF typefaces in ++ one encoding, and some in another (say, CP-1251 and KOI-8), you have ++ to put them into the separate source directories. Some lines may contain ++ 4 fields. Then the fourth field is the name of the external map to ++ convert the Unicode fonts into the desirable encoding. This map is ++ used instead of the built-in map for the specified language. ++

++ ++*8* ++An interesting thing is that some languages have more than one ++widely used character encodings. For example, the widely used ++encodings for Russian are IBM CP-866 (MS-DOS and Unix), KOI-8 ++(Unix and VAX, also the standard Internet encoding), IBM CP-1251 (MS Windows). ++That's why I have provided the means to generate the converted fonts ++in more than one encoding. See the file encodings/README for ++details about the encoding tables. Actually, if you plan to use ++these fonts with Netscape Navigator better use the aliases ++cp-866 instead of ibm-866 and windows-1251 instead of ibm-1251 ++because that's what Netscape wants. ++

++ ++ ++DSTDIR - directory for the resulting Type1 fonts. Be careful! ++ This directory gets completely wiped out before conversion, ++ so don't use any already existing directory for this purpose. ++

++ ++ ++DSTENC{language} - the list of encodings in which the destination ++ fonts will be generated for each language. Each font of that ++ language will be generated in each of the specified ++ encodings. If you don't want any translation, just specify both ++ SRCENC and DSTENC as iso8859-1 (or if you want any other encoding ++ specified in the fonts.dir, copy the description of 8859-1 with ++ new name and use this new name for SRCENC and DSTENC). ++

++ ++ ++FOUNDRY - the foundry name to be used in the fonts.dir file. I have ++ set it to `fromttf' to avoid name conflicts with any existing font for ++ sure. But this foundry name is not registered in X11 standards and ++ if you want to get the full standard compliance or have a font server ++ that enforces such a compliance, use `misc'. ++

++ ++ ++The next few parameters control the general behavior of the converter. ++They default values are set to something reasonable. ++

++ ++ ++ ++CORRECTWIDTH - if the value is set to YES then use the ++ converter option -w, otherwise don't use it. See the description of ++ this option in the README file. ++

++ ++ ++REMOVET1A - if the value is set to YES then after ++ conversion remove the un-encoded .t1a font files and the ++ intermediate .xpfa font metric files. ++

++ ++ ++INSTALLFONTMAP - a Ghostscript parameter, if the value is set to ++ YES then install the entries for the new fonts ++ right into the main Fontmap file. Otherwise just leave ++ the file Fontmap.ttf in the Ghostscript configuration ++ directory. ++

++ ++ ++HINTSUBST - if the value is set to YES use the option ++ -H, otherwise don't use it. This option enables the ++ hint substitution technique. If you have not installed the X11 patch ++ described above, use this option with great caution. See further ++ description of this option in the README file. ++

++ ++ ++ENFORCEISO - if the value is set to YES then ++ disguise the resulting fonts as the fonts in ISOLatin1 encoding. Historically ++ this was neccessary due to the way the installer scripts created the ++ X11 font configuration files. It is not neccessary any more for this ++ purpose. But if you plan to use these fonts with some other application ++ that expects ISOLatin1 encoding then better enable this option. ++

++ ++ ++ALLGLYPHS - if the value is set to YES then ++ include all the glyphs from the source fonts into the resulting fonts, even ++ if these glyphs are inaccessible. If it's set to NO then ++ include only the glyphs which have codes assigned to them. The glyphs ++ without codes can not be used directly. But some clever programs, ++ such as the Type 1 library from XFree86 3.9 and higher can change ++ the encoding on the fly and use another set of glyphs. If you have not ++ installed the X11 patch described above, use this option with great ++ caution. See further description of the option option -a in the ++ README file. ++

++ ++ ++GENUID - if the value is set to YES then use ++ the option -uA of the converter to generate UniqueIDs for ++ the converted fonts. The standard X11 Type 1 library does not use ++ this ID, so it may only be neccessary for the other applications. ++ The script is clever enough to generate different UniqueID for the ++ same font converted to multiple encodings. Also after conversion it ++ checks all the fonts generacted during the session for duplicated ++ UniqueID and shows those. Still, this does not quarantee that these ++ UniqueIDs won't overlap with some other fonts. The UniqueIDs are ++ generated as hash values from the font names, so it's guaranteed ++ that if the `convert' script runs multiple times it will ++ generate the same UniqueIDs during each run. See further description ++ of this option in the README file. ++

++ ++ ++GENUID - if the value is set to YES then create ++ the .pfb files, otherwise the .pfa files. The .pfb ++ files are more compact but contain binary data, so you may experience some ++ troubles when transferring them through the network. ++

++ ++ ++The following parameters are used to locate the other scripts and ++configuration files. By default the scripts do a bit of guessing for them: ++they search in the ttf2pt1 installation directory if ttf2pt1 ++was installed or otherwise suppose that you are running `convert' with ++`scripts' subdirectory being the current directory. ++

++ ++ ++ ++ENCDIR - directory containing the descriptions of encodings ++
++ ++MAPDIR - directory containing the external map files ++

++ ++ ++Besides that a few parameters are built into the `convert' script itself. ++You probably won't need to change them: ++

++ ++ ++ ++T1ASM, TTF2PT1, TRANS, T1FDIR, FORCEISO - paths to the other script ++

++ ++ ++Also there are a few parameters controlling the installation of ++fonts for Ghostscript. Please look at their description in the ++Ghostscript section of documentation or in the ttf2pt1_x2gs(1) ++manual page before running `convert'. If these parameters are ++set, `convert' will call the `x2gs' script automatically ++to install the newly converted fonts in Ghostscript. ++

++ ++After creating the configuration file run the `convert' script. Look at ++the result and the log file in DSTDIR. ++

++ ++Add the directory with newly converted fonts to the configuration ++of X server or font server. For most of the systems this step is ++very straightforward. For HP-UX it's rather tricky and poorly ++documented, so the file FONTS.hpux gives a short description. ++

++ ++If you don't have the privileges of the root user, you still can ++configure your private font server. Just use some non-standard ++port number (see FONTS.hpux for an example, exept that you won't ++need all the HP-related stuff on any other system). ++

++ ++ ++

++Known Problems ++

++ ++ ++ ++ ++
    ++
  • One catch is that the X11 Type 1 font library has a rather low limit ++ on the font size. Because of this the fonts with more complicated ++ outlines and the enabled hint substitution may not fit into ++ this limit. The same applies to the fonts with very complicated ++ outlines or with very many glyphs (especially the fonts with ++ over 256 glyphs). So you will need to excercise caution with ++ these options if you plan using these fonts with X11. Some vendors ++ such as HP provide the Type 1 implementation licensed from Adobe ++ which should have no such problem. ++

    ++ ++ But there is a solution even for the generic X11. A patch located ++ in the subdirectory `app/X11' fixes this problem as well ++ as some other minor problems. Its description is provided in ++ app/X11/README. ++

    ++ ++ To fix the X11 font library, you have to get the X11 sources. I ++ can recommend the ftp sites of the XFree86 project ftp://ftp.xfree86.org ++ or of the Open Group ftp://ftp.x.org. This patch was made on the sources ++ of XFree86 so you may have better success with applying it to the ++ XFree86 distribution. After you have got the sources, make sure ++ that you can compile them. Then apply the patch as described. ++ Make sure that it was applied properly. Compile the sources again ++ (actually, you need only the fonts library, the fonts server, and ++ possibly the X server). It would be prudent now to save your old ++ font library, font server and, possibly, X server. Then install ++ the new recently compiled versions of these files. Of course, ++ if you know someone who already has compiled these files for the ++ same OS as yours, you can just copy the binary fles from him. ++

    ++ ++ Alas, building the X11 system from the source code is not the ++ easiest thing in the world and if you have no experience it ++ can be quite difficult. In this case just avoid the aforementioned ++ features or check each converted font to make sure that it ++ works properly. ++

    ++ ++

  • The Type1 font library from the standard X11 distribution ++ does not work on HP-UX (at least, up to 10.01). The font server ++ supplied with HP-UX up to 10.01 is also broken. Starting from ++ HP-UX 10.20 (I don't know about 10.10) they supply a proprietary font ++ library and the converted fonts work fine with it, provided that ++ they are configured properly (see the file FONTS.hpux). ++

    ++ ++

  • The fonts.scale files created by the older versions of the ++ ttf2pt1 installation program (up to release 3.1) have conflicted ++ with the language definitions of the Xfsft font server and ++ parts of it included into XFree86. To overcome this incompatibility ++ the never versions creats the fonts.scale file describing all the ++ fonts as belonging to the adobe-fontspecific encoding and ++ the fonts.alias file with the proper names. The drawback of ++ this solution is that xlsfonts gives the list of twice more ++ fonts. But as a side effect the option ENFORCEISO in ++ `convert.cfg' is not required for X11 any more. ++

    ++ ++

  • The conversion script has no support for Eastern multi-plane fonts. ++ Contribution of such a support would be welcome. ++

    ++

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++

++Ghostscript ++

++ ++ ++ ++ ++ ++ ++The fonts generated with ttf2pt1 work fine with Ghostscript by ++themselves. The script `x2gs' (or `ttf2pt1_x2gs' when installed ++into a public directory, to avoid name conflicts with other ++programs) links the font files from the X11 direcotry into the Ghostscript ++directory and automatically creates the description file (Fontmap) ++in Ghostscript format. ++ ++ ++It's called as: ++

++ ++ ++ ++ ++

++ x2gs [config-file] ++
++ ++ ++If the configuration file is not specified as an argument then the file ++`convert.cfg' in the current directory is used, just like the ++`convert' script does. Indeed, this configuration file is used for ++both scripts. ++

++ ++The Ghostscript-related parameters in the configuration file are: ++

++ ++DSTDIR - the X11 font directory used by `x2gs' as the ++ source of the fonts. This parameter is common with the X11 ++ configuration. ++

++ ++GSDIR - the base directory of Ghostsript. If this ++ parameter is set to an empty string then `convert' won't ++ call `x2gs'. So if you want to get only the X11 fonts ++ installed then set this parameter to an empty string. This ++ directory may vary on various system, so please check your ++ system and set this value accordingly before running the script. ++

++ ++GSFONTDIR - the font directory of Ghostscript. In the standard ++ Ghostscript installation it's a subdirectory of GSDIR ++ but some systems may use completely different directories. ++

++ ++GSCONFDIR - the configuration subdirectory of Ghostscript ++ that contains the Fontmap file. ++

++ ++INSTALLFONTMAP - if the value is set to YES then ++ install the entries for the new fonts right into the main ++ Fontmap file. Otherwise just leave the file Fontmap.ttf ++ in the Ghostscript configuration directory. ++

++ ++ ++After preparing the configuration file run the script. It symbolicaly links ++all the font files and creates the description file Fontmap.ttf in ++GSCONDFIR. After that there are two choices. ++

++ ++If the option INSTALLFONTMAP was set to YES then ++the font descriptions are also automatically installed into the ++master Fontmap file. The script is clever enough to ++detect if it was run multiple times with the same directories ++and if so it replaces the old Fontmap entries with ++the new ones instead of just accumulating all of them. You ++may also run it multiple times for multiple X11 directories ++and all the results will be properly collected in the Fontmap. ++But it's your responsibility to watch that the names of the ++font files don't overlap. If the X11 font directory gets ++renamed then you have to remove its font entries from the ++Fontmap and only after that re-run `x2gs' ++for the new directory. ++

++ ++On the other hand if the option INSTALLFONTMAP was set to ++NO then go to the GSCONFDIR directory and insert the ++contents of Fontmap.ttf into the Fontmap file ++manually. This step may be left manual to make the installation ++a little bit more safe. ++

++ ++After that you may also want to redefine some of the aliases in ++Fontmap to refer to the newly installed fonts. ++But the redefinition of the aliases may be dangerous if the width of ++characters in the new font will be different from the old font. ++Alas, there is no visible solution of this problem yet. ++

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++

++MS Windows ++

++ ++ ++Ttf2pt1 can be built on Windows either with native compiler or in ++POSIX emulation mode. ++

++ ++Native MS Windows compilers require a different way to build the converter ++instead of the Makefile (their make programs commonly are quite weird ++and limited in capabilities). An example of batch file winbuild.bat ++is provided for MS Visual C/C++. Probably it can be easily adapted for other ++32-bit Windows and DOS compilers. The important part is to define the ++preprocessor symbol WINDOWS during compilation. ++

++ ++Cygnus make almost supports full Makefiles but not quite. Seems ++like its POSIX support is also of the same quality "almost but not quite". ++So another command file cygbuild.sh is provided for Cygnus GNU C, also ++with the preprocessor symbol WINDOWS defined. It is intended to be run from ++the Cygnus BASH shell. To run the programs produced by the Cygnus compiler ++the Cygnus library file CYGWIN1.DLL should be copied first into ++C:\WINDOWS. ++

++ ++To run the accompanying scripts Perl for Windows will be required as well as ++other tools from the Cygnus set. ++

++ ++The Windows support was not particularly tested, so in case of problems with ++building or running the converter please let us know. ++

++ ++The pre-built code (possibly of an older version) of ttf2pt1 for MS Windows is ++available from the GnuWin32 project from ++ ++http://gnuwin32.sourceforge.net/packages/ttf2pt1.htm ++

++ ++ ++

++Netscape Navigator/Communicator ++

++ ++ ++Basically, the biggest problem with Netscape Navigator is that ++it has built-in fixed PostScript font names and built-in fixed ++glyph tables for them. Oh, no, that's two! Let's start over: ++basically the two biggest problems of Netscape Navigator are ++that (one)it has built-in fixed PostScript font names and (two) ++built-in fixed glyph tables for them and (three) it always ++assumes that the fonts have ISOLatin1 encoding. OK, let's ++start over again: basically the three biggest problems of Netscape ++Navigator are that (one) it has built-in fixed PostScript font names, ++(two) built-in fixed glyph tables for them and (three) it always ++assumes that the fonts have ISOLatin1 encoding and (four) it ++does not remember the scaled font size between the sessions. ++You did not expect such a Spanish Inquisition, did you ? (*) ++

++ ++Luckily, we have solutions for all of these problems. They are ++located in the subdirectory `app/netscape' and described ++in app/netscape/README. ++

++ ++ ++  -------
++  *) See Monty Python's Flying Circus, episode 15 ++

++ ++*8* ++

++Netscape and cyrillic fonts
++ ++(courtesy of Zvezdan Petkovic) ++

++ ++If you use TrueType fonts in your X, as I do, and you always get ++KOI8-R encoded pages, then your Netscape does not recognise windows-1251 ++encoding. Microsoft TrueType fonts simply declare all encodings they ++can support including KOI8-R. For some reason, KOI8-R always wins over ++ISO-8859-5 in Netscape under X. If you are reading other cyrillic ++languages besides Russian, you might want to either erase KOI8-R entries ++from the fonts.dir and fonts.scale files, or alternatively fix Netscape. ++I put this line in my .Xdefaults. ++

++ ++

++ Netscape*documentFonts.charset*koi8-r: iso-8859-5 ++
++

++ ++Notice that you can still read Russian sites without trouble because ++Netscape translates KOI8-R to ISO-8859-5 on the fly. I read both Russian ++and Serbian sites with no trouble. ++

++ ++Note: If anybody knows the way to tell Netscape under Unix how to ++recognise {windows,ibm,cp}-1251 encoded fonts, I'd like to hear about that. ++

++ ++ ++

++Linux RPM package ++

++ ++ ++The spec file for the creation of a Linux RPM package is located in ++app/RPM. It has been contributed by Johan Vromans. When ++make all is ran in the main directory it among the other ++things creates the version of itself adapted to Linux in app/RPM, ++you may want to copy that version back to the main directory. ++

++ ++Warning: Please note that the install section is incomplete, and ++the installed scripts won't work until the paths inside them ++are corrected. ++

++ ++ ++

++FrameMaker ++

++ ++ ++The fonts and AFM files generated by the version 3.2 and higher ++should work with Framemaker without problems. The AFM files ++generated by the previous versions of the converter require a ++line added to them: ++

++ ++  EncodingScheme FontSpecific ++

++ ++And the underscores in the font names of the font and AFM files ++generated by the older versions may need to be changed to dashes. ++

++ ++NOTE by Jason Baietto: Ignore the directions in the Frame on-line docs ++that say to put a "serverdict begin 0 exitserver" line in the pfa files. ++Doing this caused both my printer and ghostscript to choke on the resulting ++output from FrameMaker, so I would not advise doing this (though your ++mileage may vary). ++

++ ++ ++

++StarOffice ++

++ ++ ++StarOffice 5.1x has been reported to crash if the .afm file contains ++spaces in the values of such statements as Version, Weight etc. ++These spaces are permitted by the Adobe spec, so this is a problem of ++StarOffice. The easiest way to fix these .afm files for StarOffice ++is to remove spaces in these strings or remove these strings (in case if ++they are optional) at all. This can be done automatically with a sed ++script. It seems that StarOffice 5.2 has this problem fixed, so we decided to ++spend no efforts on providing workarounds for 5.1 with ttf2pt1. ++

++ ++ ++ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/ft.c xserver/hw/xprint/extras/ttf2pt1/ft.c +--- xserver-old/hw/xprint/extras/ttf2pt1/ft.c 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/ft.c 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,808 @@ ++/* ++ * The font parser using the FreeType library version 2. ++ * ++ * see COPYRIGHT ++ * ++ */ ++ ++#ifdef USE_FREETYPE ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include FT_FREETYPE_H ++#include FT_TRUETYPE_TABLES_H ++#include FT_BBOX_H ++#include FT_GLYPH_H ++ ++#include FT_CONFIG_CONFIG_H ++#include FT_CONFIG_OPTIONS_H ++#include FT_ERRORS_H ++#include FT_SYSTEM_H ++#include FT_IMAGE_H ++#include FT_TYPES_H ++#include FT_OUTLINE_H ++#include FT_MODULE_H ++#include FT_RENDER_H ++#include FT_TYPE1_TABLES_H ++#include FT_TRUETYPE_IDS_H ++#include FT_TRUETYPE_TAGS_H ++#include FT_MULTIPLE_MASTERS_H ++#include FT_SFNT_NAMES_H ++ ++#ifdef XP_PSTEXT ++#include "os.h" ++#include "Xproto.h" ++#include "font.h" ++#include "fontstruct.h" ++#include "fntfilst.h" ++#include "fontutil.h" ++#include "fontenc.h" ++#include "ft.h" ++#define NOT_IN_FTFUNCS ++#include "ftfuncs.h" ++#endif /* XP_PSTEXT */ ++ ++#include "pt1.h" ++#include "global.h" ++ ++/* prototypes of call entries */ ++static void openfont(char *fname, char *arg); ++static void closefont( void); ++static int getnglyphs ( void); ++static int glnames( GLYPH *glyph_list); ++static void glmetrics( GLYPH *glyph_list); ++static int glenc( GLYPH *glyph_list, int *encoding, int *unimap); ++static void fnmetrics( struct font_metrics *fm); ++static void glpath( int glyphno, GLYPH *glyph_list); ++static void kerning( GLYPH *glyph_list); ++ ++/* globals */ ++ ++/* front-end descriptor */ ++struct frontsw freetype_sw = { ++ /*name*/ "ft", ++ /*descr*/ "based on the FreeType2 library", ++ /*suffix*/ { "ttf", "ttc", "otf", "otc", "pfa", "pfb" }, ++ /*open*/ openfont, ++ /*close*/ closefont, ++ /*nglyphs*/ getnglyphs, ++ /*glnames*/ glnames, ++ /*glmetrics*/ glmetrics, ++ /*glenc*/ glenc, ++ /*fnmetrics*/ fnmetrics, ++ /*glpath*/ glpath, ++ /*kerning*/ kerning, ++}; ++ ++/* statics */ ++ ++static char * dupcnstring( unsigned char *s, int len); ++ ++#ifndef XP_PSTEXT ++static FT_Library library; ++#endif /* !XP_PSTEXT */ ++static FT_Face face; ++ ++static int enc_type, enc_found; ++ ++/* SFNT functions do not seem to be included by default in FT2beta8 */ ++#define ENABLE_SFNT ++ ++/* ++ * Open font and prepare to return information to the main driver. ++ * May print error and warning messages. ++ * Exit on error. ++ */ ++ ++static void ++openfont( ++ char *fname, ++ char *arg /* unused now */ ++) ++{ ++ FT_Error error; ++ ++#ifdef XP_PSTEXT ++ extern FT_Face xp_pstext_ft_face; ++ extern FT_Library ftypeLibrary; /* defined in xc/lib/font/FreeType/ftfuncs.c */ ++ ++ face = xp_pstext_ft_face; ++#else ++ if( FT_Init_FreeType( &library ) ) { ++ fprintf(stderr, "** FreeType initialization failed\n"); ++ exit(1); ++ } ++ ++ if( error = FT_New_Face( library, fname, 0, &face ) ) { ++ if ( error == FT_Err_Unknown_File_Format ) ++ fprintf(stderr, "**** %s has format unknown to FreeType\n", fname); ++ else ++ fprintf(stderr, "**** Cannot access %s ****\n", fname); ++ exit(1); ++ } ++#endif /* XP_PSTEXT */ ++ ++ if(FT_HAS_FIXED_SIZES(face)) { ++ WARNING_1 fprintf(stderr, "Font contains bitmaps\n"); ++ } ++ if(FT_HAS_MULTIPLE_MASTERS(face)) { ++ WARNING_1 fprintf(stderr, "Font contains multiple masters, using default\n"); ++ } ++ ++ if(ISDBG(FT)) fprintf(stderr," %d units per EM\n", face->units_per_EM); ++ ++ enc_found = 0; ++} ++ ++/* ++ * Close font. ++ * Exit on error. ++ */ ++ ++static void ++closefont( ++ void ++) ++{ ++#ifdef XP_PSTEXT ++ /* NOP */ ++#else ++ if( FT_Done_Face(face) ) { ++ WARNING_1 fprintf(stderr, "Errors when closing the font file, ignored\n"); ++ } ++ if( FT_Done_FreeType(library) ) { ++ WARNING_1 fprintf(stderr, "Errors when stopping FreeType, ignored\n"); ++ } ++#endif /* XP_PSTEXT */ ++} ++ ++/* ++ * Get the number of glyphs in font. ++ */ ++ ++static int ++getnglyphs ( ++ void ++) ++{ ++ if(ISDBG(FT)) fprintf(stderr, "%d glyphs in font\n", face->num_glyphs); ++ return (int)face->num_glyphs; ++} ++ ++/* ++ * Get the names of the glyphs. ++ * Returns 0 if the names were assigned, non-zero if the font ++ * provides no glyph names. ++ */ ++ ++static int ++glnames( ++ GLYPH *glyph_list ++) ++{ ++#define MAX_NAMELEN 1024 ++ ++#ifdef XP_PSTEXT ++ char buf[1024]; ++ long i; ++ FT_Error error; ++ ++#ifdef XP_ONLY_BLOCKS ++ extern unsigned long xp_font_block_offset; ++ extern FTFontPtr xp_xtf; ++ int bc; /* block counter */ ++ ++ ++ /* FixMe: This code should use PsOut_Get_FreeType_Glyph_Name() instead of ++ * duplicating the code ++ */ ++ for( bc = xp_font_block_offset ; bc < (xp_font_block_offset+256) ; bc++ ) { ++ /* Remap X11 font index to FreeType font index */ ++ i = FTRemap(face, &xp_xtf->mapping, bc); ++ ++ if( i >= face->num_glyphs ) ++ continue; ++#else ++ for(i=0; i < face->num_glyphs; i++) { ++#endif /* XP_ONLY_BLOCKS */ ++ if( FT_Has_PS_Glyph_Names(face) ) { ++ error = FT_Get_Glyph_Name(face, i, buf, MAX_NAMELEN); ++ } ++ else ++ { ++ error = -1; ++ } ++ ++ if( error ) { ++ /* Check for unicode mapping ++ * See Adobe document "Unicode and Glyph Names" ++ * (http://partners.adobe.com/asn/tech/type/unicodegn.jsp) ++ */ ++ if( (xp_xtf->mapping.mapping->type == FONT_ENCODING_UNICODE) && ++ (i < 0xFFFE) ) ++ { ++ sprintf(buf, "uni%04lx", i); ++ } ++ else ++ { ++ sprintf(buf, "ch%02lx", i); ++ } ++ } ++ glyph_list[i].name = strdup(buf); ++ if(ISDBG(FT)) fprintf(stderr, "%d has name %s\n", i, buf); ++ if (glyph_list[i].name == NULL) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ } ++ ++ return 0; ++#else ++ char bf[1024]; ++ long i; ++ ++ if( ! FT_HAS_GLYPH_NAMES(face) ) { ++ WARNING_1 fprintf(stderr, "Font has no glyph names\n"); ++ return 1; ++ } ++ ++ for(i=0; i < face->num_glyphs; i++) { ++ if( FT_Get_Glyph_Name(face, i, bf, MAX_NAMELEN) || bf[0]==0 ) { ++ sprintf(bf, "_g_%d", i); ++ WARNING_2 fprintf(stderr, ++ "Glyph No. %d has no postscript name, becomes %s\n", i, bf); ++ } ++ glyph_list[i].name = strdup(bf); ++ if(ISDBG(FT)) fprintf(stderr, "%d has name %s\n", i, bf); ++ if (glyph_list[i].name == NULL) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ } ++ ++ return 0; ++#endif /* XP_PSTEXT */ ++} ++ ++/* ++ * Get the metrics of the glyphs. ++ */ ++ ++static void ++glmetrics( ++ GLYPH *glyph_list ++) ++{ ++ GLYPH *g; ++ int i; ++ FT_Glyph_Metrics *met; ++ FT_BBox bbox; ++ FT_Glyph gly; ++ ++#ifdef XP_ONLY_BLOCKS ++ extern unsigned long xp_font_block_offset; ++ extern FTFontPtr xp_xtf; ++ int bc; /* block counter */ ++ ++ for( bc = xp_font_block_offset ; bc < (xp_font_block_offset+256) ; bc++ ) { ++ /* Remap X11 font index to FreeType font index */ ++ i = FTRemap(face, &xp_xtf->mapping, bc); ++ ++ if( i >= face->num_glyphs ) ++ continue; ++ ++#else ++ for(i=0; i < face->num_glyphs; i++) { ++#endif /* XP_ONLY_BLOCKS */ ++ g = &(glyph_list[i]); ++ ++ if( FT_Load_Glyph(face, i, FT_LOAD_NO_BITMAP|FT_LOAD_NO_SCALE) ) { ++ fprintf(stderr, "Can't load glyph %s, skipped\n", g->name); ++ continue; ++ } ++ ++ met = &face->glyph->metrics; ++ ++ if(FT_HAS_HORIZONTAL(face)) { ++ g->width = met->horiAdvance; ++ g->lsb = met->horiBearingX; ++ } else { ++ WARNING_2 fprintf(stderr, "Glyph %s has no horizontal metrics, guessed them\n", g->name); ++ g->width = met->width; ++ g->lsb = 0; ++ } ++ ++ if( FT_Get_Glyph(face->glyph, &gly) ) { ++ fprintf(stderr, "Can't access glyph %s bbox, skipped\n", g->name); ++ continue; ++ } ++ ++ FT_Glyph_Get_CBox(gly, ft_glyph_bbox_unscaled, &bbox); ++ g->xMin = bbox.xMin; ++ g->yMin = bbox.yMin; ++ g->xMax = bbox.xMax; ++ g->yMax = bbox.yMax; ++ ++ g->ttf_pathlen = face->glyph->outline.n_points; ++ } ++} ++ ++/* ++ * Get the original encoding of the font. ++ * Returns 1 for if the original encoding is Unicode, 2 if the ++ * original encoding is other 16-bit, 0 if 8-bit. ++ */ ++ ++static int ++glenc( ++ GLYPH *glyph_list, ++ int *encoding, ++ int *unimap ++) ++{ ++#ifdef XP_PSTEXT ++ int i, ++ e; ++ unsigned code; ++ extern FTFontPtr xp_xtf; ++ extern unsigned long xp_font_block_offset; ++ ++ enc_found = 1; ++ enc_type = 0; ++ ++ for(i=0; imapping, xp_font_block_offset+i); ++ ++ if(code == 0) ++ continue; /* .notdef */ ++ ++ encoding[i] = code; ++ } ++ ++ return enc_type; ++#else ++ int i, e; ++ unsigned code; ++ ++ if(ISDBG(FT)) ++ for(e=0; e < face->num_charmaps; e++) { ++ fprintf(stderr, "found encoding pid=%d eid=%d\n", ++ face->charmaps[e]->platform_id, ++ face->charmaps[e]->encoding_id); ++ } ++ ++ if(enc_found) ++ goto populate_map; ++ ++ enc_type = 0; ++ ++ /* first check for an explicit PID/EID */ ++ ++ if(force_pid != -1) { ++ for(e=0; e < face->num_charmaps; e++) { ++ if(face->charmaps[e]->platform_id == force_pid ++ && face->charmaps[e]->encoding_id == force_eid) { ++ WARNING_1 fprintf(stderr, "Found Encoding PID=%d/EID=%d\n", ++ force_pid, force_eid); ++ if( FT_Set_Charmap(face, face->charmaps[e]) ) { ++ fprintf(stderr, "**** Cannot set charmap in FreeType ****\n"); ++ exit(1); ++ } ++ enc_type = 1; ++ goto populate_map; ++ } ++ } ++ fprintf(stderr, "*** TTF encoding table PID=%d/EID=%d not found\n", ++ force_pid, force_eid); ++ exit(1); ++ } ++ ++ /* next check for a direct Adobe mapping */ ++ ++ if(!forcemap) { ++ for(e=0; e < face->num_charmaps; e++) { ++ if(face->charmaps[e]->encoding == ft_encoding_adobe_custom) { ++ WARNING_1 fputs("Found Adobe Custom Encoding\n", stderr); ++ if( FT_Set_Charmap(face, face->charmaps[e]) ) { ++ fprintf(stderr, "**** Cannot set charmap in FreeType ****\n"); ++ exit(1); ++ } ++ goto populate_map; ++ } ++ } ++ } ++ ++ for(e=0; e < face->num_charmaps; e++) { ++ if(face->charmaps[e]->platform_id == 3) { ++ switch(face->charmaps[e]->encoding_id) { ++ case 0: ++ WARNING_1 fputs("Found Symbol Encoding\n", stderr); ++ break; ++ case 1: ++ WARNING_1 fputs("Found Unicode Encoding\n", stderr); ++ enc_type = 1; ++ break; ++ default: ++ WARNING_1 { ++ fprintf(stderr, ++ "****MS Encoding ID %d not supported****\n", ++ face->charmaps[e]->encoding_id); ++ fputs("Treating it like Symbol encoding\n", stderr); ++ } ++ break; ++ } ++ break; ++ } ++ } ++ if(e >= face->num_charmaps) { ++ WARNING_1 fputs("No Microsoft encoding, using first encoding available\n", stderr); ++ e = 0; ++ } ++ ++ if( FT_Set_Charmap(face, face->charmaps[e]) ) { ++ fprintf(stderr, "**** Cannot set charmap in FreeType ****\n"); ++ exit(1); ++ } ++ ++populate_map: ++ enc_found = 1; ++ for(i=0; i=' ' && c!=127) ++ *out++ = c; ++ else if(!warned) { ++ warned=1; ++ WARNING_1 fprintf(stderr, "Some font name strings are in Unicode, may not show properly\n"); ++ } ++ } ++ *out = 0; ++ return res; ++} ++ ++/* ++ * Get the font metrics ++ */ ++static void ++fnmetrics( ++ struct font_metrics *fm ++) ++{ ++ char *str; ++ static char *fieldstocheck[3]; ++#ifdef ENABLE_SFNT ++ FT_SfntName sn; ++#endif /* ENABLE_SFNT */ ++ int i; ++ ++ fm->italic_angle = 0.0; /* FreeType hides the angle */ ++ fm->underline_position = face->underline_position; ++ fm->underline_thickness = face->underline_thickness; ++ fm->is_fixed_pitch = FT_IS_FIXED_WIDTH(face); ++ ++ fm->ascender = face->ascender; ++ fm->descender = face->descender; ++ ++ fm->units_per_em = face->units_per_EM; ++ ++ fm->bbox[0] = face->bbox.xMin; ++ fm->bbox[1] = face->bbox.yMin; ++ fm->bbox[2] = face->bbox.xMax; ++ fm->bbox[3] = face->bbox.yMax; ++ ++#ifdef ENABLE_SFNT ++ if( FT_Get_Sfnt_Name(face, TT_NAME_ID_COPYRIGHT, &sn) ) ++#endif /* ENABLE_SFNT */ ++ fm->name_copyright = ""; ++#ifdef ENABLE_SFNT ++ else ++ fm->name_copyright = dupcnstring(sn.string, sn.string_len); ++#endif /* ENABLE_SFNT */ ++ ++ fm->name_family = face->family_name; ++ ++ fm->name_style = face->style_name; ++ if(fm->name_style == NULL) ++ fm->name_style = ""; ++ ++#ifdef ENABLE_SFNT ++ if( FT_Get_Sfnt_Name(face, TT_NAME_ID_FULL_NAME, &sn) ) ++#endif /* ENABLE_SFNT */ ++ { ++ int len; ++ ++ len = strlen(fm->name_family) + strlen(fm->name_style) + 2; ++ if(( fm->name_full = malloc(len) )==NULL) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ strcpy(fm->name_full, fm->name_family); ++ if(strlen(fm->name_style) != 0) { ++ strcat(fm->name_full, " "); ++ strcat(fm->name_full, fm->name_style); ++ } ++ } ++#ifdef ENABLE_SFNT ++ else ++ fm->name_full = dupcnstring(sn.string, sn.string_len); ++#endif /* ENABLE_SFNT */ ++ ++#ifdef ENABLE_SFNT ++ if( FT_Get_Sfnt_Name(face, TT_NAME_ID_VERSION_STRING, &sn) ) ++#endif /* ENABLE_SFNT */ ++ fm->name_version = "1.0"; ++#ifdef ENABLE_SFNT ++ else ++ fm->name_version = dupcnstring(sn.string, sn.string_len); ++#endif /* ENABLE_SFNT */ ++ ++#ifdef XP_PSTEXT ++ { ++ extern const char *xp_psfontname; ++ ++ fm->name_ps = strdup(xp_psfontname); ++ ++ /* Handle the rare case if a family name was not provided by the TTF ++ * font (like Solaris TTF fonts in /usr/openwin/lib/locale/ko.UTF-8/X11/fonts/TrueType, ++ * /usr/openwin/lib/locale/ko/X11/fonts/TrueType) - in this case we ++ * have to generate a family name somehow... */ ++ if(fm->name_family == NULL) ++ fm->name_family = fm->name_ps; ++ } ++#else ++ ++#ifdef ENABLE_SFNT ++ if( FT_Get_Sfnt_Name(face, TT_NAME_ID_PS_NAME , &sn) ) { ++#endif /* ENABLE_SFNT */ ++ if(( fm->name_ps = strdup(fm->name_full) )==NULL) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++#ifdef ENABLE_SFNT ++ } else ++ fm->name_ps = dupcnstring(sn.string, sn.string_len); ++#endif /* ENABLE_SFNT */ ++ ++#endif /* XP_PSTEXT */ ++ ++ for(i=0; fm->name_ps[i]!=0; i++) ++ if(fm->name_ps[i] == ' ') ++ fm->name_ps[i] = '_'; /* no spaces in the Postscript name *m */ ++ ++ /* guess the boldness from the font names */ ++ fm->force_bold=0; ++ ++ fieldstocheck[0] = fm->name_style; ++ fieldstocheck[1] = fm->name_full; ++ fieldstocheck[2] = fm->name_ps; ++ ++ for(i=0; !fm->force_bold && iforce_bold=1; ++ break; ++ } ++ } ++ } ++} ++ ++/* ++ * Functions to decompose the outlines ++ */ ++ ++static GLYPH *curg; ++static double lastx, lasty; ++ ++static int ++outl_moveto( ++ FT_Vector *to, ++ void *unused ++) ++{ ++ double tox, toy; ++ ++ tox = fscale((double)to->x); toy = fscale((double)to->y); ++ ++ /* FreeType does not do explicit closepath() */ ++ if(curg->lastentry) { ++ g_closepath(curg); ++ } ++ fg_rmoveto(curg, tox, toy); ++ lastx = tox; lasty = toy; ++ ++ return 0; ++} ++ ++static int ++outl_lineto( ++ FT_Vector *to, ++ void *unused ++) ++{ ++ double tox, toy; ++ ++ tox = fscale((double)to->x); toy = fscale((double)to->y); ++ ++ fg_rlineto(curg, tox, toy); ++ lastx = tox; lasty = toy; ++ ++ return 0; ++} ++ ++static int ++outl_conicto( ++ FT_Vector *control1, ++ FT_Vector *to, ++ void *unused ++) ++{ ++ double c1x, c1y, tox, toy; ++ ++ c1x = fscale((double)control1->x); c1y = fscale((double)control1->y); ++ tox = fscale((double)to->x); toy = fscale((double)to->y); ++ ++ fg_rrcurveto(curg, ++ (lastx + 2.0 * c1x) / 3.0, (lasty + 2.0 * c1y) / 3.0, ++ (2.0 * c1x + tox) / 3.0, (2.0 * c1y + toy) / 3.0, ++ tox, toy ); ++ lastx = tox; lasty = toy; ++ ++ return 0; ++} ++ ++static int ++outl_cubicto( ++ FT_Vector *control1, ++ FT_Vector *control2, ++ FT_Vector *to, ++ void *unused ++) ++{ ++ double c1x, c1y, c2x, c2y, tox, toy; ++ ++ c1x = fscale((double)control1->x); c1y = fscale((double)control1->y); ++ c2x = fscale((double)control2->x); c2y = fscale((double)control2->y); ++ tox = fscale((double)to->x); toy = fscale((double)to->y); ++ ++ fg_rrcurveto(curg, c1x, c1y, c2x, c2y, tox, toy); ++ lastx = tox; lasty = toy; ++ ++ return 0; ++} ++ ++static FT_Outline_Funcs ft_outl_funcs = { ++ outl_moveto, ++ outl_lineto, ++ outl_conicto, ++ outl_cubicto, ++ 0, ++ 0 ++}; ++ ++/* ++ * Get the path of contrours for a glyph. ++ */ ++ ++static void ++glpath( ++ int glyphno, ++ GLYPH *glyf_list ++) ++{ ++ FT_Outline *ol; ++ ++ curg = &glyf_list[glyphno]; ++ ++ if( FT_Load_Glyph(face, glyphno, FT_LOAD_NO_BITMAP|FT_LOAD_NO_SCALE|FT_LOAD_NO_HINTING) ++ || face->glyph->format != ft_glyph_format_outline ) { ++ fprintf(stderr, "Can't load glyph %s, skipped\n", curg->name); ++ return; ++ } ++ ++ ol = &face->glyph->outline; ++ lastx = 0.0; lasty = 0.0; ++ ++ if( FT_Outline_Decompose(ol, &ft_outl_funcs, NULL) ) { ++ fprintf(stderr, "Can't decompose outline of glyph %s, skipped\n", curg->name); ++ return; ++ } ++ ++ /* FreeType does not do explicit closepath() */ ++ if(curg->lastentry) { ++ g_closepath(curg); ++ } ++ ++ if(ol->flags & ft_outline_reverse_fill) { ++ assertpath(curg->entries, __FILE__, __LINE__, curg->name); ++ reversepaths(curg); ++ } ++} ++ ++/* ++ * Get the kerning data. ++ */ ++ ++static void ++kerning( ++ GLYPH *glyph_list ++) ++{ ++ int i, j, n; ++ int nglyphs = face->num_glyphs; ++ FT_Vector k; ++ GLYPH *gl; ++ ++ if( nglyphs == 0 || !FT_HAS_KERNING(face) ) { ++ WARNING_1 fputs("No Kerning data\n", stderr); ++ return; ++ } ++ ++ for(i=0; i= 1) ++#define WARNING_2 if(warnlevel >= 2) ++#define WARNING_3 if(warnlevel >= 3) ++#define WARNING_4 if(warnlevel >= 4) ++ ++/* ++ * Bitmap control macros ++ */ ++ ++#define BITMAP_BYTES(size) (((size)+7)>>3) ++#define DEF_BITMAP(name, size) unsigned char name[BITMAP_BYTES(size)] ++#define SET_BITMAP(name, bit) ( name[(bit)>>3] |= (1<<((bit)&7)) ) ++#define CLR_BITMAP(name, bit) ( name[(bit)>>3] &= ~(1<<((bit)&7)) ) ++#define IS_BITMAP(name, bit) ( name[(bit)>>3] & (1<<((bit)&7)) ) ++ ++/* debugging */ ++ ++/* debug flags */ ++#define DEBUG_UNICODE 0x00000001 /* unicode to 8-bit code conversion */ ++#define DEBUG_MAINSTEMS 0x00000002 /* glyph-wide main stem generation */ ++#define DEBUG_SUBSTEMS 0x00000004 /* substituted stem generation */ ++#define DEBUG_STEMS (DEBUG_MAINSTEMS|DEBUG_SUBSTEMS) ++#define DEBUG_REVERSAL 0x00000008 /* reversal of the paths */ ++#define DEBUG_FIXCVDIR 0x00000010 /* fixcvdir() */ ++#define DEBUG_STEMOVERLAP 0x00000020 /* stemoverlap() */ ++#define DEBUG_BLUESTEMS 0x00000040 /* markbluestems() */ ++#define DEBUG_STRAIGHTEN 0x00000080 /* markbluestems() */ ++#define DEBUG_EXTMAP 0x00000100 /* parsing of external map */ ++#define DEBUG_TOINT 0x00000200 /* conversion of path to integer */ ++#define DEBUG_BUILDG 0x00000400 /* building of glyph path */ ++#define DEBUG_QUAD 0x00000800 /* splitting curves by quadrants */ ++#define DEBUG_SQEQ 0x00001000 /* square equation solver */ ++#define DEBUG_COMPOSITE 0x00002000 /* handling of composite glyphs */ ++#define DEBUG_FCONCISE 0x00004000 /* normalization of curves */ ++#define DEBUG_FT 0x00008000 /* FreeType front-end */ ++#define DEBUG_BITMAP 0x00010000 /* conversion from bitmap */ ++#define DEBUG_DISABLED 0x80000000 /* special flag: temporary disable debugging */ ++ ++#if 0 ++/* at what we want to look now */ ++#ifndef DEBUG ++# define DEBUG (DEBUG_BITMAP) ++#endif ++ ++/* uncomment the next line if debugging data is wanted for one glyph only */ ++#define DBG_GLYPH "C118" /* */ ++#endif ++ ++#if 1 ++# define ISDBG(name) (0) ++# define ENABLEDBG(condition) (0) ++# define DISABLEDBG(condition) (0) ++#else ++ extern int debug; /* collection of the flags */ ++/* this ISDBG will only work on ANSI C, not K&R */ ++# define ISDBG(name) ( (debug & DEBUG_DISABLED) ? 0 : (debug & (DEBUG_##name)) ) ++# define ENABLEDBG(condition) ( (condition) ? (debug&=~DEBUG_DISABLED) : 0 ) ++# define DISABLEDBG(condition) ( (condition) ? (debug|=DEBUG_DISABLED) : 0 ) ++#endif ++ ++#ifdef DBG_GLYPH ++# define DBG_TO_GLYPH(g) DISABLEDBG( strcmp( (g)->name, DBG_GLYPH ) ) ++# define DBG_FROM_GLYPH(g) ENABLEDBG(1) ++#else ++# define DBG_TO_GLYPH(g) (0) ++# define DBG_FROM_GLYPH(g) (0) ++#endif ++ ++/* prototypes */ ++int iscale( int val); ++double fscale( double val); ++int unicode_rev_lookup( int unival); ++void bmp_outline( GLYPH *g, int scale, char *bmap, ++ int xsz, int ysz, int xoff, int yoff); ++int isign( int x); ++int fsign( double x); ++ ++/* global metrics for a font */ ++ ++struct font_metrics { ++ /* post */ ++ double italic_angle; ++ short underline_position; ++ short underline_thickness; ++ short is_fixed_pitch; ++ ++ /* hhea */ ++ short ascender; ++ short descender; ++ ++ /* head */ ++ unsigned short units_per_em; ++ short bbox[4]; ++ ++ /* name */ ++ char *name_copyright; ++ char *name_family; ++ char *name_style; ++ char *name_full; ++ char *name_version; ++ char *name_ps; ++ ++ /* other */ ++ int force_bold; ++}; ++ ++/* size of the encoding table - glyphs beyond 255 are actually unnumbered */ ++ ++#define ENCTABSZ 1024 ++ ++/* switch table structure for front-ends */ ++ ++#define MAXSUFFIX 10 ++ ++struct frontsw { ++ char *name; /* name of the front end */ ++ char *descr; /* description of the front end */ ++ char *suffix[MAXSUFFIX]; /* possible file name suffixes */ ++ ++ void (*open)(char *fname, char *arg); /* open font file */ ++ void (*close)(void); /* close font file */ ++ int (*nglyphs)(void); /* get the number of glyphs */ ++ int (*glnames)(GLYPH *glyphs); /* get the names of glyphs */ ++ void (*glmetrics)(GLYPH *glyphs); /* get the metrics of glyphs */ ++ int (*glenc)(GLYPH *glyphs, int *enc, int *unimap); /* get the encoding */ ++ void (*fnmetrics)(struct font_metrics *fm); /* get the font metrics */ ++ void (*glpath)(int glyphno, GLYPH *glyphs); /* get the glyph path */ ++ void (*kerning)(GLYPH *glyph_list); /* extract the kerning data */ ++}; +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/Makefile xserver/hw/xprint/extras/ttf2pt1/Makefile +--- xserver-old/hw/xprint/extras/ttf2pt1/Makefile 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/Makefile 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,279 @@ ++ ++# This file should be configured before running `make'. ++# Uncomment or change the values that are relevant for your OS. ++ ++# The preferred C compiler (by default use the OS-specific default value). ++# For BSD/OS, FreeBSD, Linux (all flavors), NetBSD, OpenBSD the default ++# compiler is GNU C. ++# (Note please the politically correct ordering by alphabet ! :-) ++# ++# Use GNU C even if it's not the default compiler ++# ++#CC=gcc ++# ++# Use the standard ANSI C compiler on HP-UX even if it's not default ++# ++#CC=c89 ++ ++# ++# The system-dependent flags for the C compiler ++# ++# Default ++ ++CFLAGS_SYS= -O ++ ++# For GNU C ++# ++#CFLAGS_SYS= -O2 ++# ++# For GNU C with long options support library (Linux etc.) ++# ++#CFLAGS_SYS= -O2 -D_GNU_SOURCE ++# ++# For GNU C on HP-UX/PA-RISC 1.1 ++# ++#CFLAGS_SYS= -O2 -Wa,-w ++# ++# For the standard ANSI C on HP-UX ++# ++#CFLAGS_SYS= +O2 -D_HPUX_SOURCE ++ ++# ++# The system-dependent libraries ++# ++# Defalut (for the BSD-style OSes) ++ ++LIBS_SYS= -lm ++ ++# For SystemV (such as SCO, UnixWare, Solaris, but _NOT_ Linux or HP-UX) ++# ++#LIBS_SYS= -lm -lsocket ++ ++# ++# The flags for C compiler for the FreeType-2 library (disabled by default). ++# This WON'T BUILD with FT2-beta8, use the FreeType release 2.0.4 ++# http://download.sourceforge.net/freetype/freetype-2.0.4.tar.gz ++ ++CFLAGS_FT= ++ ++# To enable use of the FreeType-2 library ++# (if the include and lib directory do not match your installation, ++# modify them), also uncomment LIBS_FT ++# ++#CFLAGS_FT = -DUSE_FREETYPE -I/usr/local/include/freetype2 -I/usr/local/include ++ ++# ++# The FreeType-2 library flags (disabled by default) ++ ++LIBS_FT= ++ ++# To enable use of the FreeType-2 library ++# (if the include and lib directory do not match your installation, ++# modify them), also uncomment CFLAGS_FT ++# ++#LIBS_FT= -L/usr/local/lib -lfreetype ++ ++# ++# The flags for C compiler for the Autotrace library (disabled by default). ++# USE OF THIS FEATURE IS STRONGLY DISCOURAGED, THE BUILT-IN TRACING ++# (AKA VECTORIZATION) PROVIDES MUCH BETTER RESULTS. ++# The tested version is 0.29a (and the fonts produced with it are ++# absolutely not usable). ++# http://download.sourceforge.net/autotrace/autotrace-0.29.tar.gz ++ ++CFLAGS_AT= ++ ++# To enable use of the Autotrace library ++# (if the include and lib directory do not match your installation, ++# modify them), also uncomment LIBS_AT ++# ++#CFLAGS_AT = -DUSE_AUTOTRACE -I/usr/local/include ++ ++# ++# The Autotrace library flags (disabled by default) ++ ++LIBS_AT= ++ ++# To enable use of the Autotrace library ++# (if the include and lib directory do not match your installation, ++# modify them), also uncomment CFLAGS_AT ++# ++#LIBS_AT= -L/usr/local/lib -lautotrace ++ ++# ++# Preference of front-ends if multiple parsers match a file ++# (by default the build-in front-end takes preference over FreeType) ++ ++CFLAGS_PREF= ++ ++# To prefer FreeType (if enabled): ++# ++#CFLAGS_PREF= -DPREFER_FREETYPE ++ ++# Uncomment the second line to not compile t1asm into ttf2pt1 ++CFLAGS_EXTT1ASM= ++#CFLAGS_EXTT1ASM= -DEXTERNAL_T1ASM ++ ++CFLAGS= $(CFLAGS_SYS) $(CFLAGS_FT) $(CFLAGS_AT) $(CFLAGS_PREF) ++LIBS= $(LIBS_SYS) $(LIBS_FT) $(LIBS_AT) ++ ++# Installation-related stuff ++# ++# The base dir for installation and subdirs in it ++INSTDIR = /usr/local ++# for binaries ++BINDIR = $(INSTDIR)/bin ++# for binaries of little general interest ++LIBXDIR = $(INSTDIR)/libexec/ttf2pt1 ++# for scripts, maps/encodings etc. ++SHAREDIR = $(INSTDIR)/share/ttf2pt1 ++MANDIR = $(INSTDIR)/man ++ ++# owner and group of installed files ++OWNER = root ++GROUP = bin ++ ++# After you have configured the Makefile, comment out the following ++# definition: ++warning: docs ++ @echo >&2 ++ @echo " You have to configure the Makefile before running make!" >&2 ++ @echo "(or if you are lazy and hope that it will work as is run \`make all')">&2 ++ @echo >&2 ++ ++DOCS=CHANGES README FONTS FONTS.hpux encodings/README other/README \ ++ app/X11/README app/netscape/README app/TeX/README ++ ++SUBDIRS = app encodings maps scripts other ++TXTFILES = README* FONTS* CHANGES* COPYRIGHT ++ ++MANS1=ttf2pt1.1 ttf2pt1_convert.1 ttf2pt1_x2gs.1 ++MANS=$(MANS1) $(MANS5) ++ ++all: t1asm ttf2pt1 docs mans rpm ++ ++docs: $(DOCS) ++ ++mans: $(MANS) ++ ++clean: ++ rm -f t1asm ttf2pt1 *.o app/RPM/Makefile app/RPM/*.spec *.core core.* core ++ ( cd other && make clean; ) ++ ( cd app/netscape && make clean; ) ++ ++veryclean: clean ++ rm -f $(DOCS) $(MANS) ++ ++rpm: app/RPM/Makefile app/RPM/ttf2pt1.spec ++ ++ttf2pt1.1: README.html ++ scripts/html2man . . app/RPM/Makefile ++ ++app/RPM/ttf2pt1.spec: app/RPM/ttf2pt1.spec.src version.h ++ sed 's/^Version:.*/Version: '`grep TTF2PT1_VERSION version.h| cut -d\" -f2`'/' $@ ++ ++t1asm: t1asm.c ++ $(CC) $(CFLAGS) -o t1asm -DSTANDALONE t1asm.c $(LIBS) ++ ++ttf2pt1.o: ttf2pt1.c ttf.h pt1.h global.h version.h ++ $(CC) $(CFLAGS) -c ttf2pt1.c ++ ++pt1.o: pt1.c ttf.h pt1.h global.h ++ $(CC) $(CFLAGS) -c pt1.c ++ ++ttf.o: ttf.c ttf.h pt1.h global.h ++ $(CC) $(CFLAGS) -c ttf.c ++ ++ft.o: ft.c pt1.h global.h ++ $(CC) $(CFLAGS) -c ft.c ++ ++bdf.o: bdf.c pt1.h global.h ++ $(CC) $(CFLAGS) -c bdf.c ++ ++bitmap.o: bitmap.c pt1.h global.h ++ $(CC) $(CFLAGS) -c bitmap.c ++ ++runt1asm.o: runt1asm.c global.h ++ $(CC) $(CFLAGS) $(CFLAGS_EXTT1ASM) -c runt1asm.c ++ ++ttf2pt1: ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o ++ $(CC) $(CFLAGS) -o ttf2pt1 ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o $(LIBS) ++ ++CHANGES: CHANGES.html ++ scripts/unhtml CHANGES ++ ++README: README.html ++ scripts/unhtml README ++ ++encodings/README: encodings/README.html ++ scripts/unhtml encodings/README ++ ++other/README: other/README.html ++ scripts/unhtml other/README ++ ++app/X11/README: app/X11/README.html ++ scripts/unhtml app/X11/README ++ ++app/netscape/README: app/netscape/README.html ++ scripts/unhtml app/netscape/README ++ ++app/TeX/README: app/TeX/README.html ++ scripts/unhtml app/TeX/README ++ ++FONTS: FONTS.html ++ scripts/unhtml FONTS ++ ++FONTS.hpux: FONTS.hpux.html ++ scripts/unhtml FONTS.hpux ++ ++install: all ++ scripts/inst_dir $(BINDIR) $(OWNER) $(GROUP) 0755 ++ scripts/inst_dir $(LIBXDIR) $(OWNER) $(GROUP) 0755 ++ scripts/inst_dir $(SHAREDIR) $(OWNER) $(GROUP) 0755 ++ scripts/inst_dir $(MANDIR)/man1 $(OWNER) $(GROUP) 0755 ++ scripts/inst_dir $(MANDIR)/man5 $(OWNER) $(GROUP) 0755 ++ cp -R $(TXTFILES) $(SUBDIRS) $(SHAREDIR) ++ chown -R $(OWNER) $(SHAREDIR) ++ chgrp -R $(GROUP) $(SHAREDIR) ++ chmod -R go-w $(SHAREDIR) ++ scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755 ++ [ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755 ++ sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\ ++ s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\ ++ s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' cvt.tmp ++ scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755 ++ scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755 ++ rm cvt.tmp ++ scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755 ++ for i in $(MANS1); do { \ ++ sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\ ++ s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\ ++ s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \ ++ && chown $(OWNER) $(MANDIR)/man1/$$i \ ++ && chgrp $(GROUP) $(MANDIR)/man1/$$i \ ++ && chmod 0644 $(MANDIR)/man1/$$i \ ++ || exit 1; \ ++ } done ++ ++uninstall: ++ rm -f $(BINDIR)/ttf2pt1 $(BINDIR)/ttf2pt1_convert $(BINDIR)/ttf2pt1_x2gs ++ rm -rf $(LIBXDIR) ++ rm -rf $(SHAREDIR) ++ for i in $(MANS1); do { \ ++ rm -f $(MANDIR)/man1/$$i $(MANDIR)/man1/$$i.gz; \ ++ } done ++ ++ ++# targets for automatic generation of releases and snapshots ++ ++snapshot: ++ scripts/mkrel snapshot ++ ++release: ++ scripts/mkrel release +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/pt1.c xserver/hw/xprint/extras/ttf2pt1/pt1.c +--- xserver-old/hw/xprint/extras/ttf2pt1/pt1.c 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/pt1.c 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,7374 @@ ++/* ++ * see COPYRIGHT ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifndef WINDOWS ++# include ++# include ++#else ++# include "windows.h" ++#endif ++ ++#include "ttf.h" ++#include "pt1.h" ++#include "global.h" ++ ++/* big and small values for comparisons */ ++#define FBIGVAL (1e20) ++#define FEPS (100000./FBIGVAL) ++ ++/* names of the axes */ ++#define X 0 ++#define Y 1 ++ ++/* the GENTRY extension structure used in fforceconcise() */ ++ ++struct gex_con { ++ double d[2 /*X, Y*/]; /* sizes of curve */ ++ double sin2; /* squared sinus of the angle to the next gentry */ ++ double len2; /* squared distance between the endpoints */ ++ ++/* number of reference dots taken from each curve */ ++#define NREFDOTS 3 ++ ++ double dots[NREFDOTS][2]; /* reference dots */ ++ ++ int flags; /* flags for gentry and tits joint to the next gentry */ ++/* a vertical or horizontal line may be in 2 quadrants at once */ ++#define GEXF_QUL 0x00000001 /* in up-left quadrant */ ++#define GEXF_QUR 0x00000002 /* in up-right quadrant */ ++#define GEXF_QDR 0x00000004 /* in down-right quadrant */ ++#define GEXF_QDL 0x00000008 /* in down-left quadrant */ ++#define GEXF_QMASK 0x0000000F /* quadrant mask */ ++ ++/* if a line is nearly vertical or horizontal, we remember that idealized quartant too */ ++#define GEXF_QTO_IDEAL(f) (((f)&0xF)<<4) ++#define GEXF_QFROM_IDEAL(f) (((f)&0xF0)>>4) ++#define GEXF_IDQ_L 0x00000090 /* left */ ++#define GEXF_IDQ_R 0x00000060 /* right */ ++#define GEXF_IDQ_U 0x00000030 /* up */ ++#define GEXF_IDQ_D 0x000000C0 /* down */ ++ ++/* possibly can be joined with conditions: ++ * (in order of increasing preference, the numeric order is important) ++ */ ++#define GEXF_JLINE 0x00000100 /* into one line */ ++#define GEXF_JIGN 0x00000200 /* if one entry's tangent angle is ignored */ ++#define GEXF_JID 0x00000400 /* if one entry is idealized to hor/vert */ ++#define GEXF_JFLAT 0x00000800 /* if one entry is flattened */ ++#define GEXF_JGOOD 0x00001000 /* perfectly, no additional maodifications */ ++ ++#define GEXF_JMASK 0x00001F00 /* the mask of all above */ ++#define GEXF_JCVMASK 0x00001E00 /* the mask of all above except JLINE */ ++ ++/* which entry needs to be modified for conditional joining */ ++#define GEXF_JIGN1 0x00002000 ++#define GEXF_JIGN2 0x00004000 ++#define GEXF_JIGNDIR(dir) (GEXF_JIGN1<<(dir)) ++#define GEXF_JID1 0x00008000 ++#define GEXF_JID2 0x00010000 ++#define GEXF_JIDDIR(dir) (GEXF_JID1<<(dir)) ++#define GEXF_JFLAT1 0x00020000 ++#define GEXF_JFLAT2 0x00040000 ++#define GEXF_JFLATDIR(dir) (GEXF_JFLAT1<<(dir)) ++ ++#define GEXF_VERT 0x00100000 /* is nearly vertical */ ++#define GEXF_HOR 0x00200000 /* is nearly horizontal */ ++#define GEXF_FLAT 0x00400000 /* is nearly flat */ ++ ++#define GEXF_VDOTS 0x01000000 /* the dots are valid */ ++ ++ signed char isd[2 /*X,Y*/]; /* signs of the sizes */ ++}; ++typedef struct gex_con GEX_CON; ++ ++/* convenience macros */ ++#define X_CON(ge) ((GEX_CON *)((ge)->ext)) ++#define X_CON_D(ge) (X_CON(ge)->d) ++#define X_CON_DX(ge) (X_CON(ge)->d[0]) ++#define X_CON_DY(ge) (X_CON(ge)->d[1]) ++#define X_CON_ISD(ge) (X_CON(ge)->isd) ++#define X_CON_ISDX(ge) (X_CON(ge)->isd[0]) ++#define X_CON_ISDY(ge) (X_CON(ge)->isd[1]) ++#define X_CON_SIN2(ge) (X_CON(ge)->sin2) ++#define X_CON_LEN2(ge) (X_CON(ge)->len2) ++#define X_CON_F(ge) (X_CON(ge)->flags) ++ ++/* performance statistics about guessing the concise curves */ ++static int ggoodcv=0, ggoodcvdots=0, gbadcv=0, gbadcvdots=0; ++ ++int stdhw, stdvw; /* dominant stems widths */ ++int stemsnaph[12], stemsnapv[12]; /* most typical stem width */ ++ ++int bluevalues[14]; ++int nblues; ++int otherblues[10]; ++int notherb; ++int bbox[4]; /* the FontBBox array */ ++double italic_angle; ++ ++GLYPH *glyph_list; ++int encoding[ENCTABSZ]; /* inverse of glyph[].char_no */ ++int kerning_pairs = 0; ++ ++/* prototypes */ ++static void fixcvdir( GENTRY * ge, int dir); ++static void fixcvends( GENTRY * ge); ++static int fgetcvdir( GENTRY * ge); ++static int igetcvdir( GENTRY * ge); ++static int fiszigzag( GENTRY *ge); ++static int iiszigzag( GENTRY *ge); ++static GENTRY * freethisge( GENTRY *ge); ++static void addgeafter( GENTRY *oge, GENTRY *nge ); ++static GENTRY * newgentry( int flags); ++static void debugstems( char *name, STEM * hstems, int nhs, STEM * vstems, int nvs); ++static int addbluestems( STEM *s, int n); ++static void sortstems( STEM * s, int n); ++static int stemoverlap( STEM * s1, STEM * s2); ++static int steminblue( STEM *s); ++static void markbluestems( STEM *s, int nold); ++static int joinmainstems( STEM * s, int nold, int useblues); ++static void joinsubstems( STEM * s, short *pairs, int nold, int useblues); ++static void fixendpath( GENTRY *ge); ++static void fdelsmall( GLYPH *g, double minlen); ++static void alloc_gex_con( GENTRY *ge); ++static double fjointsin2( GENTRY *ge1, GENTRY *ge2); ++#if 0 ++static double fcvarea( GENTRY *ge); ++#endif ++static double fcvval( GENTRY *ge, int axis, double t); ++static void fsampledots( GENTRY *ge, double dots[][2], int ndots); ++static void fnormalizege( GENTRY *ge); ++static void fanalyzege( GENTRY *ge); ++static void fanalyzejoint( GENTRY *ge); ++static void fconcisecontour( GLYPH *g, GENTRY *ge); ++static double fclosegap( GENTRY *from, GENTRY *to, int axis, ++ double gap, double *ret); ++ ++int ++isign( ++ int x ++) ++{ ++ if (x > 0) ++ return 1; ++ else if (x < 0) ++ return -1; ++ else ++ return 0; ++} ++ ++int ++fsign( ++ double x ++) ++{ ++ if (x > 0.0) ++ return 1; ++ else if (x < 0.0) ++ return -1; ++ else ++ return 0; ++} ++ ++static GENTRY * ++newgentry( ++ int flags ++) ++{ ++ GENTRY *ge; ++ ++ ge = calloc(1, sizeof(GENTRY)); ++ ++ if (ge == 0) { ++ fprintf(stderr, "***** Memory allocation error *****\n"); ++ exit(255); ++ } ++ ge->stemid = -1; ++ ge->flags = flags; ++ /* the rest is set to 0 by calloc() */ ++ return ge; ++} ++ ++/* ++ * Routines to print out Postscript functions with optimization ++ */ ++ ++void ++rmoveto( ++ int dx, ++ int dy ++) ++{ ++ if (optimize && dx == 0) ++ fprintf(pfa_file, "%d vmoveto\n", dy); ++ else if (optimize && dy == 0) ++ fprintf(pfa_file, "%d hmoveto\n", dx); ++ else ++ fprintf(pfa_file, "%d %d rmoveto\n", dx, dy); ++} ++ ++void ++rlineto( ++ int dx, ++ int dy ++) ++{ ++ if (optimize && dx == 0 && dy == 0) /* for special pathologic ++ * case */ ++ return; ++ else if (optimize && dx == 0) ++ fprintf(pfa_file, "%d vlineto\n", dy); ++ else if (optimize && dy == 0) ++ fprintf(pfa_file, "%d hlineto\n", dx); ++ else ++ fprintf(pfa_file, "%d %d rlineto\n", dx, dy); ++} ++ ++void ++rrcurveto( ++ int dx1, ++ int dy1, ++ int dx2, ++ int dy2, ++ int dx3, ++ int dy3 ++) ++{ ++ /* first two ifs are for crazy cases that occur surprisingly often */ ++ if (optimize && dx1 == 0 && dx2 == 0 && dx3 == 0) ++ rlineto(0, dy1 + dy2 + dy3); ++ else if (optimize && dy1 == 0 && dy2 == 0 && dy3 == 0) ++ rlineto(dx1 + dx2 + dx3, 0); ++ else if (optimize && dy1 == 0 && dx3 == 0) ++ fprintf(pfa_file, "%d %d %d %d hvcurveto\n", ++ dx1, dx2, dy2, dy3); ++ else if (optimize && dx1 == 0 && dy3 == 0) ++ fprintf(pfa_file, "%d %d %d %d vhcurveto\n", ++ dy1, dx2, dy2, dx3); ++ else ++ fprintf(pfa_file, "%d %d %d %d %d %d rrcurveto\n", ++ dx1, dy1, dx2, dy2, dx3, dy3); ++} ++ ++void ++closepath(void) ++{ ++ fprintf(pfa_file, "closepath\n"); ++} ++ ++/* ++ * Many of the path processing routines exist (or will exist) in ++ * both floating-point and integer version. Fimally most of the ++ * processing will go in floating point and the integer processing ++ * will become legacy. ++ * The names of floating routines start with f, names of integer ++ * routines start with i, and those old routines existing in one ++ * version only have no such prefix at all. ++ */ ++ ++/* ++** Routine that checks integrity of the path, for debugging ++*/ ++ ++void ++assertpath( ++ GENTRY * from, ++ char *file, ++ int line, ++ char *name ++) ++{ ++ GENTRY *first, *pe, *ge; ++ int isfloat; ++ ++ if(from==0) ++ return; ++ isfloat = (from->flags & GEF_FLOAT); ++ pe = from->prev; ++ for (ge = from; ge != 0; pe = ge, ge = ge->next) { ++ if( (ge->flags & GEF_FLOAT) ^ isfloat ) { ++ fprintf(stderr, "**! assertpath: called from %s line %d (%s) ****\n", file, line, name); ++ fprintf(stderr, "float flag changes from %s to %s at 0x%p (type %c, prev type %c)\n", ++ (isfloat ? "TRUE" : "FALSE"), (isfloat ? "FALSE" : "TRUE"), ge, ge->type, pe->type); ++ abort(); ++ } ++ if (pe != ge->prev) { ++ fprintf(stderr, "**! assertpath: called from %s line %d (%s) ****\n", file, line, name); ++ fprintf(stderr, "unidirectional chain 0x%x -next-> 0x%x -prev-> 0x%x \n", ++ pe, ge, ge->prev); ++ abort(); ++ } ++ ++ switch(ge->type) { ++ case GE_MOVE: ++ break; ++ case GE_PATH: ++ if (ge->prev == 0) { ++ fprintf(stderr, "**! assertpath: called from %s line %d (%s) ****\n", file, line, name); ++ fprintf(stderr, "empty path at 0x%x \n", ge); ++ abort(); ++ } ++ break; ++ case GE_LINE: ++ case GE_CURVE: ++ if(ge->frwd->bkwd != ge) { ++ fprintf(stderr, "**! assertpath: called from %s line %d (%s) ****\n", file, line, name); ++ fprintf(stderr, "unidirectional chain 0x%x -frwd-> 0x%x -bkwd-> 0x%x \n", ++ ge, ge->frwd, ge->frwd->bkwd); ++ abort(); ++ } ++ if(ge->prev->type == GE_MOVE) { ++ first = ge; ++ if(ge->bkwd->next->type != GE_PATH) { ++ fprintf(stderr, "**! assertpath: called from %s line %d (%s) ****\n", file, line, name); ++ fprintf(stderr, "broken first backlink 0x%x -bkwd-> 0x%x -next-> 0x%x \n", ++ ge, ge->bkwd, ge->bkwd->next); ++ abort(); ++ } ++ } ++ if(ge->next->type == GE_PATH) { ++ if(ge->frwd != first) { ++ fprintf(stderr, "**! assertpath: called from %s line %d (%s) ****\n", file, line, name); ++ fprintf(stderr, "broken loop 0x%x -...-> 0x%x -frwd-> 0x%x \n", ++ first, ge, ge->frwd); ++ abort(); ++ } ++ } ++ break; ++ } ++ ++ } ++} ++ ++void ++assertisfloat( ++ GLYPH *g, ++ char *msg ++) ++{ ++ if( !(g->flags & GF_FLOAT) ) { ++ fprintf(stderr, "**! Glyph %s is not float: %s\n", g->name, msg); ++ abort(); ++ } ++ if(g->lastentry) { ++ if( !(g->lastentry->flags & GEF_FLOAT) ) { ++ fprintf(stderr, "**! Glyphs %s last entry is int: %s\n", g->name, msg); ++ abort(); ++ } ++ } ++} ++ ++void ++assertisint( ++ GLYPH *g, ++ char *msg ++) ++{ ++ if( (g->flags & GF_FLOAT) ) { ++ fprintf(stderr, "**! Glyph %s is not int: %s\n", g->name, msg); ++ abort(); ++ } ++ if(g->lastentry) { ++ if( (g->lastentry->flags & GEF_FLOAT) ) { ++ fprintf(stderr, "**! Glyphs %s last entry is float: %s\n", g->name, msg); ++ abort(); ++ } ++ } ++} ++ ++ ++/* ++ * Routines to save the generated data about glyph ++ */ ++ ++void ++fg_rmoveto( ++ GLYPH * g, ++ double x, ++ double y) ++{ ++ GENTRY *oge; ++ ++ if (ISDBG(BUILDG)) ++ fprintf(stderr, "%s: f rmoveto(%g, %g)\n", g->name, x, y); ++ ++ assertisfloat(g, "adding float MOVE"); ++ ++ if ((oge = g->lastentry) != 0) { ++ if (oge->type == GE_MOVE) { /* just eat up the first move */ ++ oge->fx3 = x; ++ oge->fy3 = y; ++ } else if (oge->type == GE_LINE || oge->type == GE_CURVE) { ++ fprintf(stderr, "Glyph %s: MOVE in middle of path\n", g->name); ++ } else { ++ GENTRY *nge; ++ ++ nge = newgentry(GEF_FLOAT); ++ nge->type = GE_MOVE; ++ nge->fx3 = x; ++ nge->fy3 = y; ++ ++ oge->next = nge; ++ nge->prev = oge; ++ g->lastentry = nge; ++ } ++ } else { ++ GENTRY *nge; ++ ++ nge = newgentry(GEF_FLOAT); ++ nge->type = GE_MOVE; ++ nge->fx3 = x; ++ nge->fy3 = y; ++ nge->bkwd = (GENTRY*)&g->entries; ++ g->entries = g->lastentry = nge; ++ } ++ ++ if (0 && ISDBG(BUILDG)) ++ dumppaths(g, NULL, NULL); ++} ++ ++void ++ig_rmoveto( ++ GLYPH * g, ++ int x, ++ int y) ++{ ++ GENTRY *oge; ++ ++ if (ISDBG(BUILDG)) ++ fprintf(stderr, "%s: i rmoveto(%d, %d)\n", g->name, x, y); ++ ++ assertisint(g, "adding int MOVE"); ++ ++ if ((oge = g->lastentry) != 0) { ++ if (oge->type == GE_MOVE) { /* just eat up the first move */ ++ oge->ix3 = x; ++ oge->iy3 = y; ++ } else if (oge->type == GE_LINE || oge->type == GE_CURVE) { ++ fprintf(stderr, "Glyph %s: MOVE in middle of path, ignored\n", g->name); ++ } else { ++ GENTRY *nge; ++ ++ nge = newgentry(0); ++ nge->type = GE_MOVE; ++ nge->ix3 = x; ++ nge->iy3 = y; ++ ++ oge->next = nge; ++ nge->prev = oge; ++ g->lastentry = nge; ++ } ++ } else { ++ GENTRY *nge; ++ ++ nge = newgentry(0); ++ nge->type = GE_MOVE; ++ nge->ix3 = x; ++ nge->iy3 = y; ++ nge->bkwd = (GENTRY*)&g->entries; ++ g->entries = g->lastentry = nge; ++ } ++ ++} ++ ++void ++fg_rlineto( ++ GLYPH * g, ++ double x, ++ double y) ++{ ++ GENTRY *oge, *nge; ++ ++ if (ISDBG(BUILDG)) ++ fprintf(stderr, "%s: f rlineto(%g, %g)\n", g->name, x, y); ++ ++ assertisfloat(g, "adding float LINE"); ++ ++ nge = newgentry(GEF_FLOAT); ++ nge->type = GE_LINE; ++ nge->fx3 = x; ++ nge->fy3 = y; ++ ++ if ((oge = g->lastentry) != 0) { ++ if (x == oge->fx3 && y == oge->fy3) { /* empty line */ ++ /* ignore it or we will get in troubles later */ ++ free(nge); ++ return; ++ } ++ if (g->path == 0) { ++ g->path = nge; ++ nge->bkwd = nge->frwd = nge; ++ } else { ++ oge->frwd = nge; ++ nge->bkwd = oge; ++ g->path->bkwd = nge; ++ nge->frwd = g->path; ++ } ++ ++ oge->next = nge; ++ nge->prev = oge; ++ g->lastentry = nge; ++ } else { ++ WARNING_1 fprintf(stderr, "Glyph %s: LINE outside of path\n", g->name); ++ free(nge); ++ } ++ ++ if (0 && ISDBG(BUILDG)) ++ dumppaths(g, NULL, NULL); ++} ++ ++void ++ig_rlineto( ++ GLYPH * g, ++ int x, ++ int y) ++{ ++ GENTRY *oge, *nge; ++ ++ if (ISDBG(BUILDG)) ++ fprintf(stderr, "%s: i rlineto(%d, %d)\n", g->name, x, y); ++ ++ assertisint(g, "adding int LINE"); ++ ++ nge = newgentry(0); ++ nge->type = GE_LINE; ++ nge->ix3 = x; ++ nge->iy3 = y; ++ ++ if ((oge = g->lastentry) != 0) { ++ if (x == oge->ix3 && y == oge->iy3) { /* empty line */ ++ /* ignore it or we will get in troubles later */ ++ free(nge); ++ return; ++ } ++ if (g->path == 0) { ++ g->path = nge; ++ nge->bkwd = nge->frwd = nge; ++ } else { ++ oge->frwd = nge; ++ nge->bkwd = oge; ++ g->path->bkwd = nge; ++ nge->frwd = g->path; ++ } ++ ++ oge->next = nge; ++ nge->prev = oge; ++ g->lastentry = nge; ++ } else { ++ WARNING_1 fprintf(stderr, "Glyph %s: LINE outside of path\n", g->name); ++ free(nge); ++ } ++ ++} ++ ++void ++fg_rrcurveto( ++ GLYPH * g, ++ double x1, ++ double y1, ++ double x2, ++ double y2, ++ double x3, ++ double y3) ++{ ++ GENTRY *oge, *nge; ++ ++ oge = g->lastentry; ++ ++ if (ISDBG(BUILDG)) ++ fprintf(stderr, "%s: f rrcurveto(%g, %g, %g, %g, %g, %g)\n" ++ ,g->name, x1, y1, x2, y2, x3, y3); ++ ++ assertisfloat(g, "adding float CURVE"); ++ ++ if (oge && oge->fx3 == x1 && x1 == x2 && x2 == x3) /* check if it's ++ * actually a line */ ++ fg_rlineto(g, x1, y3); ++ else if (oge && oge->fy3 == y1 && y1 == y2 && y2 == y3) ++ fg_rlineto(g, x3, y1); ++ else { ++ nge = newgentry(GEF_FLOAT); ++ nge->type = GE_CURVE; ++ nge->fx1 = x1; ++ nge->fy1 = y1; ++ nge->fx2 = x2; ++ nge->fy2 = y2; ++ nge->fx3 = x3; ++ nge->fy3 = y3; ++ ++ if (oge != 0) { ++ if (x3 == oge->fx3 && y3 == oge->fy3) { ++ free(nge); /* consider this curve empty */ ++ /* ignore it or we will get in troubles later */ ++ return; ++ } ++ if (g->path == 0) { ++ g->path = nge; ++ nge->bkwd = nge->frwd = nge; ++ } else { ++ oge->frwd = nge; ++ nge->bkwd = oge; ++ g->path->bkwd = nge; ++ nge->frwd = g->path; ++ } ++ ++ oge->next = nge; ++ nge->prev = oge; ++ g->lastentry = nge; ++ } else { ++ WARNING_1 fprintf(stderr, "Glyph %s: CURVE outside of path\n", g->name); ++ free(nge); ++ } ++ } ++ ++ if (0 && ISDBG(BUILDG)) ++ dumppaths(g, NULL, NULL); ++} ++ ++void ++ig_rrcurveto( ++ GLYPH * g, ++ int x1, ++ int y1, ++ int x2, ++ int y2, ++ int x3, ++ int y3) ++{ ++ GENTRY *oge, *nge; ++ ++ oge = g->lastentry; ++ ++ if (ISDBG(BUILDG)) ++ fprintf(stderr, "%s: i rrcurveto(%d, %d, %d, %d, %d, %d)\n" ++ ,g->name, x1, y1, x2, y2, x3, y3); ++ ++ assertisint(g, "adding int CURVE"); ++ ++ if (oge && oge->ix3 == x1 && x1 == x2 && x2 == x3) /* check if it's ++ * actually a line */ ++ ig_rlineto(g, x1, y3); ++ else if (oge && oge->iy3 == y1 && y1 == y2 && y2 == y3) ++ ig_rlineto(g, x3, y1); ++ else { ++ nge = newgentry(0); ++ nge->type = GE_CURVE; ++ nge->ix1 = x1; ++ nge->iy1 = y1; ++ nge->ix2 = x2; ++ nge->iy2 = y2; ++ nge->ix3 = x3; ++ nge->iy3 = y3; ++ ++ if (oge != 0) { ++ if (x3 == oge->ix3 && y3 == oge->iy3) { ++ free(nge); /* consider this curve empty */ ++ /* ignore it or we will get in troubles later */ ++ return; ++ } ++ if (g->path == 0) { ++ g->path = nge; ++ nge->bkwd = nge->frwd = nge; ++ } else { ++ oge->frwd = nge; ++ nge->bkwd = oge; ++ g->path->bkwd = nge; ++ nge->frwd = g->path; ++ } ++ ++ oge->next = nge; ++ nge->prev = oge; ++ g->lastentry = nge; ++ } else { ++ WARNING_1 fprintf(stderr, "Glyph %s: CURVE outside of path\n", g->name); ++ free(nge); ++ } ++ } ++} ++ ++void ++g_closepath( ++ GLYPH * g ++) ++{ ++ GENTRY *oge, *nge; ++ ++ if (ISDBG(BUILDG)) ++ fprintf(stderr, "%s: closepath\n", g->name); ++ ++ oge = g->lastentry; ++ ++ if (g->path == 0) { ++ WARNING_1 fprintf(stderr, "Warning: **** closepath on empty path in glyph \"%s\" ****\n", ++ g->name); ++ if (oge == 0) { ++ WARNING_1 fprintf(stderr, "No previois entry\n"); ++ } else { ++ WARNING_1 fprintf(stderr, "Previous entry type: %c\n", oge->type); ++ if (oge->type == GE_MOVE) { ++ g->lastentry = oge->prev; ++ if (oge->prev == 0) ++ g->entries = 0; ++ else ++ g->lastentry->next = 0; ++ free(oge); ++ } ++ } ++ return; ++ } ++ ++ nge = newgentry(oge->flags & GEF_FLOAT); /* keep the same type */ ++ nge->type = GE_PATH; ++ ++ g->path = 0; ++ ++ oge->next = nge; ++ nge->prev = oge; ++ g->lastentry = nge; ++ ++ if (0 && ISDBG(BUILDG)) ++ dumppaths(g, NULL, NULL); ++} ++ ++/* ++ * * SB * Routines to smooth and fix the glyphs ++ */ ++ ++/* ++** we don't want to see the curves with coinciding middle and ++** outer points ++*/ ++ ++static void ++fixcvends( ++ GENTRY * ge ++) ++{ ++ int dx, dy; ++ int x0, y0, x1, y1, x2, y2, x3, y3; ++ ++ if (ge->type != GE_CURVE) ++ return; ++ ++ if(ge->flags & GEF_FLOAT) { ++ fprintf(stderr, "**! fixcvends(0x%x) on floating entry, ABORT\n", ge); ++ abort(); /* dump core */ ++ } ++ ++ x0 = ge->prev->ix3; ++ y0 = ge->prev->iy3; ++ x1 = ge->ix1; ++ y1 = ge->iy1; ++ x2 = ge->ix2; ++ y2 = ge->iy2; ++ x3 = ge->ix3; ++ y3 = ge->iy3; ++ ++ ++ /* look at the start of the curve */ ++ if (x1 == x0 && y1 == y0) { ++ dx = x2 - x1; ++ dy = y2 - y1; ++ ++ if ((dx == 0 && dy == 0) ++ || (x2 == x3 && y2 == y3)) { ++ /* Oops, we actually have a straight line */ ++ /* ++ * if it's small, we hope that it will get optimized ++ * later ++ */ ++ if (abs(x3 - x0) <= 2 || abs(y3 - y0) <= 2) { ++ ge->ix1 = x3; ++ ge->iy1 = y3; ++ ge->ix2 = x0; ++ ge->iy2 = y0; ++ } else {/* just make it a line */ ++ ge->type = GE_LINE; ++ } ++ } else { ++ if (abs(dx) < 4 && abs(dy) < 4) { /* consider it very ++ * small */ ++ ge->ix1 = x2; ++ ge->iy1 = y2; ++ } else if (abs(dx) < 8 && abs(dy) < 8) { /* consider it small */ ++ ge->ix1 += dx / 2; ++ ge->iy1 += dy / 2; ++ } else { ++ ge->ix1 += dx / 4; ++ ge->iy1 += dy / 4; ++ } ++ /* make sure that it's still on the same side */ ++ if (abs(x3 - x0) * abs(dy) < abs(y3 - y0) * abs(dx)) { ++ if (abs(x3 - x0) * abs(ge->iy1 - y0) > abs(y3 - y0) * abs(ge->ix1 - x0)) ++ ge->ix1 += isign(dx); ++ } else { ++ if (abs(x3 - x0) * abs(ge->iy1 - y0) < abs(y3 - y0) * abs(ge->ix1 - x0)) ++ ge->iy1 += isign(dy); ++ } ++ ++ ge->ix2 += (x3 - x2) / 8; ++ ge->iy2 += (y3 - y2) / 8; ++ /* make sure that it's still on the same side */ ++ if (abs(x3 - x0) * abs(y3 - y2) < abs(y3 - y0) * abs(x3 - x2)) { ++ if (abs(x3 - x0) * abs(y3 - ge->iy2) > abs(y3 - y0) * abs(x3 - ge->ix2)) ++ ge->iy1 -= isign(y3 - y2); ++ } else { ++ if (abs(x3 - x0) * abs(y3 - ge->iy2) < abs(y3 - y0) * abs(x3 - ge->ix2)) ++ ge->ix1 -= isign(x3 - x2); ++ } ++ ++ } ++ } else if (x2 == x3 && y2 == y3) { ++ dx = x1 - x2; ++ dy = y1 - y2; ++ ++ if (dx == 0 && dy == 0) { ++ /* Oops, we actually have a straight line */ ++ /* ++ * if it's small, we hope that it will get optimized ++ * later ++ */ ++ if (abs(x3 - x0) <= 2 || abs(y3 - y0) <= 2) { ++ ge->ix1 = x3; ++ ge->iy1 = y3; ++ ge->ix2 = x0; ++ ge->iy2 = y0; ++ } else {/* just make it a line */ ++ ge->type = GE_LINE; ++ } ++ } else { ++ if (abs(dx) < 4 && abs(dy) < 4) { /* consider it very ++ * small */ ++ ge->ix2 = x1; ++ ge->iy2 = y1; ++ } else if (abs(dx) < 8 && abs(dy) < 8) { /* consider it small */ ++ ge->ix2 += dx / 2; ++ ge->iy2 += dy / 2; ++ } else { ++ ge->ix2 += dx / 4; ++ ge->iy2 += dy / 4; ++ } ++ /* make sure that it's still on the same side */ ++ if (abs(x3 - x0) * abs(dy) < abs(y3 - y0) * abs(dx)) { ++ if (abs(x3 - x0) * abs(ge->iy2 - y3) > abs(y3 - y0) * abs(ge->ix2 - x3)) ++ ge->ix2 += isign(dx); ++ } else { ++ if (abs(x3 - x0) * abs(ge->iy2 - y3) < abs(y3 - y0) * abs(ge->ix2 - x3)) ++ ge->iy2 += isign(dy); ++ } ++ ++ ge->ix1 += (x0 - x1) / 8; ++ ge->iy1 += (y0 - y1) / 8; ++ /* make sure that it's still on the same side */ ++ if (abs(x3 - x0) * abs(y0 - y1) < abs(y3 - y0) * abs(x0 - x1)) { ++ if (abs(x3 - x0) * abs(y0 - ge->iy1) > abs(y3 - y0) * abs(x0 - ge->ix1)) ++ ge->iy1 -= isign(y0 - y1); ++ } else { ++ if (abs(x3 - x0) * abs(y0 - ge->iy1) < abs(y3 - y0) * abs(x0 - ge->ix1)) ++ ge->ix1 -= isign(x0 - x1); ++ } ++ ++ } ++ } ++} ++ ++/* ++** After transformations we want to make sure that the resulting ++** curve is going in the same quadrant as the original one, ++** because rounding errors introduced during transformations ++** may make the result completeley wrong. ++** ++** `dir' argument describes the direction of the original curve, ++** it is the superposition of two values for the front and ++** rear ends of curve: ++** ++** >EQUAL - goes over the line connecting the ends ++** =EQUAL - coincides with the line connecting the ends ++** flags & GEF_FLOAT) { ++ fprintf(stderr, "**! fixcvdir(0x%x) on floating entry, ABORT\n", ge); ++ abort(); /* dump core */ ++ } ++ ++ fdir = (dir & CVDIR_FRONT) - CVDIR_FEQUAL; ++ if ((dir & CVDIR_REAR) == CVDIR_RSAME) ++ rdir = fdir; /* we need only isign, exact value doesn't matter */ ++ else ++ rdir = (dir & CVDIR_REAR) - CVDIR_REQUAL; ++ ++ fixcvends(ge); ++ ++ c = isign(ge->ix3 - ge->prev->ix3); /* note the direction of ++ * curve */ ++ d = isign(ge->iy3 - ge->prev->iy3); ++ ++ a = ge->iy3 - ge->prev->iy3; ++ b = ge->ix3 - ge->prev->ix3; ++ kk = fabs(a == 0 ? (b == 0 ? 1. : 100000.) : ((double) b / (double) a)); ++ a = ge->iy1 - ge->prev->iy3; ++ b = ge->ix1 - ge->prev->ix3; ++ kk1 = fabs(a == 0 ? (b == 0 ? 1. : 100000.) : ((double) b / (double) a)); ++ a = ge->iy3 - ge->iy2; ++ b = ge->ix3 - ge->ix2; ++ kk2 = fabs(a == 0 ? (b == 0 ? 1. : 100000.) : ((double) b / (double) a)); ++ ++ changed = 1; ++ while (changed) { ++ if (ISDBG(FIXCVDIR)) { ++ /* for debugging */ ++ fprintf(stderr, "fixcvdir %d %d (%d %d %d %d %d %d) %f %f %f\n", ++ fdir, rdir, ++ ge->ix1 - ge->prev->ix3, ++ ge->iy1 - ge->prev->iy3, ++ ge->ix2 - ge->ix1, ++ ge->iy2 - ge->iy1, ++ ge->ix3 - ge->ix2, ++ ge->iy3 - ge->iy2, ++ kk1, kk, kk2); ++ } ++ changed = 0; ++ ++ if (fdir > 0) { ++ if (kk1 > kk) { /* the front end has problems */ ++ if (c * (ge->ix1 - ge->prev->ix3) > 0) { ++ ge->ix1 -= c; ++ changed = 1; ++ } if (d * (ge->iy2 - ge->iy1) > 0) { ++ ge->iy1 += d; ++ changed = 1; ++ } ++ /* recalculate the coefficients */ ++ a = ge->iy3 - ge->prev->iy3; ++ b = ge->ix3 - ge->prev->ix3; ++ kk = fabs(a == 0 ? (b == 0 ? 1. : 100000.) : ((double) b / (double) a)); ++ a = ge->iy1 - ge->prev->iy3; ++ b = ge->ix1 - ge->prev->ix3; ++ kk1 = fabs(a == 0 ? (b == 0 ? 1. : 100000.) : ((double) b / (double) a)); ++ } ++ } else if (fdir < 0) { ++ if (kk1 < kk) { /* the front end has problems */ ++ if (c * (ge->ix2 - ge->ix1) > 0) { ++ ge->ix1 += c; ++ changed = 1; ++ } if (d * (ge->iy1 - ge->prev->iy3) > 0) { ++ ge->iy1 -= d; ++ changed = 1; ++ } ++ /* recalculate the coefficients */ ++ a = ge->iy1 - ge->prev->iy3; ++ b = ge->ix1 - ge->prev->ix3; ++ kk1 = fabs(a == 0 ? (b == 0 ? 1. : 100000.) : ((double) b / (double) a)); ++ a = ge->iy3 - ge->prev->iy3; ++ b = ge->ix3 - ge->prev->ix3; ++ kk = fabs(a == 0 ? (b == 0 ? 1. : 100000.) : ((double) b / (double) a)); ++ } ++ } ++ if (rdir > 0) { ++ if (kk2 < kk) { /* the rear end has problems */ ++ if (c * (ge->ix2 - ge->ix1) > 0) { ++ ge->ix2 -= c; ++ changed = 1; ++ } if (d * (ge->iy3 - ge->iy2) > 0) { ++ ge->iy2 += d; ++ changed = 1; ++ } ++ /* recalculate the coefficients */ ++ a = ge->iy3 - ge->prev->iy3; ++ b = ge->ix3 - ge->prev->ix3; ++ kk = fabs(a == 0 ? (b == 0 ? 1. : 100000.) : ((double) b / (double) a)); ++ a = ge->iy3 - ge->iy2; ++ b = ge->ix3 - ge->ix2; ++ kk2 = fabs(a == 0 ? (b == 0 ? 1. : 100000.) : ((double) b / (double) a)); ++ } ++ } else if (rdir < 0) { ++ if (kk2 > kk) { /* the rear end has problems */ ++ if (c * (ge->ix3 - ge->ix2) > 0) { ++ ge->ix2 += c; ++ changed = 1; ++ } if (d * (ge->iy2 - ge->iy1) > 0) { ++ ge->iy2 -= d; ++ changed = 1; ++ } ++ /* recalculate the coefficients */ ++ a = ge->iy3 - ge->prev->iy3; ++ b = ge->ix3 - ge->prev->ix3; ++ kk = fabs(a == 0 ? (b == 0 ? 1. : 100000.) : ((double) b / (double) a)); ++ a = ge->iy3 - ge->iy2; ++ b = ge->ix3 - ge->ix2; ++ kk2 = fabs(a == 0 ? (b == 0 ? 1. : 100000.) : ((double) b / (double) a)); ++ } ++ } ++ } ++ fixcvends(ge); ++} ++ ++/* Get the directions of ends of curve for further usage */ ++ ++/* expects that the previous element is also float */ ++ ++static int ++fgetcvdir( ++ GENTRY * ge ++) ++{ ++ double a, b; ++ double k, k1, k2; ++ int dir = 0; ++ ++ if( !(ge->flags & GEF_FLOAT) ) { ++ fprintf(stderr, "**! fgetcvdir(0x%x) on int entry, ABORT\n", ge); ++ abort(); /* dump core */ ++ } ++ ++ a = fabs(ge->fy3 - ge->prev->fy3); ++ b = fabs(ge->fx3 - ge->prev->fx3); ++ k = a < FEPS ? (b < FEPS ? 1. : 100000.) : ( b / a); ++ ++ a = fabs(ge->fy1 - ge->prev->fy3); ++ b = fabs(ge->fx1 - ge->prev->fx3); ++ if(a < FEPS) { ++ if(b < FEPS) { ++ a = fabs(ge->fy2 - ge->prev->fy3); ++ b = fabs(ge->fx2 - ge->prev->fx3); ++ k1 = a < FEPS ? (b < FEPS ? k : 100000.) : ( b / a); ++ } else ++ k1 = FBIGVAL; ++ } else ++ k1 = b / a; ++ ++ a = fabs(ge->fy3 - ge->fy2); ++ b = fabs(ge->fx3 - ge->fx2); ++ if(a < FEPS) { ++ if(b < FEPS) { ++ a = fabs(ge->fy3 - ge->fy1); ++ b = fabs(ge->fx3 - ge->fx1); ++ k2 = a < FEPS ? (b < FEPS ? k : 100000.) : ( b / a); ++ } else ++ k2 = FBIGVAL; ++ } else ++ k2 = b / a; ++ ++ if(fabs(k1-k) < 0.0001) ++ dir |= CVDIR_FEQUAL; ++ else if (k1 < k) ++ dir |= CVDIR_FUP; ++ else ++ dir |= CVDIR_FDOWN; ++ ++ if(fabs(k2-k) < 0.0001) ++ dir |= CVDIR_REQUAL; ++ else if (k2 > k) ++ dir |= CVDIR_RUP; ++ else ++ dir |= CVDIR_RDOWN; ++ ++ return dir; ++} ++ ++ ++/* expects that the previous element is also int */ ++ ++static int ++igetcvdir( ++ GENTRY * ge ++) ++{ ++ int a, b; ++ double k, k1, k2; ++ int dir = 0; ++ ++ if(ge->flags & GEF_FLOAT) { ++ fprintf(stderr, "**! igetcvdir(0x%x) on floating entry, ABORT\n", ge); ++ abort(); /* dump core */ ++ } ++ ++ a = ge->iy3 - ge->prev->iy3; ++ b = ge->ix3 - ge->prev->ix3; ++ k = (a == 0) ? (b == 0 ? 1. : 100000.) : fabs((double) b / (double) a); ++ ++ a = ge->iy1 - ge->prev->iy3; ++ b = ge->ix1 - ge->prev->ix3; ++ if(a == 0) { ++ if(b == 0) { ++ a = ge->iy2 - ge->prev->iy3; ++ b = ge->ix2 - ge->prev->ix3; ++ k1 = (a == 0) ? (b == 0 ? k : 100000.) : fabs((double) b / (double) a); ++ } else ++ k1 = FBIGVAL; ++ } else ++ k1 = fabs((double) b / (double) a); ++ ++ a = ge->iy3 - ge->iy2; ++ b = ge->ix3 - ge->ix2; ++ if(a == 0) { ++ if(b == 0) { ++ a = ge->iy3 - ge->iy1; ++ b = ge->ix3 - ge->ix1; ++ k2 = (a == 0) ? (b == 0 ? k : 100000.) : fabs((double) b / (double) a); ++ } else ++ k2 = FBIGVAL; ++ } else ++ k2 = fabs((double) b / (double) a); ++ ++ if(fabs(k1-k) < 0.0001) ++ dir |= CVDIR_FEQUAL; ++ else if (k1 < k) ++ dir |= CVDIR_FUP; ++ else ++ dir |= CVDIR_FDOWN; ++ ++ if(fabs(k2-k) < 0.0001) ++ dir |= CVDIR_REQUAL; ++ else if (k2 > k) ++ dir |= CVDIR_RUP; ++ else ++ dir |= CVDIR_RDOWN; ++ ++ return dir; ++} ++ ++#if 0 ++/* a function just to test the work of fixcvdir() */ ++static void ++testfixcvdir( ++ GLYPH * g ++) ++{ ++ GENTRY *ge; ++ int dir; ++ ++ for (ge = g->entries; ge != 0; ge = ge->next) { ++ if (ge->type == GE_CURVE) { ++ dir = igetcvdir(ge); ++ fixcvdir(ge, dir); ++ } ++ } ++} ++#endif ++ ++static int ++iround( ++ double val ++) ++{ ++ return (int) (val > 0 ? val + 0.5 : val - 0.5); ++} ++ ++/* for debugging - dump the glyph ++ * mark with a star the entries from start to end inclusive ++ * (start == NULL means don't mark any, end == NULL means to the last) ++ */ ++ ++void ++dumppaths( ++ GLYPH *g, ++ GENTRY *start, ++ GENTRY *end ++) ++{ ++ GENTRY *ge; ++ int i; ++ char mark=' '; ++ ++ fprintf(stderr, "Glyph %s:\n", g->name); ++ ++ /* now do the conversion */ ++ for(ge = g->entries; ge != 0; ge = ge->next) { ++ if(ge == start) ++ mark = '*'; ++ fprintf(stderr, " %c %8x", mark, ge); ++ switch(ge->type) { ++ case GE_MOVE: ++ case GE_LINE: ++ if(ge->flags & GEF_FLOAT) ++ fprintf(stderr," %c float (%g, %g)\n", ge->type, ge->fx3, ge->fy3); ++ else ++ fprintf(stderr," %c int (%d, %d)\n", ge->type, ge->ix3, ge->iy3); ++ break; ++ case GE_CURVE: ++ if(ge->flags & GEF_FLOAT) { ++ fprintf(stderr," C float "); ++ for(i=0; i<3; i++) ++ fprintf(stderr,"(%g, %g) ", ge->fxn[i], ge->fyn[i]); ++ fprintf(stderr,"\n"); ++ } else { ++ fprintf(stderr," C int "); ++ for(i=0; i<3; i++) ++ fprintf(stderr,"(%d, %d) ", ge->ixn[i], ge->iyn[i]); ++ fprintf(stderr,"\n"); ++ } ++ break; ++ default: ++ fprintf(stderr, " %c\n", ge->type); ++ break; ++ } ++ if(ge == end) ++ mark = ' '; ++ } ++} ++ ++/* ++ * Routine that converts all entries in the path from float to int ++ */ ++ ++void ++pathtoint( ++ GLYPH *g ++) ++{ ++ GENTRY *ge; ++ int x[3], y[3]; ++ int i; ++ ++ ++ if(ISDBG(TOINT)) ++ fprintf(stderr, "TOINT: glyph %s\n", g->name); ++ assertisfloat(g, "converting path to int\n"); ++ ++ fdelsmall(g, 1.0); /* get rid of sub-pixel contours */ ++ assertpath(g->entries, __FILE__, __LINE__, g->name); ++ ++ /* 1st pass, collect the directions of the curves: have ++ * to do that in advance, while everyting is float ++ */ ++ for(ge = g->entries; ge != 0; ge = ge->next) { ++ if( !(ge->flags & GEF_FLOAT) ) { ++ fprintf(stderr, "**! glyphs %s has int entry, found in conversion to int\n", ++ g->name); ++ exit(1); ++ } ++ if(ge->type == GE_CURVE) { ++ ge->dir = fgetcvdir(ge); ++ } ++ } ++ ++ /* now do the conversion */ ++ for(ge = g->entries; ge != 0; ge = ge->next) { ++ switch(ge->type) { ++ case GE_MOVE: ++ case GE_LINE: ++ if(ISDBG(TOINT)) ++ fprintf(stderr," %c float x=%g y=%g\n", ge->type, ge->fx3, ge->fy3); ++ x[0] = iround(ge->fx3); ++ y[0] = iround(ge->fy3); ++ for(i=0; i<3; i++) { /* put some valid values everywhere, for convenience */ ++ ge->ixn[i] = x[0]; ++ ge->iyn[i] = y[0]; ++ } ++ if(ISDBG(TOINT)) ++ fprintf(stderr," int x=%d y=%d\n", ge->ix3, ge->iy3); ++ break; ++ case GE_CURVE: ++ if(ISDBG(TOINT)) ++ fprintf(stderr," %c float ", ge->type); ++ ++ for(i=0; i<3; i++) { ++ if(ISDBG(TOINT)) ++ fprintf(stderr,"(%g, %g) ", ge->fxn[i], ge->fyn[i]); ++ x[i] = iround(ge->fxn[i]); ++ y[i] = iround(ge->fyn[i]); ++ } ++ ++ if(ISDBG(TOINT)) ++ fprintf(stderr,"\n int "); ++ ++ for(i=0; i<3; i++) { ++ ge->ixn[i] = x[i]; ++ ge->iyn[i] = y[i]; ++ if(ISDBG(TOINT)) ++ fprintf(stderr,"(%d, %d) ", ge->ixn[i], ge->iyn[i]); ++ } ++ ge->flags &= ~GEF_FLOAT; /* for fixcvdir */ ++ fixcvdir(ge, ge->dir); ++ ++ if(ISDBG(TOINT)) { ++ fprintf(stderr,"\n fixed "); ++ for(i=0; i<3; i++) ++ fprintf(stderr,"(%d, %d) ", ge->ixn[i], ge->iyn[i]); ++ fprintf(stderr,"\n"); ++ } ++ ++ break; ++ } ++ ge->flags &= ~GEF_FLOAT; ++ } ++ g->flags &= ~GF_FLOAT; ++} ++ ++ ++/* check whether we can fix up the curve to change its size by (dx,dy) */ ++/* 0 means NO, 1 means YES */ ++ ++/* for float: if scaling would be under 10% */ ++ ++int ++fcheckcv( ++ GENTRY * ge, ++ double dx, ++ double dy ++) ++{ ++ if( !(ge->flags & GEF_FLOAT) ) { ++ fprintf(stderr, "**! fcheckcv(0x%x) on int entry, ABORT\n", ge); ++ abort(); /* dump core */ ++ } ++ ++ if (ge->type != GE_CURVE) ++ return 0; ++ ++ if( fabs(ge->fx3 - ge->prev->fx3) < fabs(dx) * 10 ) ++ return 0; ++ ++ if( fabs(ge->fy3 - ge->prev->fy3) < fabs(dy) * 10 ) ++ return 0; ++ ++ return 1; ++} ++ ++/* for int: if won't create new zigzags at the ends */ ++ ++int ++icheckcv( ++ GENTRY * ge, ++ int dx, ++ int dy ++) ++{ ++ int xdep, ydep; ++ ++ if(ge->flags & GEF_FLOAT) { ++ fprintf(stderr, "**! icheckcv(0x%x) on floating entry, ABORT\n", ge); ++ abort(); /* dump core */ ++ } ++ ++ if (ge->type != GE_CURVE) ++ return 0; ++ ++ xdep = ge->ix3 - ge->prev->ix3; ++ ydep = ge->iy3 - ge->prev->iy3; ++ ++ if (ge->type == GE_CURVE ++ && (xdep * (xdep + dx)) > 0 ++ && (ydep * (ydep + dy)) > 0) { ++ return 1; ++ } else ++ return 0; ++} ++ ++/* float connect the ends of open contours */ ++ ++void ++fclosepaths( ++ GLYPH * g ++) ++{ ++ GENTRY *ge, *fge, *xge, *nge; ++ int i; ++ ++ assertisfloat(g, "fclosepaths float\n"); ++ ++ for (xge = g->entries; xge != 0; xge = xge->next) { ++ if( xge->type != GE_PATH ) ++ continue; ++ ++ ge = xge->prev; ++ if(ge == 0 || (ge->type != GE_LINE && ge->type!= GE_CURVE)) { ++ fprintf(stderr, "**! Glyph %s got empty path\n", ++ g->name); ++ exit(1); ++ } ++ ++ fge = ge->frwd; ++ if (fge->prev == 0 || fge->prev->type != GE_MOVE) { ++ fprintf(stderr, "**! Glyph %s got strange beginning of path\n", ++ g->name); ++ exit(1); ++ } ++ fge = fge->prev; ++ if (fge->fx3 != ge->fx3 || fge->fy3 != ge->fy3) { ++ /* we have to fix this open path */ ++ ++ WARNING_4 fprintf(stderr, "Glyph %s got path open by dx=%g dy=%g\n", ++ g->name, fge->fx3 - ge->fx3, fge->fy3 - ge->fy3); ++ ++ ++ /* add a new line */ ++ nge = newgentry(GEF_FLOAT); ++ (*nge) = (*ge); ++ nge->fx3 = fge->fx3; ++ nge->fy3 = fge->fy3; ++ nge->type = GE_LINE; ++ ++ addgeafter(ge, nge); ++ ++ if (fabs(ge->fx3 - fge->fx3) <= 2 && fabs(ge->fy3 - fge->fy3) <= 2) { ++ /* ++ * small change, try to get rid of the new entry ++ */ ++ ++ double df[2]; ++ ++ for(i=0; i<2; i++) { ++ df[i] = ge->fpoints[i][2] - fge->fpoints[i][2]; ++ df[i] = fclosegap(nge, nge, i, df[i], NULL); ++ } ++ ++ if(df[0] == 0. && df[1] == 0.) { ++ /* closed gap successfully, remove the added entry */ ++ freethisge(nge); ++ } ++ } ++ } ++ } ++} ++ ++void ++smoothjoints( ++ GLYPH * g ++) ++{ ++ GENTRY *ge, *ne; ++ int dx1, dy1, dx2, dy2, k; ++ int dir; ++ ++ return; /* this stuff seems to create problems */ ++ ++ assertisint(g, "smoothjoints int"); ++ ++ if (g->entries == 0) /* nothing to do */ ++ return; ++ ++ for (ge = g->entries->next; ge != 0; ge = ge->next) { ++ ne = ge->frwd; ++ ++ /* ++ * although there should be no one-line path * and any path ++ * must end with CLOSEPATH, * nobody can say for sure ++ */ ++ ++ if (ge == ne || ne == 0) ++ continue; ++ ++ /* now handle various joints */ ++ ++ if (ge->type == GE_LINE && ne->type == GE_LINE) { ++ dx1 = ge->ix3 - ge->prev->ix3; ++ dy1 = ge->iy3 - ge->prev->iy3; ++ dx2 = ne->ix3 - ge->ix3; ++ dy2 = ne->iy3 - ge->iy3; ++ ++ /* check whether they have the same direction */ ++ /* and the same slope */ ++ /* then we can join them into one line */ ++ ++ if (dx1 * dx2 >= 0 && dy1 * dy2 >= 0 && dx1 * dy2 == dy1 * dx2) { ++ /* extend the previous line */ ++ ge->ix3 = ne->ix3; ++ ge->iy3 = ne->iy3; ++ ++ /* and get rid of the next line */ ++ freethisge(ne); ++ } ++ } else if (ge->type == GE_LINE && ne->type == GE_CURVE) { ++ fixcvends(ne); ++ ++ dx1 = ge->ix3 - ge->prev->ix3; ++ dy1 = ge->iy3 - ge->prev->iy3; ++ dx2 = ne->ix1 - ge->ix3; ++ dy2 = ne->iy1 - ge->iy3; ++ ++ /* if the line is nearly horizontal and we can fix it */ ++ if (dx1 != 0 && 5 * abs(dy1) / abs(dx1) == 0 ++ && icheckcv(ne, 0, -dy1) ++ && abs(dy1) <= 4) { ++ dir = igetcvdir(ne); ++ ge->iy3 -= dy1; ++ ne->iy1 -= dy1; ++ fixcvdir(ne, dir); ++ if (ge->next != ne) ++ ne->prev->iy3 -= dy1; ++ dy1 = 0; ++ } else if (dy1 != 0 && 5 * abs(dx1) / abs(dy1) == 0 ++ && icheckcv(ne, -dx1, 0) ++ && abs(dx1) <= 4) { ++ /* the same but vertical */ ++ dir = igetcvdir(ne); ++ ge->ix3 -= dx1; ++ ne->ix1 -= dx1; ++ fixcvdir(ne, dir); ++ if (ge->next != ne) ++ ne->prev->ix3 -= dx1; ++ dx1 = 0; ++ } ++ /* ++ * if line is horizontal and curve begins nearly ++ * horizontally ++ */ ++ if (dy1 == 0 && dx2 != 0 && 5 * abs(dy2) / abs(dx2) == 0) { ++ dir = igetcvdir(ne); ++ ne->iy1 -= dy2; ++ fixcvdir(ne, dir); ++ dy2 = 0; ++ } else if (dx1 == 0 && dy2 != 0 && 5 * abs(dx2) / abs(dy2) == 0) { ++ /* the same but vertical */ ++ dir = igetcvdir(ne); ++ ne->ix1 -= dx2; ++ fixcvdir(ne, dir); ++ dx2 = 0; ++ } ++ } else if (ge->type == GE_CURVE && ne->type == GE_LINE) { ++ fixcvends(ge); ++ ++ dx1 = ge->ix3 - ge->ix2; ++ dy1 = ge->iy3 - ge->iy2; ++ dx2 = ne->ix3 - ge->ix3; ++ dy2 = ne->iy3 - ge->iy3; ++ ++ /* if the line is nearly horizontal and we can fix it */ ++ if (dx2 != 0 && 5 * abs(dy2) / abs(dx2) == 0 ++ && icheckcv(ge, 0, dy2) ++ && abs(dy2) <= 4) { ++ dir = igetcvdir(ge); ++ ge->iy3 += dy2; ++ ge->iy2 += dy2; ++ fixcvdir(ge, dir); ++ if (ge->next != ne) ++ ne->prev->iy3 += dy2; ++ dy2 = 0; ++ } else if (dy2 != 0 && 5 * abs(dx2) / abs(dy2) == 0 ++ && icheckcv(ge, dx2, 0) ++ && abs(dx2) <= 4) { ++ /* the same but vertical */ ++ dir = igetcvdir(ge); ++ ge->ix3 += dx2; ++ ge->ix2 += dx2; ++ fixcvdir(ge, dir); ++ if (ge->next != ne) ++ ne->prev->ix3 += dx2; ++ dx2 = 0; ++ } ++ /* ++ * if line is horizontal and curve ends nearly ++ * horizontally ++ */ ++ if (dy2 == 0 && dx1 != 0 && 5 * abs(dy1) / abs(dx1) == 0) { ++ dir = igetcvdir(ge); ++ ge->iy2 += dy1; ++ fixcvdir(ge, dir); ++ dy1 = 0; ++ } else if (dx2 == 0 && dy1 != 0 && 5 * abs(dx1) / abs(dy1) == 0) { ++ /* the same but vertical */ ++ dir = igetcvdir(ge); ++ ge->ix2 += dx1; ++ fixcvdir(ge, dir); ++ dx1 = 0; ++ } ++ } else if (ge->type == GE_CURVE && ne->type == GE_CURVE) { ++ fixcvends(ge); ++ fixcvends(ne); ++ ++ dx1 = ge->ix3 - ge->ix2; ++ dy1 = ge->iy3 - ge->iy2; ++ dx2 = ne->ix1 - ge->ix3; ++ dy2 = ne->iy1 - ge->iy3; ++ ++ /* ++ * check if we have a rather smooth joint at extremal ++ * point ++ */ ++ /* left or right extremal point */ ++ if (abs(dx1) <= 4 && abs(dx2) <= 4 ++ && dy1 != 0 && 5 * abs(dx1) / abs(dy1) == 0 ++ && dy2 != 0 && 5 * abs(dx2) / abs(dy2) == 0 ++ && ((ge->iy3 < ge->prev->iy3 && ne->iy3 < ge->iy3) ++ || (ge->iy3 > ge->prev->iy3 && ne->iy3 > ge->iy3)) ++ && (ge->ix3 - ge->prev->ix3) * (ne->ix3 - ge->ix3) < 0 ++ ) { ++ dir = igetcvdir(ge); ++ ge->ix2 += dx1; ++ dx1 = 0; ++ fixcvdir(ge, dir); ++ dir = igetcvdir(ne); ++ ne->ix1 -= dx2; ++ dx2 = 0; ++ fixcvdir(ne, dir); ++ } ++ /* top or down extremal point */ ++ else if (abs(dy1) <= 4 && abs(dy2) <= 4 ++ && dx1 != 0 && 5 * abs(dy1) / abs(dx1) == 0 ++ && dx2 != 0 && 5 * abs(dy2) / abs(dx2) == 0 ++ && ((ge->ix3 < ge->prev->ix3 && ne->ix3 < ge->ix3) ++ || (ge->ix3 > ge->prev->ix3 && ne->ix3 > ge->ix3)) ++ && (ge->iy3 - ge->prev->iy3) * (ne->iy3 - ge->iy3) < 0 ++ ) { ++ dir = igetcvdir(ge); ++ ge->iy2 += dy1; ++ dy1 = 0; ++ fixcvdir(ge, dir); ++ dir = igetcvdir(ne); ++ ne->iy1 -= dy2; ++ dy2 = 0; ++ fixcvdir(ne, dir); ++ } ++ /* or may be we just have a smooth junction */ ++ else if (dx1 * dx2 >= 0 && dy1 * dy2 >= 0 ++ && 10 * abs(k = abs(dx1 * dy2) - abs(dy1 * dx2)) < (abs(dx1 * dy2) + abs(dy1 * dx2))) { ++ int tries[6][4]; ++ int results[6]; ++ int i, b; ++ ++ /* build array of changes we are going to try */ ++ /* uninitalized entries are 0 */ ++ if (k > 0) { ++ static int t1[6][4] = { ++ {0, 0, 0, 0}, ++ {-1, 0, 1, 0}, ++ {-1, 0, 0, 1}, ++ {0, -1, 1, 0}, ++ {0, -1, 0, 1}, ++ {-1, -1, 1, 1}}; ++ memcpy(tries, t1, sizeof tries); ++ } else { ++ static int t1[6][4] = { ++ {0, 0, 0, 0}, ++ {1, 0, -1, 0}, ++ {1, 0, 0, -1}, ++ {0, 1, -1, 0}, ++ {0, 1, 0, -1}, ++ {1, 1, -1, -1}}; ++ memcpy(tries, t1, sizeof tries); ++ } ++ ++ /* now try the changes */ ++ results[0] = abs(k); ++ for (i = 1; i < 6; i++) { ++ results[i] = abs((abs(dx1) + tries[i][0]) * (abs(dy2) + tries[i][1]) - ++ (abs(dy1) + tries[i][2]) * (abs(dx2) + tries[i][3])); ++ } ++ ++ /* and find the best try */ ++ k = abs(k); ++ b = 0; ++ for (i = 1; i < 6; i++) ++ if (results[i] < k) { ++ k = results[i]; ++ b = i; ++ } ++ /* and finally apply it */ ++ if (dx1 < 0) ++ tries[b][0] = -tries[b][0]; ++ if (dy2 < 0) ++ tries[b][1] = -tries[b][1]; ++ if (dy1 < 0) ++ tries[b][2] = -tries[b][2]; ++ if (dx2 < 0) ++ tries[b][3] = -tries[b][3]; ++ ++ dir = igetcvdir(ge); ++ ge->ix2 -= tries[b][0]; ++ ge->iy2 -= tries[b][2]; ++ fixcvdir(ge, dir); ++ dir = igetcvdir(ne); ++ ne->ix1 += tries[b][3]; ++ ne->iy1 += tries[b][1]; ++ fixcvdir(ne, dir); ++ } ++ } ++ } ++} ++ ++/* debugging: print out stems of a glyph */ ++static void ++debugstems( ++ char *name, ++ STEM * hstems, ++ int nhs, ++ STEM * vstems, ++ int nvs ++) ++{ ++ int i; ++ ++ fprintf(pfa_file, "%% %s\n", name); ++ fprintf(pfa_file, "%% %d horizontal stems:\n", nhs); ++ for (i = 0; i < nhs; i++) ++ fprintf(pfa_file, "%% %3d %d (%d...%d) %c %c%c%c%c\n", i, hstems[i].value, ++ hstems[i].from, hstems[i].to, ++ ((hstems[i].flags & ST_UP) ? 'U' : 'D'), ++ ((hstems[i].flags & ST_END) ? 'E' : '-'), ++ ((hstems[i].flags & ST_FLAT) ? 'F' : '-'), ++ ((hstems[i].flags & ST_ZONE) ? 'Z' : ' '), ++ ((hstems[i].flags & ST_TOPZONE) ? 'T' : ' ')); ++ fprintf(pfa_file, "%% %d vertical stems:\n", nvs); ++ for (i = 0; i < nvs; i++) ++ fprintf(pfa_file, "%% %3d %d (%d...%d) %c %c%c\n", i, vstems[i].value, ++ vstems[i].from, vstems[i].to, ++ ((vstems[i].flags & ST_UP) ? 'U' : 'D'), ++ ((vstems[i].flags & ST_END) ? 'E' : '-'), ++ ((vstems[i].flags & ST_FLAT) ? 'F' : '-')); ++} ++ ++/* add pseudo-stems for the limits of the Blue zones to the stem array */ ++static int ++addbluestems( ++ STEM *s, ++ int n ++) ++{ ++ int i; ++ ++ for(i=0; i ++ ((s[j].flags & (ST_ZONE|ST_FLAT|ST_END)) ^ ST_FLAT) ++ ) ++ continue; ++ } else { ++ if( ++ ((s[i].flags & (ST_ZONE|ST_FLAT|ST_END)) ^ ST_FLAT) ++ < ++ ((s[j].flags & (ST_ZONE|ST_FLAT|ST_END)) ^ ST_FLAT) ++ ) ++ continue; ++ } ++ } ++ } ++ x = s[j]; ++ s[j] = s[i]; ++ s[i] = x; ++ } ++} ++ ++/* check whether two stem borders overlap */ ++ ++static int ++stemoverlap( ++ STEM * s1, ++ STEM * s2 ++) ++{ ++ int result; ++ ++ if ((s1->from <= s2->from && s1->to >= s2->from) ++ || (s2->from <= s1->from && s2->to >= s1->from)) ++ result = 1; ++ else ++ result = 0; ++ ++ if (ISDBG(STEMOVERLAP)) ++ fprintf(pfa_file, "%% overlap %d(%d..%d)x%d(%d..%d)=%d\n", ++ s1->value, s1->from, s1->to, s2->value, s2->from, s2->to, result); ++ return result; ++} ++ ++/* ++ * check if the stem [border] is in an appropriate blue zone ++ * (currently not used) ++ */ ++ ++static int ++steminblue( ++ STEM *s ++) ++{ ++ int i, val; ++ ++ val=s->value; ++ if(s->flags & ST_UP) { ++ /* painted size up, look at lower zones */ ++ if(nblues>=2 && val>=bluevalues[0] && val<=bluevalues[1] ) ++ return 1; ++ for(i=0; i=otherblues[i] && val<=otherblues[i+1] ) ++ return 1; ++ } ++ } else { ++ /* painted side down, look at upper zones */ ++ for(i=2; i=bluevalues[i] && val<=bluevalues[i+1] ) ++ return 1; ++ } ++ } ++ ++ return 0; ++} ++ ++/* mark the outermost stem [borders] in the blue zones */ ++ ++static void ++markbluestems( ++ STEM *s, ++ int nold ++) ++{ ++ int i, j, a, b, c; ++ /* ++ * traverse the list of Blue Values, mark the lowest upper ++ * stem in each bottom zone and the topmost lower stem in ++ * each top zone with ST_BLUE ++ */ ++ ++ /* top zones */ ++ for(i=2; i=0; j--) { ++ if( s[j].flags & (ST_ZONE|ST_UP|ST_END) ) ++ continue; ++ c=s[j].value; ++ if(c=0 && s[j].value==c ++ && (s[j].flags & (ST_UP|ST_ZONE))==0 ; j--) ++ s[j].flags |= ST_BLUE; ++ break; ++ } ++ } ++ } ++ /* baseline */ ++ if(nblues>=2) { ++ a=bluevalues[0]; b=bluevalues[1]; ++ for(j=0; jb) /* too high */ ++ break; ++ if(c>=a) { /* found the lowest stem border */ ++ /* mark all the stems with the same value */ ++ if(ISDBG(BLUESTEMS)) ++ fprintf(pfa_file, "%% found U BLUE at %d\n", s[j].value); ++ /* include ST_END values */ ++ while( s[j-1].value==c && (s[j-1].flags & ST_ZONE)==0 ) ++ j--; ++ s[j].flags |= ST_BLUE; ++ for(j++; jb) /* too high */ ++ break; ++ if(c>=a) { /* found the lowest stem border */ ++ /* mark all the stems with the same value */ ++ if(ISDBG(BLUESTEMS)) ++ fprintf(pfa_file, "%% found U BLUE at %d\n", s[j].value); ++ /* include ST_END values */ ++ while( s[j-1].value==c && (s[j-1].flags & ST_ZONE)==0 ) ++ j--; ++ s[j].flags |= ST_BLUE; ++ for(j++; j=b) { /* have no free space */ ++ for(j=nold; j>=b; j--) /* make free space */ ++ s[j]=s[j-1]; ++ b++; ++ nold++; ++ } ++ s[nnew]=s[a]; ++ s[nnew].flags &= ~(ST_UP|ST_BLUE); ++ nnew++; ++ i=b-1; ++ } else { ++ s[nnew++]=s[c]; ++ i=c; /* skip up to this point */ ++ } ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% +stem %d...%d U BLUE\n", ++ s[nnew-2].value, s[nnew-1].value); ++ } else { ++ if (nstack >= MAX_STACK) { ++ WARNING_1 fprintf(stderr, "Warning: **** converter's stem stack overflow ****\n"); ++ nstack = 0; ++ } ++ stack[nstack++] = s[i]; ++ } ++ } else if(s[i].flags & ST_BLUE) { ++ /* again, we just HAVE to use this value */ ++ if (readystem) ++ nnew += 2; ++ readystem=0; ++ ++ /* remember the list of Blue zone stems with the same value */ ++ for(a=i, i++; i= 0; i--) { ++ if( (stack[i].flags & ST_UP)==0 ) { ++ if( (stack[i].flags & (ST_ZONE|ST_TOPZONE))==ST_ZONE ) ++ break; ++ else ++ continue; ++ } ++ for(j=a; j=0; j-=2) { ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% ?stem %d...%d -- %d\n", ++ s[j].value, s[j+1].value, stack[c].value); ++ if(s[j+1].value < stack[c].value) /* no conflict */ ++ break; ++ if(s[j].flags & ST_BLUE) { ++ /* oops, we don't want to spoil other blue zones */ ++ stack[c].value=s[j+1].value+1; ++ break; ++ } ++ if( (s[j].flags|s[j+1].flags) & ST_END ) { ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% -stem %d...%d p=1\n", ++ s[j].value, s[j+1].value); ++ continue; /* pri==1, silently discard it */ ++ } ++ /* we want to discard no nore than 2 stems of pri>=2 */ ++ if( ++readystem > 2 ) { ++ /* change our stem to not conflict */ ++ stack[c].value=s[j+1].value+1; ++ break; ++ } else { ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% -stem %d...%d p>=2\n", ++ s[j].value, s[j+1].value); ++ continue; ++ } ++ } ++ nnew=j+2; ++ /* add this stem */ ++ if(nnew>=b-1) { /* have no free space */ ++ for(j=nold; j>=b-1; j--) /* make free space */ ++ s[j]=s[j-1]; ++ b++; ++ nold++; ++ } ++ s[nnew++]=stack[c]; ++ s[nnew++]=s[b-1]; ++ /* clean up the stack */ ++ nstack=sbottom=0; ++ readystem=0; ++ /* set the next position to search */ ++ i=b-1; ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% +stem %d...%d D BLUE\n", ++ s[nnew-2].value, s[nnew-1].value); ++ } else if (nstack > 0) { ++ ++ /* ++ * check whether our stem overlaps with anything in ++ * stack ++ */ ++ for (j = nstack - 1; j >= sbottom; j--) { ++ if (s[i].value <= stack[j].value) ++ break; ++ if (stack[j].flags & ST_ZONE) ++ continue; ++ ++ if ((s[i].flags & ST_END) ++ || (stack[j].flags & ST_END)) ++ pri = 1; ++ else if ((s[i].flags & ST_FLAT) ++ || (stack[j].flags & ST_FLAT)) ++ pri = 3; ++ else ++ pri = 2; ++ ++ if ((pri < readystem && s[nnew + 1].value >= stack[j].value) ++ || !stemoverlap(&stack[j], &s[i])) ++ continue; ++ ++ if (readystem > 1 && s[nnew + 1].value < stack[j].value) { ++ nnew += 2; ++ readystem = 0; ++ nlps = 0; ++ } ++ /* ++ * width of the previous stem (if it's ++ * present) ++ */ ++ w1 = s[nnew + 1].value - s[nnew].value; ++ ++ /* width of this stem */ ++ w2 = s[i].value - stack[j].value; ++ ++ if (readystem == 0) { ++ /* nothing yet, just add a new stem */ ++ s[nnew] = stack[j]; ++ s[nnew + 1] = s[i]; ++ readystem = pri; ++ if (pri == 1) ++ nlps = 1; ++ else if (pri == 2) ++ sbottom = j; ++ else { ++ sbottom = j + 1; ++ while (sbottom < nstack ++ && stack[sbottom].value <= stack[j].value) ++ sbottom++; ++ } ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% +stem %d...%d p=%d n=%d\n", ++ stack[j].value, s[i].value, pri, nlps); ++ } else if (pri == 1) { ++ if (stack[j].value > s[nnew + 1].value) { ++ /* ++ * doesn't overlap with the ++ * previous one ++ */ ++ nnew += 2; ++ nlps++; ++ s[nnew] = stack[j]; ++ s[nnew + 1] = s[i]; ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% +stem %d...%d p=%d n=%d\n", ++ stack[j].value, s[i].value, pri, nlps); ++ } else if (w2 < w1) { ++ /* is narrower */ ++ s[nnew] = stack[j]; ++ s[nnew + 1] = s[i]; ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% /stem %d...%d p=%d n=%d %d->%d\n", ++ stack[j].value, s[i].value, pri, nlps, w1, w2); ++ } ++ } else if (pri == 2) { ++ if (readystem == 2) { ++ /* choose the narrower stem */ ++ if (w1 > w2) { ++ s[nnew] = stack[j]; ++ s[nnew + 1] = s[i]; ++ sbottom = j; ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% /stem %d...%d p=%d n=%d\n", ++ stack[j].value, s[i].value, pri, nlps); ++ } ++ /* else readystem==1 */ ++ } else if (stack[j].value > s[nnew + 1].value) { ++ /* ++ * value doesn't overlap with ++ * the previous one ++ */ ++ nnew += 2; ++ nlps = 0; ++ s[nnew] = stack[j]; ++ s[nnew + 1] = s[i]; ++ sbottom = j; ++ readystem = pri; ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% +stem %d...%d p=%d n=%d\n", ++ stack[j].value, s[i].value, pri, nlps); ++ } else if (nlps == 1 ++ || stack[j].value > s[nnew - 1].value) { ++ /* ++ * we can replace the top ++ * stem ++ */ ++ nlps = 0; ++ s[nnew] = stack[j]; ++ s[nnew + 1] = s[i]; ++ readystem = pri; ++ sbottom = j; ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% /stem %d...%d p=%d n=%d\n", ++ stack[j].value, s[i].value, pri, nlps); ++ } ++ } else if (readystem == 3) { /* that means also ++ * pri==3 */ ++ /* choose the narrower stem */ ++ if (w1 > w2) { ++ s[nnew] = stack[j]; ++ s[nnew + 1] = s[i]; ++ sbottom = j + 1; ++ while (sbottom < nstack ++ && stack[sbottom].value <= stack[j].value) ++ sbottom++; ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% /stem %d...%d p=%d n=%d\n", ++ stack[j].value, s[i].value, pri, nlps); ++ } ++ } else if (pri == 3) { ++ /* ++ * we can replace as many stems as ++ * neccessary ++ */ ++ nnew += 2; ++ while (nnew > 0 && s[nnew - 1].value >= stack[j].value) { ++ nnew -= 2; ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% -stem %d..%d\n", ++ s[nnew].value, s[nnew + 1].value); ++ } ++ nlps = 0; ++ s[nnew] = stack[j]; ++ s[nnew + 1] = s[i]; ++ readystem = pri; ++ sbottom = j + 1; ++ while (sbottom < nstack ++ && stack[sbottom].value <= stack[j].value) ++ sbottom++; ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% +stem %d...%d p=%d n=%d\n", ++ stack[j].value, s[i].value, pri, nlps); ++ } ++ } ++ } ++ } ++ if (readystem) ++ nnew += 2; ++ ++ /* change the 1-pixel-wide stems to 20-pixel-wide stems if possible ++ * the constant 20 is recommended in the Type1 manual ++ */ ++ if(useblues) { ++ for(i=0; ii+2 && s[i+2].value0 && s[i-1].value>s[i].value-22) ++ s[i].value=s[i-1].value+2; /* compensate for fuzziness */ ++ else ++ s[i].value-=20; ++ } ++ } ++ } ++ /* make sure that no stem it stretched between ++ * a top zone and a bottom zone ++ */ ++ if(useblues) { ++ for(i=0; i=s[i].value && c<=s[i+1].value && c=2) { ++ c=bluevalues[1]; ++ if( c>=s[i].value && c<=s[i+1].value && c>b ) ++ b=c; ++ } ++ for(j=1; j=s[i].value && c<=s[i+1].value && c>b ) ++ b=c; ++ } ++ if( a!=10000 && b!= -10000 ) { /* it is stretched */ ++ /* split the stem into 2 ghost stems */ ++ for(j=nnew+1; j>i+1; j--) /* make free space */ ++ s[j]=s[j-2]; ++ nnew+=2; ++ ++ if(s[i].value+22 >= a) ++ s[i+1].value=a-2; /* leave space for fuzziness */ ++ else ++ s[i+1].value=s[i].value+20; ++ ++ if(s[i+3].value-22 <= b) ++ s[i+2].value=b+2; /* leave space for fuzziness */ ++ else ++ s[i+2].value=s[i+3].value-20; ++ ++ i+=2; ++ } ++ } ++ } ++ /* look for triple stems */ ++ for (i = 0; i < nnew; i += 2) { ++ if (nnew - i >= 6) { ++ a = s[i].value + s[i + 1].value; ++ b = s[i + 2].value + s[i + 3].value; ++ c = s[i + 4].value + s[i + 5].value; ++ ++ w1 = s[i + 1].value - s[i].value; ++ w2 = s[i + 3].value - s[i + 2].value; ++ w3 = s[i + 5].value - s[i + 4].value; ++ ++ fw = w3 - w1; /* fuzz in width */ ++ fd = ((c - b) - (b - a)); /* fuzz in distance ++ * (doubled) */ ++ ++ /* we are able to handle some fuzz */ ++ /* ++ * it doesn't hurt if the declared stem is a bit ++ * narrower than actual unless it's an edge in ++ * a blue zone ++ */ ++ if (abs(abs(fd) - abs(fw)) * 5 < w2 ++ && abs(fw) * 20 < (w1 + w3)) { /* width dirrerence <10% */ ++ ++ if(useblues) { /* check that we don't disturb any blue stems */ ++ j=c; k=a; ++ if (fw > 0) { ++ if (fd > 0) { ++ if( s[i+5].flags & ST_BLUE ) ++ continue; ++ j -= fw; ++ } else { ++ if( s[i+4].flags & ST_BLUE ) ++ continue; ++ j += fw; ++ } ++ } else if(fw < 0) { ++ if (fd > 0) { ++ if( s[i+1].flags & ST_BLUE ) ++ continue; ++ k -= fw; ++ } else { ++ if( s[i].flags & ST_BLUE ) ++ continue; ++ k += fw; ++ } ++ } ++ pri = ((j - b) - (b - k)); ++ ++ if (pri > 0) { ++ if( s[i+2].flags & ST_BLUE ) ++ continue; ++ } else if(pri < 0) { ++ if( s[i+3].flags & ST_BLUE ) ++ continue; ++ } ++ } ++ ++ /* ++ * first fix up the width of 1st and 3rd ++ * stems ++ */ ++ if (fw > 0) { ++ if (fd > 0) { ++ s[i + 5].value -= fw; ++ c -= fw; ++ } else { ++ s[i + 4].value += fw; ++ c += fw; ++ } ++ } else { ++ if (fd > 0) { ++ s[i + 1].value -= fw; ++ a -= fw; ++ } else { ++ s[i].value += fw; ++ a += fw; ++ } ++ } ++ fd = ((c - b) - (b - a)); ++ ++ if (fd > 0) { ++ s[i + 2].value += abs(fd) / 2; ++ } else { ++ s[i + 3].value -= abs(fd) / 2; ++ } ++ ++ s[i].flags |= ST_3; ++ i += 4; ++ } ++ } ++ } ++ ++ return (nnew & ~1); /* number of lines must be always even */ ++} ++ ++/* ++ * these macros and function allow to set the base stem, ++ * check that it's not empty and subtract another stem ++ * from the base stem (possibly dividing it into multiple parts) ++ */ ++ ++/* pairs for pieces of the base stem */ ++static short xbstem[MAX_STEMS*2]; ++/* index of the last point */ ++static int xblast= -1; ++ ++#define setbasestem(from, to) \ ++ (xbstem[0]=from, xbstem[1]=to, xblast=1) ++#define isbaseempty() (xblast<=0) ++ ++/* returns 1 if was overlapping, 0 otherwise */ ++static int ++subfrombase( ++ int from, ++ int to ++) ++{ ++ int a, b; ++ int i, j; ++ ++ if(isbaseempty()) ++ return 0; ++ ++ /* handle the simple case simply */ ++ if(from > xbstem[xblast] || to < xbstem[0]) ++ return 0; ++ ++ /* the binary search may be more efficient */ ++ /* but for now the linear search is OK */ ++ for(b=1; from > xbstem[b]; b+=2) {} /* result: from <= xbstem[b] */ ++ for(a=xblast-1; to < xbstem[a]; a-=2) {} /* result: to >= xbstem[a] */ ++ ++ /* now the interesting examples are: ++ * (it was hard for me to understand, so I looked at the examples) ++ * 1 ++ * a|-----| |-----|b |-----| |-----| ++ * f|-----|t ++ * 2 ++ * a|-----|b |-----| |-----| |-----| ++ * f|--|t ++ * 3 ++ * a|-----|b |-----| |-----| |-----| ++ * f|-----|t ++ * 4 ++ * |-----|b a|-----| |-----| |-----| ++ * f|------------|t ++ * 5 ++ * |-----| |-----|b |-----| a|-----| ++ * f|-----------------------------|t ++ * 6 ++ * |-----|b |-----| |-----| a|-----| ++ * f|--------------------------------------------------|t ++ * 7 ++ * |-----|b |-----| a|-----| |-----| ++ * f|--------------------------|t ++ */ ++ ++ if(a < b-1) /* hits a gap - example 1 */ ++ return 0; ++ ++ /* now the subtraction itself */ ++ ++ if(a==b-1 && from > xbstem[a] && to < xbstem[b]) { ++ /* overlaps with only one subrange and splits it - example 2 */ ++ j=xblast; i=(xblast+=2); ++ while(j>=b) ++ xbstem[i--]=xbstem[j--]; ++ xbstem[b]=from-1; ++ xbstem[b+1]=to+1; ++ return 1; ++ /* becomes ++ * 2a ++ * a|b || |-----| |-----| |-----| ++ * f|--|t ++ */ ++ } ++ ++ if(xbstem[b-1] < from) { ++ /* cuts the back of this subrange - examples 3, 4, 7 */ ++ xbstem[b] = from-1; ++ b+=2; ++ /* becomes ++ * 3a ++ * a|----| |-----|b |-----| |-----| ++ * f|-----|t ++ * 4a ++ * |---| a|-----|b |-----| |-----| ++ * f|------------|t ++ * 7a ++ * |---| |-----|b a|-----| |-----| ++ * f|--------------------------|t ++ */ ++ } ++ ++ if(xbstem[a+1] > to) { ++ /* cuts the front of this subrange - examples 4a, 5, 7a */ ++ xbstem[a] = to+1; ++ a-=2; ++ /* becomes ++ * 4b ++ * a|---| |---|b |-----| |-----| ++ * f|------------|t ++ * 5b ++ * |-----| |-----|b a|-----| || ++ * f|-----------------------------|t ++ * 7b ++ * |---| a|-----|b || |-----| ++ * f|--------------------------|t ++ */ ++ } ++ ++ if(a < b-1) /* now after modification it hits a gap - examples 3a, 4b */ ++ return 1; /* because we have removed something */ ++ ++ /* now remove the subranges completely covered by the new stem */ ++ /* examples 5b, 6, 7b */ ++ i=b-1; j=a+2; ++ /* positioned as: ++ * 5b i j ++ * |-----| |-----|b a|-----| || ++ * f|-----------------------------|t ++ * 6 i xblast j ++ * |-----|b |-----| |-----| a|-----| ++ * f|--------------------------------------------------|t ++ * 7b i j ++ * |---| a|-----|b || |-----| ++ * f|--------------------------|t ++ */ ++ while(j <= xblast) ++ xbstem[i++]=xbstem[j++]; ++ xblast=i-1; ++ return 1; ++} ++ ++/* for debugging */ ++static void ++printbasestem(void) ++{ ++ int i; ++ ++ printf("( "); ++ for(i=0; i lastpri ++ && ( lastpri==1 || s[j].value-v<20 || (s[x].value-v)*2 >= s[j].value-v ) ) ) { ++ lastpri=pri; ++ x=j; ++ } ++ } ++ } else { ++ for(j=i-1; j>=0; j--) { ++ if(mx[i][j]==0) ++ continue; ++ ++ if( (f | s[j].flags) & ST_END ) ++ pri=1; ++ else if( (f | s[j].flags) & ST_FLAT ) ++ pri=3; ++ else ++ pri=2; ++ ++ if(lastpri==0 ++ || ( pri > lastpri ++ && ( lastpri==1 || v-s[j].value<20 || (v-s[x].value)*2 >= v-s[j].value ) ) ) { ++ lastpri=pri; ++ x=j; ++ } ++ } ++ } ++ if(x== -1 && mx[i][i]) ++ pairs[i]=i; /* a special case */ ++ else ++ pairs[i]=x; ++ } ++ ++ if(ISDBG(SUBSTEMS)) { ++ for(i=0; i0) ++ fprintf(pfa_file, "%% %d...%d (%d x %d)\n", s[i].value, s[j].value, i, j); ++ } ++ } ++} ++ ++/* ++ * Make all the stems originating at the same value get the ++ * same width. Without this the rasterizer may move the dots ++ * randomly up or down by one pixel, and that looks bad. ++ * The prioritisation is the same as in findstemat(). ++ */ ++static void ++uniformstems( ++ STEM * s, ++ short *pairs, ++ int ns ++) ++{ ++ int i, j, from, to, val, dir; ++ int pri, prevpri[2], wd, prevwd[2], prevbest[2]; ++ ++ for(from=0; from prevpri[dir] || wd= 0) { ++ if(ISDBG(SUBSTEMS)) { ++ fprintf(stderr, "at %d (%s %d) pair %d->%d(%d)\n", i, ++ (dir ? "UP":"DOWN"), s[i].value, pairs[i], prevbest[dir], ++ s[prevbest[dir]].value); ++ } ++ pairs[i] = prevbest[dir]; ++ } ++ } ++ } ++} ++ ++/* ++ * Find the best stem in the array at the specified (value, origin), ++ * related to the entry ge. ++ * Returns its index in the array sp, -1 means "none". ++ * prevbest is the result for the other end of the line, we must ++ * find something better than it or leave it as it is. ++ */ ++static int ++findstemat( ++ int value, ++ int origin, ++ GENTRY *ge, ++ STEM *sp, ++ short *pairs, ++ int ns, ++ int prevbest /* -1 means "none" */ ++) ++{ ++ int i, min, max; ++ int v, si; ++ int pri, prevpri; /* priority, 0 = has ST_END, 1 = no ST_END */ ++ int wd, prevwd; /* stem width */ ++ ++ si= -1; /* nothing yet */ ++ ++ /* stems are ordered by value, binary search */ ++ min=0; max=ns; /* min <= i < max */ ++ while( min < max ) { ++ i=(min+max)/2; ++ v=sp[i].value; ++ if(vvalue) ++ max=i; ++ else { ++ si=i; /* temporary value */ ++ break; ++ } ++ } ++ ++ if( si < 0 ) /* found nothing this time */ ++ return prevbest; ++ ++ /* find the priority of the prevbest */ ++ /* we expect that prevbest has a pair */ ++ if(prevbest>=0) { ++ i=pairs[prevbest]; ++ prevpri=1; ++ if( (sp[prevbest].flags | sp[i].flags) & ST_END ) ++ prevpri=0; ++ prevwd=abs(sp[i].value-value); ++ } ++ ++ /* stems are not ordered by origin, so now do the linear search */ ++ ++ while( si>0 && sp[si-1].value==value ) /* find the first one */ ++ si--; ++ ++ for(; siprevpri ++ || (pri==prevpri && prevwd==0) || (wd!=0 && wdprev->ix3; ++ y=ge->prev->iy3; ++ ++ if(*nextvsi == -2) ++ si[SI_VP]=findstemat(x, y, ge, vs, vpairs, nvs, -1); ++ else { ++ si[SI_VP]= *nextvsi; *nextvsi= -2; ++ } ++ if(*nexthsi == -2) ++ si[SI_HP]=findstemat(y, x, ge, hs, hpairs, nhs, -1); ++ else { ++ si[SI_HP]= *nexthsi; *nexthsi= -2; ++ } ++ ++ /* ++ * For the horizontal lines we make sure that both ++ * ends of the line have the same horizontal stem, ++ * and the same thing for vertical lines and stems. ++ * In both cases we enforce the stem for the next entry. ++ * Otherwise unpleasant effects may arise. ++ */ ++ ++ if(ge->type==GE_LINE) { ++ if(ge->ix3==x) { /* vertical line */ ++ *nextvsi=si[SI_VP]=findstemat(x, ge->iy3, ge->frwd, vs, vpairs, nvs, si[SI_VP]); ++ } else if(ge->iy3==y) { /* horizontal line */ ++ *nexthsi=si[SI_HP]=findstemat(y, ge->ix3, ge->frwd, hs, hpairs, nhs, si[SI_HP]); ++ } ++ } ++ ++ if(si[SI_VP]+si[SI_HP] == -2) /* no stems, leave it alone */ ++ return 0; ++ ++ /* build the array of relevant bounds */ ++ nr=0; ++ for(i=0; i< sizeof(si) / sizeof(si[0]); i++) { ++ STEM *sp; ++ short *pairs; ++ int step; ++ int f; ++ int nzones, firstzone, binzone, einzone; ++ int btype, etype; ++ ++ if(si[i] < 0) ++ continue; ++ ++ if(i r[nr].high) { ++ j=r[nr].low; r[nr].low=r[nr].high; r[nr].high=j; ++ step= -1; ++ } else { ++ step=1; ++ } ++ ++ /* handle the interaction with Blue Zones */ ++ ++ if(i>=SI_HP) { /* only for horizontal stems */ ++ if(si[i]==pairs[si[i]]) { ++ /* special case, the outermost stem in the ++ * Blue Zone without a pair, simulate it to 20-pixel ++ */ ++ if(sp[ si[i] ].flags & ST_UP) { ++ r[nr].high+=20; ++ for(j=si[i]+1; j sp[j].value-2) ++ r[nr].high=sp[j].value-2; ++ break; ++ } ++ } else { ++ r[nr].low-=20; ++ for(j=si[i]-1; j>=0; j--) ++ if( (sp[j].flags & (ST_ZONE|ST_TOPZONE)) ++ == (ST_ZONE) ) { ++ if(r[nr].low < sp[j].value+2) ++ r[nr].low=sp[j].value+2; ++ break; ++ } ++ } ++ } ++ ++ /* check that the stem borders don't end up in ++ * different Blue Zones */ ++ f=sp[ si[i] ].flags; ++ nzones=0; einzone=binzone=0; ++ for(j=si[i]; j!=pairs[ si[i] ]; j+=step) { ++ if( (sp[j].flags & ST_ZONE)==0 ) ++ continue; ++ /* if see a zone border going in the same direction */ ++ if( ((f ^ sp[j].flags) & ST_UP)==0 ) { ++ if( ++nzones == 1 ) { ++ firstzone=sp[j].value; /* remember the first one */ ++ etype=sp[j].flags & ST_TOPZONE; ++ } ++ einzone=1; ++ ++ } else { /* the opposite direction */ ++ if(nzones==0) { /* beginning is in a blue zone */ ++ binzone=1; ++ btype=sp[j].flags & ST_TOPZONE; ++ } ++ einzone=0; ++ } ++ } ++ ++ /* beginning and end are in Blue Zones of different types */ ++ if( binzone && einzone && (btype ^ etype)!=0 ) { ++ if( sp[si[i]].flags & ST_UP ) { ++ if(firstzone > r[nr].low+22) ++ r[nr].high=r[nr].low+20; ++ else ++ r[nr].high=firstzone-2; ++ } else { ++ if(firstzone < r[nr].high-22) ++ r[nr].low=r[nr].high-20; ++ else ++ r[nr].low=firstzone+2; ++ } ++ } ++ } ++ ++ if(ISDBG(SUBSTEMS)) ++ fprintf(pfa_file, "%% at(%d,%d)[%d,%d] %d..%d %c (%d x %d)\n", x, y, i, nr, ++ r[nr].low, r[nr].high, r[nr].isvert ? 'v' : 'h', ++ si[i], pairs[si[i]]); ++ ++ nr++; ++ } ++ ++ /* now try to find a group */ ++ conflict=0; /* no conflicts found yet */ ++ for(j=0; j= lb ) { ++ if( r[j].low == lb && r[j].high == hb ) /* coincides */ ++ r[j].already=1; ++ else ++ conflict=1; ++ } ++ ++ if(conflict) ++ break; ++ } ++ ++ if(conflict) { /* nope, check all the groups */ ++ for(j=0; j= lb ) { ++ if( r[j].low == lb && r[j].high == hb ) /* coincides */ ++ r[j].already=1; ++ else ++ conflict=1; ++ } ++ ++ if(conflict) ++ i=egp[grp]-1; /* fast forward to the next group */ ++ } ++ } ++ ++ /* do we have any empty group ? */ ++ if(conflict && grp < NSTEMGRP-1) { ++ grp++; conflict=0; ++ for(j=0; j 0) { ++ for(i=egp[NSTEMGRP-1]-1; i>=egp[grp]; i--) ++ s[i+rexpand]=s[i]; ++ for(i=0; istemid = gssentry_lastgrp = grp; ++ return 0; ++} ++ ++/* ++ * Create the groups of substituted stems from the list. ++ * Each group will be represented by a subroutine in the Subs ++ * array. ++ */ ++ ++static void ++groupsubstems( ++ GLYPH *g, ++ STEM *hs, /* horizontal stems, sorted by value */ ++ short *hpairs, ++ int nhs, ++ STEM *vs, /* vertical stems, sorted by value */ ++ short *vpairs, ++ int nvs ++) ++{ ++ GENTRY *ge; ++ int i, j; ++ ++ /* temporary storage */ ++ STEMBOUNDS s[MAX_STEMS*2]; ++ /* indexes in there, pointing past the end each stem group */ ++ short egp[NSTEMGRP]; ++ ++ int nextvsi, nexthsi; /* -2 means "check by yourself" */ ++ ++ for(i=0; ientries; ge != 0; ge = ge->next) { ++ if(ge->type!=GE_LINE && ge->type!=GE_CURVE) { ++ nextvsi=nexthsi= -2; /* next path is independent */ ++ continue; ++ } ++ ++ if( gssentry(ge, hs, hpairs, nhs, vs, vpairs, nvs, s, egp, &nextvsi, &nexthsi) ) { ++ WARNING_2 fprintf(stderr, "*** glyph %s requires over %d hint subroutines, ignored them\n", ++ g->name, NSTEMGRP); ++ /* it's better to have no substituted hints at all than have only part */ ++ for (ge = g->entries; ge != 0; ge = ge->next) ++ ge->stemid= -1; ++ g->nsg=0; /* just to be safe, already is 0 by initialization */ ++ return; ++ } ++ ++ /* ++ * handle the last vert/horiz line of the path specially, ++ * correct the hint for the first entry of the path ++ */ ++ if(ge->frwd != ge->next && (nextvsi != -2 || nexthsi != -2) ) { ++ if( gssentry(ge->frwd, hs, hpairs, nhs, vs, vpairs, nvs, s, egp, &nextvsi, &nexthsi) ) { ++ WARNING_2 fprintf(stderr, "*** glyph %s requires over %d hint subroutines, ignored them\n", ++ g->name, NSTEMGRP); ++ /* it's better to have no substituted hints at all than have only part */ ++ for (ge = g->entries; ge != 0; ge = ge->next) ++ ge->stemid= -1; ++ g->nsg=0; /* just to be safe, already is 0 by initialization */ ++ return; ++ } ++ } ++ ++ } ++ ++ /* find the index of the first empty group - same as the number of groups */ ++ if(egp[0]>0) { ++ for(i=1; insg=i; ++ } else ++ g->nsg=0; ++ ++ if(ISDBG(SUBSTEMS)) { ++ fprintf(pfa_file, "%% %d substem groups (%d %d %d)\n", g->nsg, ++ g->nsg>1 ? egp[g->nsg-2] : -1, ++ g->nsg>0 ? egp[g->nsg-1] : -1, ++ g->nsgnsg] : -1 ); ++ j=0; ++ for(i=0; insg; i++) { ++ fprintf(pfa_file, "%% grp %3d: ", i); ++ for(; jnsg==1) { /* it would be the same as the main stems */ ++ /* so erase it */ ++ for (ge = g->entries; ge != 0; ge = ge->next) ++ ge->stemid= -1; ++ g->nsg=0; ++ } ++ ++ if(g->nsg>0) { ++ if( (g->nsbs=malloc(g->nsg * sizeof (egp[0]))) == 0 ) { ++ fprintf(stderr, "**** not enough memory for substituted hints ****\n"); ++ exit(255); ++ } ++ memmove(g->nsbs, egp, g->nsg * sizeof(short)); ++ if( (g->sbstems=malloc(egp[g->nsg-1] * sizeof (s[0]))) == 0 ) { ++ fprintf(stderr, "**** not enough memory for substituted hints ****\n"); ++ exit(255); ++ } ++ memmove(g->sbstems, s, egp[g->nsg-1] * sizeof(s[0])); ++ } ++} ++ ++void ++buildstems( ++ GLYPH * g ++) ++{ ++ STEM hs[MAX_STEMS], vs[MAX_STEMS]; /* temporary working ++ * storage */ ++ short hs_pairs[MAX_STEMS], vs_pairs[MAX_STEMS]; /* best pairs for these stems */ ++ STEM *sp; ++ GENTRY *ge, *nge, *pge; ++ int nx, ny; ++ int ovalue; ++ int totals, grp, lastgrp; ++ ++ assertisint(g, "buildstems int"); ++ ++ g->nhs = g->nvs = 0; ++ memset(hs, 0, sizeof hs); ++ memset(vs, 0, sizeof vs); ++ ++ /* first search the whole character for possible stem points */ ++ ++ for (ge = g->entries; ge != 0; ge = ge->next) { ++ if (ge->type == GE_CURVE) { ++ ++ /* ++ * SURPRISE! ++ * We consider the stems bound by the ++ * H/V ends of the curves as flat ones. ++ * ++ * But we don't include the point on the ++ * other end into the range. ++ */ ++ ++ /* first check the beginning of curve */ ++ /* if it is horizontal, add a hstem */ ++ if (ge->iy1 == ge->prev->iy3) { ++ hs[g->nhs].value = ge->iy1; ++ ++ if (ge->ix1 < ge->prev->ix3) ++ hs[g->nhs].flags = ST_FLAT | ST_UP; ++ else ++ hs[g->nhs].flags = ST_FLAT; ++ ++ hs[g->nhs].origin = ge->prev->ix3; ++ hs[g->nhs].ge = ge; ++ ++ if (ge->ix1 < ge->prev->ix3) { ++ hs[g->nhs].from = ge->ix1+1; ++ hs[g->nhs].to = ge->prev->ix3; ++ if(hs[g->nhs].from > hs[g->nhs].to) ++ hs[g->nhs].from--; ++ } else { ++ hs[g->nhs].from = ge->prev->ix3; ++ hs[g->nhs].to = ge->ix1-1; ++ if(hs[g->nhs].from > hs[g->nhs].to) ++ hs[g->nhs].to++; ++ } ++ if (ge->ix1 != ge->prev->ix3) ++ g->nhs++; ++ } ++ /* if it is vertical, add a vstem */ ++ else if (ge->ix1 == ge->prev->ix3) { ++ vs[g->nvs].value = ge->ix1; ++ ++ if (ge->iy1 > ge->prev->iy3) ++ vs[g->nvs].flags = ST_FLAT | ST_UP; ++ else ++ vs[g->nvs].flags = ST_FLAT; ++ ++ vs[g->nvs].origin = ge->prev->iy3; ++ vs[g->nvs].ge = ge; ++ ++ if (ge->iy1 < ge->prev->iy3) { ++ vs[g->nvs].from = ge->iy1+1; ++ vs[g->nvs].to = ge->prev->iy3; ++ if(vs[g->nvs].from > vs[g->nvs].to) ++ vs[g->nvs].from--; ++ } else { ++ vs[g->nvs].from = ge->prev->iy3; ++ vs[g->nvs].to = ge->iy1-1; ++ if(vs[g->nvs].from > vs[g->nvs].to) ++ vs[g->nvs].to++; ++ } ++ ++ if (ge->iy1 != ge->prev->iy3) ++ g->nvs++; ++ } ++ /* then check the end of curve */ ++ /* if it is horizontal, add a hstem */ ++ if (ge->iy3 == ge->iy2) { ++ hs[g->nhs].value = ge->iy3; ++ ++ if (ge->ix3 < ge->ix2) ++ hs[g->nhs].flags = ST_FLAT | ST_UP; ++ else ++ hs[g->nhs].flags = ST_FLAT; ++ ++ hs[g->nhs].origin = ge->ix3; ++ hs[g->nhs].ge = ge->frwd; ++ ++ if (ge->ix3 < ge->ix2) { ++ hs[g->nhs].from = ge->ix3; ++ hs[g->nhs].to = ge->ix2-1; ++ if( hs[g->nhs].from > hs[g->nhs].to ) ++ hs[g->nhs].to++; ++ } else { ++ hs[g->nhs].from = ge->ix2+1; ++ hs[g->nhs].to = ge->ix3; ++ if( hs[g->nhs].from > hs[g->nhs].to ) ++ hs[g->nhs].from--; ++ } ++ ++ if (ge->ix3 != ge->ix2) ++ g->nhs++; ++ } ++ /* if it is vertical, add a vstem */ ++ else if (ge->ix3 == ge->ix2) { ++ vs[g->nvs].value = ge->ix3; ++ ++ if (ge->iy3 > ge->iy2) ++ vs[g->nvs].flags = ST_FLAT | ST_UP; ++ else ++ vs[g->nvs].flags = ST_FLAT; ++ ++ vs[g->nvs].origin = ge->iy3; ++ vs[g->nvs].ge = ge->frwd; ++ ++ if (ge->iy3 < ge->iy2) { ++ vs[g->nvs].from = ge->iy3; ++ vs[g->nvs].to = ge->iy2-1; ++ if( vs[g->nvs].from > vs[g->nvs].to ) ++ vs[g->nvs].to++; ++ } else { ++ vs[g->nvs].from = ge->iy2+1; ++ vs[g->nvs].to = ge->iy3; ++ if( vs[g->nvs].from > vs[g->nvs].to ) ++ vs[g->nvs].from--; ++ } ++ ++ if (ge->iy3 != ge->iy2) ++ g->nvs++; ++ } else { ++ ++ /* ++ * check the end of curve for a not smooth ++ * local extremum ++ */ ++ nge = ge->frwd; ++ ++ if (nge == 0) ++ continue; ++ else if (nge->type == GE_LINE) { ++ nx = nge->ix3; ++ ny = nge->iy3; ++ } else if (nge->type == GE_CURVE) { ++ nx = nge->ix1; ++ ny = nge->iy1; ++ } else ++ continue; ++ ++ /* check for vertical extremums */ ++ if ((ge->iy3 > ge->iy2 && ge->iy3 > ny) ++ || (ge->iy3 < ge->iy2 && ge->iy3 < ny)) { ++ hs[g->nhs].value = ge->iy3; ++ hs[g->nhs].from ++ = hs[g->nhs].to ++ = hs[g->nhs].origin = ge->ix3; ++ hs[g->nhs].ge = ge->frwd; ++ ++ if (ge->ix3 < ge->ix2 ++ || nx < ge->ix3) ++ hs[g->nhs].flags = ST_UP; ++ else ++ hs[g->nhs].flags = 0; ++ ++ if (ge->ix3 != ge->ix2 || nx != ge->ix3) ++ g->nhs++; ++ } ++ /* ++ * the same point may be both horizontal and ++ * vertical extremum ++ */ ++ /* check for horizontal extremums */ ++ if ((ge->ix3 > ge->ix2 && ge->ix3 > nx) ++ || (ge->ix3 < ge->ix2 && ge->ix3 < nx)) { ++ vs[g->nvs].value = ge->ix3; ++ vs[g->nvs].from ++ = vs[g->nvs].to ++ = vs[g->nvs].origin = ge->iy3; ++ vs[g->nvs].ge = ge->frwd; ++ ++ if (ge->iy3 > ge->iy2 ++ || ny > ge->iy3) ++ vs[g->nvs].flags = ST_UP; ++ else ++ vs[g->nvs].flags = 0; ++ ++ if (ge->iy3 != ge->iy2 || ny != ge->iy3) ++ g->nvs++; ++ } ++ } ++ ++ } else if (ge->type == GE_LINE) { ++ nge = ge->frwd; ++ ++ /* if it is horizontal, add a hstem */ ++ /* and the ends as vstems if they brace the line */ ++ if (ge->iy3 == ge->prev->iy3 ++ && ge->ix3 != ge->prev->ix3) { ++ hs[g->nhs].value = ge->iy3; ++ if (ge->ix3 < ge->prev->ix3) { ++ hs[g->nhs].flags = ST_FLAT | ST_UP; ++ hs[g->nhs].from = ge->ix3; ++ hs[g->nhs].to = ge->prev->ix3; ++ } else { ++ hs[g->nhs].flags = ST_FLAT; ++ hs[g->nhs].from = ge->prev->ix3; ++ hs[g->nhs].to = ge->ix3; ++ } ++ hs[g->nhs].origin = ge->ix3; ++ hs[g->nhs].ge = ge->frwd; ++ ++ pge = ge->bkwd; ++ ++ /* add beginning as vstem */ ++ vs[g->nvs].value = pge->ix3; ++ vs[g->nvs].origin ++ = vs[g->nvs].from ++ = vs[g->nvs].to = pge->iy3; ++ vs[g->nvs].ge = ge; ++ ++ if(pge->type==GE_CURVE) ++ ovalue=pge->iy2; ++ else ++ ovalue=pge->prev->iy3; ++ ++ if (pge->iy3 > ovalue) ++ vs[g->nvs].flags = ST_UP | ST_END; ++ else if (pge->iy3 < ovalue) ++ vs[g->nvs].flags = ST_END; ++ else ++ vs[g->nvs].flags = 0; ++ ++ if( vs[g->nvs].flags != 0 ) ++ g->nvs++; ++ ++ /* add end as vstem */ ++ vs[g->nvs].value = ge->ix3; ++ vs[g->nvs].origin ++ = vs[g->nvs].from ++ = vs[g->nvs].to = ge->iy3; ++ vs[g->nvs].ge = ge->frwd; ++ ++ if(nge->type==GE_CURVE) ++ ovalue=nge->iy1; ++ else ++ ovalue=nge->iy3; ++ ++ if (ovalue > ge->iy3) ++ vs[g->nvs].flags = ST_UP | ST_END; ++ else if (ovalue < ge->iy3) ++ vs[g->nvs].flags = ST_END; ++ else ++ vs[g->nvs].flags = 0; ++ ++ if( vs[g->nvs].flags != 0 ) ++ g->nvs++; ++ ++ g->nhs++; ++ } ++ /* if it is vertical, add a vstem */ ++ /* and the ends as hstems if they brace the line */ ++ else if (ge->ix3 == ge->prev->ix3 ++ && ge->iy3 != ge->prev->iy3) { ++ vs[g->nvs].value = ge->ix3; ++ if (ge->iy3 > ge->prev->iy3) { ++ vs[g->nvs].flags = ST_FLAT | ST_UP; ++ vs[g->nvs].from = ge->prev->iy3; ++ vs[g->nvs].to = ge->iy3; ++ } else { ++ vs[g->nvs].flags = ST_FLAT; ++ vs[g->nvs].from = ge->iy3; ++ vs[g->nvs].to = ge->prev->iy3; ++ } ++ vs[g->nvs].origin = ge->iy3; ++ vs[g->nvs].ge = ge->frwd; ++ ++ pge = ge->bkwd; ++ ++ /* add beginning as hstem */ ++ hs[g->nhs].value = pge->iy3; ++ hs[g->nhs].origin ++ = hs[g->nhs].from ++ = hs[g->nhs].to = pge->ix3; ++ hs[g->nhs].ge = ge; ++ ++ if(pge->type==GE_CURVE) ++ ovalue=pge->ix2; ++ else ++ ovalue=pge->prev->ix3; ++ ++ if (pge->ix3 < ovalue) ++ hs[g->nhs].flags = ST_UP | ST_END; ++ else if (pge->ix3 > ovalue) ++ hs[g->nhs].flags = ST_END; ++ else ++ hs[g->nhs].flags = 0; ++ ++ if( hs[g->nhs].flags != 0 ) ++ g->nhs++; ++ ++ /* add end as hstem */ ++ hs[g->nhs].value = ge->iy3; ++ hs[g->nhs].origin ++ = hs[g->nhs].from ++ = hs[g->nhs].to = ge->ix3; ++ hs[g->nhs].ge = ge->frwd; ++ ++ if(nge->type==GE_CURVE) ++ ovalue=nge->ix1; ++ else ++ ovalue=nge->ix3; ++ ++ if (ovalue < ge->ix3) ++ hs[g->nhs].flags = ST_UP | ST_END; ++ else if (ovalue > ge->ix3) ++ hs[g->nhs].flags = ST_END; ++ else ++ hs[g->nhs].flags = 0; ++ ++ if( hs[g->nhs].flags != 0 ) ++ g->nhs++; ++ ++ g->nvs++; ++ } ++ /* ++ * check the end of line for a not smooth local ++ * extremum ++ */ ++ nge = ge->frwd; ++ ++ if (nge == 0) ++ continue; ++ else if (nge->type == GE_LINE) { ++ nx = nge->ix3; ++ ny = nge->iy3; ++ } else if (nge->type == GE_CURVE) { ++ nx = nge->ix1; ++ ny = nge->iy1; ++ } else ++ continue; ++ ++ /* check for vertical extremums */ ++ if ((ge->iy3 > ge->prev->iy3 && ge->iy3 > ny) ++ || (ge->iy3 < ge->prev->iy3 && ge->iy3 < ny)) { ++ hs[g->nhs].value = ge->iy3; ++ hs[g->nhs].from ++ = hs[g->nhs].to ++ = hs[g->nhs].origin = ge->ix3; ++ hs[g->nhs].ge = ge->frwd; ++ ++ if (ge->ix3 < ge->prev->ix3 ++ || nx < ge->ix3) ++ hs[g->nhs].flags = ST_UP; ++ else ++ hs[g->nhs].flags = 0; ++ ++ if (ge->ix3 != ge->prev->ix3 || nx != ge->ix3) ++ g->nhs++; ++ } ++ /* ++ * the same point may be both horizontal and vertical ++ * extremum ++ */ ++ /* check for horizontal extremums */ ++ if ((ge->ix3 > ge->prev->ix3 && ge->ix3 > nx) ++ || (ge->ix3 < ge->prev->ix3 && ge->ix3 < nx)) { ++ vs[g->nvs].value = ge->ix3; ++ vs[g->nvs].from ++ = vs[g->nvs].to ++ = vs[g->nvs].origin = ge->iy3; ++ vs[g->nvs].ge = ge->frwd; ++ ++ if (ge->iy3 > ge->prev->iy3 ++ || ny > ge->iy3) ++ vs[g->nvs].flags = ST_UP; ++ else ++ vs[g->nvs].flags = 0; ++ ++ if (ge->iy3 != ge->prev->iy3 || ny != ge->iy3) ++ g->nvs++; ++ } ++ } ++ } ++ ++ g->nhs=addbluestems(hs, g->nhs); ++ sortstems(hs, g->nhs); ++ sortstems(vs, g->nvs); ++ ++ if (ISDBG(STEMS)) ++ debugstems(g->name, hs, g->nhs, vs, g->nvs); ++ ++ /* find the stems interacting with the Blue Zones */ ++ markbluestems(hs, g->nhs); ++ ++ if(subhints) { ++ if (ISDBG(SUBSTEMS)) ++ fprintf(pfa_file, "%% %s: joining subst horizontal stems\n", g->name); ++ joinsubstems(hs, hs_pairs, g->nhs, 1); ++ uniformstems(hs, hs_pairs, g->nhs); ++ ++ if (ISDBG(SUBSTEMS)) ++ fprintf(pfa_file, "%% %s: joining subst vertical stems\n", g->name); ++ joinsubstems(vs, vs_pairs, g->nvs, 0); ++ ++ groupsubstems(g, hs, hs_pairs, g->nhs, vs, vs_pairs, g->nvs); ++ } ++ ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% %s: joining main horizontal stems\n", g->name); ++ g->nhs = joinmainstems(hs, g->nhs, 1); ++ if (ISDBG(MAINSTEMS)) ++ fprintf(pfa_file, "%% %s: joining main vertical stems\n", g->name); ++ g->nvs = joinmainstems(vs, g->nvs, 0); ++ ++ if (ISDBG(MAINSTEMS)) ++ debugstems(g->name, hs, g->nhs, vs, g->nvs); ++ ++ if(g->nhs > 0) { ++ if ((sp = malloc(sizeof(STEM) * g->nhs)) == 0) { ++ fprintf(stderr, "**** not enough memory for hints ****\n"); ++ exit(255); ++ } ++ g->hstems = sp; ++ memcpy(sp, hs, sizeof(STEM) * g->nhs); ++ } else ++ g->hstems = 0; ++ ++ if(g->nvs > 0) { ++ if ((sp = malloc(sizeof(STEM) * g->nvs)) == 0) { ++ fprintf(stderr, "**** not enough memory for hints ****\n"); ++ exit(255); ++ } ++ g->vstems = sp; ++ memcpy(sp, vs, sizeof(STEM) * g->nvs); ++ } else ++ g->vstems = 0; ++ ++ /* now check that the stems won't overflow the interpreter's stem stack: ++ * some interpreters (like X11) push the stems on each change into ++ * stack and pop them only after the whole glyphs is completed. ++ */ ++ ++ totals = (g->nhs+g->nvs) / 2; /* we count whole stems, not halves */ ++ lastgrp = -1; ++ ++ for (ge = g->entries; ge != 0; ge = ge->next) { ++ grp=ge->stemid; ++ if(grp >= 0 && grp != lastgrp) { ++ if(grp==0) ++ totals += g->nsbs[0]; ++ else ++ totals += g->nsbs[grp] - g->nsbs[grp-1]; ++ ++ lastgrp = grp; ++ } ++ } ++ ++ /* be on the safe side, check for >= , not > */ ++ if(totals >= max_stemdepth) { /* oops, too deep */ ++ WARNING_2 { ++ fprintf(stderr, "Warning: glyph %s needs hint stack depth %d\n", g->name, totals); ++ fprintf(stderr, " (limit %d): removed the substituted hints from it\n", max_stemdepth); ++ } ++ if(g->nsg > 0) { ++ for (ge = g->entries; ge != 0; ge = ge->next) ++ ge->stemid = -1; ++ free(g->sbstems); g->sbstems = 0; ++ free(g->nsbs); g->nsbs = 0; ++ g->nsg = 0; ++ } ++ } ++ ++ /* now check if there are too many main stems */ ++ totals = (g->nhs+g->nvs) / 2; /* we count whole stems, not halves */ ++ if(totals >= max_stemdepth) { ++ /* even worse, too much of non-substituted stems */ ++ WARNING_2 { ++ fprintf(stderr, "Warning: glyph %s has %d main hints\n", g->name, totals); ++ fprintf(stderr, " (limit %d): removed the hints from it\n", max_stemdepth); ++ } ++ if(g->vstems) { ++ free(g->vstems); g->vstems = 0; g->nvs = 0; ++ } ++ if(g->hstems) { ++ free(g->hstems); g->hstems = 0; g->nhs = 0; ++ } ++ } ++} ++ ++/* convert weird curves that are close to lines into lines. ++*/ ++ ++void ++fstraighten( ++ GLYPH * g ++) ++{ ++ GENTRY *ge, *pge, *nge, *ige; ++ double df; ++ int dir; ++ double iln, oln; ++ int svdir, i, o; ++ ++ for (ige = g->entries; ige != 0; ige = ige->next) { ++ if (ige->type != GE_CURVE) ++ continue; ++ ++ ge = ige; ++ pge = ge->bkwd; ++ nge = ge->frwd; ++ ++ df = 0.; ++ ++ /* look for vertical then horizontal */ ++ for(i=0; i<2; i++) { ++ o = !i; /* other axis */ ++ ++ iln = fabs(ge->fpoints[i][2] - pge->fpoints[i][2]); ++ oln = fabs(ge->fpoints[o][2] - pge->fpoints[o][2]); ++ /* ++ * if current curve is almost a vertical line, and it ++ * doesn't begin or end horizontally (and the prev/next ++ * line doesn't join smoothly ?) ++ */ ++ if( oln < 1. ++ || ge->fpoints[o][2] == ge->fpoints[o][1] ++ || ge->fpoints[o][0] == pge->fpoints[o][2] ++ || iln > 2. ++ || (iln > 1. && iln/oln > 0.1) ) ++ continue; ++ ++ ++ if(ISDBG(STRAIGHTEN)) ++ fprintf(stderr,"** straighten almost %s\n", (i? "horizontal":"vertical")); ++ ++ df = ge->fpoints[i][2] - pge->fpoints[i][2]; ++ dir = fsign(ge->fpoints[o][2] - pge->fpoints[o][2]); ++ ge->type = GE_LINE; ++ ++ /* ++ * suck in all the sequence of such almost lines ++ * going in the same direction but not deviating ++ * too far from vertical ++ */ ++ iln = fabs(nge->fpoints[i][2] - ge->fpoints[i][2]); ++ oln = nge->fpoints[o][2] - ge->fpoints[o][2]; ++ ++ while (fabs(df) <= 5 && nge->type == GE_CURVE ++ && dir == fsign(oln) /* that also gives oln != 0 */ ++ && iln <= 2. ++ && ( iln <= 1. || iln/fabs(oln) <= 0.1 ) ) { ++ ge->fx3 = nge->fx3; ++ ge->fy3 = nge->fy3; ++ ++ if(ISDBG(STRAIGHTEN)) ++ fprintf(stderr,"** straighten collapsing %s\n", (i? "horizontal":"vertical")); ++ freethisge(nge); ++ fixendpath(ge); ++ pge = ge->bkwd; ++ nge = ge->frwd; ++ ++ df = ge->fpoints[i][2] - pge->fpoints[i][2]; ++ ++ iln = fabs(nge->fpoints[i][2] - ge->fpoints[i][2]); ++ oln = nge->fpoints[o][2] - ge->fpoints[o][2]; ++ } ++ ++ /* now check what do we have as previous/next line */ ++ ++ if(ge != pge) { ++ if( pge->type == GE_LINE && pge->fpoints[i][2] == pge->prev->fpoints[i][2] ++ && fabs(pge->fpoints[o][2] != pge->prev->fpoints[o][2]) ) { ++ if(ISDBG(STRAIGHTEN)) fprintf(stderr,"** straighten join with previous 0x%x 0x%x\n", pge, ge); ++ /* join the previous line with current */ ++ pge->fx3 = ge->fx3; ++ pge->fy3 = ge->fy3; ++ ++ ige = freethisge(ge)->prev; /* keep the iterator valid */ ++ ge = pge; ++ fixendpath(ge); ++ pge = ge->bkwd; ++ } ++ } ++ ++ if(ge != nge) { ++ if (nge->type == GE_LINE && nge->fpoints[i][2] == ge->fpoints[i][2] ++ && fabs(nge->fpoints[o][2] != ge->fpoints[o][2]) ) { ++ if(ISDBG(STRAIGHTEN)) fprintf(stderr,"** straighten join with next 0x%x 0x%x\n", ge, nge); ++ /* join the next line with current */ ++ ge->fx3 = nge->fx3; ++ ge->fy3 = nge->fy3; ++ ++ freethisge(nge); ++ fixendpath(ge); ++ pge = ge->bkwd; ++ nge = ge->frwd; ++ ++ } ++ } ++ ++ if(ge != pge) { ++ /* try to align the lines if neccessary */ ++ if(df != 0.) ++ fclosegap(ge, ge, i, df, NULL); ++ } else { ++ /* contour consists of only one line, get rid of it */ ++ ige = freethisge(ge); /* keep the iterator valid */ ++ if(ige == 0) /* this was the last contour */ ++ return; ++ ige = ige->prev; ++ } ++ ++ break; /* don't bother looking at the other axis */ ++ } ++ } ++} ++ ++/* solve a square equation, ++ * returns the number of solutions found, the solutions ++ * are stored in res which should point to array of two doubles. ++ * min and max limit the area for solutions ++ */ ++ ++static int ++fsqequation( ++ double a, ++ double b, ++ double c, ++ double *res, ++ double min, ++ double max ++) ++{ ++ double D; ++ int n; ++ ++ if(ISDBG(SQEQ)) fprintf(stderr, "sqeq(%g,%g,%g) [%g;%g]\n", a, b, c, min, max); ++ ++ if(fabs(a) < 0.000001) { /* if a linear equation */ ++ n=0; ++ if(fabs(b) < 0.000001) /* not an equation at all */ ++ return 0; ++ res[0] = -c/b; ++ if(ISDBG(SQEQ)) fprintf(stderr, "sqeq: linear t=%g\n", res[0]); ++ if(res[0] >= min && res[0] <= max) ++ n++; ++ return n; ++ } ++ ++ D = b*b - 4.0*a*c; ++ if(ISDBG(SQEQ)) fprintf(stderr, "sqeq: D=%g\n", D); ++ if(D<0) ++ return 0; ++ ++ D = sqrt(D); ++ ++ n=0; ++ res[0] = (-b+D) / (2*a); ++ if(ISDBG(SQEQ)) fprintf(stderr, "sqeq: t1=%g\n", res[0]); ++ if(res[0] >= min && res[0] <= max) ++ n++; ++ ++ res[n] = (-b-D) / (2*a); ++ if(ISDBG(SQEQ)) fprintf(stderr, "sqeq: t2=%g\n", res[n]); ++ if(res[n] >= min && res[n] <= max) ++ n++; ++ ++ /* return 2nd solution only if it's different enough */ ++ if(n==2 && fabs(res[0]-res[1])<0.000001) ++ n=1; ++ ++ return n; ++} ++ ++/* check that the curves don't cross quadrant boundary */ ++/* (float) */ ++ ++/* ++ Here we make sure that the curve does not continue past ++ horizontal or vertical extremums. The horizontal points are ++ explained, vertical points are by analogy. ++ ++ The horizontal points are where the derivative ++ dy/dx is equal to 0. But the Bezier curves are defined by ++ parametric formulas ++ x=fx(t) ++ y=fy(t) ++ so finding this derivative is complicated. ++ Also even if we find some point (x,y) splitting at this point ++ is far not obvious. Fortunately we can use dy/dt = 0 instead, ++ this gets to a rather simple square equation and splitting ++ at a known value of t is simple. ++ ++ The formulas are: ++ ++ y = A*(1-t)^3 + 3*B*(1-t)^2*t + 3*C*(1-t)*t^2 + D*t^3 ++ y = (-A+3*B-3*C+D)*t^3 + (3*A-6*B+3*C)*t^2 + (-3*A+3*B)*t + A ++ dy/dt = 3*(-A+3*B-3*C+D)*t^2 + 2*(3*A-6*B+3*C)*t + (-3*A+3*B) ++ */ ++ ++void ++ffixquadrants( ++ GLYPH *g ++) ++{ ++ GENTRY *ge, *nge; ++ int i, j, np, oldnp; ++ double sp[5]; /* split points, last one empty */ ++ char dir[5]; /* for debugging, direction by which split happened */ ++ double a, b, *pts; /* points of a curve */ ++ ++ for (ge = g->entries; ge != 0; ge = ge->next) { ++ if (ge->type != GE_CURVE) ++ continue; ++ ++ doagain: ++ np = 0; /* no split points yet */ ++ if(ISDBG(QUAD)) { ++ fprintf(stderr, "%s: trying 0x%x (%g %g) (%g %g) (%g %g) (%g %g)\n ", g->name, ++ ge, ge->prev->fx3, ge->prev->fy3, ge->fx1, ge->fy1, ge->fx2, ge->fy2, ++ ge->fx3, ge->fy3); ++ } ++ for(i=0; i<2; i++) { /* first for x then for y */ ++ /* find the cooridnates of control points */ ++ a = ge->prev->fpoints[i][2]; ++ pts = &ge->fpoints[i][0]; ++ ++ oldnp = np; ++ np += fsqequation( ++ 3.0*(-a + 3.0*pts[0] - 3.0*pts[1] + pts[2]), ++ 6.0*(a - 2.0*pts[0] + pts[1]), ++ 3.0*(-a + pts[0]), ++ &sp[np], ++ 0.0, 1.0); /* XXX range is [0;1] */ ++ ++ if(np == oldnp) ++ continue; ++ ++ if(ISDBG(QUAD)) ++ fprintf(stderr, "%s: 0x%x: %d pts(%c): ", ++ g->name, ge, np-oldnp, i? 'y':'x'); ++ ++ /* remove points that are too close to the ends ++ * because hor/vert ends are permitted, also ++ * if the split point is VERY close to the ends ++ * but not exactly then just flatten it and check again. ++ */ ++ for(j = oldnp; jfpoints[i][0] != ge->prev->fpoints[i][2]) { ++ ge->fpoints[i][0] = ge->prev->fpoints[i][2]; ++ if(ISDBG(QUAD)) fprintf(stderr, "flattened at front\n"); ++ goto doagain; ++ } ++ if( ge->fpoints[i][1] != ge->fpoints[i][0] ++ && fsign(ge->fpoints[i][2] - ge->fpoints[i][1]) ++ != fsign(ge->fpoints[i][1] - ge->fpoints[i][0]) ) { ++ ge->fpoints[i][1] = ge->fpoints[i][0]; ++ if(ISDBG(QUAD)) fprintf(stderr, "flattened zigzag at front\n"); ++ goto doagain; ++ } ++ sp[j] = sp[j+1]; np--; j--; ++ if(ISDBG(QUAD)) fprintf(stderr, "(front flat) "); ++ } else if(sp[j] > 0.97) { /* rear end of curve */ ++ if(ge->fpoints[i][1] != ge->fpoints[i][2]) { ++ ge->fpoints[i][1] = ge->fpoints[i][2]; ++ if(ISDBG(QUAD)) fprintf(stderr, "flattened at rear\n"); ++ goto doagain; ++ } ++ if( ge->fpoints[i][0] != ge->fpoints[i][1] ++ && fsign(ge->prev->fpoints[i][2] - ge->fpoints[i][0]) ++ != fsign(ge->fpoints[i][0] - ge->fpoints[i][1]) ) { ++ ge->fpoints[i][0] = ge->fpoints[i][1]; ++ if(ISDBG(QUAD)) fprintf(stderr, "flattened zigzag at rear\n"); ++ goto doagain; ++ } ++ sp[j] = sp[j+1]; np--; j--; ++ if(ISDBG(QUAD)) fprintf(stderr, "(rear flat) "); ++ } ++ } ++ if(ISDBG(QUAD)) fprintf(stderr, "\n"); ++ } ++ ++ if(np==0) /* no split points, leave it alone */ ++ continue; ++ ++ if(ISDBG(QUAD)) { ++ fprintf(stderr, "%s: splitting 0x%x (%g %g) (%g %g) (%g %g) (%g %g) at %d points\n ", g->name, ++ ge, ge->prev->fx3, ge->prev->fy3, ge->fx1, ge->fy1, ge->fx2, ge->fy2, ++ ge->fx3, ge->fy3, np); ++ for(i=0; i sp[j]) { ++ a = sp[i]; sp[i] = sp[j]; sp[j] = a; ++ } ++ ++ /* now finally do the split on each point */ ++ for(j=0; jfpoints[i][0]; /* get the middle points */ ++ b = ge->fpoints[i][1]; ++ ++ /* calculate new internal points */ ++ c = SPLIT(a, b); ++ ++ ge->fpoints[i][0] = SPLIT(ge->prev->fpoints[i][2], a); ++ ge->fpoints[i][1] = SPLIT(ge->fpoints[i][0], c); ++ ++ nge->fpoints[i][1] = SPLIT(b, nge->fpoints[i][2]); ++ nge->fpoints[i][0] = SPLIT(c, nge->fpoints[i][1]); ++ ++ ge->fpoints[i][2] = SPLIT(ge->fpoints[i][1], ++ + nge->fpoints[i][0]); ++ } ++#undef SPLIT ++ ++ addgeafter(ge, nge); ++ ++ /* go to the next part, adjust remaining points */ ++ ge = nge; ++ for(i=j+1; itype != GE_CURVE) ++ return 0; ++ ++ a = ge->iy2 - ge->iy1; ++ b = ge->ix2 - ge->ix1; ++ if(a == 0) { ++ if(b == 0) { ++ return 0; ++ } else ++ k = FBIGVAL; ++ } else ++ k = fabs((double) b / (double) a); ++ ++ a = ge->iy1 - ge->prev->iy3; ++ b = ge->ix1 - ge->prev->ix3; ++ if(a == 0) { ++ if(b == 0) { ++ return 0; ++ } else ++ k1 = FBIGVAL; ++ } else ++ k1 = fabs((double) b / (double) a); ++ ++ a = ge->iy3 - ge->iy2; ++ b = ge->ix3 - ge->ix2; ++ if(a == 0) { ++ if(b == 0) { ++ return 0; ++ } else ++ k2 = FBIGVAL; ++ } else ++ k2 = fabs((double) b / (double) a); ++ ++ /* if the curve is not a zigzag */ ++ if ((k1+0.0001 >= k && k2 <= k+0.0001) || (k1 <= k+0.0001 && k2+0.0001 >= k)) ++ return 0; ++ else ++ return 1; ++} ++ ++/* check if a curve is a zigzag - floating */ ++ ++static int ++fiszigzag( ++ GENTRY *ge ++) ++{ ++ double k, k1, k2; ++ double a, b; ++ ++ if (ge->type != GE_CURVE) ++ return 0; ++ ++ a = fabs(ge->fy2 - ge->fy1); ++ b = fabs(ge->fx2 - ge->fx1); ++ if(a < FEPS) { ++ if(b < FEPS) { ++ return 0; ++ } else ++ k = FBIGVAL; ++ } else ++ k = b / a; ++ ++ a = fabs(ge->fy1 - ge->prev->fy3); ++ b = fabs(ge->fx1 - ge->prev->fx3); ++ if(a < FEPS) { ++ if(b < FEPS) { ++ return 0; ++ } else ++ k1 = FBIGVAL; ++ } else ++ k1 = b / a; ++ ++ a = fabs(ge->fy3 - ge->fy2); ++ b = fabs(ge->fx3 - ge->fx2); ++ if(a < FEPS) { ++ if(b < FEPS) { ++ return 0; ++ } else ++ k2 = FBIGVAL; ++ } else ++ k2 = b / a; ++ ++ /* if the curve is not a zigzag */ ++ if ((k1+0.0001 >= k && k2 <= k+0.0001) || (k1 <= k+0.0001 && k2+0.0001 >= k)) ++ return 0; ++ else ++ return 1; ++} ++ ++/* split the zigzag-like curves into two parts */ ++ ++void ++fsplitzigzags( ++ GLYPH * g ++) ++{ ++ GENTRY *ge, *nge; ++ double a, b, c, d; ++ ++ assertisfloat(g, "splitting zigzags"); ++ for (ge = g->entries; ge != 0; ge = ge->next) { ++ if (ge->type != GE_CURVE) ++ continue; ++ ++ /* if the curve is not a zigzag */ ++ if ( !fiszigzag(ge) ) { ++ continue; ++ } ++ ++ if(ISDBG(FCONCISE)) { ++ double maxsc1, maxsc2; ++ fprintf(stderr, "split a zigzag "); ++ fnormalizege(ge); ++ if( fcrossraysge(ge, ge, &maxsc1, &maxsc2, NULL) ) { ++ fprintf(stderr, "sc1=%g sc2=%g\n", maxsc1, maxsc2); ++ } else { ++ fprintf(stderr, "(rays don't cross)\n"); ++ } ++ } ++ /* split the curve by t=0.5 */ ++ nge = newgentry(GEF_FLOAT); ++ (*nge) = (*ge); ++ nge->type = GE_CURVE; ++ ++ a = ge->prev->fx3; ++ b = ge->fx1; ++ c = ge->fx2; ++ d = ge->fx3; ++ nge->fx3 = d; ++ nge->fx2 = (c + d) / 2.; ++ nge->fx1 = (b + 2. * c + d) / 4.; ++ ge->fx3 = (a + b * 3. + c * 3. + d) / 8.; ++ ge->fx2 = (a + 2. * b + c) / 4.; ++ ge->fx1 = (a + b) / 2.; ++ ++ a = ge->prev->fy3; ++ b = ge->fy1; ++ c = ge->fy2; ++ d = ge->fy3; ++ nge->fy3 = d; ++ nge->fy2 = (c + d) / 2.; ++ nge->fy1 = (b + 2. * c + d) / 4.; ++ ge->fy3 = (a + b * 3. + c * 3. + d) / 8.; ++ ge->fy2 = (a + 2. * b + c) / 4.; ++ ge->fy1 = (a + b) / 2.; ++ ++ addgeafter(ge, nge); ++ ++ if(ISDBG(FCONCISE)) { ++ dumppaths(g, ge, nge); ++ } ++ } ++} ++ ++/* free this GENTRY, returns what was ge->next ++ * (ge must be of type GE_LINE or GE_CURVE) ++ * works on both float and int entries ++ */ ++ ++static GENTRY * ++freethisge( ++ GENTRY *ge ++) ++{ ++ GENTRY *xge; ++ ++ if (ge->bkwd != ge->prev) { ++ /* at beginning of the contour */ ++ ++ xge = ge->bkwd; ++ if(xge == ge) { /* was the only line in contour */ ++ /* remove the contour completely */ ++ /* prev is GE_MOVE, next is GE_PATH, remove them all */ ++ ++ /* may be the first contour, then ->bkwd points to ge->entries */ ++ if(ge->prev->prev == 0) ++ *(GENTRY **)(ge->prev->bkwd) = ge->next->next; ++ else ++ ge->prev->prev->next = ge->next->next; ++ ++ if(ge->next->next) { ++ ge->next->next->prev = ge->prev->prev; ++ ge->next->next->bkwd = ge->prev->bkwd; ++ } ++ ++ xge = ge->next->next; ++ free(ge->prev); free(ge->next); free(ge); ++ return xge; ++ } ++ ++ /* move the start point of the contour */ ++ if(ge->flags & GEF_FLOAT) { ++ ge->prev->fx3 = xge->fx3; ++ ge->prev->fy3 = xge->fy3; ++ } else { ++ ge->prev->ix3 = xge->ix3; ++ ge->prev->iy3 = xge->iy3; ++ } ++ } else if(ge->frwd != ge->next) { ++ /* at end of the contour */ ++ ++ xge = ge->frwd->prev; ++ /* move the start point of the contour */ ++ if(ge->flags & GEF_FLOAT) { ++ xge->fx3 = ge->bkwd->fx3; ++ xge->fy3 = ge->bkwd->fy3; ++ } else { ++ xge->ix3 = ge->bkwd->ix3; ++ xge->iy3 = ge->bkwd->iy3; ++ } ++ } ++ ++ ge->prev->next = ge->next; ++ ge->next->prev = ge->prev; ++ ge->bkwd->frwd = ge->frwd; ++ ge->frwd->bkwd = ge->bkwd; ++ ++ xge = ge->next; ++ free(ge); ++ return xge; ++} ++ ++/* inserts a new gentry (LINE or CURVE) after another (MOVE ++ * or LINE or CURVE) ++ * corrects the first GE_MOVE if neccessary ++ */ ++ ++static void ++addgeafter( ++ GENTRY *oge, /* after this */ ++ GENTRY *nge /* insert this */ ++) ++{ ++ if(oge->type == GE_MOVE) { ++ /* insert before next */ ++ if(oge->next->type == GE_PATH) { ++ /* first and only GENTRY in path */ ++ nge->frwd = nge->bkwd = nge; ++ } else { ++ nge->frwd = oge->next; ++ nge->bkwd = oge->next->bkwd; ++ oge->next->bkwd->frwd = nge; ++ oge->next->bkwd = nge; ++ } ++ } else { ++ nge->frwd = oge->frwd; ++ nge->bkwd = oge; ++ oge->frwd->bkwd = nge; ++ oge->frwd = nge; ++ } ++ ++ nge->next = oge->next; ++ nge->prev = oge; ++ oge->next->prev = nge; ++ oge->next = nge; ++ ++ if(nge->frwd->prev->type == GE_MOVE) { ++ /* fix up the GE_MOVE entry */ ++ if(nge->flags & GEF_FLOAT) { ++ nge->frwd->prev->fx3 = nge->fx3; ++ nge->frwd->prev->fy3 = nge->fy3; ++ } else { ++ nge->frwd->prev->ix3 = nge->ix3; ++ nge->frwd->prev->iy3 = nge->iy3; ++ } ++ } ++} ++ ++/* ++ * Check if this GENTRY happens to be at the end of path ++ * and fix the first MOVETO accordingly ++ * handles both int and float ++ */ ++ ++static void ++fixendpath( ++ GENTRY *ge ++) ++{ ++ GENTRY *mge; ++ ++ mge = ge->frwd->prev; ++ if(mge->type == GE_MOVE) { ++ if(ge->flags & GEF_FLOAT) { ++ mge->fx3 = ge->fx3; ++ mge->fy3 = ge->fy3; ++ } else { ++ mge->ix3 = ge->ix3; ++ mge->iy3 = ge->iy3; ++ } ++ } ++} ++ ++/* ++ * This function adjusts the rest of path (the part from...to is NOT changed) ++ * to cover the specified gap by the specified axis (0 - X, 1 - Y). ++ * Gap is counted in direction (end_of_to - beginning_of_from). ++ * Returns by how much the gap was not closed (0.0 if it was fully closed). ++ * Ret contains by how much the first and last points of [from...to] ++ * were moved to bring them in consistence to the rest of the path. ++ * If ret==NULL then this info is not returned. ++ */ ++ ++static double ++fclosegap( ++ GENTRY *from, ++ GENTRY *to, ++ int axis, ++ double gap, ++ double *ret ++) ++{ ++#define TIMESLARGER 10. /* how many times larger must be a curve to not change too much */ ++ double rm[2]; ++ double oldpos[2]; ++ double times, limit, df, dx; ++ int j, k; ++ GENTRY *xge, *pge, *nge, *bge[2]; ++ ++ /* remember the old points to calculate ret */ ++ oldpos[0] = from->prev->fpoints[axis][2]; ++ oldpos[1] = to->fpoints[axis][2]; ++ ++ rm[0] = rm[1] = gap / 2. ; ++ ++ bge[0] = from; /* this is convenient for iterations */ ++ bge[1] = to; ++ ++ /* first try to modify large curves but if have none then settle for small */ ++ for(times = (TIMESLARGER-1); times > 0.1; times /= 2. ) { ++ ++ if(rm[0]+rm[1] == 0.) ++ break; ++ ++ /* iterate in both directions, backwards then forwards */ ++ for(j = 0; j<2; j++) { ++ ++ if(rm[j] == 0.) /* if this direction is exhausted */ ++ continue; ++ ++ limit = fabs(rm[j]) * (1.+times); ++ ++ for(xge = bge[j]->cntr[j]; xge != bge[!j]; xge = xge->cntr[j]) { ++ dx = xge->fpoints[axis][2] - xge->prev->fpoints[axis][2]; ++ df = fabs(dx) - limit; ++ if( df <= FEPS ) /* curve is too small to change */ ++ continue; ++ ++ if( df >= fabs(rm[j]) ) ++ df = rm[j]; ++ else ++ df *= fsign(rm[j]); /* we may cover this part of rm */ ++ ++ rm[j] -= df; ++ limit = fabs(rm[j]) * (1.+times); ++ ++ if(xge->type == GE_CURVE) { /* correct internal points */ ++ double scale = ((dx+df) / dx) - 1.; ++ double base; ++ ++ if(j) ++ base = xge->fpoints[axis][2]; ++ else ++ base = xge->prev->fpoints[axis][2]; ++ ++ for(k = 0; k<2; k++) ++ xge->fpoints[axis][k] += scale * ++ (xge->fpoints[axis][k] - base); ++ } ++ ++ /* move all the intermediate lines */ ++ if(j) { ++ df = -df; /* absolute direction */ ++ pge = bge[1]->bkwd; ++ nge = xge->bkwd; ++ } else { ++ xge->fpoints[axis][2] += df; ++ pge = bge[0]; ++ nge = xge->frwd; ++ } ++ while(nge != pge) { ++ if(nge->type == GE_CURVE) { ++ nge->fpoints[axis][0] +=df; ++ nge->fpoints[axis][1] +=df; ++ } ++ nge->fpoints[axis][2] += df; ++ if(nge->next != nge->frwd) { /* last entry of contour */ ++ nge->frwd->prev->fpoints[axis][2] += df; ++ } ++ nge = nge->cntr[!j]; ++ } ++ ++ if(rm[j] == 0.) ++ break; ++ } ++ } ++ } ++ ++ /* find the difference */ ++ oldpos[0] -= from->prev->fpoints[axis][2]; ++ oldpos[1] -= to->fpoints[axis][2]; ++ ++ if(ret) { ++ ret[0] = oldpos[0] - from->prev->fpoints[axis][2]; ++ ret[1] = oldpos[1] - to->fpoints[axis][2]; ++ } ++ ++#if 0 ++ if( rm[0]+rm[1] != gap - oldpos[1] + oldpos[0]) { ++ fprintf(stderr, "** gap=%g rm[0]=%g rm[1]=%g o[0]=%g o[1]=%g rg=%g og=%g\n", ++ gap, rm[0], rm[1], oldpos[0], oldpos[1], rm[0]+rm[1], ++ gap - oldpos[1] + oldpos[0]); ++ } ++#endif ++ ++ return rm[0]+rm[1]; ++#undef TIMESLARGER ++} ++ ++/* remove the lines or curves smaller or equal to the size limit */ ++ ++static void ++fdelsmall( ++ GLYPH *g, ++ double minlen ++) ++{ ++ GENTRY *ge, *nge, *pge, *xge, *next; ++ int i, k; ++ double dx, dy, d2, d2m; ++ double minlen2; ++#define TIMESLARGER 10. /* how much larger must be a curve to not change too much */ ++ ++ minlen2 = minlen*minlen; ++ ++ for (ge = g->entries; ge != 0; ge = next) { ++ next = ge->next; ++ ++ if (ge->type != GE_CURVE && ge->type != GE_LINE) ++ continue; ++ ++ d2m = 0; ++ for(i= (ge->type==GE_CURVE? 0: 2); i<3; i++) { ++ dx = ge->fxn[i] - ge->prev->fx3; ++ dy = ge->fyn[i] - ge->prev->fy3; ++ d2 = dx*dx + dy*dy; ++ if(d2m < d2) ++ d2m = d2; ++ } ++ ++ if( d2m > minlen2 ) { /* line is not too small */ ++ /* XXX add more normalization here */ ++ continue; ++ } ++ ++ /* if the line is too small */ ++ ++ /* check forwards if we have a whole sequence of them */ ++ nge = ge; ++ for(xge = ge->frwd; xge != ge; xge = xge->frwd) { ++ d2m = 0; ++ for(i= (xge->type==GE_CURVE? 0: 2); i<3; i++) { ++ dx = xge->fxn[i] - xge->prev->fx3; ++ dy = xge->fyn[i] - xge->prev->fy3; ++ d2 = dx*dx + dy*dy; ++ if(d2m < d2) ++ d2m = d2; ++ } ++ if( d2m > minlen2 ) /* line is not too small */ ++ break; ++ nge = xge; ++ if(next == nge) /* move the next step past this sequence */ ++ next = next->next; ++ } ++ ++ /* check backwards if we have a whole sequence of them */ ++ pge = ge; ++ for(xge = ge->bkwd; xge != ge; xge = xge->bkwd) { ++ d2m = 0; ++ for(i= (xge->type==GE_CURVE? 0: 2); i<3; i++) { ++ dx = xge->fxn[i] - xge->prev->fx3; ++ dy = xge->fyn[i] - xge->prev->fy3; ++ d2 = dx*dx + dy*dy; ++ if(d2m < d2) ++ d2m = d2; ++ } ++ if( d2m > minlen2 ) /* line is not too small */ ++ break; ++ pge = xge; ++ } ++ ++ /* now we have a sequence of small fragments in pge...nge (inclusive) */ ++ ++ if(ISDBG(FCONCISE)) { ++ fprintf(stderr, "glyph %s has very small fragments(%x..%x..%x)\n", ++ g->name, pge, ge, nge); ++ dumppaths(g, pge, nge); ++ } ++ ++ /* reduce whole sequence to one part and remember the middle point */ ++ if(pge != nge) { ++ while(1) { ++ xge = pge->frwd; ++ if(xge == nge) { ++ pge->fx1 = pge->fx2 = pge->fx3; ++ pge->fx3 = nge->fx3; ++ pge->fy1 = pge->fy2 = pge->fy3; ++ pge->fy3 = nge->fy3; ++ pge->type = GE_CURVE; ++ freethisge(nge); ++ break; ++ } ++ if(xge == nge->bkwd) { ++ pge->fx1 = pge->fx2 = (pge->fx3+xge->fx3)/2.; ++ pge->fx3 = nge->fx3; ++ pge->fy1 = pge->fy2 = (pge->fy3+xge->fy3)/2.; ++ pge->fy3 = nge->fy3; ++ pge->type = GE_CURVE; ++ freethisge(nge); ++ freethisge(xge); ++ break; ++ } ++ freethisge(pge); pge = xge; ++ xge = nge->bkwd; freethisge(nge); nge = xge; ++ } ++ } ++ ge = pge; ++ ++ /* check if the whole sequence is small */ ++ dx = ge->fx3 - ge->prev->fx3; ++ dy = ge->fy3 - ge->prev->fy3; ++ d2 = dx*dx + dy*dy; ++ ++ if( d2 > minlen2 ) { /* no, it is not */ ++ double b, d; ++ ++ WARNING_3 fprintf(stderr, "glyph %s had a sequence of fragments < %g points each, reduced to one curve\n", ++ g->name, minlen); ++ ++ /* check that we did not create a monstrosity spanning quadrants */ ++ if(fsign(ge->fx1 - ge->prev->fx1) * fsign(ge->fx3 - ge->fx1) < 0 ++ || fsign(ge->fy1 - ge->prev->fy1) * fsign(ge->fy3 - ge->fy1) < 0 ) { ++ /* yes, we did; are both parts of this thing big enough ? */ ++ dx = ge->fx1 - ge->prev->fx3; ++ dy = ge->fy1 - ge->prev->fy3; ++ d2 = dx*dx + dy*dy; ++ ++ dx = ge->fx3 - ge->fx1; ++ dy = ge->fy3 - ge->fy1; ++ d2m = dx*dx + dy*dy; ++ ++ if(d2 > minlen2 && d2m > minlen2) { /* make two straights */ ++ nge = newgentry(GEF_FLOAT); ++ *nge = *ge; ++ ++ for(i=0; i<2; i++) { ++ ge->fpoints[i][2] = ge->fpoints[i][0]; ++ b = nge->fpoints[i][0]; ++ d = nge->fpoints[i][2] - b; ++ nge->fpoints[i][0] = b + 0.1*d; ++ nge->fpoints[i][1] = b + 0.9*d; ++ } ++ } ++ for(i=0; i<2; i++) { /* make one straight or first of two straights */ ++ b = ge->prev->fpoints[i][2]; ++ d = ge->fpoints[i][2] - b; ++ ge->fpoints[i][0] = b + 0.1*d; ++ ge->fpoints[i][1] = b + 0.9*d; ++ } ++ } ++ continue; ++ } ++ ++ if(ge->frwd == ge) { /* points to itself, just remove the path completely */ ++ WARNING_3 fprintf(stderr, "glyph %s had a path made of fragments < %g points each, removed\n", ++ g->name, minlen); ++ ++ next = freethisge(ge); ++ continue; ++ } ++ ++ /* now close the gap by x and y */ ++ for(i=0; i<2; i++) { ++ double gap; ++ ++ gap = ge->fpoints[i][2] - ge->prev->fpoints[i][2]; ++ if( fclosegap(ge, ge, i, gap, NULL) != 0.0 ) { ++ double scale, base; ++ ++ /* not good, as the last resort just scale the next line */ ++ gap = ge->fpoints[i][2] - ge->prev->fpoints[i][2]; ++ ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, " last resort on %c: closing next by %g\n", ++ (i==0 ? 'x' : 'y'), gap); ++ ++ nge = ge->frwd; ++ base = nge->fpoints[i][2]; ++ dx = ge->fpoints[i][2] - base; ++ if(fabs(dx) < FEPS) ++ continue; ++ ++ scale = ((dx-gap) / dx); ++ ++ if(nge->type == GE_CURVE) ++ for(k = 0; k<2; k++) ++ nge->fpoints[i][k] = base + ++ scale * (nge->fpoints[i][k] - base); ++ ++ ge->fpoints[i][2] -= gap; ++ } ++ } ++ ++ /* OK, the gap is closed - remove this useless GENTRY */ ++ freethisge(ge); ++ } ++#undef TIMESLARGER ++} ++ ++/* find the point where two rays continuing vectors cross ++ * returns 1 if they cross, 0 if they don't ++ * If they cross optionally (if the pointers are not NULL) returns ++ * the maximal scales for both vectors and also optionally the point ++ * where the rays cross (twice). ++ * Expects that the curves are normalized. ++ * ++ * For convenience there are 2 front-end functions taking ++ * arguments in different formats ++ */ ++ ++struct ray { ++ double x1, y1, x2, y2; ++ int isvert; ++ double k, b; /* lines are represented as y = k*x + b */ ++ double *maxp; ++}; ++static struct ray ray[3]; ++ ++/* the back-end doing the actual work ++ * the rays are defined in the static array ray[] ++ */ ++ ++static int ++fcrossraysxx( ++ double crossdot[2][2] ++) ++{ ++ double x, y, max; ++ int i; ++ ++ for(i=0; i<2; i++) { ++ if(ray[i].x1 == ray[i].x2) ++ ray[i].isvert = 1; ++ else { ++ ray[i].isvert = 0; ++ ray[i].k = (ray[i].y2 - ray[i].y1) / (ray[i].x2 - ray[i].x1); ++ ray[i].b = ray[i].y2 - ray[i].k * ray[i].x2; ++ } ++ } ++ ++ if(ray[0].isvert && ray[1].isvert) { ++ if(ISDBG(FCONCISE)) fprintf(stderr, "crossrays: both vertical\n"); ++ return 0; /* both vertical, don't cross */ ++ } ++ ++ if(ray[1].isvert) { ++ ray[2] = ray[0]; /* exchange them */ ++ ray[0] = ray[1]; ++ ray[1] = ray[2]; ++ } ++ ++ if(ray[0].isvert) { ++ x = ray[0].x1; ++ } else { ++ if( fabs(ray[0].k - ray[1].k) < FEPS) { ++ if(ISDBG(FCONCISE)) fprintf(stderr, "crossrays: parallel lines, k = %g, %g\n", ++ ray[0].k, ray[1].k); ++ return 0; /* parallel lines */ ++ } ++ x = (ray[1].b - ray[0].b) / (ray[0].k - ray[1].k) ; ++ } ++ y = ray[1].k * x + ray[1].b; ++ ++ for(i=0; i<2; i++) { ++ if(ray[i].isvert) ++ max = (y - ray[i].y1) / (ray[i].y2 - ray[i].y1); ++ else ++ max = (x - ray[i].x1) / (ray[i].x2 - ray[i].x1); ++ /* check if wrong sides of rays cross */ ++ if( max < 0 ) { ++ if(ISDBG(FCONCISE)) fprintf(stderr, "crossrays: %c scale=%g @(%g,%g) (%g,%g)<-(%g,%g)\n", ++ (i?'Y':'X'), max, x, y, ray[i].x2, ray[i].y2, ray[i].x1, ray[i].y1); ++ return 0; ++ } ++ if(ray[i].maxp) ++ *ray[i].maxp = max; ++ } ++ if(crossdot != 0) { ++ crossdot[0][0] = crossdot[1][0] = x; ++ crossdot[0][1] = crossdot[1][1] = y; ++ } ++ return 1; ++} ++ ++/* the front-end getting the arguments from 4 dots defining ++ * a curve in the same format as for fapproxcurve(): ++ * rays are defined as beginning and end of the curve, ++ * the crossdot is inserted as the two middle dots of the curve ++ */ ++ ++int ++fcrossrayscv( ++ double curve[4][2 /*X,Y*/], ++ double *max1, ++ double *max2 ++) ++{ ++ ray[0].x1 = curve[0][X]; ++ ray[0].y1 = curve[0][Y]; ++ ray[0].x2 = curve[1][X]; ++ ray[0].y2 = curve[1][Y]; ++ ray[0].maxp = max1; ++ ++ ray[1].x1 = curve[2][X]; ++ ray[1].y1 = curve[2][Y]; ++ ray[1].x2 = curve[3][X]; ++ ray[1].y2 = curve[3][Y]; ++ ray[1].maxp = max2; ++ ++ return fcrossraysxx(&curve[1]); ++} ++ ++/* the front-end getting the arguments from gentries: ++ * rays are defined as beginning of curve1 and end of curve 2 ++ */ ++ ++int ++fcrossraysge( ++ GENTRY *ge1, ++ GENTRY *ge2, ++ double *max1, ++ double *max2, ++ double crossdot[2][2] ++) ++{ ++ ray[0].x1 = ge1->prev->fx3; ++ ray[0].y1 = ge1->prev->fy3; ++ ray[0].x2 = ge1->fpoints[X][ge1->ftg]; ++ ray[0].y2 = ge1->fpoints[Y][ge1->ftg]; ++ ray[0].maxp = max1; ++ ++ ray[1].x1 = ge2->fx3; ++ ray[1].y1 = ge2->fy3; ++ if(ge2->rtg < 0) { ++ ray[1].x2 = ge2->prev->fx3; ++ ray[1].y2 = ge2->prev->fy3; ++ } else { ++ ray[1].x2 = ge2->fpoints[X][ge2->rtg]; ++ ray[1].y2 = ge2->fpoints[Y][ge2->rtg]; ++ } ++ ray[1].maxp = max2; ++ ++ return fcrossraysxx(crossdot); ++} ++ ++/* debugging printout functions */ ++ ++#if defined(DEBUG_DOTSEG) || defined(DEBUG_DOTCURVE) || defined(DEBUG_APPROXCV) ++ ++/* for debugging */ ++static ++printdot( ++ double dot[2] ++) ++{ ++ fprintf(stderr, "(%g,%g)", dot[0], dot[1]); ++} ++ ++static ++printseg( ++ double seg[2][2] ++) ++{ ++ putc('[', stderr); ++ printdot(seg[0]); ++ putc(' ', stderr); ++ printdot(seg[1]); ++ putc(']', stderr); ++} ++ ++#endif /* DEBUG_* */ ++ ++/* ++ * Find squared distance from a dot to a line segment ++ */ ++ ++double ++fdotsegdist2( ++ double seg[2][2 /*X,Y*/], ++ double dot[2 /*X,Y*/] ++) ++{ ++#define x1 seg[0][X] ++#define y1 seg[0][Y] ++#define x2 seg[1][X] ++#define y2 seg[1][Y] ++#define xdot dot[X] ++#define ydot dot[Y] ++ ++ double dx, dy; /* segment dimensions */ ++ double kline, bline; /* segment line formula is y=k*x+b */ ++ double kperp, bperp; /* perpendicular from the dot to the line */ ++ double xcross, ycross; /* where the perpendicular crosses the segment */ ++ ++/* handle the situation where the nearest point of the segment is its end */ ++#define HANDLE_LIMITS(less12, lesscr1, lesscr2) \ ++ if( less12 ) { \ ++ if( lesscr1 ) { \ ++ xcross = x1; \ ++ ycross = y1; \ ++ } else if( !(lesscr2) ) { \ ++ xcross = x2; \ ++ ycross = y2; \ ++ } \ ++ } else { \ ++ if( !(lesscr1) ) { \ ++ xcross = x1; \ ++ ycross = y1; \ ++ } else if( lesscr2 ) { \ ++ xcross = x2; \ ++ ycross = y2; \ ++ } \ ++ } \ ++ /* end of macro */ ++ ++ ++ dx = x2 - x1; ++ dy = y2 - y1; ++ ++ if(fabs(dx) < FEPS) { ++ /* special case - vertical line */ ++#ifdef DEBUG_DOTSEG ++ printf("vertical line!\n"); ++#endif ++ xcross = x1; ++ ycross = ydot; ++ HANDLE_LIMITS( y1 < y2, ycross < y1, ycross < y2); ++ } else if(fabs(dy) < FEPS) { ++ /* special case - horizontal line */ ++#ifdef DEBUG_DOTSEG ++ printf("horizontal line!\n"); ++#endif ++ xcross = xdot; ++ ycross = y1; ++ HANDLE_LIMITS( x1 < x2, xcross < x1, xcross < x2) ++ } else { ++ kline = dy/dx; ++ bline = y1 - x1*kline; ++ kperp = -1./kline; ++ bperp = ydot - xdot*kperp; ++ ++ xcross = (bline-bperp) / (kperp-kline); ++ ycross = kline*xcross + bline; ++ ++ HANDLE_LIMITS( x1 < x2, xcross < x1, xcross < x2) ++ } ++#ifdef DEBUG_DOTSEG ++ printf("crossover at (%g,%g)\n", xcross, ycross); ++#endif ++ ++ dx = xdot-xcross; ++ dy = ydot-ycross; ++ return dx*dx+dy*dy; ++#undef x1 ++#undef y1 ++#undef x2 ++#undef y2 ++#undef xdot ++#undef ydot ++#undef HANDLE_LIMITS ++} ++ ++/* find the weighted quadratic average for the distance of a set ++ * of dots from the curve; also fills out the individual distances ++ * for each dot; if maxp!=NULL then returns the maximal squared ++ * distance in there ++ */ ++ ++double ++fdotcurvdist2( ++ double curve[4][2 /*X,Y*/ ], ++ struct dot_dist *dots, ++ int ndots, /* number of entries in dots */ ++ double *maxp ++) ++{ ++ /* a curve is approximated by this many straight segments */ ++#define NAPSECT 16 ++ /* a curve is divided into this many sections with equal weight each */ ++#define NWSECT 4 ++ /* table of coefficients for finding the dots on the curve */ ++ /* tt[0] is left unused */ ++ static double tt[NAPSECT][4]; ++ static int havett = 0; /* flag: tt is initialized */ ++ /* dots on the curve */ ++ double cvd[NAPSECT+1][2 /*X,Y*/]; ++ /* sums by sections */ ++ double sum[NWSECT]; ++ /* counts by sections */ ++ double count[NWSECT]; ++ int d, i, j; ++ int id1, id2; ++ double dist1, dist2, dist3, dx, dy, x, y; ++ double max = 0.; ++ ++ if(!havett) { ++ double t, nt, t2, nt2, step; ++ ++ havett++; ++ step = 1. / NAPSECT; ++ t = 0; ++ for(i=1; iid1+1; i--) { ++ dx = x - cvd[i][X]; ++ dy = y - cvd[i][Y]; ++ dist3 = dx*dx + dy*dy; ++#ifdef DEBUG_DOTCURVE ++ printf(" dot %d ",i); printdot(cvd[i]); printf(" dist=%g\n", sqrt(dist3)); ++#endif ++ if(dist3 < dist2) { ++ dist2 = dist3; ++ id2 = i; ++ } else ++ break; ++ } ++ ++ /* now find which of the local minimums is smaller */ ++ if(dist2 < dist1) { ++ id1 = id2; ++ } ++ } ++ ++ /* the nearest segment must include the nearest dot */ ++ if(id1==0) { ++ dots[d].seg = 0; ++ dots[d].dist2 = fdotsegdist2(&cvd[0], dots[d].p); ++ } else if(id1==NAPSECT) { ++ dots[d].seg = NAPSECT-1; ++ dots[d].dist2 = fdotsegdist2(&cvd[NAPSECT-1], dots[d].p); ++ } else { ++ dist1 = fdotsegdist2(&cvd[id1], dots[d].p); ++ dist2 = fdotsegdist2(&cvd[id1-1], dots[d].p); ++ if(dist2 < dist1) { ++ dots[d].seg = id1-1; ++ dots[d].dist2 = dist2; ++ } else { ++ dots[d].seg = id1; ++ dots[d].dist2 = dist1; ++ } ++ } ++ ++ i = dots[d].seg % NWSECT; ++ sum[i] += dots[d].dist2; ++ if(dots[d].dist2 > max) ++ max = dots[d].dist2; ++ count[i]++; ++#ifdef DEBUG_DOTCURVE ++ printf(" best seg %d sect %d dist=%g\n", dots[d].seg, i, sqrt(dots[d].dist2)); ++#endif ++ } ++ ++ /* calculate the weighted average */ ++ id1=0; ++ dist1=0.; ++ for(i=0; irtg < 0) { ++ d[1][X] = ge1->fx3 - ge1->prev->fx3; ++ d[1][Y] = ge1->fy3 - ge1->prev->fy3; ++ } else { ++ d[1][X] = ge1->fx3 - ge1->fpoints[X][ge1->rtg]; ++ d[1][Y] = ge1->fy3 - ge1->fpoints[Y][ge1->rtg]; ++ } ++ d[2][X] = ge2->fpoints[X][ge2->ftg] - ge2->prev->fx3; ++ d[2][Y] = ge2->fpoints[Y][ge2->ftg] - ge2->prev->fy3; ++ ++ len1 = sqrt( d[1][X]*d[1][X] + d[1][Y]*d[1][Y] ); ++ len2 = sqrt( d[2][X]*d[2][X] + d[2][Y]*d[2][Y] ); ++ /* scale the 2nd segment to the length of 1 ++ * and to make sure that the 1st segment is longer scale it to ++ * the length of 2 and extend to the same distance backwards ++ */ ++ scale1 = 2./len1; ++ scale2 = 1./len2; ++ ++ for(axis=0; axis <2; axis++) { ++ d[0][axis] = -( d[1][axis] *= scale1 ); ++ d[2][axis] *= scale2; ++ } ++ return fdotsegdist2(d, d[2]); ++} ++ ++#if 0 ++/* find the area covered by the curve ++ * (limited by the projections to the X axis) ++ */ ++ ++static double ++fcvarea( ++ GENTRY *ge ++) ++{ ++ double Ly, My, Ny, Py, Qx, Rx, Sx; ++ double area; ++ ++ /* y = Ly*t^3 + My*t^2 + Ny*t + Py */ ++ Ly = -ge->prev->fy3 + 3*(ge->fy1 - ge->fy2) + ge->fy3; ++ My = 3*ge->prev->fy3 - 6*ge->fy1 + 3*ge->fy2; ++ Ny = 3*(-ge->prev->fy3 + ge->fy1); ++ Py = ge->prev->fy3; ++ ++ /* dx/dt = Qx*t^2 + Rx*t + Sx */ ++ Qx = 3*(-ge->prev->fx3 + 3*(ge->fx1 - ge->fx2) + ge->fx3); ++ Rx = 6*(ge->prev->fx3 - 2*ge->fx1 + ge->fx2); ++ Sx = 3*(-ge->prev->fx3 + ge->fx1); ++ ++ /* area is integral[from 0 to 1]( y(t) * dx(t)/dt *dt) */ ++ area = 1./6.*(Ly*Qx) + 1./5.*(Ly*Rx + My*Qx) ++ + 1./4.*(Ly*Sx + My*Rx + Ny*Qx) + 1./3.*(My*Sx + Ny*Rx + Py*Qx) ++ + 1./2.*(Ny*Sx + Py*Rx) + Py*Sx; ++ ++ return area; ++} ++#endif ++ ++/* find the value of point on the curve at the given parameter t, ++ * along the given axis (0 - X, 1 - Y). ++ */ ++ ++static double ++fcvval( ++ GENTRY *ge, ++ int axis, ++ double t ++) ++{ ++ double t2, mt, mt2; ++ ++ /* val = A*(1-t)^3 + 3*B*(1-t)^2*t + 3*C*(1-t)*t^2 + D*t^3 */ ++ t2 = t*t; ++ mt = 1-t; ++ mt2 = mt*mt; ++ ++ return ge->prev->fpoints[axis][2]*mt2*mt ++ + 3*(ge->fpoints[axis][0]*mt2*t + ge->fpoints[axis][1]*mt*t2) ++ + ge->fpoints[axis][2]*t*t2; ++} ++ ++/* ++ * Find ndots equally spaced dots on a curve or line and fill ++ * their coordinates into the dots array ++ */ ++ ++static void ++fsampledots( ++ GENTRY *ge, ++ double dots[][2], /* the dots to fill */ ++ int ndots ++) ++{ ++ int i, axis; ++ double t, nf, dx, d[2]; ++ ++ nf = ndots+1; ++ if(ge->type == GE_CURVE) { ++ for(i=0; ifx3 - ge->prev->fx3; ++ d[1] = ge->fy3 - ge->prev->fy3; ++ for(i=0; iprev->fpoints[axis][2] ++ + t*d[axis]; ++ } ++ } ++} ++ ++/* ++ * Allocate a structure gex_con ++ */ ++ ++static void ++alloc_gex_con( ++ GENTRY *ge ++) ++{ ++ ge->ext = (void*)calloc(1, sizeof(GEX_CON)); ++ if(ge->ext == 0) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++} ++ ++/* ++ * Normalize a gentry for fforceconcise() : find the points that ++ * can be used to calculate the tangents. ++ */ ++ ++static void ++fnormalizege( ++ GENTRY *ge ++) ++{ ++ int midsame, frontsame, rearsame; ++ ++ if(ge->type == GE_LINE) { ++ ge->ftg = 2; ++ ge->rtg = -1; ++ } else { /* assume it's a curve */ ++ midsame = (fabs(ge->fx1-ge->fx2)fy1-ge->fy2)fx1-ge->prev->fx3)fy1-ge->prev->fy3)fx3-ge->fx2)fy3-ge->fy2)ftg = 2; ++ ge->rtg = -1; ++ } else { ++ if(frontsame) { ++ ge->ftg = 1; ++ } else { ++ ge->ftg = 0; ++ } ++ if(rearsame) { ++ ge->rtg = 0; ++ } else { ++ ge->rtg = 1; ++ } ++ } ++ } ++} ++ ++/* various definition for the processing of outlines */ ++ ++/* maximal average quadratic distance from the original curve ++ * (in dots) to consider the joined curve good ++ */ ++#define CVEPS 1.5 ++#define CVEPS2 (CVEPS*CVEPS) ++/* squared sinus of the maximal angle that we consider a smooth joint */ ++#define SMOOTHSIN2 0.25 /* 0.25==sin(30 degrees)^2 */ ++/* squared line length that we consider small */ ++#define SMALL_LINE2 (15.*15.) ++/* how many times a curve must be bigger than a line to join, squared */ ++#define TIMES_LINE2 (3.*3.) ++ ++/* ++ * Normalize and analyse a gentry for fforceconcise() and fill out the gex_con ++ * structure ++ */ ++ ++static void ++fanalyzege( ++ GENTRY *ge ++) ++{ ++ int i, ix, iy; ++ double avsd2, dots[3][2 /*X,Y*/]; ++ GEX_CON *gex; ++ ++ gex = X_CON(ge); ++ memset(gex, 0, sizeof *gex); ++ ++ gex->len2 = 0; ++ for(i=0; i<2; i++) { ++ avsd2 = gex->d[i] = ge->fpoints[i][2] - ge->prev->fpoints[i][2]; ++ gex->len2 += avsd2*avsd2; ++ } ++ gex->sin2 = fjointsin2(ge, ge->frwd); ++ if(ge->type == GE_CURVE) { ++ ge->dir = fgetcvdir(ge); ++ for(i=0; i<2; i++) { ++ dots[0][i] = ge->prev->fpoints[i][2]; ++ dots[1][i] = ge->fpoints[i][2]; ++ dots[2][i] = fcvval(ge, i, 0.5); ++ } ++ avsd2 = fdotsegdist2(dots, dots[2]); ++ if(avsd2 <= CVEPS2) { ++ gex->flags |= GEXF_FLAT; ++ } ++ } else { ++ ge->dir = CVDIR_FEQUAL|CVDIR_REQUAL; ++ gex->flags |= GEXF_FLAT; ++ } ++ if(gex->flags & GEXF_FLAT) { ++ if( fabs(gex->d[X]) > FEPS && fabs(gex->d[Y]) < 5. ++ && fabs(gex->d[Y] / gex->d[X]) < 0.2) ++ gex->flags |= GEXF_HOR; ++ else if( fabs(gex->d[Y]) > FEPS && fabs(gex->d[X]) < 5. ++ && fabs(gex->d[X] / gex->d[Y]) < 0.2) ++ gex->flags |= GEXF_VERT; ++ } ++ ix = gex->isd[X] = fsign(gex->d[X]); ++ iy = gex->isd[Y] = fsign(gex->d[Y]); ++ if(ix <= 0) { ++ if(iy <= 0) ++ gex->flags |= GEXF_QDL; ++ if(iy >= 0) ++ gex->flags |= GEXF_QUL; ++ if(gex->flags & GEXF_HOR) ++ gex->flags |= GEXF_IDQ_L; ++ } ++ if(ix >= 0) { ++ if(iy <= 0) ++ gex->flags |= GEXF_QDR; ++ if(iy >= 0) ++ gex->flags |= GEXF_QUR; ++ if(gex->flags & GEXF_HOR) ++ gex->flags |= GEXF_IDQ_R; ++ } ++ if(gex->flags & GEXF_VERT) { ++ if(iy <= 0) { ++ gex->flags |= GEXF_IDQ_U; ++ } else { /* supposedly there is no 0-sized entry */ ++ gex->flags |= GEXF_IDQ_D; ++ } ++ } ++} ++ ++/* ++ * Analyse a joint between this and following gentry for fforceconcise() ++ * and fill out the corresponding parts of the gex_con structure ++ * Bothe entries must be analyzed first. ++ */ ++ ++static void ++fanalyzejoint( ++ GENTRY *ge ++) ++{ ++ GENTRY *nge = ge->frwd; ++ GENTRY tge; ++ GEX_CON *gex, *ngex; ++ double avsd2, dots[3][2 /*X,Y*/]; ++ int i; ++ ++ gex = X_CON(ge); ngex = X_CON(nge); ++ ++ /* look if they can be joined honestly */ ++ ++ /* if any is flat, they should join smoothly */ ++ if( (gex->flags & GEXF_FLAT || ngex->flags & GEXF_FLAT) ++ && gex->sin2 > SMOOTHSIN2) ++ goto try_flatboth; ++ ++ if(ge->type == GE_LINE) { ++ if(nge->type == GE_LINE) { ++ if(gex->len2 > SMALL_LINE2 || ngex->len2 > SMALL_LINE2) ++ goto try_flatboth; ++ } else { ++ if(gex->len2*TIMES_LINE2 > ngex->len2) ++ goto try_flatboth; ++ } ++ } else if(nge->type == GE_LINE) { ++ if(ngex->len2*TIMES_LINE2 > gex->len2) ++ goto try_flatboth; ++ } ++ ++ /* if curve changes direction */ ++ if( gex->isd[X]*ngex->isd[X]<0 || gex->isd[Y]*ngex->isd[Y]<0) ++ goto try_idealone; ++ ++ /* if would create a zigzag */ ++ if( ((ge->dir&CVDIR_FRONT)-CVDIR_FEQUAL) * ((nge->dir&CVDIR_REAR)-CVDIR_REQUAL) < 0 ) ++ goto try_flatone; ++ ++ if( fcrossraysge(ge, nge, NULL, NULL, NULL) ) ++ gex->flags |= GEXF_JGOOD; ++ ++try_flatone: ++ /* look if they can be joined by flatting out one of the entries */ ++ ++ /* at this point we know that the general direction of the ++ * gentries is OK ++ */ ++ ++ if( gex->flags & GEXF_FLAT ) { ++ tge = *ge; ++ tge.fx1 = tge.fx3; ++ tge.fy1 = tge.fy3; ++ fnormalizege(&tge); ++ if( fcrossraysge(&tge, nge, NULL, NULL, NULL) ) ++ gex->flags |= GEXF_JFLAT|GEXF_JFLAT1; ++ } ++ if( ngex->flags & GEXF_FLAT ) { ++ tge = *nge; ++ tge.fx2 = ge->fx3; ++ tge.fy2 = ge->fy3; ++ fnormalizege(&tge); ++ if( fcrossraysge(ge, &tge, NULL, NULL, NULL) ) ++ gex->flags |= GEXF_JFLAT|GEXF_JFLAT2; ++ } ++ ++try_idealone: ++ /* look if one of the entries can be brought to an idealized ++ * horizontal or vertical position and then joined ++ */ ++ if( gex->flags & GEXF_HOR && gex->isd[X]*ngex->isd[X]>=0 ) { ++ tge = *ge; ++ tge.fx1 = tge.fx3; ++ tge.fy1 = ge->prev->fy3; /* force horizontal */ ++ fnormalizege(&tge); ++ if( fcrossraysge(&tge, nge, NULL, NULL, NULL) ) ++ gex->flags |= GEXF_JID|GEXF_JID1; ++ } else if( gex->flags & GEXF_VERT && gex->isd[Y]*ngex->isd[Y]>=0 ) { ++ tge = *ge; ++ tge.fx1 = ge->prev->fx3; /* force vertical */ ++ tge.fy1 = tge.fy3; ++ fnormalizege(&tge); ++ if( fcrossraysge(&tge, nge, NULL, NULL, NULL) ) ++ gex->flags |= GEXF_JID|GEXF_JID1; ++ } ++ if( ngex->flags & GEXF_HOR && gex->isd[X]*ngex->isd[X]>=0 ) { ++ tge = *nge; ++ tge.fx2 = ge->fx3; ++ tge.fy2 = nge->fy3; /* force horizontal */ ++ fnormalizege(&tge); ++ if( fcrossraysge(ge, &tge, NULL, NULL, NULL) ) ++ gex->flags |= GEXF_JID|GEXF_JID2; ++ } else if( ngex->flags & GEXF_VERT && gex->isd[Y]*ngex->isd[Y]>=0 ) { ++ tge = *nge; ++ tge.fx2 = nge->fx3; /* force vertical */ ++ tge.fy2 = ge->fy3; ++ fnormalizege(&tge); ++ if( fcrossraysge(ge, &tge, NULL, NULL, NULL) ) ++ gex->flags |= GEXF_JID|GEXF_JID2; ++ } ++ ++try_flatboth: ++ /* look if we can change them to one line */ ++ if(gex->flags & GEXF_FLAT && ngex->flags & GEXF_FLAT) { ++ for(i=0; i<2; i++) { ++ dots[0][i] = ge->prev->fpoints[i][2]; ++ dots[1][i] = nge->fpoints[i][2]; ++ dots[2][i] = ge->fpoints[i][2]; ++ } ++ if( fdotsegdist2(dots, dots[2]) <= CVEPS2) ++ gex->flags |= GEXF_JLINE; ++ } ++} ++ ++/* ++ * Force conciseness of one contour in the glyph, ++ * the contour is indicated by one entry from it. ++ */ ++ ++static void ++fconcisecontour( ++ GLYPH *g, ++ GENTRY *startge ++) ++{ ++/* initial maximal number of dots to be used as reference */ ++#define MAXDOTS ((NREFDOTS+1)*12) ++ ++ GENTRY *ge, *pge, *nge, *ige; ++ GEX_CON *gex, *pgex, *ngex, *nngex; ++ GENTRY tpge, tnge; ++ int quad, qq, i, j, ndots, maxdots; ++ int found[2]; ++ int joinmask, pflag, nflag; ++ struct dot_dist *dots; ++ double avsd2, maxd2, eps2; ++ double apcv[4][2]; ++ ++ if(startge == 0) { ++ fprintf(stderr, "WARNING: assertion in %s line %d, please report it to the ttf2pt1 project\n", ++ __FILE__, __LINE__); ++ fprintf(stderr, "Strange contour in glyph %s\n", g->name); ++ dumppaths(g, NULL, NULL); ++ return; ++ } ++ ++ if(startge->type != GE_CURVE && startge->type != GE_LINE) ++ return; /* probably a degenerate contour */ ++ ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "processing contour 0x%p of glyph %s\n", startge, g->name); ++ ++ maxdots = MAXDOTS; ++ dots = (struct dot_dist *)malloc(sizeof(*dots)*maxdots); ++ if(dots == NULL) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ ++ ge = startge; ++ joinmask = GEXF_JGOOD; ++ while(1) { ++ restart: ++ gex = X_CON(ge); ++ if((gex->flags & GEXF_JMASK) > ((joinmask<<1)-1)) { ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "found higher flag (%x>%x) at 0x%p\n", ++ gex->flags & GEXF_JMASK, ((joinmask<<1)-1), ge); ++ joinmask <<= 1; ++ startge = ge; /* have to redo the pass */ ++ continue; ++ } ++ if(( gex->flags & joinmask )==0) ++ goto next; ++ ++ /* if we happen to be in the middle of a string of ++ * joinable entries, find its beginning ++ */ ++ if( gex->flags & (GEXF_JCVMASK^GEXF_JID) ) ++ quad = gex->flags & X_CON_F(ge->frwd) & GEXF_QMASK; ++ else if( gex->flags & GEXF_JID2 ) ++ quad = gex->flags & GEXF_QFROM_IDEAL(X_CON_F(ge->frwd)) & GEXF_QMASK; ++ else /* must be GEXF_JID1 */ ++ quad = GEXF_QFROM_IDEAL(gex->flags) & X_CON_F(ge->frwd) & GEXF_QMASK; ++ ++ pge = ge; ++ pgex = X_CON(pge->bkwd); ++ ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "ge %p prev -> 0x%p ", ge, pge); ++ ++ while(pgex->flags & GEXF_JCVMASK) { ++ if( !(pgex->flags & ((GEXF_JCVMASK^GEXF_JID)|GEXF_JID2)) ) ++ qq = GEXF_QFROM_IDEAL(pgex->flags); ++ else ++ qq = pgex->flags & GEXF_QMASK; ++ ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "(%x?%x)", quad, qq); ++ ++ if( !(quad & qq) ) { ++ if( !(X_CON_F(pge) & (GEXF_JCVMASK^GEXF_JID)) ++ && pgex->flags & (GEXF_JCVMASK^GEXF_JID) ) { ++ /* the previos entry is definitely a better match */ ++ if(pge == ge) { ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "\nprev is a better match at %p\n", pge); ++ startge = ge; ++ goto next; ++ } else ++ pge = pge->frwd; ++ } ++ break; ++ } ++ ++ quad &= qq; ++ pge = pge->bkwd; ++ pgex = X_CON(pge->bkwd); ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "0x%p ", pge); ++ } ++ ++ /* collect as many entries for joining as possible */ ++ nge = ge->frwd; ++ ngex = X_CON(nge); ++ nngex = X_CON(nge->frwd); ++ ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, ": 0x%x\nnext -> 0x%p ", pge, nge); ++ ++ while(ngex->flags & GEXF_JCVMASK) { ++ if( !(ngex->flags & ((GEXF_JCVMASK^GEXF_JID)|GEXF_JID1)) ) ++ qq = GEXF_QFROM_IDEAL(nngex->flags); ++ else ++ qq = nngex->flags & GEXF_QMASK; ++ ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "(%x?%x)", quad, qq); ++ if( !(quad & qq) ) { ++ if( !(X_CON_F(nge->bkwd) & (GEXF_JCVMASK^GEXF_JID)) ++ && ngex->flags & (GEXF_JCVMASK^GEXF_JID) ) { ++ /* the next-next entry is definitely a better match */ ++ if(nge == ge->frwd) { ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "\nnext %x is a better match than %x at %p (jmask %x)\n", ++ ngex->flags & GEXF_JCVMASK, gex->flags & GEXF_JCVMASK, nge, joinmask); ++ goto next; ++ } else ++ nge = nge->bkwd; ++ } ++ break; ++ } ++ ++ quad &= qq; ++ nge = nge->frwd; ++ ngex = nngex; ++ nngex = X_CON(nge->frwd); ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "0x%p ", nge); ++ } ++ ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, ": 0x%x\n", nge); ++ ++ /* XXX add splitting of last entries if neccessary */ ++ ++ /* make sure that all the reference dots are valid */ ++ for(ige = pge; ige != nge->frwd; ige = ige->frwd) { ++ nngex = X_CON(ige); ++ if( !(nngex->flags & GEXF_VDOTS) ) { ++ fsampledots(ige, nngex->dots, NREFDOTS); ++ nngex->flags |= GEXF_VDOTS; ++ } ++ } ++ ++ /* do the actual joining */ ++ while(1) { ++ pgex = X_CON(pge); ++ ngex = X_CON(nge->bkwd); ++ /* now the segments to be joined are pge...nge */ ++ ++ ndots = 0; ++ for(ige = pge; ige != nge->frwd; ige = ige->frwd) { ++ if(maxdots < ndots+(NREFDOTS+1)) { ++ maxdots += MAXDOTS; ++ dots = (struct dot_dist *)realloc((void *)dots, sizeof(*dots)*maxdots); ++ if(dots == NULL) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ } ++ nngex = X_CON(ige); ++ for(i=0; idots[i][j]; ++ ndots++; ++ } ++ for(j=0; j<2; j++) ++ dots[ndots].p[j] = ige->fpoints[j][2]; ++ ndots++; ++ } ++ ndots--; /* the last point is not interesting */ ++ ++ tpge = *pge; ++ pflag = pgex->flags; ++ if(pflag & (GEXF_JGOOD|GEXF_JFLAT2|GEXF_JID2)) { ++ /* nothing */ ++ } else if(pflag & GEXF_JFLAT) { ++ tpge.fx1 = tpge.fx3; ++ tpge.fy1 = tpge.fy3; ++ } else if(pflag & GEXF_JID) { ++ if(pflag & GEXF_HOR) ++ tpge.fy1 = tpge.bkwd->fy3; ++ else ++ tpge.fx1 = tpge.bkwd->fx3; ++ } ++ ++ tnge = *nge; ++ nflag = ngex->flags; ++ if(nflag & (GEXF_JGOOD|GEXF_JFLAT1|GEXF_JID) ++ && !(nflag & GEXF_JID2)) { ++ /* nothing */ ++ } else if(nflag & GEXF_JFLAT) { ++ tnge.fx2 = tnge.bkwd->fx3; ++ tnge.fy2 = tnge.bkwd->fy3; ++ } else if(nflag & GEXF_JID) { ++ if(X_CON_F(nge) & GEXF_HOR) ++ tnge.fy2 = tnge.fy3; ++ else ++ tnge.fx2 = tnge.fx3; ++ } ++ ++ fnormalizege(&tpge); ++ fnormalizege(&tnge); ++ if( fcrossraysge(&tpge, &tnge, NULL, NULL, &apcv[1]) ) { ++ apcv[0][X] = tpge.bkwd->fx3; ++ apcv[0][Y] = tpge.bkwd->fy3; ++ /* apcv[1] and apcv[2] were filled by fcrossraysge() */ ++ apcv[3][X] = tnge.fx3; ++ apcv[3][Y] = tnge.fy3; ++ ++ /* calculate the precision depending on the smaller dimension of the curve */ ++ maxd2 = apcv[3][X]-apcv[0][X]; ++ maxd2 *= maxd2; ++ eps2 = apcv[3][Y]-apcv[0][Y]; ++ eps2 *= eps2; ++ if(maxd2 < eps2) ++ eps2 = maxd2; ++ eps2 *= (CVEPS2*4.) / (400.*400.); ++ if(eps2 < CVEPS2) ++ eps2 = CVEPS2; ++ else if(eps2 > CVEPS2*4.) ++ eps2 = CVEPS2*4.; ++ ++ fapproxcurve(apcv, dots, ndots); ++ ++ avsd2 = fdotcurvdist2(apcv, dots, ndots, &maxd2); ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "avsd = %g, maxd = %g, ", sqrt(avsd2), sqrt(maxd2)); ++ if(avsd2 <= eps2 && maxd2 <= eps2*2.) { ++ /* we've guessed a curve that is close enough */ ++ ggoodcv++; ggoodcvdots += ndots; ++ ++ if(ISDBG(FCONCISE)) { ++ fprintf(stderr, "in %s joined %p-%p to ", g->name, pge, nge); ++ for(i=0; i<4; i++) { ++ fprintf(stderr, " (%g, %g)", apcv[i][X], apcv[i][Y]); ++ } ++ fprintf(stderr, " from\n"); ++ dumppaths(g, pge, nge); ++ } ++ for(i=0; i<3; i++) { ++ pge->fxn[i] = apcv[i+1][X]; ++ pge->fyn[i] = apcv[i+1][Y]; ++ } ++ pge->type = GE_CURVE; ++ ge = pge; ++ for(ige = pge->frwd; ; ige = pge->frwd) { ++ if(ige == pge) { ++ fprintf(stderr, "WARNING: assertion in %s line %d, please report it to the ttf2pt1 project\n", ++ __FILE__, __LINE__); ++ free(dots); ++ return; ++ } ++ if(startge == ige) ++ startge = pge; ++ free(ige->ext); ++ freethisge(ige); ++ if(ige == nge) ++ break; ++ } ++ fnormalizege(ge); ++ if(ISDBG(FCONCISE)) { ++ fprintf(stderr, "normalized "); ++ for(i=0; i<3; i++) { ++ fprintf(stderr, " (%g, %g)", ge->fpoints[X][i], ge->fpoints[Y][i]); ++ } ++ fprintf(stderr, "\n"); ++ } ++ fanalyzege(ge); ++ fanalyzejoint(ge); ++ fanalyzege(ge->bkwd); ++ fanalyzejoint(ge->bkwd); ++ ++ /* the results of this join will have to be reconsidered */ ++ startge = ge = ge->frwd; ++ goto restart; ++ } else { ++ gbadcv++; gbadcvdots += ndots; ++ } ++ } ++ ++ /* if we're down to 2 entries then the join has failed */ ++ if(pge->frwd == nge) { ++ pgex->flags &= ~joinmask; ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "no match\n"); ++ goto next; ++ } ++ ++ /* reduce the number of entries by dropping one at some end, ++ * should never drop the original ge from the range ++ */ ++ ++ if(nge->bkwd == ge ++ || (pge != ge && (pgex->flags & GEXF_JCVMASK) <= (ngex->flags & GEXF_JCVMASK)) ) { ++ pge = pge->frwd; ++ } else { ++ nge = nge->bkwd; ++ } ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "next try: %p to %p\n", pge, nge); ++ } ++ ++next: ++ ge = ge->frwd; ++ if(ge == startge) { ++ joinmask = (joinmask >> 1) & GEXF_JCVMASK; ++ if(joinmask == 0) ++ break; ++ } ++ } ++ ++ /* join flat segments into lines */ ++ /* here ge==startge */ ++ while(1) { ++ gex = X_CON(ge); ++ if( !(gex->flags & GEXF_JLINE) ) ++ goto next2; ++ ++ ndots = 0; ++ dots[ndots].p[X] = ge->fx3; ++ dots[ndots].p[Y] = ge->fy3; ++ ndots++; ++ ++ pge = ge->bkwd; ++ nge = ge->frwd; ++ ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "joining LINE from %p-%p\n", ge, nge); ++ ++ while(pge!=nge) { ++ pgex = X_CON(pge); ++ ngex = X_CON(nge); ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "(p=%p/%x n=0x%x/%x) ", pge, pgex->flags & GEXF_JLINE, ++ nge, ngex->flags & GEXF_JLINE); ++ if( !((pgex->flags | ngex->flags) & GEXF_JLINE) ) { ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "(end p=%p n=%p) ", pge, nge); ++ break; ++ } ++ ++ if(maxdots < ndots+2) { ++ maxdots += MAXDOTS; ++ dots = (struct dot_dist *)realloc((void *)dots, sizeof(*dots)*maxdots); ++ if(dots == NULL) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ } ++ if( pgex->flags & GEXF_JLINE ) { ++ for(i=0; i<2; i++) { ++ apcv[0][i] = pge->bkwd->fpoints[i][2]; ++ apcv[1][i] = nge->fpoints[i][2]; ++ dots[ndots].p[i] = pge->fpoints[i][2]; ++ } ++ ndots++; ++ for(i=0; i CVEPS2) ++ break; ++ } ++ if(iflags &= ~GEXF_JLINE; ++ } else { ++ pge = pge->bkwd; ++ if(pge == nge) { ++ if(ISDBG(FCONCISE)) ++ fprintf(stderr, "intersected at prev %p ", pge); ++ break; /* oops, tried to self-intersect */ ++ } ++ } ++ } else if(ISDBG(FCONCISE)) ++ fprintf(stderr, "(p=%p) ", pge); ++ ++ if( ngex->flags & GEXF_JLINE ) { ++ for(i=0; i<2; i++) { ++ apcv[0][i] = pge->fpoints[i][2]; /* pge points before the 1st segment */ ++ apcv[1][i] = nge->frwd->fpoints[i][2]; ++ dots[ndots].p[i] = nge->fpoints[i][2]; ++ } ++ ndots++; ++ for(i=0; i CVEPS2) ++ break; ++ } ++ if(ifrwd); ++ ndots--; ++ ngex->flags &= ~GEXF_JLINE; ++ } else { ++ nge = nge->frwd; ++ } ++ } else if(ISDBG(FCONCISE)) ++ fprintf(stderr, "(n=%p) ", nge); ++ } ++ ++ pge = pge->frwd; /* now the limits are pge...nge inclusive */ ++ if(pge == nge) /* a deeply perversive contour */ ++ break; ++ ++ if(ISDBG(FCONCISE)) { ++ fprintf(stderr, "\nin %s joined LINE %p-%p from\n", g->name, pge, nge); ++ dumppaths(g, pge, nge); ++ } ++ pge->type = GE_LINE; ++ for(i=0; i<2; i++) { ++ pge->fpoints[i][2] = nge->fpoints[i][2]; ++ } ++ fnormalizege(pge); ++ X_CON_F(pge) &= ~GEXF_JLINE; ++ ++ ge = pge; ++ for(ige = pge->frwd; ; ige = pge->frwd) { ++ if(ige == pge) { ++ fprintf(stderr, "WARNING: assertion in %s line %d, please report it to the ttf2pt1 project\n", ++ __FILE__, __LINE__); ++ free(dots); ++ return; ++ } ++ if(startge == ige) ++ startge = pge; ++ free(ige->ext); ++ freethisge(ige); ++ if(ige == nge) ++ break; ++ } ++next2: ++ ge = ge->frwd; ++ if(ge == startge) ++ break; ++ } ++ ++ free(dots); ++} ++ ++/* force conciseness: substitute 2 or more curves going in the ++** same quadrant with one curve ++** in floating point ++*/ ++ ++void ++fforceconcise( ++ GLYPH * g ++) ++{ ++ ++ GENTRY *ge, *nge, *endge, *xge; ++ ++ assertisfloat(g, "enforcing conciseness"); ++ ++ fdelsmall(g, 0.05); ++ assertpath(g->entries, __FILE__, __LINE__, g->name); ++ ++ if(ISDBG(FCONCISE)) ++ dumppaths(g, NULL, NULL); ++ ++ /* collect more information about each gentry and their joints */ ++ for (ge = g->entries; ge != 0; ge = ge->next) ++ if (ge->type == GE_CURVE || ge->type == GE_LINE) ++ fnormalizege(ge); ++ ++ for (ge = g->entries; ge != 0; ge = ge->next) ++ if (ge->type == GE_CURVE || ge->type == GE_LINE) { ++ alloc_gex_con(ge); ++ fanalyzege(ge); ++ } ++ ++ /* see what we can do about joining */ ++ for (ge = g->entries; ge != 0; ge = ge->next) ++ if (ge->type == GE_CURVE || ge->type == GE_LINE) ++ fanalyzejoint(ge); ++ ++ /* now do the joining */ ++ for (ge = g->entries; ge != 0; ge = ge->next) ++ if(ge->type == GE_MOVE) ++ fconcisecontour(g, ge->next); ++ ++ for (ge = g->entries; ge != 0; ge = ge->next) ++ if (ge->type == GE_CURVE || ge->type == GE_LINE) ++ free(ge->ext); ++} ++ ++void ++print_glyph( ++ int glyphno ++) ++{ ++ GLYPH *g; ++ GENTRY *ge; ++ int x = 0, y = 0; ++ int i; ++ int grp, lastgrp= -1; ++ ++ if(ISDBG(FCONCISE) && glyphno == 0) { ++ fprintf(stderr, "Guessed curves: bad %d/%d good %d/%d\n", ++ gbadcv, gbadcvdots, ggoodcv, ggoodcvdots); ++ } ++ ++ g = &glyph_list[glyphno]; ++ ++ fprintf(pfa_file, "/%s { \n", g->name); ++ ++ /* consider widths >MAXLEGALWIDTH as bugs */ ++ if( g->scaledwidth <= MAXLEGALWIDTH ) { ++ fprintf(pfa_file, "0 %d hsbw\n", g->scaledwidth); ++ } else { ++ fprintf(pfa_file, "0 1000 hsbw\n"); ++ WARNING_2 fprintf(stderr, "glyph %s: width %d seems to be buggy, set to 1000\n", ++ g->name, g->scaledwidth); ++ } ++ ++#if 0 ++ fprintf(pfa_file, "%% contours: "); ++ for (i = 0; i < g->ncontours; i++) ++ fprintf(pfa_file, "%s(%d,%d) ", (g->contours[i].direction == DIR_OUTER ? "out" : "in"), ++ g->contours[i].xofmin, g->contours[i].ymin); ++ fprintf(pfa_file, "\n"); ++ ++ if (g->rymin < 5000) ++ fprintf(pfa_file, "%d lower%s\n", g->rymin, (g->flatymin ? "flat" : "curve")); ++ if (g->rymax > -5000) ++ fprintf(pfa_file, "%d upper%s\n", g->rymax, (g->flatymax ? "flat" : "curve")); ++#endif ++ ++ if (g->hstems) ++ for (i = 0; i < g->nhs; i += 2) { ++ if (g->hstems[i].flags & ST_3) { ++ fprintf(pfa_file, "%d %d %d %d %d %d hstem3\n", ++ g->hstems[i].value, ++ g->hstems[i + 1].value - g->hstems[i].value, ++ g->hstems[i + 2].value, ++ g->hstems[i + 3].value - g->hstems[i + 2].value, ++ g->hstems[i + 4].value, ++ g->hstems[i + 5].value - g->hstems[i + 4].value ++ ); ++ i += 4; ++ } else { ++ fprintf(pfa_file, "%d %d hstem\n", g->hstems[i].value, ++ g->hstems[i + 1].value - g->hstems[i].value); ++ } ++ } ++ ++ if (g->vstems) ++ for (i = 0; i < g->nvs; i += 2) { ++ if (g->vstems[i].flags & ST_3) { ++ fprintf(pfa_file, "%d %d %d %d %d %d vstem3\n", ++ g->vstems[i].value, ++ g->vstems[i + 1].value - g->vstems[i].value, ++ g->vstems[i + 2].value, ++ g->vstems[i + 3].value - g->vstems[i + 2].value, ++ g->vstems[i + 4].value, ++ g->vstems[i + 5].value - g->vstems[i + 4].value ++ ); ++ i += 4; ++ } else { ++ fprintf(pfa_file, "%d %d vstem\n", g->vstems[i].value, ++ g->vstems[i + 1].value - g->vstems[i].value); ++ } ++ } ++ ++ for (ge = g->entries; ge != 0; ge = ge->next) { ++ if(g->nsg>0) { ++ grp=ge->stemid; ++ if(grp >= 0 && grp != lastgrp) { ++ fprintf(pfa_file, "%d 4 callsubr\n", grp+g->firstsubr); ++ lastgrp=grp; ++ } ++ } ++ ++ switch (ge->type) { ++ case GE_MOVE: ++ if (absolute) ++ fprintf(pfa_file, "%d %d amoveto\n", ge->ix3, ge->iy3); ++ else ++ rmoveto(ge->ix3 - x, ge->iy3 - y); ++ if (0) ++ fprintf(stderr, "Glyph %s: print moveto(%d, %d)\n", ++ g->name, ge->ix3, ge->iy3); ++ x = ge->ix3; ++ y = ge->iy3; ++ break; ++ case GE_LINE: ++ if (absolute) ++ fprintf(pfa_file, "%d %d alineto\n", ge->ix3, ge->iy3); ++ else ++ rlineto(ge->ix3 - x, ge->iy3 - y); ++ x = ge->ix3; ++ y = ge->iy3; ++ break; ++ case GE_CURVE: ++ if (absolute) ++ fprintf(pfa_file, "%d %d %d %d %d %d arcurveto\n", ++ ge->ix1, ge->iy1, ge->ix2, ge->iy2, ge->ix3, ge->iy3); ++ else ++ rrcurveto(ge->ix1 - x, ge->iy1 - y, ++ ge->ix2 - ge->ix1, ge->iy2 - ge->iy1, ++ ge->ix3 - ge->ix2, ge->iy3 - ge->iy2); ++ x = ge->ix3; ++ y = ge->iy3; ++ break; ++ case GE_PATH: ++ closepath(); ++ break; ++ default: ++ WARNING_1 fprintf(stderr, "**** Glyph %s: unknown entry type '%c'\n", ++ g->name, ge->type); ++ break; ++ } ++ } ++ ++ fprintf(pfa_file, "endchar } ND\n"); ++} ++ ++/* print the subroutines for this glyph, returns the number of them */ ++int ++print_glyph_subs( ++ int glyphno, ++ int startid /* start numbering subroutines from this id */ ++) ++{ ++ GLYPH *g; ++ int i, grp; ++ ++ g = &glyph_list[glyphno]; ++ ++ if(!hints || !subhints || g->nsg<1) ++ return 0; ++ ++ g->firstsubr=startid; ++ ++#if 0 ++ fprintf(pfa_file, "%% %s %d\n", g->name, g->nsg); ++#endif ++ for(grp=0; grpnsg; grp++) { ++ fprintf(pfa_file, "dup %d {\n", startid++); ++ for(i= (grp==0)? 0 : g->nsbs[grp-1]; insbs[grp]; i++) ++ fprintf(pfa_file, "\t%d %d %cstem\n", g->sbstems[i].low, ++ g->sbstems[i].high-g->sbstems[i].low, ++ g->sbstems[i].isvert ? 'v' : 'h'); ++ fprintf(pfa_file, "\treturn\n\t} NP\n"); ++ } ++ ++ return g->nsg; ++} ++ ++void ++print_glyph_metrics( ++ int code, ++ int glyphno ++) ++{ ++ GLYPH *g; ++ ++ g = &glyph_list[glyphno]; ++ ++ if(transform) ++ fprintf(afm_file, "C %d ; WX %d ; N %s ; B %d %d %d %d ;\n", ++ code, g->scaledwidth, g->name, ++ iscale(g->xMin), iscale(g->yMin), iscale(g->xMax), iscale(g->yMax)); ++ else ++ fprintf(afm_file, "C %d ; WX %d ; N %s ; B %d %d %d %d ;\n", ++ code, g->scaledwidth, g->name, ++ g->xMin, g->yMin, g->xMax, g->yMax); ++} ++ ++/* ++ SB: ++ An important note about the BlueValues. ++ ++ The Adobe documentation says that the maximal width of a Blue zone ++ is connected to the value of BlueScale, which is by default 0.039625. ++ The BlueScale value defines, at which point size the overshoot ++ suppression be disabled. ++ ++ The formula for it that is given in the manual is: ++ ++ BlueScale=point_size/240, for a 300dpi device ++ ++ that makes us wonder what is this 240 standing for. Incidentally ++ 240=72*1000/300, where 72 is the relation between inches and points, ++ 1000 is the size of the glyph matrix, and 300dpi is the resolution of ++ the output device. Knowing that we can recalculate the formula for ++ the font size in pixels rather than points: ++ ++ BlueScale=pixel_size/1000 ++ ++ That looks a lot simpler than the original formula, does not it ? ++ And the limitation about the maximal width of zone also looks ++ a lot simpler after the transformation: ++ ++ max_width < 1000/pixel_size ++ ++ that ensures that even at the maximal pixel size when the overshoot ++ suppression is disabled the zone width will be less than one pixel. ++ This is important, failure to comply to this limit will result in ++ really ugly fonts (been there, done that). But knowing the formula ++ for the pixel width, we see that in fact we can use the maximal width ++ of 24, not 23 as specified in the manual. ++ ++*/ ++ ++#define MAXBLUEWIDTH (24) ++ ++/* ++ * Find the indexes of the most frequent values ++ * in the hystogram, sort them in ascending order, and save which one ++ * was the best one (if asked). ++ * Returns the number of values found (may be less than maximal because ++ * we ignore the zero values) ++ */ ++ ++#define MAXHYST (2000) /* size of the hystogram */ ++#define HYSTBASE 500 ++ ++static int ++besthyst( ++ int *hyst, /* the hystogram */ ++ int base, /* the base point of the hystogram */ ++ int *best, /* the array for indexes of best values */ ++ int nbest, /* its allocated size */ ++ int width, /* minimal difference between indexes */ ++ int *bestindp /* returned top point */ ++) ++{ ++ unsigned char hused[MAXHYST / 8 + 1]; ++ int i, max, j, w, last = 0; ++ int nf = 0; ++ ++ width--; ++ ++ memset(hused, 0 , sizeof hused); ++ ++ max = 1; ++ for (i = 0; i < nbest && max != 0; i++) { ++ best[i] = 0; ++ max = 0; ++ for (j = 1; j < MAXHYST - 1; j++) { ++ w = hyst[j]; ++ ++ if (w > max && (hused[j>>3] & (1 << (j & 0x07))) == 0) { ++ best[i] = j; ++ max = w; ++ } ++ } ++ if (max != 0) { ++ if (max < last/2) { ++ /* do not pick the too low values */ ++ break; ++ } ++ for (j = best[i] - width; j <= best[i] + width; j++) { ++ if (j >= 0 && j < MAXHYST) ++ hused[j >> 3] |= (1 << (j & 0x07)); ++ } ++ last = max; ++ best[i] -= base; ++ nf = i + 1; ++ } ++ } ++ ++ if (bestindp) ++ *bestindp = best[0]; ++ ++ /* sort the indexes in ascending order */ ++ for (i = 0; i < nf; i++) { ++ for (j = i + 1; j < nf; j++) ++ if (best[j] < best[i]) { ++ w = best[i]; ++ best[i] = best[j]; ++ best[j] = w; ++ } ++ } ++ ++ return nf; ++} ++ ++/* ++ * Find the next best Blue zone in the hystogram. ++ * Return the weight of the found zone. ++ */ ++ ++static int ++bestblue( ++ short *zhyst, /* the zones hystogram */ ++ short *physt, /* the points hystogram */ ++ short *ozhyst, /* the other zones hystogram */ ++ int *bluetab /* where to put the found zone */ ++) ++{ ++ int i, j, w, max, ind, first, last; ++ ++ /* find the highest point in the zones hystogram */ ++ /* if we have a plateau, take its center */ ++ /* if we have multiple peaks, take the first one */ ++ ++ max = -1; ++ first = last = -10; ++ for (i = 0; i <= MAXHYST - MAXBLUEWIDTH; i++) { ++ w = zhyst[i]; ++ if (w > max) { ++ first = last = i; ++ max = w; ++ } else if (w == max) { ++ if (last == i - 1) ++ last = i; ++ } ++ } ++ ind = (first + last) / 2; ++ ++ if (max == 0) /* no zones left */ ++ return 0; ++ ++ /* now we reuse `first' and `last' as inclusive borders of the zone */ ++ first = ind; ++ last = ind + (MAXBLUEWIDTH - 1); ++ ++ /* our maximal width is far too big, so we try to make it narrower */ ++ w = max; ++ j = (w & 1); /* a pseudo-random bit */ ++ while (1) { ++ while (physt[first] == 0) ++ first++; ++ while (physt[last] == 0) ++ last--; ++ if (last - first < (MAXBLUEWIDTH * 2 / 3) || (max - w) * 10 > max) ++ break; ++ ++ if (physt[first] < physt[last] ++ || (physt[first] == physt[last] && j)) { ++ if (physt[first] * 20 > w) /* if weight is >5%, ++ * stop */ ++ break; ++ w -= physt[first]; ++ first++; ++ j = 0; ++ } else { ++ if (physt[last] * 20 > w) /* if weight is >5%, ++ * stop */ ++ break; ++ w -= physt[last]; ++ last--; ++ j = 1; ++ } ++ } ++ ++ /* save our zone */ ++ bluetab[0] = first - HYSTBASE; ++ bluetab[1] = last - HYSTBASE; ++ ++ /* invalidate all the zones overlapping with this one */ ++ /* the constant of 2 is determined by the default value of BlueFuzz */ ++ for (i = first - (MAXBLUEWIDTH - 1) - 2; i <= last + 2; i++) ++ if (i >= 0 && i < MAXHYST) { ++ zhyst[i] = 0; ++ ozhyst[i] = 0; ++ } ++ return w; ++} ++ ++/* ++ * Try to find the Blue Values, bounding box and italic angle ++ */ ++ ++void ++findblues(void) ++{ ++ /* hystograms for upper and lower zones */ ++ short hystl[MAXHYST]; ++ short hystu[MAXHYST]; ++ short zuhyst[MAXHYST]; ++ short zlhyst[MAXHYST]; ++ int nchars; ++ int i, j, k, w, max; ++ GENTRY *ge; ++ GLYPH *g; ++ double ang; ++ ++ /* find the lowest and highest points of glyphs */ ++ /* and by the way build the values for FontBBox */ ++ /* and build the hystogram for the ItalicAngle */ ++ ++ /* re-use hystl for the hystogram of italic angle */ ++ ++ bbox[0] = bbox[1] = 5000; ++ bbox[2] = bbox[3] = -5000; ++ ++ for (i = 0; i < MAXHYST; i++) ++ hystl[i] = 0; ++ ++ nchars = 0; ++ ++ for (i = 0, g = glyph_list; i < numglyphs; i++, g++) { ++ if (g->flags & GF_USED) { ++ nchars++; ++ ++ g->rymin = 5000; ++ g->rymax = -5000; ++ for (ge = g->entries; ge != 0; ge = ge->next) { ++ if (ge->type == GE_LINE) { ++ ++ j = ge->iy3 - ge->prev->iy3; ++ k = ge->ix3 - ge->prev->ix3; ++ if (j > 0) ++ ang = atan2(-k, j) * 180.0 / M_PI; ++ else ++ ang = atan2(k, -j) * 180.0 / M_PI; ++ ++ k /= 100; ++ j /= 100; ++ if (ang > -45.0 && ang < 45.0) { ++ /* ++ * be careful to not overflow ++ * the counter ++ */ ++ hystl[HYSTBASE + (int) (ang * 10.0)] += (k * k + j * j) / 4; ++ } ++ if (ge->iy3 == ge->prev->iy3) { ++ if (ge->iy3 <= g->rymin) { ++ g->rymin = ge->iy3; ++ g->flatymin = 1; ++ } ++ if (ge->iy3 >= g->rymax) { ++ g->rymax = ge->iy3; ++ g->flatymax = 1; ++ } ++ } else { ++ if (ge->iy3 < g->rymin) { ++ g->rymin = ge->iy3; ++ g->flatymin = 0; ++ } ++ if (ge->iy3 > g->rymax) { ++ g->rymax = ge->iy3; ++ g->flatymax = 0; ++ } ++ } ++ } else if (ge->type == GE_CURVE) { ++ if (ge->iy3 < g->rymin) { ++ g->rymin = ge->iy3; ++ g->flatymin = 0; ++ } ++ if (ge->iy3 > g->rymax) { ++ g->rymax = ge->iy3; ++ g->flatymax = 0; ++ } ++ } ++ if (ge->type == GE_LINE || ge->type == GE_CURVE) { ++ if (ge->ix3 < bbox[0]) ++ bbox[0] = ge->ix3; ++ if (ge->ix3 > bbox[2]) ++ bbox[2] = ge->ix3; ++ if (ge->iy3 < bbox[1]) ++ bbox[1] = ge->iy3; ++ if (ge->iy3 > bbox[3]) ++ bbox[3] = ge->iy3; ++ } ++ } ++ } ++ } ++ ++ /* get the most popular angle */ ++ max = 0; ++ w = 0; ++ for (i = 0; i < MAXHYST; i++) { ++ if (hystl[i] > w) { ++ w = hystl[i]; ++ max = i; ++ } ++ } ++ ang = (double) (max - HYSTBASE) / 10.0; ++ WARNING_2 fprintf(stderr, "Guessed italic angle: %f\n", ang); ++ if (italic_angle == 0.0) ++ italic_angle = ang; ++ ++ /* build the hystogram of the lower points */ ++ for (i = 0; i < MAXHYST; i++) ++ hystl[i] = 0; ++ ++ for (i = 0, g = glyph_list; i < numglyphs; i++, g++) { ++ if ((g->flags & GF_USED) ++ && g->rymin + HYSTBASE >= 0 && g->rymin < MAXHYST - HYSTBASE) { ++ hystl[g->rymin + HYSTBASE]++; ++ } ++ } ++ ++ /* build the hystogram of the upper points */ ++ for (i = 0; i < MAXHYST; i++) ++ hystu[i] = 0; ++ ++ for (i = 0, g = glyph_list; i < numglyphs; i++, g++) { ++ if ((g->flags & GF_USED) ++ && g->rymax + HYSTBASE >= 0 && g->rymax < MAXHYST - HYSTBASE) { ++ hystu[g->rymax + HYSTBASE]++; ++ } ++ } ++ ++ /* build the hystogram of all the possible lower zones with max width */ ++ for (i = 0; i < MAXHYST; i++) ++ zlhyst[i] = 0; ++ ++ for (i = 0; i <= MAXHYST - MAXBLUEWIDTH; i++) { ++ for (j = 0; j < MAXBLUEWIDTH; j++) ++ zlhyst[i] += hystl[i + j]; ++ } ++ ++ /* build the hystogram of all the possible upper zones with max width */ ++ for (i = 0; i < MAXHYST; i++) ++ zuhyst[i] = 0; ++ ++ for (i = 0; i <= MAXHYST - MAXBLUEWIDTH; i++) { ++ for (j = 0; j < MAXBLUEWIDTH; j++) ++ zuhyst[i] += hystu[i + j]; ++ } ++ ++ /* find the baseline */ ++ w = bestblue(zlhyst, hystl, zuhyst, &bluevalues[0]); ++ if (0) ++ fprintf(stderr, "BaselineBlue zone %d%% %d...%d\n", w * 100 / nchars, ++ bluevalues[0], bluevalues[1]); ++ ++ if (w == 0) /* no baseline, something weird */ ++ return; ++ ++ /* find the upper zones */ ++ for (nblues = 2; nblues < 14; nblues += 2) { ++ w = bestblue(zuhyst, hystu, zlhyst, &bluevalues[nblues]); ++ ++ if (0) ++ fprintf(stderr, "Blue zone %d%% %d...%d\n", w * 100 / nchars, ++ bluevalues[nblues], bluevalues[nblues+1]); ++ ++ if (w * 20 < nchars) ++ break; /* don't save this zone */ ++ } ++ ++ /* find the lower zones */ ++ for (notherb = 0; notherb < 10; notherb += 2) { ++ w = bestblue(zlhyst, hystl, zuhyst, &otherblues[notherb]); ++ ++ if (0) ++ fprintf(stderr, "OtherBlue zone %d%% %d...%d\n", w * 100 / nchars, ++ otherblues[notherb], otherblues[notherb+1]); ++ ++ ++ if (w * 20 < nchars) ++ break; /* don't save this zone */ ++ } ++ ++} ++ ++/* ++ * Find the actual width of the glyph and modify the ++ * description to reflect it. Not guaranteed to do ++ * any good, may make character spacing too wide. ++ */ ++ ++void ++docorrectwidth(void) ++{ ++ int i; ++ GENTRY *ge; ++ GLYPH *g; ++ int xmin, xmax; ++ int maxwidth, minsp; ++ ++ /* enforce this minimal spacing, ++ * we limit the amount of the enforced spacing to avoid ++ * spacing the bold wonts too widely ++ */ ++ minsp = (stdhw>60 || stdhw<10)? 60 : stdhw; ++ ++ for (i = 0, g = glyph_list; i < numglyphs; i++, g++) { ++ g->oldwidth=g->scaledwidth; /* save the old width, will need for AFM */ ++ ++ if (correctwidth && g->flags & GF_USED) { ++ xmin = 5000; ++ xmax = -5000; ++ for (ge = g->entries; ge != 0; ge = ge->next) { ++ if (ge->type != GE_LINE && ge->type != GE_CURVE) ++ continue; ++ ++ if (ge->ix3 <= xmin) { ++ xmin = ge->ix3; ++ } ++ if (ge->ix3 >= xmax) { ++ xmax = ge->ix3; ++ } ++ } ++ ++ maxwidth=xmax+minsp; ++ if( g->scaledwidth < maxwidth ) { ++ g->scaledwidth = maxwidth; ++ WARNING_3 fprintf(stderr, "glyph %s: extended from %d to %d\n", ++ g->name, g->oldwidth, g->scaledwidth ); ++ } ++ } ++ } ++ ++} ++ ++/* ++ * Try to find the typical stem widths ++ */ ++ ++void ++stemstatistics(void) ++{ ++#define MINDIST 10 /* minimal distance between the widths */ ++ int hyst[MAXHYST+MINDIST*2]; ++ int best[12]; ++ int i, j, k, w; ++ int nchars; ++ int ns; ++ STEM *s; ++ GLYPH *g; ++ ++ /* start with typical stem width */ ++ ++ nchars=0; ++ ++ /* build the hystogram of horizontal stem widths */ ++ memset(hyst, 0, sizeof hyst); ++ ++ for (i = 0, g = glyph_list; i < numglyphs; i++, g++) { ++ if (g->flags & GF_USED) { ++ nchars++; ++ s = g->hstems; ++ for (j = 0; j < g->nhs; j += 2) { ++ if ((s[j].flags | s[j + 1].flags) & ST_END) ++ continue; ++ w = s[j + 1].value - s[j].value+1; ++ if(w==20) /* split stems should not be counted */ ++ continue; ++ if (w > 0 && w < MAXHYST - 1) { ++ /* ++ * handle some fuzz present in ++ * converted fonts ++ */ ++ hyst[w+MINDIST] += MINDIST-1; ++ for(k=1; kflags & GF_USED) { ++ s = g->vstems; ++ for (j = 0; j < g->nvs; j += 2) { ++ if ((s[j].flags | s[j + 1].flags) & ST_END) ++ continue; ++ w = s[j + 1].value - s[j].value+1; ++ if (w > 0 && w < MAXHYST - 1) { ++ /* ++ * handle some fuzz present in ++ * converted fonts ++ */ ++ hyst[w+MINDIST] += MINDIST-1; ++ for(k=1; knext) { ++ if(ge->type == GE_LINE || ge->type == GE_CURVE) { ++ if (ISDBG(REVERSAL)) ++ fprintf(stderr, "reverse path 0x%x <- 0x%x, 0x%x\n", ge, ge->prev, ge->bkwd); ++ ++ /* cut out the path itself */ ++ pge = ge->prev; /* GE_MOVE */ ++ if (pge == 0) { ++ fprintf(stderr, "**! No MOVE before line !!! Fatal. ****\n"); ++ exit(1); ++ } ++ nge = ge->bkwd->next; /* GE_PATH */ ++ pge->next = nge; ++ nge->prev = pge; ++ ge->bkwd->next = 0; /* mark end of chain */ ++ ++ /* remember the starting point */ ++ if(ge->flags & GEF_FLOAT) { ++ flast[0] = pge->fx3; ++ flast[1] = pge->fy3; ++ } else { ++ ilast[0] = pge->ix3; ++ ilast[1] = pge->iy3; ++ } ++ ++ /* then reinsert them in backwards order */ ++ for(cur = ge; cur != 0; cur = next ) { ++ next = cur->next; /* or addgeafter() will screw it up */ ++ if(cur->flags & GEF_FLOAT) { ++ for(i=0; i<2; i++) { ++ /* reverse the direction of path element */ ++ f = cur->fpoints[i][0]; ++ cur->fpoints[i][0] = cur->fpoints[i][1]; ++ cur->fpoints[i][1] = f; ++ f = flast[i]; ++ flast[i] = cur->fpoints[i][2]; ++ cur->fpoints[i][2] = f; ++ } ++ } else { ++ for(i=0; i<2; i++) { ++ /* reverse the direction of path element */ ++ n = cur->ipoints[i][0]; ++ cur->ipoints[i][0] = cur->ipoints[i][1]; ++ cur->ipoints[i][1] = n; ++ n = ilast[i]; ++ ilast[i] = cur->ipoints[i][2]; ++ cur->ipoints[i][2] = n; ++ } ++ } ++ addgeafter(pge, cur); ++ } ++ ++ /* restore the starting point */ ++ if(ge->flags & GEF_FLOAT) { ++ pge->fx3 = flast[0]; ++ pge->fy3 = flast[1]; ++ } else { ++ pge->ix3 = ilast[0]; ++ pge->iy3 = ilast[1]; ++ } ++ ++ ge = nge; ++ } ++ ++ } ++} ++ ++void ++reversepaths( ++ GLYPH * g ++) ++{ ++ reversepathsfromto(g->entries, NULL); ++} ++ ++/* add a kerning pair information, scales the value */ ++ ++void ++addkernpair( ++ unsigned id1, ++ unsigned id2, ++ int unscval ++) ++{ ++ static unsigned char *bits = 0; ++ static int lastid; ++ GLYPH *g = &glyph_list[id1]; ++ int i, n; ++ struct kern *p; ++ ++ if(unscval == 0 || id1 >= numglyphs || id2 >= numglyphs) ++ return; ++ ++ if( (glyph_list[id1].flags & GF_USED)==0 ++ || (glyph_list[id2].flags & GF_USED)==0 ) ++ return; ++ ++ if(bits == 0) { ++ bits = calloc( BITMAP_BYTES(numglyphs), 1); ++ if (bits == NULL) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ lastid = id1; ++ } ++ ++ if(lastid != id1) { ++ /* refill the bitmap cache */ ++ memset(bits, 0,BITMAP_BYTES(numglyphs)); ++ p = g->kern; ++ for(i=g->kerncount; i>0; i--) { ++ n = (p++)->id; ++ SET_BITMAP(bits, n); ++ } ++ lastid = id1; ++ } ++ ++ if(IS_BITMAP(bits, id2)) ++ return; /* duplicate */ ++ ++ if(g->kerncount <= g->kernalloc) { ++ g->kernalloc += 8; ++ p = realloc(g->kern, sizeof(struct kern) * g->kernalloc); ++ if(p == 0) { ++ fprintf (stderr, "** realloc failed, kerning data will be incomplete\n"); ++ } ++ g->kern = p; ++ } ++ ++ SET_BITMAP(bits, id2); ++ p = &g->kern[g->kerncount]; ++ p->id = id2; ++ p->val = iscale(unscval) - (g->scaledwidth - g->oldwidth); ++ g->kerncount++; ++ kerning_pairs++; ++} ++ ++/* print out the kerning information */ ++ ++void ++print_kerning( ++ FILE *afm_file ++) ++{ ++ int i, j, n; ++ GLYPH *g; ++ struct kern *p; ++ ++ if( kerning_pairs == 0 ) ++ return; ++ ++ fprintf(afm_file, "StartKernData\n"); ++ fprintf(afm_file, "StartKernPairs %hd\n", kerning_pairs); ++ ++ for(i=0; iflags & GF_USED) ==0) ++ continue; ++ p = g->kern; ++ for(j=g->kerncount; j>0; j--, p++) { ++ fprintf(afm_file, "KPX %s %s %d\n", g->name, ++ glyph_list[ p->id ].name, p->val ); ++ } ++ } ++ ++ fprintf(afm_file, "EndKernPairs\n"); ++ fprintf(afm_file, "EndKernData\n"); ++} ++ ++ ++#if 0 ++ ++/* ++** This function is commented out because the information ++** collected by it is not used anywhere else yet. Now ++** it only collects the directions of contours. And the ++** direction of contours gets fixed already in draw_glyf(). ++** ++*********************************************** ++** ++** Here we expect that the paths are already closed. ++** We also expect that the contours do not intersect ++** and that curves doesn't cross any border of quadrant. ++** ++** Find which contours go inside which and what is ++** their proper direction. Then fix the direction ++** to make it right. ++** ++*/ ++ ++#define MAXCONT 1000 ++ ++void ++fixcontours( ++ GLYPH * g ++) ++{ ++ CONTOUR cont[MAXCONT]; ++ short ymax[MAXCONT]; /* the highest point */ ++ short xofmax[MAXCONT]; /* X-coordinate of any point ++ * at ymax */ ++ short ymin[MAXCONT]; /* the lowest point */ ++ short xofmin[MAXCONT]; /* X-coordinate of any point ++ * at ymin */ ++ short count[MAXCONT]; /* count of lines */ ++ char dir[MAXCONT]; /* in which direction they must go */ ++ GENTRY *start[MAXCONT], *minptr[MAXCONT], *maxptr[MAXCONT]; ++ int ncont; ++ int i; ++ int dx1, dy1, dx2, dy2; ++ GENTRY *ge, *nge; ++ ++ /* find the contours and their most upper/lower points */ ++ ncont = 0; ++ ymax[0] = -5000; ++ ymin[0] = 5000; ++ for (ge = g->entries; ge != 0; ge = ge->next) { ++ if (ge->type == GE_LINE || ge->type == GE_CURVE) { ++ if (ge->iy3 > ymax[ncont]) { ++ ymax[ncont] = ge->iy3; ++ xofmax[ncont] = ge->ix3; ++ maxptr[ncont] = ge; ++ } ++ if (ge->iy3 < ymin[ncont]) { ++ ymin[ncont] = ge->iy3; ++ xofmin[ncont] = ge->ix3; ++ minptr[ncont] = ge; ++ } ++ } ++ if (ge->frwd != ge->next) { ++ start[ncont++] = ge->frwd; ++ ymax[ncont] = -5000; ++ ymin[ncont] = 5000; ++ } ++ } ++ ++ /* determine the directions of contours */ ++ for (i = 0; i < ncont; i++) { ++ ge = minptr[i]; ++ nge = ge->frwd; ++ ++ if (ge->type == GE_CURVE) { ++ dx1 = ge->ix3 - ge->ix2; ++ dy1 = ge->iy3 - ge->iy2; ++ ++ if (dx1 == 0 && dy1 == 0) { /* a pathological case */ ++ dx1 = ge->ix3 - ge->ix1; ++ dy1 = ge->iy3 - ge->iy1; ++ } ++ if (dx1 == 0 && dy1 == 0) { /* a more pathological ++ * case */ ++ dx1 = ge->ix3 - ge->prev->ix3; ++ dy1 = ge->iy3 - ge->prev->iy3; ++ } ++ } else { ++ dx1 = ge->ix3 - ge->prev->ix3; ++ dy1 = ge->iy3 - ge->prev->iy3; ++ } ++ if (nge->type == GE_CURVE) { ++ dx2 = ge->ix3 - nge->ix1; ++ dy2 = ge->iy3 - nge->iy1; ++ if (dx1 == 0 && dy1 == 0) { /* a pathological case */ ++ dx2 = ge->ix3 - nge->ix2; ++ dy2 = ge->iy3 - nge->iy2; ++ } ++ if (dx1 == 0 && dy1 == 0) { /* a more pathological ++ * case */ ++ dx2 = ge->ix3 - nge->ix3; ++ dy2 = ge->iy3 - nge->iy3; ++ } ++ } else { ++ dx2 = ge->ix3 - nge->ix3; ++ dy2 = ge->iy3 - nge->iy3; ++ } ++ ++ /* compare angles */ ++ cont[i].direction = DIR_INNER; ++ if (dy1 == 0) { ++ if (dx1 < 0) ++ cont[i].direction = DIR_OUTER; ++ } else if (dy2 == 0) { ++ if (dx2 > 0) ++ cont[i].direction = DIR_OUTER; ++ } else if (dx2 * dy1 < dx1 * dy2) ++ cont[i].direction = DIR_OUTER; ++ ++ cont[i].ymin = ymin[i]; ++ cont[i].xofmin = xofmin[i]; ++ } ++ ++ /* save the information that may be needed further */ ++ g->ncontours = ncont; ++ if (ncont > 0) { ++ g->contours = malloc(sizeof(CONTOUR) * ncont); ++ if (g->contours == 0) { ++ fprintf(stderr, "***** Memory allocation error *****\n"); ++ exit(255); ++ } ++ memcpy(g->contours, cont, sizeof(CONTOUR) * ncont); ++ } ++} ++ ++#endif ++ ++/* ++ * ++ */ ++ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/pt1.h xserver/hw/xprint/extras/ttf2pt1/pt1.h +--- xserver-old/hw/xprint/extras/ttf2pt1/pt1.h 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/pt1.h 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,257 @@ ++/* ++ * see COPYRIGHT ++ */ ++ ++ ++/* glyph entry, one drawing command */ ++typedef struct gentry { ++ /* this list links all GENTRYs of a GLYPH sequentially */ ++ struct gentry *next; /* double linked list */ ++ struct gentry *prev; ++ ++ /* this list links all GENTRYs of one contour - ++ * of types GE_LINE and GE_CURVE only ++ * bkwd is also reused: in the very first entry (normally ++ * of type GE_MOVE) it points to g->entries ++ */ ++ struct gentry *cntr[2]; /* double-linked circular list */ ++/* convenience handles */ ++#define bkwd cntr[0] ++#define frwd cntr[1] ++ ++ /* various extended structures used at some stage of transformation */ ++ void *ext; ++ ++ union { ++ struct { ++ int val[2][3]; /* integer values */ ++ } i; ++ struct { ++ double val[2][3]; /* floating values */ ++ } f; ++ } points; /* absolute values, NOT deltas */ ++/* convenience handles */ ++#define ipoints points.i.val ++#define fpoints points.f.val ++#define ixn ipoints[0] ++#define iyn ipoints[1] ++#define fxn fpoints[0] ++#define fyn fpoints[1] ++#define ix1 ixn[0] ++#define ix2 ixn[1] ++#define ix3 ixn[2] ++#define iy1 iyn[0] ++#define iy2 iyn[1] ++#define iy3 iyn[2] ++#define fx1 fxn[0] ++#define fx2 fxn[1] ++#define fx3 fxn[2] ++#define fy1 fyn[0] ++#define fy2 fyn[1] ++#define fy3 fyn[2] ++ ++ char flags; ++#define GEF_FLOAT 0x02 /* entry contains floating point data */ ++#define GEF_LINE 0x04 /* entry looks like a line even if it's a curve */ ++ ++ unsigned char dir; /* used to temporarily store the values for ++ * the directions of the ends of curves */ ++/* front end */ ++#define CVDIR_FUP 0x02 /* goes over the line connecting the ends */ ++#define CVDIR_FEQUAL 0x01 /* coincides with the line connecting the ++ * ends */ ++#define CVDIR_FDOWN 0x00 /* goes under the line connecting the ends */ ++#define CVDIR_FRONT 0x0F /* mask of all front directions */ ++/* rear end */ ++#define CVDIR_RSAME 0x30 /* is the same as for the front end */ ++#define CVDIR_RUP 0x20 /* goes over the line connecting the ends */ ++#define CVDIR_REQUAL 0x10 /* coincides with the line connecting the ++ * ends */ ++#define CVDIR_RDOWN 0x00 /* goes under the line connecting the ends */ ++#define CVDIR_REAR 0xF0 /* mask of all rear directions */ ++ ++ signed char stemid; /* connection to the substituted stem group */ ++ char type; ++#define GE_HSBW 'B' ++#define GE_MOVE 'M' ++#define GE_LINE 'L' ++#define GE_CURVE 'C' ++#define GE_PATH 'P' ++ ++ /* indexes of the points to be used for calculation of the tangents */ ++ signed char ftg; /* front tangent */ ++ signed char rtg; /* rear tangent, -1 means "idx 2 of the previous entry" */ ++} GENTRY; ++ ++/* stem structure, describes one [hv]stem */ ++/* acually, it describes one border of a stem */ ++/* the whole stem is a pair of these structures */ ++ ++typedef struct stem { ++ short value; /* value of X or Y coordinate */ ++ short origin; /* point of origin for curve stems */ ++ GENTRY *ge; /* entry that has (value, origin) as its first dot */ ++ /* also for all the stems the couple (value, origin) ++ * is used to determine whether a stem is relevant for a ++ * line, it's considered revelant if this tuple is ++ * equal to any of the ends of the line. ++ * ge is also used to resolve ambiguity if there is more than ++ * one line going through certain pointi, it is used to ++ * distinguish these lines. ++ */ ++ ++ short from, to; /* values of other coordinate between ++ * which this stem is valid */ ++ ++ short flags; ++ /* ordering of ST_END, ST_FLAT, ST_ZONE is IMPORTANT for sorting */ ++#define ST_END 0x01 /* end of line, lowest priority */ ++#define ST_FLAT 0x02 /* stem is defined by a flat line, not a ++ * curve */ ++#define ST_ZONE 0x04 /* pseudo-stem, the limit of a blue zone */ ++#define ST_UP 0x08 /* the black area is to up or right from ++ * value */ ++#define ST_3 0x20 /* first stem of [hv]stem3 */ ++#define ST_BLUE 0x40 /* stem is in blue zone */ ++#define ST_TOPZONE 0x80 /* 1 - top zone, 0 - bottom zone */ ++#define ST_VERT 0x100 /* vertical stem (used in substitutions) */ ++} STEM; ++ ++#define MAX_STEMS 2000 /* we can't have more stems than path ++ * elements (or hope so) */ ++#define NSTEMGRP 50 /* maximal number of the substituted stem groups */ ++ ++/* structure for economical representation of the ++ * substituted stems ++ */ ++ ++typedef struct stembounds { ++ short low; /* low bound */ ++ short high; /* high bound */ ++ char isvert; /* 1 - vertical, 0 - horizontal */ ++ char already; /* temp. flag: is aleready included */ ++} STEMBOUNDS; ++ ++struct kern { ++ unsigned id; /* ID of the second glyph */ ++ int val; /* kerning value */ ++}; ++ ++typedef struct contour { ++ short ymin, xofmin; ++ short inside; /* inside which contour */ ++ char direction; ++#define DIR_OUTER 1 ++#define DIR_INNER 0 ++} CONTOUR; ++ ++typedef struct glyph { ++ int char_no;/* Encoding of glyph */ ++ int orig_code;/* code of glyph in the font's original encoding */ ++ char *name; /* Postscript name of glyph */ ++ int xMin, yMin, xMax, yMax; /* values from TTF dictionary */ ++ int lsb; /* left sidebearing */ ++ int ttf_pathlen; /* total length of TTF paths */ ++ short width; ++ short flags; ++#define GF_USED 0x0001 /* whether is this glyph used in T1 font */ ++#define GF_FLOAT 0x0002 /* thys glyph contains floating point entries */ ++ ++ GENTRY *entries;/* doube linked list of entries */ ++ GENTRY *lastentry; /* the last inserted entry */ ++ GENTRY *path; /* beggining of the last path */ ++ int oldwidth; /* actually also scaled */ ++ int scaledwidth; ++#define MAXLEGALWIDTH 10000 ++ ++ struct kern *kern; /* kerning data */ ++ int kerncount; /* number of kerning pairs */ ++ int kernalloc; /* for how many pairs we have space */ ++ ++ STEM *hstems; /* global horiz. and vert. stems */ ++ STEM *vstems; ++ int nhs, nvs; /* numbers of stems */ ++ ++ STEMBOUNDS *sbstems; /* substituted stems for all the groups */ ++ short *nsbs; /* indexes of the group ends in the common array */ ++ int nsg; /* actual number of the stem groups */ ++ int firstsubr; /* first substistuted stems subroutine number */ ++ ++ CONTOUR *contours; /* it is not used now */ ++ int ncontours; ++ ++ int rymin, rymax; /* real values */ ++ /* do we have flat surfaces on top/bottom */ ++ char flatymin, flatymax; ++ ++} GLYPH; ++ ++/* description of a dot for calculation of its distance to a curve */ ++ ++struct dot_dist { ++ double p[2 /*X,Y*/]; /* coordinates of a dot */ ++ double dist2; /* squared distance from the dot to the curve */ ++ short seg; /* the closest segment of the curve */ ++}; ++ ++extern int stdhw, stdvw; /* dominant stems widths */ ++extern int stemsnaph[12], stemsnapv[12]; /* most typical stem width */ ++ ++extern int bluevalues[14]; ++extern int nblues; ++extern int otherblues[10]; ++extern int notherb; ++extern int bbox[4]; /* the FontBBox array */ ++extern double italic_angle; ++ ++extern GLYPH *glyph_list; ++extern int encoding[]; /* inverse of glyph[].char_no */ ++ ++/* prototypes of functions */ ++void rmoveto( int dx, int dy); ++void rlineto( int dx, int dy); ++void rrcurveto( int dx1, int dy1, int dx2, int dy2, int dx3, int dy3); ++void assertpath( GENTRY * from, char *file, int line, char *name); ++ ++void fg_rmoveto( GLYPH * g, double x, double y); ++void ig_rmoveto( GLYPH * g, int x, int y); ++void fg_rlineto( GLYPH * g, double x, double y); ++void ig_rlineto( GLYPH * g, int x, int y); ++void fg_rrcurveto( GLYPH * g, double x1, double y1, ++ double x2, double y2, double x3, double y3); ++void ig_rrcurveto( GLYPH * g, int x1, int y1, ++ int x2, int y2, int x3, int y3); ++void g_closepath( GLYPH * g); ++ ++void pathtoint( GLYPH *g); ++void ffixquadrants( GLYPH *g); ++void flattencurves( GLYPH * g); ++int checkcv( GENTRY * ge, int dx, int dy); ++void iclosepaths( GLYPH * g); ++void fclosepaths( GLYPH * g); ++void smoothjoints( GLYPH * g); ++void buildstems( GLYPH * g); ++void fstraighten( GLYPH * g); ++void istraighten( GLYPH * g, int zigonly); ++void isplitzigzags( GLYPH * g); ++void fsplitzigzags( GLYPH * g); ++void fforceconcise( GLYPH * g); ++void iforceconcise( GLYPH * g); ++void reversepathsfromto( GENTRY * from, GENTRY * to); ++void reversepaths( GLYPH * g); ++void dumppaths( GLYPH * g, GENTRY *start, GENTRY *end); ++void print_glyph( int glyphno); ++int print_glyph_subs( int glyphno, int startid); ++void print_glyph_metrics( int code, int glyphno); ++void findblues(void); ++void stemstatistics(void); ++void docorrectwidth(void); ++void addkernpair( unsigned id1, unsigned id2, int unscval); ++void print_kerning( FILE *afm_file); ++ ++int fcrossrayscv( double curve[4][2], double *max1, double *max2); ++int fcrossraysge( GENTRY *ge1, GENTRY *ge2, double *max1, double *max2, ++ double crossdot[2][2]); ++double fdotsegdist2( double seg[2][2], double dot[2]); ++double fdotcurvdist2( double curve[4][2], struct dot_dist *dots, int ndots, double *maxp); ++void fapproxcurve( double cv[4][2], struct dot_dist *dots, int ndots); +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/README.FIRST xserver/hw/xprint/extras/ttf2pt1/README.FIRST +--- xserver-old/hw/xprint/extras/ttf2pt1/README.FIRST 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/README.FIRST 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,4 @@ ++To get the plain-text README and installation guides run: ++ ++ make docs ++ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/README.html xserver/hw/xprint/extras/ttf2pt1/README.html +--- xserver-old/hw/xprint/extras/ttf2pt1/README.html 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/README.html 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,1182 @@ ++ ++ ++ ++TTF2PT1 - A True Type to PostScript Type 1 Converter ++ ++ ++ ++ ++

++ ++TTF2PT1 - A True Type to PostScript Type 1 Font Converter ++ ++

++ ++ ++ ++[ ++
++ ++ Based on ttf2pfa by Andrew Weeks, and help from Frank Siegert. ++
++ Modification by Mark Heath. ++
++ Further modification by Sergey Babkin. ++
++ The Type1 assembler by I. Lee Hetherington with modifications by ++ Kai-Uwe Herbing. ++ ++
++] ++ ++

++ ++Ever wanted to install a particular font on your XServer but only could find ++the font you are after in True Type Format? ++

++ ++Ever asked comp.fonts for a True Type to Type 1 converter and got a List ++of Commercial software that doesn't run on your Operating System? ++

++ ++Well, this program should be the answer. This program is written in C (so it ++should be portable) and therefore should run on any OS. The only limitation ++is that the program requires some method of converting Big endian integers into ++local host integers so the network functions ntohs and ntohl are used. These ++can be replaced by macros if your platform doesn't have them. ++Of course the target platform requires a C compiler and command line ability. ++

++ ++ ++Ttf2pt1 is a font converter from the True Type format (and some other formats ++supported by the FreeType library as well) to the Adobe Type1 format. ++

++ ++The versions 3.0 and later got rather extensive post-processing algorithm that ++brings the converted fonts to the requirements of the Type1 standard, tries to ++correct the rounding errors introduced during conversions and some simple ++kinds of bugs that are typical for the public domain TTF fonts. It ++also generates the hints that enable much better rendering of fonts in ++small sizes that are typical for the computer displays. But everything ++has its price, and some of the optimizations may not work well for certain ++fonts. That's why the options were added to the converter, to control ++the performed optimizations. ++

++ ++ ++The converter is simple to run, just: ++

++ ++ ++

++ ttf2pt1 [-options] ttffont.ttf [Fontname] ++
++or ++
++ ttf2pt1 [-options] ttffont.ttf - ++
++ ++

++ ++ ++The first variant creates the file Fontname.pfa (or Fontname.pfb if the ++option '-b' was used) with the converted font and Fontname.afm with the ++font metrics, the second one prints the font or another file (if the option ++'-G' was used) on the standard output from where it can be immediately ++piped through some filter. If no Fontname is specified for the first ++variant, the name is generated from ttffont by replacing the .ttf ++filename suffix. ++

++ ++Most of the time no options are neccessary (with a possible exception ++of '-e'). But if there are some troubles with the resulting font, they ++may be used to control the conversion. ++The options are: ++

++ ++ ++ ++-a - Include all the glyphs from the source file into the converted ++ file. If this option is not specified then only the glyphs that have ++ been assigned some encoding are included, because the rest of glyphs ++ would be inaccessible anyway and would only consume the disk space. ++ But some applications are clever enough to change the encoding on ++ the fly and thus use the other glyphs, in this case they could ++ benefit from using this option. But there is a catch: the X11 library ++ has rather low limit for the font size. Including more glyphs increases ++ the file size and thus increases the chance of hitting this limit. ++ See app/X11/README for the description of a ++ patch to X11 which fixes this problem. ++

++ ++ ++-b - Encode the resulting font to produce a ready .pfb file. ++

++ ++ ++-d suboptions - Debugging options. The suboptions are: ++

++ ++

++ a - Print out the absolute coordinates of dots in outlines. Such ++ a font can not be used by any program (that's why this option is ++ incompatible with '-e') but it has proven to be a valuable debuging ++ information. ++

++ ++ r - Do not reverse the direction of outlines. The TTF fonts have ++ the standard direction of outlines opposite to the Type1 fonts. So ++ they should be reversed during proper conversion. This option ++ may be used for debugging or to handle a TTF font with wrong ++ direction of outlines (possibly, converted in a broken way from ++ a Type1 font). The first signs of the wrong direction are the ++ letters like "P" or "B" without the unpainted "holes" inside. ++

++

++ ++ ++-e - Assemble the resulting font to produce a ready .pfa file. ++ ++ [ S.B.: Personally I don't think that this option is particularly useful. ++ The same result may be achieved by piping the unassembled data ++ through t1asm, the Type 1 assembler. And, anyways, it's good to ++ have the t1utils package handy. But Mark and many users think that ++ this functionality is good and it took not much time to add this option. ] ++ ++

++ ++ ++-F - Force the Unicode encoding: any type of MS encoding specified ++ in the font is ignored and the font is treated like it has Unicode ++ encoding. WARNING: this option is intended for buggy fonts ++ which actually are in Unicode but are marked as something else. The ++ effect on the other fonts is unpredictable. ++

++ ++ ++-G suboptions - File generation options. The suboptions may be lowercase ++ or uppercase, the lowercase ones disable the generation of particular ++ files, the corresponding uppercase suboptions enable the generation of the ++ same kind of files. If the result of ttf2pt1 is requested to be printed on ++ the standard output, the last enabling suboption of -G determines ++ which file will be written to the standard output and the rest of files ++ will be discarded. For example, -G A will request the AFM file. ++ The suboptions to disable/enable the generation of the files are: ++

++ ++

++ f/F - The font file. Depending on the other options this file ++ will have one of the suffixes .t1a, .pfa or .pfb. If the conversion result ++ is requested on the standard output ('-' is used as the output file name) ++ then the font file will also be written there by default, if not overwritten ++ by another suboption of -G. ++ Default: enabled ++

++ ++ a/A - The Adobe font metrics file (.afm). ++ Default: enabled ++

++ ++ e/E - The dvips encoding file (.enc). ++ Default: disabled ++

++ ++

++ ++ ++-l language[+argument] - Extract the fonts for the specified language from a ++ multi-language Unicode font. If this option is not used the converter ++ tries to guess the language by the values of the shell variable LANG. ++ If it is not able to guess the language by LANG it tries all the ++ languages in the order they are listed. ++

++ ++ After the plus sign an optional argument for the language extractor ++ may be specified. The format of the argument is absolutely up to ++ the particular language converter. The primary purpose of the ++ argument is to support selection of planes for the multi-plane ++ Eastern encodings but it can also be used in any other way. The ++ language extractor may decide to add the plane name in some form ++ to the name of the resulting font. None of the currently supported ++ languages make any use of the argument yet. ++

++ ++ As of now the following languages are supported: ++
++   latin1 - for all the languages using the Latin-1 encoding ++
++   latin2 - for the Central European languages ++
++   latin4 - for the Baltic languages ++
++   latin5 - for the Turkish language ++
++   cyrillic - for the languages with Cyrillic alphabet ++
++   russian - historic synonym for cyrillic ++
++   bulgarian - historic synonym for cyrillic ++
++   adobestd - for the AdobeStandard encoding used by TeX ++
++   plane+argument - to select one plane from a multi-byte encoding ++

++ ++ The argument of the "plane" language may be in one of three forms: ++

++   plane+pid=<pid>,eid=<eid> ++
++   plane+pid=<pid>,eid=<eid>,<plane_number> ++
++   plane+<plane_number> ++

++ ++ Pid (TTF platform id) and eid (TTF encoding id) select a particular ++ TTF encoding table in the original font. They are specified as decimal ++ numbers. If this particular encoding table is not present in the font ++ file then the conversion fails. The native ("ttf") front-end parser supports ++ only pid=3 (Windows platform), the FreeType-based ("ft") front-end supports ++ any platform. If pid/eid is not specified then the TTF encoding table is ++ determined as usual: Unicode encoding if it's first or an 8-bit encoding ++ if not (and for an 8-bit encoding the plane number is silently ignored). ++ To prevent the converter from falling back to an 8-bit encoding, specify ++ the Unicode pid/eid value explicitly. ++

++ ++ Plane_number is a hexadecimal (if starts with "0x") or decimal number. ++ It gives the values of upper bytes for which 256 characters will be ++ selected. If not specified, defaults to 0. It is also used as a font ++ name suffix (the leading "0x" is not included into the suffix). ++

++ ++ ++ NOTE: ++ ++ It seems that many Eastern fonts use features of the TTF format that are ++ not supported by the ttf2pt1's built-in front-end parser. Because of ++ this for now we recommend using the FreeType-based parser (option ++ '-p ft') with the "plane" language. ++

++ ++ ++ ++ ++ NOTE: ++ You may notice that the language names are not uniform: some are the ++ names of particular languages and some are names of encodings. This ++ is because of the different approaches. The original idea was to ++ implement a conversion from Unicode to the appropriate Windows ++ encoding for a given language. And then use the translation tables ++ to generate the fonts in whatever final encodings are needed. This ++ would allow to pile together the Unicode fonts and the non-Unicode ++ Windows fonts for that language and let the program to sort them out ++ automatically. And then generate fonts in all the possible encodings ++ for that language. An example of this approach is the Russian language ++ support. But if there is no multiplicity of encodings used for some ++ languages and if the non-Unicode fonts are not considered important ++ by the users, another way would be simpler to implement: just provide ++ only one table for extraction of the target encoding from Unicode ++ and don't bother with the translation tables. The latin* "languages" ++ are examples of this approach. If somebody feels that he needs the ++ Type1 fonts both in Latin-* and Windows encodings he or she is absolutely ++ welcome to submit the code to implement it. ++

++ ++ WARNING: ++ Some of the glyphs included into the AdobeStandard encoding are not ++ included into the Unicode standard. The most typical examples of such ++ glyphs are ligatures like 'fi', 'fl' etc. Because of this the font ++ designers may place them at various places. The converter tries to ++ do its best, if the glyphs have honest Adobe names and/or are ++ placed at the same codes as in the Microsoft fonts they will be ++ picked up. Otherwise a possible solution is to use the option '-L' ++ with an external map. ++

++ ++ ++-L file[+[pid=<pid>,eid=<eid>,][plane]] - Extract the fonts for the specified ++ language from a multi-language font using the map from this file. This is ++ rather like the option '-l' but the encoding map is not ++ compiled into the program, it's taken from that file, so it's ++ easy to edit. Examples of such files are provided in ++ maps/adobe-standard-encoding.map, CP1250.map. (NOTE: ++ the 'standard encoding' map does not include all the glyphs of the ++ AdobeStandard encoding, it's provided only as an example.) The ++ description of the supported map formats is in the file ++ maps/unicode-sample.map. ++

++ ++ Likewise to '-l', an argument may be specified after the map file ++ name. But in this case the argument has fixed meaning: it selects the ++ original TTF encoding table (the syntax is the same as in '-l plane') ++ and/or a plane of the map file. The plane name also gets added after dash ++ to the font name. The plane is a concept used in the Eastern fonts with big ++ number of glyphs: one TTF font gets divided into multiple Type1 fonts, ++ each containing one plane of up to 256 glyphs. But with a little ++ creativity this concept may be used for other purposes of combining ++ multiple translation maps into one file. To extract multiple planes ++ from a TTF font ttf2pt1 must be run multiple times, each time with ++ a different plane name specified. ++

++ ++ The default original TTF encoding table used for the option '-L' is ++ Unicode. The map files may include directives to specify different original ++ TTF encodings. However if the pid/eid pair is specified with ++ it overrides any original encoding specified in the map file. ++

++ ++ ++-m type=value - Set maximal or minimal limits of resources. ++ These limits control the the font generation by limiting the resources ++ that the font is permitted to require from the PostScript interpreter. ++ The currently supported types of limits are: ++

++ ++

++ h - the maximal hint stack depth for the substituted hints. ++ The default value is 128, according to the limitation in X11. This seems to ++ be the lowest (and thus the safest) widespread value. To display the ++ hint stack depth required by each glyph in a .t1a file use the script ++ scripts/cntstems.pl. ++

++

++ ++ ++-O suboptions - Outline processing options. The suboptions ++ may be lowercase or uppercase, the lowercase ones disable the features, ++ the corresponding uppercase suboptions enable the same features. ++ The suboptions to disable/enable features are: ++

++ ++

++ b/B - Guessing of the ForceBold parameter. This parameter helps ++ the Type1 engine to rasterize the bold fonts properly at small sizes. ++ But the algorithm used to guess the proper value of this flag makes ++ that guess based solely on the font name. In rare cases that may cause ++ errors, in these cases you may want to disable this guessing. ++ Default: enabled ++

++ ++ h/H - Autogeneration of hints. The really complex outlines ++ may confuse the algorithm, so theoretically it may be useful ++ sometimes to disable them. Although up to now it seems that ++ even bad hints are better than no hints at all. ++ Default: enabled ++

++ ++ u/U - Hint substitution. Hint substitution is a technique ++ permitting generation of more detailed hints for the rasterizer. It allows ++ to use different sets of hints for different parts of a glyph and change ++ these sets as neccessary during rasterization (that's why "substituted"). ++ So it should improve the quality of the fonts rendered at small sizes. ++ But there are two catches: First, the X11 library has rather low limit for ++ the font size. More detailed hints increase the file size and thus increase ++ the chance of hitting this limit (that does not mean that you shall hit it ++ but you may if your fonts are particularly big). This is especially ++ probable for Unicode fonts converted with option '-a', so you may want to ++ use '-a' together with '-Ou'. See app/X11/README for the description of ++ a patch to X11 which fixes this problem. Second, some rasterizers (again, ++ X11 is the typical example) have a limitation for total number of hints ++ used when drawing a glyph (also known as the hint stack depth). If that ++ stack overflows the glyph is ignored. Starting from version 3.22 ttf2pt1 ++ uses algorithms to minimizing this depth, with the trade-off of slightly ++ bigger font files. The glyphs which still exceed the limit set by option ++ '-mh' have all the substituted hints removed and only base hints left. ++ The algorithms seem to have been refined far enough to make the fonts with ++ substituted hints look better than the fonts without them or at least the ++ same. Still if the original fonts are not well-designed the detailed ++ hinting may emphasize the defects of the design, such as non-even thickness ++ of lines. So provided that you are not afraid of the X11 bug the best idea ++ would be to generate a font with this feature and without it, then compare ++ the results using the program other/cmpf (see the description ++ in other/README) and decide which one looks better. ++ Default: enabled ++

++ ++ o/O - Space optimization of the outlines' code. This kind of optimization ++ never hurts, and the only reason to disable this feature is for comparison ++ of the generated fonts with the fonts generated by the previous versions of ++ converter. Well, it _almost_ never hurts. As it turned out there exist ++ some brain-damaged printers which don't understand it. Actually this ++ feature does not change the outlines at all. The Type 1 font manual ++ provides a set of redundant operators that make font description shorter, ++ such as '10 hlineto' instead of '0 10 rlineto' to describe a horizontal ++ line. This feature enables use of these operators. ++ Default: enabled ++

++ ++ s/S - Smoothing of outlines. If the font is broken in some ++ way (even the ones that are not easily noticeable), such smoothing ++ may break it further. So disabling this feature is the first thing to be ++ tried if some font looks odd. But with smoothing off the hint generation ++ algorithms may not work properly too. ++ Default: enabled ++

++ ++ t/T - Auto-scaling to the 1000x1000 Type1 standard matrix. The ++ TTF fonts are described in terms of an arbitrary matrix up to ++ 4000x4000. The converted fonts must be scaled to conform to ++ the Type1 standard. But the scaling introduces additional rounding ++ errors, so it may be curious sometimes to look at the font in its ++ original scale. ++ Default: enabled ++

++ ++ v/V - Do vectorization on the bitmap fonts. Functionally ++ "vectorization" is the same thing as "autotracing", a different word is ++ used purely to differentiate it from the Autotrace library. It tries to ++ produce nice smooth outlines from bitmaps. This feature is still a work ++ in progress though the results are already mostly decent. ++ Default: disabled ++

++ ++ w/W - Glyphs' width corection. This option is designed to be ++ used on broken fonts which specify too narrow widths for the ++ letters. You can tell that a font can benefit from this option ++ if you see that the characters are smashed together without ++ any whitespace between them. This option causes the converter ++ to set the character widths to the actual width of this character ++ plus the width of a typical vertical stem. But on the other hand ++ the well-designed fonts may have characters that look better if ++ their widths are set slightly narrower. Such well-designed fonts ++ will benefit from disabling this feature. You may want to convert ++ a font with and without this feature, compare the results and ++ select the better one. This feature may be used only on proportional ++ fonts, it has no effect on the fixed-width fonts. ++ Default: disabled ++

++ ++ z/Z - Use the Autotrace library on the bitmap fonts. The results ++ are horrible and the use of this option is not recommended. This option is ++ present for experimental purposes. It may change or be removed in the ++ future. The working tracing can be achieved with option -OV. ++ Default: disabled ++

++

++ ++ ++-p parser_name - Use the specified front-end parser to read the font file. ++ If this option is not used, ttf2pt1 selects the parser automatically based ++ on the suffix of the font file name, it uses the first parser in its ++ list that supports this font type. Now two parsers are supported: ++

++ ++   ttf - built-in parser for the ttf files (suffix .ttf) ++
++   bdf - built-in parser for the BDF files (suffix .bdf) ++
++   ft - parser based on the FreeType-2 library (suffixes .ttf, ++ .otf, .pfa, .pfb) ++

++ ++ The parser ft is NOT linked in by default. See Makefile ++ for instructions how to enable it. We do no support this parser on ++ Windows: probably it will work but nobody tried and nobody knows how ++ to build it. ++

++ ++ The conversion of the bitmap fonts (such as BDF) is simplistic yet, ++ producing jagged outlines. When converting such fonts, it might be ++ a good idea to turn off the hint substitution (using option -Ou) ++ because the hints produced will be huge but not adding much to the ++ quality of the fonts. ++

++ ++ ++-u number - Mark the font with this value as its ++ UniqueID. The UniqueID is used by the printers with the hard disks ++ to cache the rasterized characters and thus significantly ++ speed-up the printing. Some of those printers just can't ++ store the fonts without UniqueID on their disk.The problem ++ is that the ID is supposed to be unique, as it name says. And ++ there is no easy way to create a guaranteed unique ID. Adobe specifies ++ the range 4000000-4999999 for private IDs but still it's difficult ++ to guarantee the uniqueness within it. So if you don't really need the ++ UniqueID don't use it, it's optional. Luckily there are a few millions of ++ possible IDs, so the chances of collision are rather low. ++ If instead of the number a special value 'A' is given ++ then the converter generates the value of UniqueID automatically, ++ as a hash of the font name. (NOTE: in the version 3.22 the ++ algorithm for autogeneration of UniqueID was changed to fit the values ++ into the Adobe-spacified range. This means that if UniqueIDs were used ++ then the printer's cache may need to be flushed before replacing the ++ fonts converted by an old version with fonts converted by a newer version). ++ A simple way to find if any of the fonts in a given directory have ++ duplicated UniqueIDs is to use the command: ++

++ ++   cat *.pf[ab] | grep UniqueID | sort | uniq -c | grep -v ' 1 ' ++

++ ++ Or if you use scripts/convert it will do that for you automatically ++ plus it will also give the exact list of files with duplicate UIDs. ++

++ ++ ++-v size - Re-scale the font to get the size of a typical uppercase ++ letter somewhere around the specified size. Actually, it re-scales ++ the whole font to get the size of one language-dependent letter to be ++ at least of the specified size. Now this letter is "A" in all the ++ supported languages. The size is specified in the points of the ++ Type 1 coordinate grids, the maximal value is 1000. This is an ++ experimental option and should be used with caution. It tries to ++ increase the visible font size for a given point size and thus make ++ the font more readable. But if overused it may cause the fonts to ++ look out of scale. As of now the interesting values of size for ++ this option seem to be located mostly between 600 and 850. This ++ re-scaling may be quite useful but needs more experience to ++ understand the balance of its effects. ++

++ ++ ++-W level - Select the verbosity level of the warnings. ++ Currently the levels from 0 to 4 are supported. Level 0 means no warnings ++ at all, level 4 means all the possible warnings. The default level is 3. ++ Other levels may be added in the future, so using the level number 99 is ++ recommended to get all the possible warnings. Going below level 2 is ++ not generally recommended because you may miss valuable information about ++ the problems with the fonts being converted. ++

++ ++ ++Obsolete option: ++-A - Print the font metrics (.afm file) instead of the font on STDOUT. ++ Use -GA instead. ++

++ ++ ++Very obsolete option: ++
++ The algorithm that implemented the forced fixed width had major ++ flaws, so it was disabled. The code is still in the program and ++ some day it will be refined and returned back. Meanwhile the ++ option name '-f' was reused for another option. The old version was: ++
++-f - Don't try to force the fixed width of font. Normally the converter ++ considers the fonts in which the glyph width deviates by not more ++ than 5% as buggy fixed width fonts and forces them to have really ++ fixed width. If this is undesirable, it can be disabled by this option. ++

++ ++ ++The .pfa font format supposes that the description of the characters ++is binary encoded and encrypted. This converter does not encode or ++encrypt the data by default, you have to specify the option '-e' ++or use the t1asm program to assemble (that means, encode and ++encrypt) the font program. The t1asm program that is included with ++the converter is actually a part of the t1utils package, rather old ++version of which may be obtained from ++

++ ++

++ ++ http://ttf2pt1.sourceforge.net/t1utils.tar.gz ++ ++
++

++ ++Note that t1asm from the old version of that package won't work properly ++with the files generated by ttf2pt1 version 3.20 and later. Please use ++t1asm packaged with ttf2pt1 or from the new version t1utils ++instead. For a newer version of t1utils please look at ++

++ ++

++ ++ http://www.lcdf.org/~eddietwo/type/ ++ ++
++

++ ++ ++ ++So, the following command lines: ++

++ ++

++ ttf2pt1 -e ttffont.ttf t1font ++
++ ttf2pt1 ttffont.ttf - | t1asm >t1font.pfa ++
++

++ ++represent two ways to get a working font. The benefit of the second form ++is that other filters may be applied to the font between the converter ++and assembler. ++

++ ++ ++

++Installation and deinstallation of the converter ++

++ ++ ++The converter may be easily installed systemwide with ++ ++
++ make install ++
++ ++and uninstalled with ++ ++
++ make uninstall ++
++ ++By default the Makefile is configured to install in the hierarchy ++of directory /usr/local. This destination directory as well as ++the structure of the hierarchy may be changed by editing the Makefile. ++ ++

++Installation of the fonts ++

++ ++ ++Running the converter manually becomes somewhat boring if it has to ++be applied to a few hundreds of fonts and then you have to generate the ++fonts.scale and/or Fontmap files. The FONTS file describes how to use ++the supplied scripts to handle such cases easily. It also discusses ++the installation of the fonts for a few widespread programs. ++

++ ++

++Other utilities ++

++ ++ ++A few other small interesting programs that allow a cloase look at ++the fonts are located in the subdirectory 'other'. They ++are described shortly in others/README. ++

++ ++

++Optional packages ++

++ ++ ++Some auxiliary files are not needed by everyone and are big enough that ++moving them to a separate package speeds up the downloads of the main ++package significantly. As of now we have one such optional package: ++

++ ++  ttf2pt1-chinese - contains the Chinese conversion maps ++

++ ++The general versioning policy for the optional packages is the following: ++These packages may have no direct dependency on the ttf2pt1 version. ++But they may be updated in future, as well as some versions of optional ++packages may have dependencies on certain versions of ttf2pt1. ++To avoid unneccessary extra releases on one hand and keep the updates in ++sync with the ttf2pt1 itself on the other hand, a new version of an optional ++package will be released only if there are any changes to it and it will be ++given the same version number as ttf2pt1 released at the same time. So not ++every release of ttf2pt1 would have a corresponding release of all optional ++packages. For example, to get the correct version of optional packages for an ++imaginary release 8.3.4 of ttf2pt1 you would need to look for optional ++packages of the highest version not higher than (but possibly equal to) 8.3.4. ++

++ ++

++TO DO: ++

++ ++ ++
    ++
  • Improve hinting. ++
  • Improve the auto-tracing of bitmaps. ++
  • Implement the family-level hints. ++
  • Add generation of CID-fonts. ++
  • Handle the composite glyphs with relative base points. ++
  • Preserve the relative width of stems during scaling to 1000x1000 matrix. ++
  • Add support for bitmap TTF fonts. ++
  • Implement better support of Asian encodings. ++
  • Implement automatic creation of ligatures. ++
++ ++

++TROUBLESHOOTING AND BUG REPORTS ++

++ ++ ++ ++ ++Have problems with conversion of some font ? The converter dumps core ? Or your ++printer refuses to understand the converted fonts ? Or some characters are ++missing ? Or some characters look strange ? ++

++ ++Send the bug reports to the ttf2pt1 development mailing list at ++ttf2pt1-devel@lists.sourceforge.net. ++

++ ++Try to collect more information about the problem and include it into ++the bug report. (Of course, even better if you would provide a ready ++fix, but just a detailed bug report is also good). Provide detailed ++information about your problem, this will speed up the response greatly. ++Don't just write "this font looks strange after conversion" but describe ++what's exactly wrong with it: for example, what characters look wrong ++and what exactly is wrong about their look. Providing a link to the ++original font file would be also a good idea. Try to do a little ++troublehooting and report its result. This not only would help with ++the fix but may also give you a temporary work-around for the bug. ++

++ ++First, enable full warnings with option '-W99', save them to ++a file and read carefully. Sometimes the prolem is with a not implemented ++feature which is reported in the warnings. Still, reporting about such ++problems may be a good idea: some features were missed to cut corners, ++in hope that no real font is using them. So a report about a font using ++such a feature may motivate someone to implement it. Of course, you ++may be the most motivated person: after all, you are the one wishing ++to convert that font. ;-) Seriously, the philosophy "scrath your own itch" ++seems to be the strongest moving force behind the Open Source software. ++

++ ++The next step is playing with the options. This serves a dual purpose: ++on one hand, it helps to localize the bug, on the other hand you may be ++able to get a working version of the font for the meantime while the ++bug is being fixed. The typical options to try out are: first '-Ou', if ++it does not help then '-Os', then '-Oh', then '-Oo'. ++They are described in a bit more detail above. Try them one by one ++and in combinations. See if with them the resulting fonts look better. ++

++ ++On some fonts ttf2pt1 just crashes. Commonly that happens because the ++font being converted is highly defective (although sometimes the bug ++is in ttf2pt1 itself). In any case it should not crash, so the reports ++about such cases will help to handle these defects properly in future. ++

++ ++We try to respond to the bug reports in a timely fashion but alas, this ++may not always be possible, especially if the problem is complex. ++This is a volunteer project and its resources are limited. Because ++of this we would appreciate bug reports as detailed as possible, ++and we would appreciate the ready fixes and contributions even more. ++

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++

++CONTACTS ++

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ttf2pt1-announce@lists.sourceforge.net ++
++ The mailing list with announcements about ttf2pt1. It is a moderated mailing ++ with extremely low traffic. Everyone is encouraged to subscribe to keep in ++ touch with the current status of project. To subscribe use the Web interface ++ at http://lists.sourceforge.net/mailman/listinfo/ttf2pt1-announce. ++ If you have only e-mail access to the Net then send a subscribe request to ++ the development mailing list ttf2pt1-devel@lists.sourceforge.net and somebody ++ will help you with subscription. ++

++ ++ ++ ++ttf2pt1-devel@lists.sourceforge.net ++
++ ++ttf2pt1-users@lists.sourceforge.net ++
++ The ttf2pt1 mailing lists for development and users issues. They have not ++ that much traffic either. To subscribe use the Web interface at ++ http://lists.sourceforge.net/mailman/listinfo/ttf2pt1-devel ++ and http://lists.sourceforge.net/mailman/listinfo/ttf2pt1-users. ++ If you have only e-mail access to the Net then send a subscribe request to ++ the development mailing list ttf2pt1-devel@lists.sourceforge.net and somebody ++ will help you with subscription. ++

++ ++ ++ ++mheath@netspace.net.au ++
++ Mark Heath ++

++ ++ ++A.Weeks@mcc.ac.uk ++
++ Andrew Weeks ++

++ ++ ++babkin@users.sourceforge.net (preferred)
++ ++sab123@hotmail.com ++
++ ++http://members.bellatlantic.net/~babkin ++
++ Sergey Babkin ++

++ ++

++SEE ALSO ++

++ ++ ++ ++ ++ ++http://ttf2pt1.sourceforge.net ++
++ The main page of the project. ++

++ ++ ++http://www.netspace.net.au/~mheath/ttf2pt1/ ++
++ The old main page of the project. ++

++ ++ ++ ++ ++http://sourceforge.net/projects/gnuwin32 ++
++ Precompiled binaries for Windows. ++

++ ++ ++http://www.lcdf.org/~eddietwo/type/ ++
++ The home page of the Type 1 utilities package. ++

++ ++ ++http://www.rightbrain.com/pages/books.html ++
++ The first book about PostScript on the Web, "Thinking in PostScript". ++

++ ++ ++http://fonts.apple.com/TTRefMan/index.html ++
++ The True Type reference manual. ++

++ ++ ++http://partners.adobe.com/asn/developer/PDFS/TN/PLRM.pdf ++
++ Adobe PostScript reference manual. ++

++ ++ ++http://partners.adobe.com/asn/developer/PDFS/TN/T1_SPEC.PDF ++
++ Specification of the Type 1 font format. ++

++ ++ ++http://partners.adobe.com/asn/developer/PDFS/TN/5015.Type1_Supp.pdf ++
++ The Type 1 font format supplement. ++

++ ++ ++http://partners.adobe.com/asn/developer/PDFS/TN/5004.AFM_Spec.pdf ++
++ Specification of the Adobe font metrics file format. ++

++ ++ ++http://www.cs.wpi.edu/~matt/courses/cs563/talks/surface/bez_surf.html ++
++ ++http://www.cs.wpi.edu/~matt/courses/cs563/talks/curves.html ++
++ Information about the Bezier curves. ++

++ ++ ++http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib/t1lib.html ++
++ A stand-alone library supporting the Type1 fonts. Is neccessary ++ to compile the programs other/cmpf and other/dmpf. ++

++ ++ ++http://www.freetype.org ++
++ A library supporting the TTF fonts. Also many useful TTF programs ++ are included with it. ++

++ ++ ++http://heliotrope.homestead.com/files/printsoft.html ++
++ Moses Gold's collection of links to printing software. ++

++ ++ ++http://linuxartist.org/fonts/ ++
++ Collection of font-related links. ++

++ ++

++
++ ++ ++Following is the Readme of ttf2pfa (true type to type 3 font converter) It ++covers other issues regarding the use of this software. Please note that ++although ttf2pfa is a public domain software, ttf2pt1 ++is instead covered by an Open Source license. See the COPYRIGHT ++file for details. ++

++ ++Please note also that ttf2pfa has not been maintained for a long time. ++All of its functionality has been integrated into ttf2pt1 and all the ++development moved to ttf2pt1, including Andrew Weeks, the author of ++ttf2pfa. Ttf2pfa is provided for historical reasons only. Please use ++ttf2pt1 instead. ++ ++

++ ++ ++

++True Type to Postscript Font converter ++

++ ++ ++My mind is still reeling from the discovery that I was able to write ++this program. What it does is it reads a Microsoft TrueType font and ++creates a Postscript font. '_A_ postscript font', that is, not necessarily ++the same font, you understand, but a fair imitation. ++

++ ++Run it like this: ++

++ ++

++ ttf2pfa fontfile.ttf fontname ++
++

++ ++The first parameter is the truetype filename, the second is a stem for ++the output file names. The program will create a fontname.pfa containing ++the Postscript font and a fontname.afm containing the metrics. ++

++ ++The motivation behind this is that in Linux if you do not have a ++Postscript printer, but only some other printer, you can only print ++Postscript by using Ghostscript. But the fonts that come with ++Ghostscript are very poor (they are converted from bitmaps and look ++rather lumpy). This is rather frustrating as the PC running Linux ++probably has MS-Windows as well and will therefore have truetype fonts, ++but which are quite useless with Linux, X or Ghostscript. ++

++ ++The program has been tested on over a hundred different TrueType fonts ++from various sources, and seems to work fairly well. The converted ++characters look OK, and the program doesn't seem to crash any more. I'm ++not sure about the AFM files though, as I have no means to test them. ++

++ ++The fonts generated will not work with X, as the font rasterizer that ++comes with X only copes with Type 1 fonts. If I have the time I may ++modify ttf2pfa to generate Type 1s. ++

++ ++

++Copyright issues ++

++ ++ ++I am putting this program into the public domain, so don't bother ++sending me any money, I'd only have to declare it for income tax. ++

++ ++Copyright on fonts, however, is a difficult legal question. Any ++copyright statements found in a font will be preserved in the output. ++Whether you are entitled to translate them at all I don't know. ++

++ ++If you have a license to run a software package, like say MS-Windows, on ++your PC, then you probably have a right to use any part of it, including ++fonts, on that PC, even if not using that package for its intended ++purpose. ++

++ ++I am not a lawyer, however, so this is not a legal opinion, and may be ++garbage. ++

++ ++There shouldn't be a any problem with public domain fonts. ++

++ ++

++About the Program ++

++ ++ ++It was written in C on a IBM PC running Linux. ++

++ ++The TrueType format was originally developed by Apple for the MAC, which ++has opposite endianness to the PC, so to ensure compatibility 16 and 32 ++bit fields are the wrong way round from the PC's point of view. This is ++the reason for all the 'ntohs' and 'ntohl' calls. Doing it this way ++means the program will also work on big-endian machines like Suns. ++

++ ++I doubt whether it will work on a DOS-based PC though. ++

++ ++The program produces what technically are Type 3 rather than Type 1 ++fonts. They are not compressed or encrypted and are plain text. This is ++so I (and you) can see what's going on, and (if you're a Postscript guru ++and really want to) can alter the outlines. ++

++ ++I only translate the outlines, not the 'instructions' that come with ++them. This latter task is probably virtually impossible anyway. TrueType ++outlines are B-splines rather than the Bezier curves that Postscript ++uses. I believe that my conversion algorithm is reasonably correct, if ++nothing else because the characters look right. ++

++ ++

++Problems that may occur ++

++ ++ ++Most seriously, very complex characters (with lots of outline segments) ++can make Ghostscript releases 2.x.x fail with a 'limitcheck' error. It ++is possible that this may happen with some older Postscript printers as ++well. Such characters will be flagged by the program and there are ++basically two things you can do. First is to edit the .pfa file to ++simplify or remove the offending character. This is not really ++recommended. The second is to use Ghostscript release 3, if you can get ++it. This has much larger limits and does not seem to have any problems ++with complex characters. ++

++ ++Then there are buggy fonts (yes, a font can have bugs). I try to deal ++with these in as sane a manner as possible, but it's not always ++possible. ++

++ ++

++Encodings ++

++ ++ ++A postscript font must have a 256 element array, called an encoding, ++each element of which is a name, which is also the name of a procedure ++contained within the font. The 'BuildChar' command takes a byte and uses ++it to index the encoding array to find a character name, and then looks ++that up in the font's procedure table find the commands to draw the ++glyph. However, not all characters need be in the encoding array. Those ++that are not cannot be drawn (at least not using 'show'), however it is ++possible to 're-encode' the font to enable these characters. There are ++several standard encodings: Adobe's original, ISO-Latin1 and Symbol ++being the most commonly encountered. ++

++ ++TrueType fonts are organised differently. As well as the glyph ++descriptions there are a number of tables. One of these is a mapping ++from a character set into the glyph array, and another is a mapping from ++the glyph array into a set of Postscript character names. The problems ++are: ++

++ 1) Microsoft uses Unicode, a 16-bit system, to encode the font. ++
++ 2) that more than one glyph is given the same Postscript name. ++

++ ++I deal with (1) by assuming a Latin1 encoding. The MS-Windows and ++Unicode character sets are both supersets of ISO-8859-1. This usually ++means that most characters will be properly encoded, but you should be ++warned that some software may assume that fonts have an Adobe encoding. ++Symbol, or Dingbat, fonts are in fact less of a problem, as they have ++private encodings starting at 0xF000. It is easy to just lose the top ++byte. ++

++ ++Postscript fonts can be re-encoded, either manually, or by software. ++Groff, for example, generates postscript that re-encodes fonts with the ++Adobe encoding. The problem here is that not all characters in the Adobe ++set are in the MS-Windows set. In particular there are no fi and fl ++ligatures. This means that conversions of the versions of ++Times-New-Roman and Arial that come with MS-Windows cannot be used ++blindly as replacements for Adobe Times-Roman and Helvetica. You can get ++expanded versions of MS fonts from Microsoft's web site which do contain ++these ligatures (and a lot else besides). ++

++ ++I deal with (2) by creating new character names. This can be error-prone ++because I do not know which of them is the correct glyph to give the ++name to. Some (buggy) fonts have large numbers of blank glyphs, all with ++the same name. ++

++ ++(almost every TrueType font has three glyphs called .notdef, one of them ++is usually an empty square shape, one has no outline and has zero width, ++and one has no outline and a positive width. This example is not really ++a problem with well formed fonts since the .notdef characters are only ++used for unprintable characters, which shouldn't occur in your documents ++anyway). ++

++ ++ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/runt1asm.c xserver/hw/xprint/extras/ttf2pt1/runt1asm.c +--- xserver-old/hw/xprint/extras/ttf2pt1/runt1asm.c 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/runt1asm.c 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,61 @@ ++/* ++ * Wrap-around code to either compile in t1asm or call it externally ++ * ++ * Copyright (C) 2000 by Sergey Babkin ++ * Copyright (C) 2000 by The TTF2PT1 Project ++ * ++ * See COPYRIGHT for full license ++ */ ++ ++#ifdef EXTERNAL_T1ASM ++ ++#include ++#include ++ ++FILE *ifp; ++FILE *ofp; ++ ++int ++runt1asm( ++ int pfbflag ++) ++{ ++ char *cmd; ++ int id, od; ++ int error; ++ ++ /* first make a copy in case some of then is already stdin/stdout */ ++ if(( id = dup(fileno(ifp)) )<0) { ++ perror("** Re-opening input file for t1asm"); ++ exit(1); ++ } ++ if(( od = dup(fileno(ofp)) )<0) { ++ perror("** Re-opening output file for t1asm"); ++ exit(1); ++ } ++ fclose(ifp); fclose(ofp); ++ close(0); ++ if(( dup(id) )!=0) { ++ perror("** Re-directing input file for t1asm"); ++ exit(1); ++ } ++ close(1); ++ if(( dup(od) )!=1) { ++ perror("** Re-directing output file for t1asm"); ++ exit(1); ++ } ++ close(id); close(od); ++ ++ if(pfbflag) ++ error = execlp("t1asm", "t1asm", "-b", NULL); ++ else ++ error = execlp("t1asm", "t1asm", NULL); ++ ++ perror("** Calling t1asm"); ++ ++ exit(1); ++} ++ ++#else ++# include "t1asm.c" ++#endif +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/t1asm.c xserver/hw/xprint/extras/ttf2pt1/t1asm.c +--- xserver-old/hw/xprint/extras/ttf2pt1/t1asm.c 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/t1asm.c 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,606 @@ ++/* t1asm ++ * ++ * This program `assembles' Adobe Type-1 font programs in pseudo-PostScript ++ * form into either PFB or PFA format. The human readable/editable input is ++ * charstring- and eexec-encrypted as specified in the `Adobe Type 1 Font ++ * Format' version 1.1 (the `black book'). There is a companion program, ++ * t1disasm, which `disassembles' PFB and PFA files into a pseudo-PostScript ++ * file. ++ * ++ * Copyright (c) 1992 by I. Lee Hetherington, all rights reserved. ++ * ++ * Permission is hereby granted to use, modify, and distribute this program ++ * for any purpose provided this copyright notice and the one below remain ++ * intact. ++ * ++ * I. Lee Hetherington (ilh@lcs.mit.edu) ++ * ++ * Revision 1.2 92/05/22 11:54:45 ilh ++ * Fixed bug where integers larger than 32000 could not be encoded in ++ * charstrings. Now integer range is correct for four-byte ++ * twos-complement integers: -(1<<31) <= i <= (1<<31)-1. Bug detected by ++ * Piet Tutelaers (rcpt@urc.tue.nl). ++ * ++ * Revision 1.1 92/05/22 11:48:46 ilh ++ * initial version ++ * ++ * Ported to Microsoft C/C++ Compiler and MS-DOS operating system by ++ * Kai-Uwe Herbing (herbing@netmbx.netmbx.de) on June 12, 1992. Code ++ * specific to the MS-DOS version is encapsulated with #ifdef _MSDOS ++ * ... #endif, where _MSDOS is an identifier, which is automatically ++ * defined, if you compile with the Microsoft C/C++ Compiler. ++ * ++ */ ++ ++#ifndef lint ++static char copyright[] = ++ "@(#) Copyright (c) 1992 by I. Lee Hetherington, all rights reserved."; ++#ifdef _MSDOS ++static char portnotice[] = ++ "@(#) Ported to MS-DOS by Kai-Uwe Herbing (herbing@netmbx.netmbx.de)."; ++#endif ++#endif ++ ++/* Note: this is ANSI C. */ ++ ++#ifdef _MSDOS ++ #include ++ #include ++ #include ++#endif ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef WINDOWS ++# ifdef STANDALONE ++# define WINDOWS_FUNCTIONS ++# include "windows.h" ++# endif ++#endif ++ ++/* int32 must be at least 32-bit and uint16 must be at least 16-bit */ ++#ifndef AIXV3 ++#if INT_MAX >= 0x7FFFFFFFUL ++typedef int int32; ++#else ++typedef long int32; ++#endif ++#endif /* !AIXV3 */ ++#if USHRT_MAX >= 0xFFFFUL ++typedef unsigned short uint16; ++#else ++typedef unsigned int uint16; ++#endif ++ ++#define LINESIZE 256 ++ ++#define MAXBLOCKLEN ((1L<<17)-6) ++#define MINBLOCKLEN ((1L<<8)-6) ++ ++#define MARKER 128 ++#define ASCII 1 ++#define BINARY 2 ++#define DONE 3 ++ ++typedef unsigned char byte; ++ ++/* must be visible from outside */ ++FILE *ifp; ++FILE *ofp; ++ ++/* flags */ ++static int pfb = 0; ++static int active = 0; ++static int start_charstring = 0; ++static int in_eexec = 0; ++ ++static char line[LINESIZE]; ++ ++/* lenIV and charstring start command */ ++static int lenIV = 4; ++static char cs_start[10]; ++ ++/* for charstring buffering */ ++static byte charstring_buf[65535]; ++static byte *charstring_bp; ++ ++/* for PFB block buffering */ ++static byte blockbuf[MAXBLOCKLEN]; ++static int32 blocklen = MAXBLOCKLEN; ++static int32 blockpos = -1; ++static int blocktyp = ASCII; ++ ++/* decryption stuff */ ++static uint16 er, cr; ++static uint16 c1 = 52845, c2 = 22719; ++ ++/* table of charstring commands */ ++static struct command { ++ char *name; ++ int one, two; ++} command_table[] = { ++ { "callothersubr", 12, 16 }, ++ { "callsubr", 10, -1 }, ++ { "closepath", 9, -1 }, ++ { "div", 12, 12 }, ++ { "dotsection", 12, 0 }, ++ { "endchar", 14, -1 }, ++ { "hlineto", 6, -1 }, ++ { "hmoveto", 22, -1 }, ++ { "hsbw", 13, -1 }, ++ { "hstem", 1, -1 }, ++ { "hstem3", 12, 2 }, ++ { "hvcurveto", 31, -1 }, ++ { "pop", 12, 17 }, ++ { "return", 11, -1 }, ++ { "rlineto", 5, -1 }, ++ { "rmoveto", 21, -1 }, ++ { "rrcurveto", 8, -1 }, ++ { "sbw", 12, 7 }, ++ { "seac", 12, 6 }, ++ { "setcurrentpoint", 12, 33 }, ++ { "vhcurveto", 30, -1 }, ++ { "vlineto", 7, -1 }, ++ { "vmoveto", 4, -1 }, ++ { "vstem", 3, -1 }, ++ { "vstem3", 12, 1 }, ++}; /* alphabetical */ ++ ++/* Two separate encryption functions because eexec and charstring encryption ++ must proceed in parallel. */ ++ ++static byte eencrypt(byte plain) ++{ ++ byte cipher; ++ ++ cipher = (byte) (plain ^ (er >> 8)); ++ er = (uint16) ((cipher + er) * c1 + c2); ++ return cipher; ++} ++ ++static byte cencrypt(byte plain) ++{ ++ byte cipher; ++ ++ cipher = (byte) (plain ^ (cr >> 8)); ++ cr = (uint16) ((cipher + cr) * c1 + c2); ++ return cipher; ++} ++ ++/* This function flushes a buffered PFB block. */ ++ ++static void output_block() ++{ ++ int32 i; ++ ++ /* output four-byte block length */ ++ fputc((int) (blockpos & 0xff), ofp); ++ fputc((int) ((blockpos >> 8) & 0xff), ofp); ++ fputc((int) ((blockpos >> 16) & 0xff), ofp); ++ fputc((int) ((blockpos >> 24) & 0xff), ofp); ++ ++ /* output block data */ ++ for (i = 0; i < blockpos; i++) ++ fputc(blockbuf[i], ofp); ++ ++ /* mark block buffer empty and uninitialized */ ++ blockpos = -1; ++} ++ ++/* This function outputs a single byte. If output is in PFB format then output ++ is buffered through blockbuf[]. If output is in PFA format, then output ++ will be hexadecimal if in_eexec is set, ASCII otherwise. */ ++ ++static void output_byte(byte b) ++{ ++ static char *hexchar = "0123456789ABCDEF"; ++ static int hexcol = 0; ++ ++ if (pfb) { ++ /* PFB */ ++ if (blockpos < 0) { ++ fputc(MARKER, ofp); ++ fputc(blocktyp, ofp); ++ blockpos = 0; ++ } ++ blockbuf[blockpos++] = b; ++ if (blockpos == blocklen) ++ output_block(); ++ } else { ++ /* PFA */ ++ if (in_eexec) { ++ /* trim hexadecimal lines to 64 columns */ ++ if (hexcol >= 64) { ++ fputc('\n', ofp); ++ hexcol = 0; ++ } ++ fputc(hexchar[(b >> 4) & 0xf], ofp); ++ fputc(hexchar[b & 0xf], ofp); ++ hexcol += 2; ++ } else { ++ fputc(b, ofp); ++ } ++ } ++} ++ ++/* This function outputs a byte through possible eexec encryption. */ ++ ++static void eexec_byte(byte b) ++{ ++ if (in_eexec) ++ output_byte(eencrypt(b)); ++ else ++ output_byte(b); ++} ++ ++/* This function outputs a null-terminated string through possible eexec ++ encryption. */ ++ ++static void eexec_string(char *string) ++{ ++ while (*string) ++ eexec_byte((byte) *string++); ++} ++ ++/* This function gets ready for the eexec-encrypted data. If output is in ++ PFB format then flush current ASCII block and get ready for binary block. ++ We start encryption with four random (zero) bytes. */ ++ ++static void eexec_start() ++{ ++ eexec_string(line); ++ if (pfb) { ++ output_block(); ++ blocktyp = BINARY; ++ } ++ ++ in_eexec = 1; ++ er = 55665; ++ eexec_byte(0); ++ eexec_byte(0); ++ eexec_byte(0); ++ eexec_byte(0); ++} ++ ++/* This function wraps-up the eexec-encrypted data. ++ If output is in PFB format then this entails flushing binary block and ++ starting an ASCII block. */ ++ ++static void eexec_end() ++{ ++ int i, j; ++ ++ if (pfb) { ++ output_block(); ++ blocktyp = ASCII; ++ } else { ++ fputc('\n', ofp); ++ } ++ in_eexec = 0; ++ for (i = 0; i < 8; i++) { ++ for (j = 0; j < 64; j++) ++ eexec_byte('0'); ++ eexec_byte('\n'); ++ } ++#if 0 ++ eexec_string("cleartomark\n"); ++#endif ++} ++ ++/* This function writes ASCII trailer. ++ If output is in PFB format then this entails flushing binary block and ++ starting an ASCII block. */ ++ ++static void file_end() ++{ ++ if (pfb) { ++ output_block(); ++ fputc(MARKER, ofp); ++ fputc(DONE, ofp); ++ } ++} ++/* This function returns an input line of characters. A line is terminated by ++ length (including terminating null) greater than LINESIZE, a newline \n, or ++ when active (looking for charstrings) by '{'. When terminated by a newline ++ the newline is put into line[]. When terminated by '{', the '{' is not put ++ into line[], and the flag start_charstring is set to 1. */ ++ ++static void t1asm_getline() ++{ ++ int c; ++ char *p = line; ++ int comment = 0; ++ ++ start_charstring = 0; ++ while (p < line + LINESIZE) { ++ c = fgetc(ifp); ++ if (c == EOF) ++ break; ++ if (c == '%') ++ comment = 1; ++ if (active && !comment && c == '{') { ++ start_charstring = 1; ++ break; ++ } ++ *p++ = (char) c; ++ if (c == '\n') ++ break; ++ } ++ *p = '\0'; ++} ++ ++/* This function is used by the binary search, bsearch(), for command names in ++ the command table. */ ++ ++static int command_compare(const void *key, const void *item) ++{ ++ return strcmp((char *) key, ((struct command *) item)->name); ++} ++ ++/* This function returns 1 if the string is an integer and 0 otherwise. */ ++ ++static int is_integer(char *string) ++{ ++ if (isdigit(string[0]) || string[0] == '-' || string[0] == '+') { ++ while (*++string && isdigit(*string)) ++ ; /* deliberately empty */ ++ if (!*string) ++ return 1; ++ } ++ return 0; ++} ++ ++/* This function initializes charstring encryption. Note that this is called ++ at the beginning of every charstring. */ ++ ++static void charstring_start() ++{ ++ int i; ++ ++ charstring_bp = charstring_buf; ++ cr = 4330; ++ for (i = 0; i < lenIV; i++) ++ *charstring_bp++ = cencrypt((byte) 0); ++} ++ ++/* This function encrypts and buffers a single byte of charstring data. */ ++ ++static void charstring_byte(int v) ++{ ++ byte b = (byte) (v & 0xff); ++ ++ if (charstring_bp - charstring_buf > sizeof(charstring_buf)) { ++ fprintf(stderr, "error: charstring_buf full (%d bytes)\n", ++ sizeof(charstring_buf)); ++ exit(1); ++ } ++ *charstring_bp++ = cencrypt(b); ++} ++ ++/* This function outputs buffered, encrypted charstring data through possible ++ eexec encryption. */ ++ ++static void charstring_end() ++{ ++ byte *bp; ++ ++ sprintf(line, "%d ", charstring_bp - charstring_buf); ++ eexec_string(line); ++ sprintf(line, "%s ", cs_start); ++ eexec_string(line); ++ for (bp = charstring_buf; bp < charstring_bp; bp++) ++ eexec_byte(*bp); ++} ++ ++/* This function generates the charstring representation of an integer. */ ++ ++static void charstring_int(int num) ++{ ++ int x; ++ ++ if (num >= -107 && num <= 107) { ++ charstring_byte(num + 139); ++ } else if (num >= 108 && num <= 1131) { ++ x = num - 108; ++ charstring_byte(x / 256 + 247); ++ charstring_byte(x % 256); ++ } else if (num >= -1131 && num <= -108) { ++ x = abs(num) - 108; ++ charstring_byte(x / 256 + 251); ++ charstring_byte(x % 256); ++ } else if (num >= (-2147483647-1) && num <= 2147483647) { ++ charstring_byte(255); ++ charstring_byte(num >> 24); ++ charstring_byte(num >> 16); ++ charstring_byte(num >> 8); ++ charstring_byte(num); ++ } else { ++ fprintf(stderr, ++ "error: cannot format the integer %d, too large\n", num); ++ exit(1); ++ } ++} ++ ++/* This function parses an entire charstring into integers and commands, ++ outputting bytes through the charstring buffer. */ ++ ++static void parse_charstring() ++{ ++ struct command *cp; ++ ++ charstring_start(); ++ while (fscanf(ifp, "%s", line) == 1) { ++ if (line[0] == '%') { ++ /* eat comment to end of line */ ++ while (fgetc(ifp) != '\n' && !feof(ifp)) ++ ; /* deliberately empty */ ++ continue; ++ } ++ if (line[0] == '}') ++ break; ++ if (is_integer(line)) { ++ charstring_int(atoi(line)); ++ } else { ++ cp = (struct command *) ++ bsearch((void *) line, (void *) command_table, ++ sizeof(command_table) / sizeof(struct command), ++ sizeof(struct command), ++ command_compare); ++ if (cp) { ++ charstring_byte(cp->one); ++ if (cp->two >= 0) ++ charstring_byte(cp->two); ++ } else { ++ fprintf(stderr, "error: cannot use `%s' in charstring\n",line); ++ exit(1); ++ } ++ } ++ } ++ charstring_end(); ++} ++ ++static void usage() ++{ ++ fprintf(stderr, ++ "usage: t1asm [-b] [-l block-length] [input [output]]\n"); ++ fprintf(stderr, ++ "\n-b means output in PFB format, otherwise PFA format.\n"); ++ fprintf(stderr, ++ "The block length applies to the length of blocks in the\n"); ++ fprintf(stderr, ++ "PFB output file; the default is to use the largest possible.\n"); ++ exit(1); ++} ++ ++static void print_banner() ++{ ++ static char rcs_revision[] = ""; /* removed RCS */ ++ static char revision[20]; ++ ++ if (sscanf(rcs_revision, "$Revision: %19s", revision) != 1) ++ revision[0] = '\0'; ++ fprintf(stderr, "This is t1asm %s.\n", revision); ++} ++ ++#ifdef STANDALONE ++int main(int argc, char **argv) ++{ ++ char *p, *q, *r; ++ int c; ++ ++ extern char *optarg; ++ extern int optind; ++ ++ ifp = stdin; ++ ofp = stdout; ++ ++ print_banner(); ++ ++ /* interpret command line arguments using getopt */ ++ while ((c = getopt(argc, argv, "bl:")) != -1) ++ switch (c) { ++ case 'b': ++ pfb = 1; ++ break; ++ case 'l': ++ blocklen = atoi(optarg); ++ if (blocklen < MINBLOCKLEN) { ++ blocklen = MINBLOCKLEN; ++ fprintf(stderr, ++ "warning: using minimum block length of %d\n", ++ blocklen); ++ } else if (blocklen > MAXBLOCKLEN) { ++ blocklen = MAXBLOCKLEN; ++ fprintf(stderr, ++ "warning: using maximum block length of %d\n", ++ blocklen); ++ } ++ break; ++ default: ++ usage(); ++ break; ++ } ++ if (argc - optind > 2) ++ usage(); ++ ++ /* possibly open input & output files */ ++ if (argc - optind >= 1) { ++ ifp = fopen(argv[optind], "r"); ++ if (!ifp) { ++ fprintf(stderr, "error: cannot open %s for reading\n", argv[1]); ++ exit(1); ++ } ++ } ++ if (argc - optind >= 2) { ++ ofp = fopen(argv[optind + 1], "w"); ++ if (!ofp) { ++ fprintf(stderr, "error: cannot open %s for writing\n", argv[2]); ++ exit(1); ++ } ++ } ++ ++#else ++int runt1asm(int pfbflag) ++{ ++ char *p, *q, *r; ++ ++ pfb = pfbflag; ++#endif ++ ++ #ifdef _MSDOS ++ /* If we are processing a PFB (binary) output */ ++ /* file, we must set its file mode to binary. */ ++ if (pfb) ++ _setmode(_fileno(ofp), _O_BINARY); ++ #endif ++ ++ /* Finally, we loop until no more input. Some special things to look for ++ are the `currentfile eexec' line, the beginning of the `/Subrs' ++ definition, the definition of `/lenIV', and the definition of the ++ charstring start command which has `...string currentfile...' in it. */ ++ ++ while (!feof(ifp) && !ferror(ifp)) { ++ t1asm_getline(); ++ if (strcmp(line, "currentfile eexec\n") == 0) { ++ eexec_start(); ++ continue; ++ } else if (strstr(line, "/Subrs") && isspace(line[6])) { ++ active = 1; ++ } else if ((p = strstr(line, "/lenIV"))) { ++ sscanf(p, "%*s %d", &lenIV); ++ } else if ((p = strstr(line, "string currentfile"))) { ++ /* locate the name of the charstring start command */ ++ *p = '\0'; /* damage line[] */ ++ q = strrchr(line, '/'); ++ if (q) { ++ r = cs_start; ++ ++q; ++ while (!isspace(*q) && *q != '{') ++ *r++ = *q++; ++ *r = '\0'; ++ } ++ *p = 's'; /* repair line[] */ ++ } ++ /* output line data */ ++ eexec_string(line); ++ if ((p = strstr(line, "currentfile closefile"))) { ++ eexec_end(); ++ } ++ if (start_charstring) { ++ if (!cs_start[0]) { ++ fprintf(stderr, "error: couldn't find charstring start command\n"); ++ exit(1); ++ } ++ parse_charstring(); ++ } ++ } ++ file_end(); ++ ++ fclose(ifp); ++ fclose(ofp); ++ ++ return 0; ++} +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/ttf2pt1.1 xserver/hw/xprint/extras/ttf2pt1/ttf2pt1.1 +--- xserver-old/hw/xprint/extras/ttf2pt1/ttf2pt1.1 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/ttf2pt1.1 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,828 @@ ++.rn '' }` ++''' $RCSfile$$Revision$$Date$ ++''' ++''' $Log$ ++''' Revision 1.1.4.1 2004/04/21 10:03:13 gisburn ++''' Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=530 - Land XPRINT branch on XORG-CURRENT ++''' ++''' Revision 1.1 2003/06/04 00:33:54 roland ++''' Fix for http://xprint.mozdev.org/bugs/show_bug.cgi?id=3846 - RFE: Upload Freetype --> PS Type1 font converter "ttf2pt1" ... ++''' ++''' ++.de Sh ++.br ++.if t .Sp ++.ne 5 ++.PP ++\fB\\$1\fR ++.PP ++.. ++.de Sp ++.if t .sp .5v ++.if n .sp ++.. ++.de Ip ++.br ++.ie \\n(.$>=3 .ne \\$3 ++.el .ne 3 ++.IP "\\$1" \\$2 ++.. ++.de Vb ++.ft CW ++.nf ++.ne \\$1 ++.. ++.de Ve ++.ft R ++ ++.fi ++.. ++''' ++''' ++''' Set up \*(-- to give an unbreakable dash; ++''' string Tr holds user defined translation string. ++''' Bell System Logo is used as a dummy character. ++''' ++.tr \(*W-|\(bv\*(Tr ++.ie n \{\ ++.ds -- \(*W- ++.ds PI pi ++.if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch ++.if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch ++.ds L" "" ++.ds R" "" ++''' \*(M", \*(S", \*(N" and \*(T" are the equivalent of ++''' \*(L" and \*(R", except that they are used on ".xx" lines, ++''' such as .IP and .SH, which do another additional levels of ++''' double-quote interpretation ++.ds M" """ ++.ds S" """ ++.ds N" """"" ++.ds T" """"" ++.ds L' ' ++.ds R' ' ++.ds M' ' ++.ds S' ' ++.ds N' ' ++.ds T' ' ++'br\} ++.el\{\ ++.ds -- \(em\| ++.tr \*(Tr ++.ds L" `` ++.ds R" '' ++.ds M" `` ++.ds S" '' ++.ds N" `` ++.ds T" '' ++.ds L' ` ++.ds R' ' ++.ds M' ` ++.ds S' ' ++.ds N' ` ++.ds T' ' ++.ds PI \(*p ++'br\} ++.\" If the F register is turned on, we'll generate ++.\" index entries out stderr for the following things: ++.\" TH Title ++.\" SH Header ++.\" Sh Subsection ++.\" Ip Item ++.\" X<> Xref (embedded ++.\" Of course, you have to process the output yourself ++.\" in some meaninful fashion. ++.if \nF \{ ++.de IX ++.tm Index:\\$1\t\\n%\t"\\$2" ++.. ++.nr % 0 ++.rr F ++.\} ++.TH TTF2PT1 1 "version 3.4.4-SNAP-030526" "May 26, 2003" "TTF2PT1 Font Converter" ++.UC ++.if n .hy 0 ++.if n .na ++.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' ++.de CQ \" put $1 in typewriter font ++.ft CW ++'if n "\c ++'if t \\&\\$1\c ++'if n \\&\\$1\c ++'if n \&" ++\\&\\$2 \\$3 \\$4 \\$5 \\$6 \\$7 ++'.ft R ++.. ++.\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2 ++. \" AM - accent mark definitions ++.bd B 3 ++. \" fudge factors for nroff and troff ++.if n \{\ ++. ds #H 0 ++. ds #V .8m ++. ds #F .3m ++. ds #[ \f1 ++. ds #] \fP ++.\} ++.if t \{\ ++. ds #H ((1u-(\\\\n(.fu%2u))*.13m) ++. ds #V .6m ++. ds #F 0 ++. ds #[ \& ++. ds #] \& ++.\} ++. \" simple accents for nroff and troff ++.if n \{\ ++. ds ' \& ++. ds ` \& ++. ds ^ \& ++. ds , \& ++. ds ~ ~ ++. ds ? ? ++. ds ! ! ++. ds / ++. ds q ++.\} ++.if t \{\ ++. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" ++. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' ++. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' ++. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' ++. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' ++. ds ? \s-2c\h'-\w'c'u*7/10'\u\h'\*(#H'\zi\d\s+2\h'\w'c'u*8/10' ++. ds ! \s-2\(or\s+2\h'-\w'\(or'u'\v'-.8m'.\v'.8m' ++. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' ++. ds q o\h'-\w'o'u*8/10'\s-4\v'.4m'\z\(*i\v'-.4m'\s+4\h'\w'o'u*8/10' ++.\} ++. \" troff and (daisy-wheel) nroff accents ++.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' ++.ds 8 \h'\*(#H'\(*b\h'-\*(#H' ++.ds v \\k:\h'-(\\n(.wu*9/10-\*(#H)'\v'-\*(#V'\*(#[\s-4v\s0\v'\*(#V'\h'|\\n:u'\*(#] ++.ds _ \\k:\h'-(\\n(.wu*9/10-\*(#H+(\*(#F*2/3))'\v'-.4m'\z\(hy\v'.4m'\h'|\\n:u' ++.ds . \\k:\h'-(\\n(.wu*8/10)'\v'\*(#V*4/10'\z.\v'-\*(#V*4/10'\h'|\\n:u' ++.ds 3 \*(#[\v'.2m'\s-2\&3\s0\v'-.2m'\*(#] ++.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] ++.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' ++.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' ++.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] ++.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] ++.ds ae a\h'-(\w'a'u*4/10)'e ++.ds Ae A\h'-(\w'A'u*4/10)'E ++.ds oe o\h'-(\w'o'u*4/10)'e ++.ds Oe O\h'-(\w'O'u*4/10)'E ++. \" corrections for vroff ++.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' ++.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' ++. \" for low resolution devices (crt and lpr) ++.if \n(.H>23 .if \n(.V>19 \ ++\{\ ++. ds : e ++. ds 8 ss ++. ds v \h'-1'\o'\(aa\(ga' ++. ds _ \h'-1'^ ++. ds . \h'-1'. ++. ds 3 3 ++. ds o a ++. ds d- d\h'-1'\(ga ++. ds D- D\h'-1'\(hy ++. ds th \o'bp' ++. ds Th \o'LP' ++. ds ae ae ++. ds Ae AE ++. ds oe oe ++. ds Oe OE ++.\} ++.rm #[ #] #H #V #F C ++.SH "NAME" ++TTF2PT1 \- A True Type to PostScript Type 1 Font Converter ++.SH "SYNOPSIS" ++\f(CWttf2pt1 \fI[-options] ttffont.ttf [Fontname]\fR\fR ++.PP ++or ++.PP ++\f(CWttf2pt1 \fI[-options] ttffont.ttf -\fR\fR ++.SH "DESCRIPTION" ++Ttf2pt1 is a font converter from the True Type format (and some other formats ++supported by the FreeType library as well) to the Adobe Type1 format. ++.PP ++The versions 3.0 and later got rather extensive post-processing algorithm that ++brings the converted fonts to the requirements of the Type1 standard, tries to ++correct the rounding errors introduced during conversions and some simple ++kinds of bugs that are typical for the public domain TTF fonts. It ++also generates the hints that enable much better rendering of fonts in ++small sizes that are typical for the computer displays. But everything ++has its price, and some of the optimizations may not work well for certain ++fonts. That's why the options were added to the converter, to control ++the performed optimizations. ++.SH "OPTIONS" ++The first variant creates the file \f(CWFontname.pfa\fR (or \f(CWFontname.pfb\fR if the ++option \*(L'\fB\-b\fR\*(R' was used) with the converted font and \f(CWFontname.afm\fR with the ++font metrics, the second one prints the font or another file (if the option ++\&\*(R'\fB\-G\fR\*(R' was used) on the standard output from where it can be immediately ++piped through some filter. If no \f(CWFontname\fR is specified for the first ++variant, the name is generated from \f(CWttffont\fR by replacing the \f(CW.ttf\fR ++filename suffix. ++.PP ++Most of the time no options are neccessary (with a possible exception ++of \*(L'\fB\-e\fR'). But if there are some troubles with the resulting font, they ++may be used to control the conversion. ++The \fBoptions\fR are: ++.Ip "\(bu" 2 ++\f(CW\fB-a\fR\fR \- Include all the glyphs from the source file into the converted ++file. If this option is not specified then only the glyphs that have ++been assigned some encoding are included, because the rest of glyphs ++would be inaccessible anyway and would only consume the disk space. ++But some applications are clever enough to change the encoding on ++the fly and thus use the other glyphs, in this case they could ++benefit from using this option. But there is a catch: the X11 library ++has rather low limit for the font size. Including more glyphs increases ++the file size and thus increases the chance of hitting this limit. ++See \f(CWapp/X11/README\fR for the description of a ++patch to X11 which fixes this problem. ++.Ip "\(bu" 2 ++\f(CW\fB-b\fR\fR \- Encode the resulting font to produce a ready \f(CW.pfb\fR file. ++.Ip "\(bu" 2 ++\f(CW\fB-d \fIsuboptions\fR\fR\fR \- Debugging options. The suboptions are: ++.Sp ++\f(CW\fBa\fR\fR \- Print out the absolute coordinates of dots in outlines. Such ++a font can not be used by any program (that's why this option is ++incompatible with \*(L'\fB\-e\fR') but it has proven to be a valuable debuging ++information. ++.Sp ++\f(CW\fBr\fR\fR \- Do not reverse the direction of outlines. The \s-1TTF\s0 fonts have ++the standard direction of outlines opposite to the Type1 fonts. So ++they should be reversed during proper conversion. This option ++may be used for debugging or to handle a \s-1TTF\s0 font with wrong ++direction of outlines (possibly, converted in a broken way from ++a Type1 font). The first signs of the wrong direction are the ++letters like \*(L"P\*(R" or \*(L"B\*(R" without the unpainted \*(L"holes\*(R" inside. ++.Ip "\(bu" 2 ++\f(CW\fB-e\fR\fR \- Assemble the resulting font to produce a ready \f(CW.pfa\fR file. ++.Sp ++[ S.B.: Personally I don't think that this option is particularly useful. ++The same result may be achieved by piping the unassembled data ++through t1asm, the Type 1 assembler. And, anyways, it's good to ++have the t1utils package handy. But Mark and many users think that ++this functionality is good and it took not much time to add this option. ] ++.Ip "\(bu" 2 ++\f(CW\fB-F\fR\fR \- Force the Unicode encoding: any type of \s-1MS\s0 encoding specified ++in the font is ignored and the font is treated like it has Unicode ++encoding. \fB\s-1WARNING\s0:\fR this option is intended for buggy fonts ++which actually are in Unicode but are marked as something else. The ++effect on the other fonts is unpredictable. ++.Ip "\(bu" 2 ++\f(CW\fB-G \fIsuboptions\fR\fR\fR \- File generation options. The suboptions may be lowercase ++or uppercase, the lowercase ones disable the generation of particular ++files, the corresponding uppercase suboptions enable the generation of the ++same kind of files. If the result of ttf2pt1 is requested to be printed on ++the standard output, the last enabling suboption of \fB\-G\fR determines ++which file will be written to the standard output and the rest of files ++will be discarded. For example, \fB\-G A\fR will request the \s-1AFM\s0 file. ++The suboptions to disable/enable the generation of the files are: ++.Sp ++\f(CW\fBf/F\fR\fR \- The font file. Depending on the other options this file ++will have one of the suffixes \f(CW.t1a\fR, \f(CW.pfa\fR or \f(CW.pfb\fR. If the conversion result ++is requested on the standard output ('\f(CW-\fR\*(R' is used as the output file name) ++then the font file will also be written there by default, if not overwritten ++by another suboption of \fB\-G\fR. ++\fBDefault: enabled\fR ++.Sp ++\f(CW\fBa/A\fR\fR \- The Adobe font metrics file (\f(CW.afm\fR). ++\fBDefault: enabled\fR ++.Sp ++\f(CW\fBe/E\fR\fR \- The dvips encoding file (\f(CW.enc\fR). ++\fBDefault: disabled\fR ++.Ip "\(bu" 2 ++\f(CW\fB-l \fIlanguage\fR[+\fIargument\fR]\fR\fR \- Extract the fonts for the specified language from a ++multi-language Unicode font. If this option is not used the converter ++tries to guess the language by the values of the shell variable \s-1LANG\s0. ++If it is not able to guess the language by \s-1LANG\s0 it tries all the ++languages in the order they are listed. ++.Sp ++After the plus sign an optional argument for the language extractor ++may be specified. The format of the argument is absolutely up to ++the particular language converter. The primary purpose of the ++argument is to support selection of planes for the multi-plane ++Eastern encodings but it can also be used in any other way. The ++language extractor may decide to add the plane name in some form ++to the name of the resulting font. None of the currently supported ++languages make any use of the argument yet. ++.Sp ++As of now the following languages are supported: ++.Sp ++\ \ \f(CWlatin1\fR \- for all the languages using the Latin-1 encoding ++.Sp ++\ \ \f(CWlatin2\fR \- for the Central European languages ++.Sp ++\ \ \f(CWlatin4\fR \- for the Baltic languages ++.Sp ++\ \ \f(CWlatin5\fR \- for the Turkish language ++.Sp ++\ \ \f(CWcyrillic\fR \- for the languages with Cyrillic alphabet ++.Sp ++\ \ \f(CWrussian\fR \- historic synonym for cyrillic ++.Sp ++\ \ \f(CWbulgarian\fR \- historic synonym for cyrillic ++.Sp ++\ \ \f(CWadobestd\fR \- for the AdobeStandard encoding used by TeX ++.Sp ++\ \ \f(CWplane+\fIargument\fR\fR \- to select one plane from a multi-byte encoding ++.Sp ++The argument of the \*(L"\f(CWplane\fR\*(R" language may be in one of three forms: ++.Sp ++\ \ \f(CWplane+\fBpid=\fR\fI\fR\fB,eid=\fR\fI\fR\fR ++.Sp ++\ \ \f(CWplane+\fBpid=\fR\fI\fR\fB,eid=\fR\fI\fR\fB,\fR\fI\fR\fR ++.Sp ++\ \ \f(CWplane+\fI\fR\fR ++.Sp ++Pid (\s-1TTF\s0 platform id) and eid (\s-1TTF\s0 encoding id) select a particular ++\s-1TTF\s0 encoding table in the original font. They are specified as decimal ++numbers. If this particular encoding table is not present in the font ++file then the conversion fails. The native ("ttf") front-end parser supports ++only pid=3 (Windows platform), the FreeType-based ("ft") front-end supports ++any platform. If pid/eid is not specified then the \s-1TTF\s0 encoding table is ++determined as usual: Unicode encoding if it's first or an 8-bit encoding ++if not (and for an 8-bit encoding the plane number is silently ignored). ++To prevent the converter from falling back to an 8-bit encoding, specify ++the Unicode pid/eid value explicitly. ++.Sp ++Plane_number is a hexadecimal (if starts with \*(L"\fB0x\fR") or decimal number. ++It gives the values of upper bytes for which 256 characters will be ++selected. If not specified, defaults to 0. It is also used as a font ++name suffix (the leading \*(L"0x\*(R" is not included into the suffix). ++.Sp ++\fB\s-1NOTE\s0:\fR ++You may notice that the language names are not uniform: some are the ++names of particular languages and some are names of encodings. This ++is because of the different approaches. The original idea was to ++implement a conversion from Unicode to the appropriate Windows ++encoding for a given language. And then use the translation tables ++to generate the fonts in whatever final encodings are needed. This ++would allow to pile together the Unicode fonts and the non-Unicode ++Windows fonts for that language and let the program to sort them out ++automatically. And then generate fonts in all the possible encodings ++for that language. An example of this approach is the Russian language ++support. But if there is no multiplicity of encodings used for some ++languages and if the non-Unicode fonts are not considered important ++by the users, another way would be simpler to implement: just provide ++only one table for extraction of the target encoding from Unicode ++and don't bother with the translation tables. The latin* \*(L"languages\*(R" ++are examples of this approach. If somebody feels that he needs the ++Type1 fonts both in Latin-* and Windows encodings he or she is absolutely ++welcome to submit the code to implement it. ++.Sp ++\fB\s-1WARNING\s0:\fR ++Some of the glyphs included into the AdobeStandard encoding are not ++included into the Unicode standard. The most typical examples of such ++glyphs are ligatures like \*(L'fi\*(R', \*(L'fl\*(R' etc. Because of this the font ++designers may place them at various places. The converter tries to ++do its best, if the glyphs have honest Adobe names and/or are ++placed at the same codes as in the Microsoft fonts they will be ++picked up. Otherwise a possible solution is to use the option \*(L'\fB\-L\fR\*(R' ++with an external map. ++.Ip "\(bu" 2 ++\f(CW\fB-L \fIfile\fR[+[pid=\fI\fR,eid=\fI\fR,][\fIplane\fR]]\fR\fR \- Extract the fonts for the specified ++language from a multi-language font using the map from this file. This is ++rather like the option \*(L'\fB\-l\fR\*(R' but the encoding map is not ++compiled into the program, it's taken from that file, so it's ++easy to edit. Examples of such files are provided in ++\f(CWmaps/adobe-standard-encoding.map\fR, \f(CWCP1250.map\fR. (\fB\s-1NOTE\s0:\fR ++the \*(L'standard encoding\*(R' map does not include all the glyphs of the ++AdobeStandard encoding, it's provided only as an example.) The ++description of the supported map formats is in the file ++\f(CWmaps/unicode-sample.map\fR. ++.Sp ++Likewise to \*(L'\fB\-l\fR\*(R', an argument may be specified after the map file ++name. But in this case the argument has fixed meaning: it selects the ++original \s-1TTF\s0 encoding table (the syntax is the same as in \*(L'\fB\-l plane\fR') ++and/or a plane of the map file. The plane name also gets added after dash ++to the font name. The plane is a concept used in the Eastern fonts with big ++number of glyphs: one \s-1TTF\s0 font gets divided into multiple Type1 fonts, ++each containing one plane of up to 256 glyphs. But with a little ++creativity this concept may be used for other purposes of combining ++multiple translation maps into one file. To extract multiple planes ++from a \s-1TTF\s0 font \f(CWttf2pt1\fR must be run multiple times, each time with ++a different plane name specified. ++.Sp ++The default original \s-1TTF\s0 encoding table used for the option \*(L'\fB\-L\fR\*(R' is ++Unicode. The map files may include directives to specify different original ++\s-1TTF\s0 encodings. However if the pid/eid pair is specified with ++it overrides any original encoding specified in the map file. ++.Ip "\(bu" 2 ++\f(CW\fB-m \fItype\fR=\fIvalue\fR\fR\fR \- Set maximal or minimal limits of resources. ++These limits control the the font generation by limiting the resources ++that the font is permitted to require from the PostScript interpreter. ++The currently supported types of limits are: ++.Sp ++\f(CW\fBh\fR\fR \- the maximal hint stack depth for the substituted hints. ++The default value is 128, according to the limitation in X11. This seems to ++be the lowest (and thus the safest) widespread value. To display the ++hint stack depth required by each glyph in a \f(CW.t1a\fR file use the script ++\f(CWscripts/cntstems.pl\fR. ++.Ip "\(bu" 2 ++\f(CW\fB-O \fIsuboptions\fR\fR\fR \- Outline processing options. The suboptions ++may be lowercase or uppercase, the lowercase ones disable the features, ++the corresponding uppercase suboptions enable the same features. ++The suboptions to disable/enable features are: ++.Sp ++\f(CW\fBb/B\fR\fR \- Guessing of the ForceBold parameter. This parameter helps ++the Type1 engine to rasterize the bold fonts properly at small sizes. ++But the algorithm used to guess the proper value of this flag makes ++that guess based solely on the font name. In rare cases that may cause ++errors, in these cases you may want to disable this guessing. ++\fBDefault: enabled\fR ++.Sp ++\f(CW\fBh/H\fR\fR \- Autogeneration of hints. The really complex outlines ++may confuse the algorithm, so theoretically it may be useful ++sometimes to disable them. Although up to now it seems that ++even bad hints are better than no hints at all. ++\fBDefault: enabled\fR ++.Sp ++\f(CW\fBu/U\fR\fR \- Hint substitution. Hint substitution is a technique ++permitting generation of more detailed hints for the rasterizer. It allows ++to use different sets of hints for different parts of a glyph and change ++these sets as neccessary during rasterization (that's why \*(L"substituted"). ++So it should improve the quality of the fonts rendered at small sizes. ++But there are two catches: First, the X11 library has rather low limit for ++the font size. More detailed hints increase the file size and thus increase ++the chance of hitting this limit (that does not mean that you shall hit it ++but you may if your fonts are particularly big). This is especially ++probable for Unicode fonts converted with option \*(L'\fB\-a\fR\*(R', so you may want to ++use \*(L'\fB\-a\fR\*(R' together with \*(L'\fB\-Ou\fR\*(R'. See \f(CWapp/X11/README\fR for the description of ++a patch to X11 which fixes this problem. Second, some rasterizers (again, ++X11 is the typical example) have a limitation for total number of hints ++used when drawing a glyph (also known as the hint stack depth). If that ++stack overflows the glyph is ignored. Starting from version 3.22 \f(CWttf2pt1\fR ++uses algorithms to minimizing this depth, with the trade-off of slightly ++bigger font files. The glyphs which still exceed the limit set by option ++\&\*(R'\fB\-mh\fR\*(R' have all the substituted hints removed and only base hints left. ++The algorithms seem to have been refined far enough to make the fonts with ++substituted hints look better than the fonts without them or at least the ++same. Still if the original fonts are not well-designed the detailed ++hinting may emphasize the defects of the design, such as non-even thickness ++of lines. So provided that you are not afraid of the X11 bug the best idea ++would be to generate a font with this feature and without it, then compare ++the results using the program \f(CWother/cmpf\fR (see the description ++in \f(CWother/README\fR) and decide which one looks better. ++\fBDefault: enabled\fR ++.Sp ++\f(CW\fBo/O\fR\fR \- Space optimization of the outlines\*(R' code. This kind of optimization ++never hurts, and the only reason to disable this feature is for comparison ++of the generated fonts with the fonts generated by the previous versions of ++converter. Well, it _almost_ never hurts. As it turned out there exist ++some brain-damaged printers which don't understand it. Actually this ++feature does not change the outlines at all. The Type 1 font manual ++provides a set of redundant operators that make font description shorter, ++such as \*(L'10 hlineto\*(R' instead of \*(L'0 10 rlineto\*(R' to describe a horizontal ++line. This feature enables use of these operators. ++\fBDefault: enabled\fR ++.Sp ++\f(CW\fBs/S\fR\fR \- Smoothing of outlines. If the font is broken in some ++way (even the ones that are not easily noticeable), such smoothing ++may break it further. So disabling this feature is the first thing to be ++tried if some font looks odd. But with smoothing off the hint generation ++algorithms may not work properly too. ++\fBDefault: enabled\fR ++.Sp ++\f(CW\fBt/T\fR\fR \- Auto-scaling to the 1000x1000 Type1 standard matrix. The ++\s-1TTF\s0 fonts are described in terms of an arbitrary matrix up to ++4000x4000. The converted fonts must be scaled to conform to ++the Type1 standard. But the scaling introduces additional rounding ++errors, so it may be curious sometimes to look at the font in its ++original scale. ++\fBDefault: enabled\fR ++.Sp ++\f(CW\fBv/V\fR\fR \- Do vectorization on the bitmap fonts. Functionally ++\*(L"vectorization\*(R" is the same thing as \*(L"autotracing\*(R", a different word is ++used purely to differentiate it from the Autotrace library. It tries to ++produce nice smooth outlines from bitmaps. This feature is still a work ++in progress though the results are already mostly decent. ++\fBDefault: disabled\fR ++.Sp ++\f(CW\fBw/W\fR\fR \- Glyphs\*(R' width corection. This option is designed to be ++used on broken fonts which specify too narrow widths for the ++letters. You can tell that a font can benefit from this option ++if you see that the characters are smashed together without ++any whitespace between them. This option causes the converter ++to set the character widths to the actual width of this character ++plus the width of a typical vertical stem. But on the other hand ++the well-designed fonts may have characters that look better if ++their widths are set slightly narrower. Such well-designed fonts ++will benefit from disabling this feature. You may want to convert ++a font with and without this feature, compare the results and ++select the better one. This feature may be used only on proportional ++fonts, it has no effect on the fixed-width fonts. ++\fBDefault: disabled\fR ++.Sp ++\f(CW\fBz/Z\fR\fR \- Use the Autotrace library on the bitmap fonts. The results ++are horrible and \fBthe use of this option is not recommended\fR. This option is ++present for experimental purposes. It may change or be removed in the ++future. The working tracing can be achieved with option \f(CW\fB-OV\fR\fR. ++\fBDefault: disabled\fR ++.Ip "\(bu" 2 ++\f(CW\fB-p \fIparser_name\fR\fR\fR \- Use the specified front-end parser to read the font file. ++If this option is not used, ttf2pt1 selects the parser automatically based ++on the suffix of the font file name, it uses the first parser in its ++list that supports this font type. Now two parsers are supported: ++.Sp ++\ \ \f(CWttf\fR \- built-in parser for the ttf files (suffix \f(CW.ttf\fR) ++.Sp ++\ \ \f(CWbdf\fR \- built-in parser for the \s-1BDF\s0 files (suffix \f(CW.bdf\fR) ++.Sp ++\ \ \f(CWft\fR \- parser based on the FreeType-2 library (suffixes \f(CW.ttf\fR, ++\&\f(CW.otf\fR, \f(CW.pfa\fR, \f(CW.pfb\fR) ++.Sp ++The parser \f(CWft\fR is \fB\s-1NOT\s0\fR linked in by default. See \f(CWMakefile\fR ++for instructions how to enable it. We do no support this parser on ++Windows: probably it will work but nobody tried and nobody knows how ++to build it. ++.Sp ++The conversion of the bitmap fonts (such as \s-1BDF\s0) is simplistic yet, ++producing jagged outlines. When converting such fonts, it might be ++a good idea to turn off the hint substitution (using option \fB\-Ou\fR) ++because the hints produced will be huge but not adding much to the ++quality of the fonts. ++.Ip "\(bu" 2 ++\f(CW\fB-u \fInumber\fR\fR\fR \- Mark the font with this value as its ++UniqueID. The UniqueID is used by the printers with the hard disks ++to cache the rasterized characters and thus significantly ++speed-up the printing. Some of those printers just can't ++store the fonts without UniqueID on their disk.The problem ++is that the \s-1ID\s0 is supposed to be unique, as it name says. And ++there is no easy way to create a guaranteed unique \s-1ID\s0. Adobe specifies ++the range 4000000-4999999 for private IDs but still it's difficult ++to guarantee the uniqueness within it. So if you don't really need the ++UniqueID don't use it, it's optional. Luckily there are a few millions of ++possible IDs, so the chances of collision are rather low. ++If instead of the number a special value \*(L'\f(CW\fBA\fR\fR\*(R' is given ++then the converter generates the value of UniqueID automatically, ++as a hash of the font name. (\fB\s-1NOTE\s0:\fR in the version 3.22 the ++algorithm for autogeneration of UniqueID was changed to fit the values ++into the Adobe-spacified range. This means that if UniqueIDs were used ++then the printer's cache may need to be flushed before replacing the ++fonts converted by an old version with fonts converted by a newer version). ++A simple way to find if any of the fonts in a given directory have ++duplicated UniqueIDs is to use the command: ++.Sp ++\f(CW\ \ cat *.pf[ab] | grep UniqueID | sort | uniq -c | grep -v ' 1 '\fR ++.Sp ++Or if you use \f(CWscripts/convert\fR it will do that for you automatically ++plus it will also give the exact list of files with duplicate UIDs. ++.Ip "\(bu" 2 ++\f(CW\fB-v \fIsize\fR\fR\fR \- Re-scale the font to get the size of a typical uppercase ++letter somewhere around the specified size. Actually, it re-scales ++the whole font to get the size of one language-dependent letter to be ++at least of the specified size. Now this letter is \*(L"A\*(R" in all the ++supported languages. The size is specified in the points of the ++Type 1 coordinate grids, the maximal value is 1000. This is an ++experimental option and should be used with caution. It tries to ++increase the visible font size for a given point size and thus make ++the font more readable. But if overused it may cause the fonts to ++look out of scale. As of now the interesting values of size for ++this option seem to be located mostly between 600 and 850. This ++re-scaling may be quite useful but needs more experience to ++understand the balance of its effects. ++.Ip "\(bu" 2 ++\f(CW\fB-W \fIlevel\fR\fR\fR \- Select the verbosity level of the warnings. ++Currently the levels from 0 to 4 are supported. Level 0 means no warnings ++at all, level 4 means all the possible warnings. The default level is 3. ++Other levels may be added in the future, so using the level number 99 is ++recommended to get all the possible warnings. Going below level 2 is ++not generally recommended because you may miss valuable information about ++the problems with the fonts being converted. ++.Ip "\(bu" 2 ++\fBObsolete option:\fR ++\f(CW\fB-A\fR\fR \- Print the font metrics (.afm file) instead of the font on \s-1STDOUT\s0. ++Use \fB\-\s-1GA\s0\fR instead. ++.Ip "\(bu" 2 ++\fBVery obsolete option:\fR ++.Sp ++The algorithm that implemented the forced fixed width had major ++flaws, so it was disabled. The code is still in the program and ++some day it will be refined and returned back. Meanwhile the ++option name \*(L'\fB\-f\fR\*(R' was reused for another option. The old version was: ++.Sp ++\f(CW\fB-f\fR\fR \- Don't try to force the fixed width of font. Normally the converter ++considers the fonts in which the glyph width deviates by not more ++than 5% as buggy fixed width fonts and forces them to have really ++fixed width. If this is undesirable, it can be disabled by this option. ++.PP ++The \f(CW.pfa\fR font format supposes that the description of the characters ++is binary encoded and encrypted. This converter does not encode or ++encrypt the data by default, you have to specify the option \*(L'\fB\-e\fR\*(R' ++or use the \f(CWt1asm\fR program to assemble (that means, encode and ++encrypt) the font program. The \f(CWt1asm\fR program that is included with ++the converter is actually a part of the \f(CWt1utils\fR package, rather old ++version of which may be obtained from ++.PP ++http://ttf2pt1.sourceforge.net/t1utils.tar.gz ++.PP ++Note that \f(CWt1asm\fR from the old version of that package won't work properly ++with the files generated by \f(CWttf2pt1\fR version 3.20 and later. Please use ++\f(CWt1asm\fR packaged with \f(CWttf2pt1\fR or from the new version \f(CWt1utils\fR ++instead. For a newer version of \f(CWt1utils\fR please look at ++.PP ++http://www.lcdf.org/~eddietwo/type/ ++.SH "EXAMPLES" ++So, the following command lines: ++.PP ++\f(CWttf2pt1 -e ttffont.ttf t1font\fR ++.PP ++\f(CWttf2pt1 ttffont.ttf - | t1asm >t1font.pfa\fR ++.PP ++represent two ways to get a working font. The benefit of the second form ++is that other filters may be applied to the font between the converter ++and assembler. ++.SH "FILES" ++.Ip "\(bu" 2 ++\s-1TTF2PT1_LIBXDIR/\s0t1asm ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR\s0/* ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR/\s0scripts/* ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR/\s0other/* ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR/README\s0 ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR/FONTS\s0 ++.SH "SEE ALSO" ++.Ip "\(bu" 4 ++the \fIttf2pt1_convert(1)\fR manpage ++.Ip "\(bu" 4 ++the \fIttf2pt1_x2gs(1)\fR manpage ++.Ip "\(bu" 4 ++the \fIt1asm(1)\fR manpage ++.Ip "\(bu" 4 ++ttf2pt1-announce@lists.sourceforge.net ++.Sp ++The mailing list with announcements about ttf2pt1. It is a moderated mailing ++with extremely low traffic. Everyone is encouraged to subscribe to keep in ++touch with the current status of project. To subscribe use the Web interface ++at http://lists.sourceforge.net/mailman/listinfo/ttf2pt1-announce. ++If you have only e-mail access to the Net then send a subscribe request to ++the development mailing list ttf2pt1-devel@lists.sourceforge.net and somebody ++will help you with subscription. ++.Ip "\(bu" 4 ++ttf2pt1-devel@lists.sourceforge.net ++.Sp ++ttf2pt1-users@lists.sourceforge.net ++.Sp ++The ttf2pt1 mailing lists for development and users issues. They have not ++that much traffic either. To subscribe use the Web interface at ++http://lists.sourceforge.net/mailman/listinfo/ttf2pt1-devel ++and http://lists.sourceforge.net/mailman/listinfo/ttf2pt1-users. ++If you have only e-mail access to the Net then send a subscribe request to ++the development mailing list ttf2pt1-devel@lists.sourceforge.net and somebody ++will help you with subscription. ++.Ip "\(bu" 4 ++http://ttf2pt1.sourceforge.net ++.Sp ++The main page of the project. ++.Sp ++http://www.netspace.net.au/~mheath/ttf2pt1/ ++.Sp ++The old main page of the project. ++.SH "BUGS" ++It seems that many Eastern fonts use features of the TTF format that are ++not supported by the ttf2pt1's built-in front-end parser. Because of ++this for now we recommend using the FreeType-based parser (option ++\&\*(R'\fB\-p ft\fR') with the \*(L"\f(CWplane\fR\*(R" language. ++.Sh "Troubleshooting and bug reports" ++Have problems with conversion of some font ? The converter dumps core ? Or your ++printer refuses to understand the converted fonts ? Or some characters are ++missing ? Or some characters look strange ? ++.PP ++Send the bug reports to the ttf2pt1 development mailing list at ++ttf2pt1-devel@lists.sourceforge.net. ++.PP ++Try to collect more information about the problem and include it into ++the bug report. (Of course, even better if you would provide a ready ++fix, but just a detailed bug report is also good). Provide detailed ++information about your problem, this will speed up the response greatly. ++Don't just write \*(L"this font looks strange after conversion\*(R" but describe ++what's exactly wrong with it: for example, what characters look wrong ++and what exactly is wrong about their look. Providing a link to the ++original font file would be also a good idea. Try to do a little ++troublehooting and report its result. This not only would help with ++the fix but may also give you a temporary work-around for the bug. ++.PP ++First, enable full warnings with option \*(L'\fB\-W99\fR\*(R', save them to ++a file and read carefully. Sometimes the prolem is with a not implemented ++feature which is reported in the warnings. Still, reporting about such ++problems may be a good idea: some features were missed to cut corners, ++in hope that no real font is using them. So a report about a font using ++such a feature may motivate someone to implement it. Of course, you ++may be the most motivated person: after all, you are the one wishing ++to convert that font. ;\-) Seriously, the philosophy \*(L"scrath your own itch\*(R" ++seems to be the strongest moving force behind the Open Source software. ++.PP ++The next step is playing with the options. This serves a dual purpose: ++on one hand, it helps to localize the bug, on the other hand you may be ++able to get a working version of the font for the meantime while the ++bug is being fixed. The typical options to try out are: first \*(L'\fB\-Ou\fR\*(R', if ++it does not help then \*(L'\fB\-Os\fR\*(R', then \*(L'\fB\-Oh\fR\*(R', then \*(L'\fB\-Oo\fR\*(R'. ++They are described in a bit more detail above. Try them one by one ++and in combinations. See if with them the resulting fonts look better. ++.PP ++On some fonts ttf2pt1 just crashes. Commonly that happens because the ++font being converted is highly defective (although sometimes the bug ++is in ttf2pt1 itself). In any case it should not crash, so the reports ++about such cases will help to handle these defects properly in future. ++.PP ++We try to respond to the bug reports in a timely fashion but alas, this ++may not always be possible, especially if the problem is complex. ++This is a volunteer project and its resources are limited. Because ++of this we would appreciate bug reports as detailed as possible, ++and we would appreciate the ready fixes and contributions even more. ++.SH "HISTORY" ++Based on ttf2pfa by Andrew Weeks, and help from Frank Siegert. ++.PP ++Modification by Mark Heath. ++.PP ++Further modification by Sergey Babkin. ++.PP ++The Type1 assembler by I. Lee Hetherington with modifications by ++Kai-Uwe Herbing. ++ ++.rn }` '' ++.IX Title "TTF2PT1 1" ++.IX Name "TTF2PT1 - A True Type to PostScript Type 1 Font Converter" ++ ++.IX Header "NAME" ++ ++.IX Header "SYNOPSIS" ++ ++.IX Header "DESCRIPTION" ++ ++.IX Header "OPTIONS" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Header "EXAMPLES" ++ ++.IX Header "FILES" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Header "SEE ALSO" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Header "BUGS" ++ ++.IX Subsection "Troubleshooting and bug reports" ++ ++.IX Header "HISTORY" ++ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/ttf2pt1.c xserver/hw/xprint/extras/ttf2pt1/ttf2pt1.c +--- xserver-old/hw/xprint/extras/ttf2pt1/ttf2pt1.c 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/ttf2pt1.c 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,2722 @@ ++/* ++ * True Type Font to Adobe Type 1 font converter ++ * By Mark Heath ++ * Based on ttf2pfa by Andrew Weeks ++ * With help from Frank M. Siegert ++ * ++ * see COPYRIGHT for full copyright notice ++ * ++*********************************************************************** ++ * ++ * Sergey Babkin , ++ * ++ * Added post-processing of resulting outline to correct the errors ++ * both introduced during conversion and present in the original font, ++ * autogeneration of hints (has yet to be improved though) and BlueValues, ++ * scaling to 1000x1000 matrix, option to print the result on STDOUT, ++ * support of Unicode to CP1251 conversion, optimization of the ++ * resulting font code by space (that improves the speed too). Excluded ++ * the glyphs that are unaccessible through the encoding table from ++ * the output file. Added the built-in Type1 assembler (taken from ++ * the `t1utils' package). ++ * ++*********************************************************************** ++ * ++ * Thomas Henlich ++ * ++ * Added generation of .afm file (font metrics) ++ * Read encoding information from encoding description file ++ * Fixed bug in error message about unknown language ('-l' option) ++ * Added `:' after %%!PS-AdobeFont-1.0 ++ * changed unused entries in ISOLatin1Encoding[] from .notdef to c127,c128... ++ * ++*********************************************************************** ++ * ++ * Thomas Henlich ++ * ++ * Added generation of .afm file (font metrics) ++ * ++*********************************************************************** ++ * ++ * Bug Fixes: ++************************************************************************ ++ * ++ * Sun, 21 Jun 1998 Thomas Henlich ++ * 1. "width" should be "short int" because otherwise: ++ * characters with negative widths (e.g. -4) become *very* wide (65532) ++ * 2. the number of /CharStrings is numglyphs and not numglyphs+1 ++ * ++*********************************************************************** ++ * ++ * ++ * ++ * The resultant font file produced by this program still needs to be ran ++ * through t1asm (from the t1utils archive) to produce a completely valid ++ * font. ++ * ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef _GNU_SOURCE ++#include ++#endif ++ ++#ifndef WINDOWS ++# include ++# include ++# define BITBUCKET "/dev/null" ++# include ++#else ++# define WINDOWS_FUNCTIONS /* ask to define functions - in one file only */ ++# include "windows.h" ++# define BITBUCKET "NUL" ++# define snprintf _snprintf ++#endif ++ ++#ifdef XP_PSTEXT ++#include ++#include FT_FREETYPE_H ++#include FT_TRUETYPE_TABLES_H ++#include FT_BBOX_H ++#include FT_GLYPH_H ++ ++#include FT_CONFIG_CONFIG_H ++#include FT_CONFIG_OPTIONS_H ++#include FT_ERRORS_H ++#include FT_SYSTEM_H ++#include FT_IMAGE_H ++#include FT_TYPES_H ++#include FT_OUTLINE_H ++#include FT_MODULE_H ++#include FT_RENDER_H ++#include FT_TYPE1_TABLES_H ++#include FT_TRUETYPE_IDS_H ++#include FT_TRUETYPE_TAGS_H ++#include FT_MULTIPLE_MASTERS_H ++#include FT_SFNT_NAMES_H ++ ++#include "os.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#define NOT_IN_FTFUNCS ++#include ++#endif /* XP_PSTEXT */ ++ ++#include "pt1.h" ++#include "global.h" ++#include "version.h" ++ ++/* globals */ ++ ++/* table of front-ends */ ++ ++#ifdef USE_TTF ++extern struct frontsw ttf_sw; ++#endif /* USE_TTF */ ++#ifdef USE_BDF ++extern struct frontsw bdf_sw; ++#endif /* USE_BDF */ ++#if defined(USE_FREETYPE) ++ extern struct frontsw freetype_sw; ++#endif ++ ++struct frontsw *frontswtab[] = { ++#ifdef USE_BDF ++ &bdf_sw, ++#endif /* USE_BDF */ ++#if defined(USE_FREETYPE) && defined(PREFER_FREETYPE) ++ &freetype_sw, ++#endif ++#ifdef USE_TTF ++ &ttf_sw, ++#endif /* USE_TTF */ ++#if defined(USE_FREETYPE) && !defined(PREFER_FREETYPE) ++ &freetype_sw, ++#endif ++ NULL /* end of table */ ++}; ++ ++struct frontsw *cursw=0; /* the active front end */ ++char *front_arg=""; /* optional argument */ ++ ++/* options */ ++int encode = 0; /* encode the resulting file */ ++int pfbflag = 0; /* produce compressed file */ ++int wantafm=0; /* want to see .afm instead of .t1a on stdout */ ++int correctvsize=0; /* try to correct the vertical size of characters */ ++int wantuid = 0; /* user wants UniqueID entry in the font */ ++int allglyphs = 0; /* convert all glyphs, not only 256 of them */ ++int warnlevel = 3; /* the level of permitted warnings */ ++int forcemap = 0; /* do mapping even on non-Unicode fonts */ ++/* options - maximal limits */ ++int max_stemdepth = 128; /* maximal depth of stem stack in interpreter (128 - limit from X11) */ ++/* options - debugging */ ++int absolute = 0; /* print out in absolute values */ ++int reverse = 1; /* reverse font to Type1 path directions */ ++/* options - suboptions of Outline Processing, defaults are set in table */ ++int optimize; /* enables space optimization */ ++int smooth; /* enable smoothing of outlines */ ++int transform; /* enables transformation to 1000x1000 matrix */ ++int hints; /* enables autogeneration of hints */ ++int subhints; /* enables autogeneration of substituted hints */ ++int trybold; /* try to guess whether the font is bold */ ++int correctwidth; /* try to correct the character width */ ++int vectorize; /* vectorize the bitmaps */ ++int use_autotrace; /* use the autotrace library on bitmap */ ++/* options - suboptions of File Generation, defaults are set in table */ ++int gen_pfa; /* generate the font file */ ++int gen_afm; /* generate the metrics file */ ++int gen_dvienc; /* generate the dvips encoding file */ ++ ++/* not quite options to select a particular source encoding */ ++int force_pid = -1; /* specific platform id */ ++int force_eid = -1; /* specific encoding id */ ++ ++/* structure to define the sub-option lists controlled by the ++ * case: uppercase enables them, lowercase disables ++ */ ++struct subo_case { ++ char disbl; /* character to disable - enforced lowercase */ ++ char enbl; /* character to enable - auto-set as toupper(disbl) */ ++ int *valp; /* pointer to the actual variable containing value */ ++ int dflt; /* default value */ ++ char *descr; /* description */ ++}; ++ ++#ifdef DEBUG ++int debug = DEBUG; /* debugging flag */ ++#else ++int debug = 0; ++#endif /* DEBUG */ ++ ++FILE *null_file, *pfa_file, *afm_file, *dvienc_file; ++int numglyphs; ++struct font_metrics fontm; ++ ++/* non-globals */ ++static char *strUID = 0; /* user-supplied UniqueID */ ++static unsigned long numUID; /* auto-generated UniqueID */ ++ ++static int ps_fmt_3 = 0; ++static double scale_factor, original_scale_factor; ++ ++static char *glyph_rename[ENCTABSZ]; ++ ++/* the names assigned if the original font ++ * does not specify any ++ */ ++ ++static char *Fmt3Encoding[256] = { ++ "c0", "c1", "c2", "c3", ++ "c4", "c5", "c6", "c7", ++ "c8", "c9", "c10", "c11", ++ "c12", "CR", "c14", "c15", ++ "c16", "c17", "c18", "c19", ++ "c20", "c21", "c22", "c23", ++ "c24", "c25", "c26", "c27", ++ "c28", "c29", "c30", "c31", ++ "space", "exclam", "quotedbl", "numbersign", ++ "dollar", "percent", "ampersand", "quotesingle", ++ "parenleft", "parenright", "asterisk", "plus", ++ "comma", "hyphen", "period", "slash", ++ "zero", "one", "two", "three", ++ "four", "five", "six", "seven", ++ "eight", "nine", "colon", "semicolon", ++ "less", "equal", "greater", "question", ++ "at", "A", "B", "C", ++ "D", "E", "F", "G", ++ "H", "I", "J", "K", ++ "L", "M", "N", "O", ++ "P", "Q", "R", "S", ++ "T", "U", "V", "W", ++ "X", "Y", "Z", "bracketleft", ++ "backslash", "bracketright", "asciicircum", "underscore", ++ "grave", "a", "b", "c", ++ "d", "e", "f", "g", ++ "h", "i", "j", "k", ++ "l", "m", "n", "o", ++ "p", "q", "r", "s", ++ "t", "u", "v", "w", ++ "x", "y", "z", "braceleft", ++ "bar", "braceright", "asciitilde", "c127", ++ "c128", "c129", "quotesinglbase", "florin", ++ "quotedblbase", "ellipsis", "dagger", "daggerdbl", ++ "circumflex", "perthousand", "Scaron", "guilsinglleft", ++ "OE", "c141", "c142", "c143", ++ "c144", "quoteleft", "quoteright", "quotedblleft", ++ "quotedblright", "bullet", "endash", "emdash", ++ "tilde", "trademark", "scaron", "guilsinglright", ++ "oe", "c157", "c158", "Ydieresis", ++ "nbspace", "exclamdown", "cent", "sterling", ++ "currency", "yen", "brokenbar", "section", ++ "dieresis", "copyright", "ordfeminine", "guillemotleft", ++ "logicalnot", "sfthyphen", "registered", "macron", ++ "degree", "plusminus", "twosuperior", "threesuperior", ++ "acute", "mu", "paragraph", "periodcentered", ++ "cedilla", "onesuperior", "ordmasculine", "guillemotright", ++ "onequarter", "onehalf", "threequarters", "questiondown", ++ "Agrave", "Aacute", "Acircumflex", "Atilde", ++ "Adieresis", "Aring", "AE", "Ccedilla", ++ "Egrave", "Eacute", "Ecircumflex", "Edieresis", ++ "Igrave", "Iacute", "Icircumflex", "Idieresis", ++ "Eth", "Ntilde", "Ograve", "Oacute", ++ "Ocircumflex", "Otilde", "Odieresis", "multiply", ++ "Oslash", "Ugrave", "Uacute", "Ucircumflex", ++ "Udieresis", "Yacute", "Thorn", "germandbls", ++ "agrave", "aacute", "acircumflex", "atilde", ++ "adieresis", "aring", "ae", "ccedilla", ++ "egrave", "eacute", "ecircumflex", "edieresis", ++ "igrave", "iacute", "icircumflex", "idieresis", ++ "eth", "ntilde", "ograve", "oacute", ++ "ocircumflex", "otilde", "odieresis", "divide", ++ "oslash", "ugrave", "uacute", "ucircumflex", ++ "udieresis", "yacute", "thorn", "ydieresis" ++}; ++ ++#ifdef notdef /* { */ ++/* This table is not used anywhere in the code ++ * so it's ifdef-ed out by default but left in ++ * the source code for reference purposes (and ++ * possibly for future use) ++ */ ++ ++static char *ISOLatin1Encoding[256] = { ++ ".null", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", "CR", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ "space", "exclam", "quotedbl", "numbersign", ++ "dollar", "percent", "ampersand", "quoteright", ++ "parenleft", "parenright", "asterisk", "plus", ++ "comma", "hyphen", "period", "slash", ++ "zero", "one", "two", "three", ++ "four", "five", "six", "seven", ++ "eight", "nine", "colon", "semicolon", ++ "less", "equal", "greater", "question", ++ "at", "A", "B", "C", ++ "D", "E", "F", "G", ++ "H", "I", "J", "K", ++ "L", "M", "N", "O", ++ "P", "Q", "R", "S", ++ "T", "U", "V", "W", ++ "X", "Y", "Z", "bracketleft", ++ "backslash", "bracketright", "asciicircum", "underscore", ++ "grave", "a", "b", "c", ++ "d", "e", "f", "g", ++ "h", "i", "j", "k", ++ "l", "m", "n", "o", ++ "p", "q", "r", "s", ++ "t", "u", "v", "w", ++ "x", "y", "z", "braceleft", ++ "bar", "braceright", "asciitilde", "c127", ++ "c128", "c129", "quotesinglbase", "florin", ++ "quotedblbase", "ellipsis", "dagger", "daggerdbl", ++ "circumflex", "perthousand", "Scaron", "guilsinglleft", ++ "OE", "c141", "c142", "c143", ++ "c144", "quoteleft", "quoteright", "quotedblleft", ++ "quotedblright", "bullet", "endash", "emdash", ++ "tilde", "trademark", "scaron", "guilsinglright", ++ "oe", "c157", "c158", "Ydieresis", ++ "nbspace", "exclamdown", "cent", "sterling", ++ "currency", "yen", "brokenbar", "section", ++ "dieresis", "copyright", "ordfeminine", "guillemotleft", ++ "logicalnot", "sfthyphen", "registered", "macron", ++ "degree", "plusminus", "twosuperior", "threesuperior", ++ "acute", "mu", "paragraph", "periodcentered", ++ "cedilla", "onesuperior", "ordmasculine", "guillemotright", ++ "onequarter", "onehalf", "threequarters", "questiondown", ++ "Agrave", "Aacute", "Acircumflex", "Atilde", ++ "Adieresis", "Aring", "AE", "Ccedilla", ++ "Egrave", "Eacute", "Ecircumflex", "Edieresis", ++ "Igrave", "Iacute", "Icircumflex", "Idieresis", ++ "Eth", "Ntilde", "Ograve", "Oacute", ++ "Ocircumflex", "Otilde", "Odieresis", "multiply", ++ "Oslash", "Ugrave", "Uacute", "Ucircumflex", ++ "Udieresis", "Yacute", "Thorn", "germandbls", ++ "agrave", "aacute", "acircumflex", "atilde", ++ "adieresis", "aring", "ae", "ccedilla", ++ "egrave", "eacute", "ecircumflex", "edieresis", ++ "igrave", "iacute", "icircumflex", "idieresis", ++ "eth", "ntilde", "ograve", "oacute", ++ "ocircumflex", "otilde", "odieresis", "divide", ++ "oslash", "ugrave", "uacute", "ucircumflex", ++ "udieresis", "yacute", "thorn", "ydieresis" ++}; ++ ++#endif /* } notdef */ ++ ++static char *adobe_StandardEncoding[256] = { ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ "space", "exclam", "quotedbl", "numbersign", ++ "dollar", "percent", "ampersand", "quoteright", ++ "parenleft", "parenright", "asterisk", "plus", ++ "comma", "hyphen", "period", "slash", ++ "zero", "one", "two", "three", ++ "four", "five", "six", "seven", ++ "eight", "nine", "colon", "semicolon", ++ "less", "equal", "greater", "question", ++ "at", "A", "B", "C", "D", "E", "F", "G", ++ "H", "I", "J", "K", "L", "M", "N", "O", ++ "P", "Q", "R", "S", "T", "U", "V", "W", ++ "X", "Y", "Z", "bracketleft", ++ "backslash", "bracketright", "asciicircum", "underscore", ++ "quoteleft", "a", "b", "c", "d", "e", "f", "g", ++ "h", "i", "j", "k", "l", "m", "n", "o", ++ "p", "q", "r", "s", "t", "u", "v", "w", ++ "x", "y", "z", "braceleft", ++ "bar", "braceright", "asciitilde", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", "exclamdown", "cent", "sterling", ++ "fraction", "yen", "florin", "section", ++ "currency", "quotesingle", "quotedblleft", "guillemotleft", ++ "guilsinglleft", "guilsinglright", "fi", "fl", ++ ".notdef", "endash", "dagger", "daggerdbl", ++ "periodcentered", ".notdef", "paragraph", "bullet", ++ "quotesinglbase", "quotedblbase", "quotedblright", "guillemotright", ++ "ellipsis", "perthousand", ".notdef", "questiondown", ++ ".notdef", "grave", "acute", "circumflex", ++ "tilde", "macron", "breve", "dotaccent", ++ "dieresis", ".notdef", "ring", "cedilla", ++ ".notdef", "hungarumlaut", "ogonek", "caron", ++ "emdash", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", "AE", ".notdef", "ordfeminine", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ "Lslash", "Oslash", "OE", "ordmasculine", ++ ".notdef", ".notdef", ".notdef", ".notdef", ++ ".notdef", "ae", ".notdef", ".notdef", ++ ".notdef", "dotlessi", ".notdef", ".notdef", ++ "lslash", "oslash", "oe", "germandbls", ++ ".notdef", ".notdef", ".notdef", ".notdef" ++}; ++ ++/* ++ * Decription of the supported conversions from Unicode ++ * ++ * SB ++ * Yes, I know that the compiled-in conversion is stupid but ++ * it is simple to implement and allows not to worry about the ++ * filesystem context. After all, the source is always available ++ * and adding another language to it is easy. ++ * ++ * The language name is expected to be the same as the subdirectory name ++ * in the `encodings' directory (for possible future extensions). ++ * The primary use of the aliases is for guessing based on the current ++ * locale. ++ */ ++ ++#define MAXUNIALIAS 10 ++#define MAXUNITABLES 3 ++ ++/* the character used as the language argument separator */ ++#define LANG_ARG_SEP '+' ++ ++ ++/* ++ * Types of language-related routines. Arguments are: ++ * name is the glyph name ++ * arg is the user-specified language-dependent argument ++ * which can for example select the subfont plane for Eastern fonts. ++ * If none is supplied by user then an empty string ("") is passed. ++ * If no language is specified by user and auto-guessing happens ++ * then NULL is passed. ++ * when shows if the conversion by name was called before conversion by ++ * map or after (it's called twice) ++ */ ++ ++/* type of the Unicode map initialization routine */ ++typedef void uni_init_t(char *arg); ++ ++/* type of Unicode converter-by-name function ++ * it's called for each glyph twice: one time for each glyph ++ * before doing conversion by map and one time after ++ */ ++typedef int uni_conv_t(char *name, char *arg, int when); ++#define UNICONV_BYNAME_BEFORE 0 ++#define UNICONV_BYNAME_AFTER 1 ++ ++struct uni_language { ++ uni_init_t *init[MAXUNITABLES]; /* map initialization routines */ ++ uni_conv_t *convbyname; /* the name-based conversion function */ ++ char *name; /* the language name */ ++ char *descr; /* description */ ++ char *alias[MAXUNIALIAS]; /* aliases of the language name */ ++ int sample_upper; /* code of some uppercase character for correctvsize() */ ++}; ++ ++/* the converter routines have an option of adding this suffix to the font name */ ++static char *uni_font_name_suffix = ""; /* empty by default */ ++/* this buffer may be used to store the suffix */ ++#define UNI_MAX_SUFFIX_LEN 100 ++static char uni_suffix_buf[UNI_MAX_SUFFIX_LEN+1]; ++ ++/* ++ * Prototypes of the conversion routines ++ */ ++ ++static uni_init_t unicode_latin1; ++static uni_init_t unicode_latin2; ++static uni_init_t unicode_latin4; ++static uni_init_t unicode_latin5; ++static uni_init_t unicode_cyrillic; ++static uni_init_t unicode_adobestd; ++static uni_init_t unicode_plane; ++static uni_conv_t unicode_adobestd_byname; ++ ++static uni_init_t unicode_init_user; ++ ++/* ++ * The order of descriptions is important: if we can't guess the ++ * language we just call all the conversion routines in order until ++ * we find one that understands this glyph. ++ */ ++static struct uni_language uni_lang[]= { ++ /* pseudo-language for all the languages using Latin1 */ ++ { ++ { unicode_latin1 }, ++ 0, /* no name-based mapping */ ++ "latin1", ++ "works for most of the Western languages", ++ { "en_", "de_", "fr_", "nl_", "no_", "da_", "it_" }, ++ 'A' ++ }, ++ { /* by Szalay Tamas */ ++ { unicode_latin2 }, ++ 0, /* no name-based mapping */ ++ "latin2", ++ "works for Central European languages", ++ { "hu_","pl_","cz_","si_","sk_" }, ++ 'A' ++ }, ++ { /* by Rièardas Èepas */ ++ { unicode_latin4 }, ++ 0, /* no name-based mapping */ ++ "latin4", ++ "works for Baltic languages", ++ { "lt_", "lv_" }, /* doubt about ee_ */ ++ 'A' ++ }, ++ { /* by Turgut Uyar */ ++ { unicode_latin5 }, ++ 0, /* no name-based mapping */ ++ "latin5", ++ "for Turkish", ++ { "tr_" }, ++ 'A' ++ }, ++ { /* by Zvezdan Petkovic */ ++ { unicode_cyrillic, unicode_latin1 }, ++ 0, /* no name-based mapping */ ++ "cyrillic", ++ "in Windows encoding", ++ { "bg_", "be_", "mk_", "ru_", "sr_", "su_", "uk_" }, ++ 'A' ++ }, ++ { ++ { unicode_cyrillic, unicode_latin1 }, ++ 0, /* no name-based mapping */ ++ "russian", ++ "obsolete, use cyrillic instead", ++ { 0 }, ++ 'A' ++ }, ++ { ++ { unicode_cyrillic, unicode_latin1 }, ++ 0, /* no name-based mapping */ ++ "bulgarian", ++ "obsolete, use cyrillic instead", ++ { 0 }, ++ 'A' ++ }, ++ { ++ { unicode_adobestd }, ++ unicode_adobestd_byname, ++ "adobestd", ++ "Adobe Standard, expected by TeX", ++ { NULL }, ++ 'A' ++ }, ++ { ++ { unicode_plane }, ++ 0, /* no name-based mapping */ ++ "plane", ++ "one plane of Unicode or other multi-byte encoding as is", ++ { NULL }, ++ 0 /* no easy way to predict the capital letters */ ++ }, ++}; ++ ++static struct uni_language uni_lang_user = { ++ { unicode_init_user }, ++ 0, /* no name-based mapping */ ++ 0, /* no name */ ++ 0, /* no description */ ++ { 0 }, ++ 0 /* no sample */ ++}; ++ ++static struct uni_language *uni_lang_selected=0; /* 0 means "unknown, try all" */ ++static int uni_sample='A'; /* sample of an uppercase character */ ++static char *uni_lang_arg=""; /* user-supplied language-dependent argument */ ++ ++extern int runt1asm(int); ++ ++/* ++ * user-defined loadable maps ++ */ ++ ++ ++/* The idea begind buckets is to avoid comparing every code with all ENCTABSZ codes in table. ++ * All the 16-bit unicode space is divided between a number of equal-sized buckets. ++ * Initially all the buckets are marked with 0. Then if any code in the bucket is ++ * used it's marked with 1. Later during translation we check the code's bucket first ++ * and it it's 0 then return failure right away. This may be useful for ++ * Chinese fonts with many thousands of glyphs. ++ */ ++ ++#define BUCKET_ID_BITS 11 ++#define MARK_UNI_BUCKET(unicode) SET_BITMAP(uni_user_buckets, (unicode)>>(16-BUCKET_ID_BITS)) ++#define IS_UNI_BUCKET(unicode) IS_BITMAP(uni_user_buckets, (unicode)>>(16-BUCKET_ID_BITS)) ++ ++static DEF_BITMAP(uni_user_buckets, 1< UNI_MAX_SUFFIX_LEN-1) ++ arg = NULL; ++ else { ++ sprintf(uni_suffix_buf, "-%s", arg); ++ uni_font_name_suffix = uni_suffix_buf; ++ } ++ } ++ ++ /* now read in the encoding description file, if requested */ ++ if ((unicode_map_file = fopen(path, "r")) == NULL) { ++ fprintf(stderr, "**** Cannot access map file '%s' ****\n", path); ++ exit(1); ++ } ++ ++ sawplane = 0; ++ if(arg==NULL) ++ enabled = found = 1; ++ else ++ enabled = found = 0; ++ ++ lineno=0; curpos=0; ++ while (fgets (buffer, UNIBFSZ, unicode_map_file) != NULL) { ++ char name[UNIBFSZ]; ++ ++ lineno++; ++ ++ if(sscanf(buffer, "plane %s", name)==1) { ++ sawplane = 1; ++ if(arg == 0) { ++ fprintf(stderr, "**** map file '%s' requires plane name\n", path); ++ fprintf(stderr, "for example:\n"); ++ fprintf(stderr, " ttf2pt1 -L %s%c[pid=N,eid=N,]%s ...\n", ++ path, LANG_ARG_SEP, name); ++ fprintf(stderr, "to select plane '%s'\n", name); ++ exit(1); ++ } ++ if( !strcmp(arg, name) ) { ++ enabled = found = 1; ++ curpos = 0; ++ } else { ++ enabled = 0; ++ if(found) /* no need to read further */ ++ break; ++ } ++ continue; ++ } ++ ++ if(sscanf(buffer, "id %d %d", &pid, &eid)==2) { ++ if( !overid /* only if the user has not overriden */ ++ && (enabled || !sawplane) ) { ++ force_pid = pid; force_eid = eid; ++ forcemap = 1; ++ } ++ continue; ++ } ++ ++ if( !enabled ) ++ continue; /* skip to the next plane */ ++ ++ if( sscanf(buffer, "at %i", &curpos) == 1 ) { ++ if(curpos > 255) { ++ fprintf(stderr, "**** map file '%s' line %d: code over 255\n", path, lineno); ++ exit(1); ++ } ++ if(ISDBG(EXTMAP)) fprintf(stderr, "=== at 0x%x\n", curpos); ++ continue; ++ } ++ ++ /* try the format of Roman Czyborra's files */ ++ if ( sscanf (buffer, " =%x U+%4x", &code, &unicode) == 2 ++ /* try the format of Linux locale charmap file */ ++ || sscanf (buffer, " <%*s /x%x ", &code, &unicode) == 2 ) { ++ if (code < ENCTABSZ) { ++ if(code >= enctabsz) enctabsz=code+1; ++ unicode_map[code] = unicode; ++ glyph_rename[code] = NULL; ++ } ++ } ++ /* try the format with glyph renaming */ ++ else if (sscanf (buffer, " !%x U+%4x %128s", &code, ++ &unicode, name) == 3) { ++ if (code < ENCTABSZ) { ++ if(code >= enctabsz) enctabsz=code+1; ++ unicode_map[code] = unicode; ++ glyph_rename[code] = strdup(name); ++ } ++ } ++ /* try the compact sequence format */ ++ else if( (n=sscanf(buffer, " %i%n", &unicode, &cnt)) == 1 ) { ++ p = buffer; ++ do { ++ if(curpos > 255) { ++ fprintf(stderr, "**** map file '%s' line %d: code over 255 for unicode 0x%x\n", ++ path, lineno, unicode); ++ exit(1); ++ } ++ if(ISDBG(EXTMAP)) fprintf(stderr, "=== 0x%d -> 0x%x\n", curpos, unicode); ++ unicode_map[curpos++] = unicode; ++ p += cnt; ++ if( sscanf(p, " %[,-]%n", &next,&cnt) == 1 ) { ++ if(ISDBG(EXTMAP)) fprintf(stderr, "=== next: '%c'\n", next); ++ p += cnt; ++ if( next == '-' ) { /* range */ ++ if ( sscanf(p, " %i%n", &unicode2, &cnt) != 1 ) { ++ fprintf(stderr, "**** map file '%s' line %d: missing end of range\n", path, lineno); ++ exit(1); ++ } ++ p += cnt; ++ if(ISDBG(EXTMAP)) fprintf(stderr, "=== range 0x%x to 0x%x\n", unicode, unicode2); ++ for(unicode++; unicode <= unicode2; unicode++) { ++ if(curpos > 255) { ++ fprintf(stderr, "**** map file '%s' line %d: code over 255 in unicode range ...-0x%x\n", ++ path, lineno, unicode2); ++ exit(1); ++ } ++ if(ISDBG(EXTMAP)) fprintf(stderr, "=== 0x%x -> 0x%x\n", curpos, unicode); ++ unicode_map[curpos++] = unicode; ++ } ++ } ++ } ++ } while ( sscanf(p, " %i%n", &unicode, &cnt) == 1 ); ++ } ++ ++ } ++ ++ fclose (unicode_map_file); ++ ++ if( !found ) { ++ fprintf(stderr, "**** map file '%s' has no plane '%s'\n", path, arg); ++ exit(1); ++ } ++ ++ if(unicode_map['A'] == 'A') ++ uni_sample = 'A'; /* seems to be compatible with Latin */ ++ else ++ uni_sample = 0; /* don't make any assumptions */ ++} ++ ++/* ++ * by Zvezdan Petkovic ++ */ ++static void ++unicode_cyrillic( ++ char *arg ++) ++{ ++ int i; ++ static unsigned int cyrillic_unicode_map[] = { ++ 0x0402, 0x0403, 0x201a, 0x0453, 0x201e, 0x2026, 0x2020, 0x2021, /* 80 */ ++ 0x20ac, 0x2030, 0x0409, 0x2039, 0x040a, 0x040c, 0x040b, 0x040f, /* 88 */ ++ 0x0452, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, /* 90 */ ++ 0x02dc, 0x2122, 0x0459, 0x203a, 0x045a, 0x045c, 0x045b, 0x045f, /* 98 */ ++ 0x00a0, 0x040e, 0x045e, 0x0408, 0x00a4, 0x0490, 0x00a6, 0x00a7, /* A0 */ ++ 0x0401, 0x00a9, 0x0404, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x0407, /* A8 */ ++ 0x00b0, 0x00b1, 0x0406, 0x0456, 0x0491, 0x00b5, 0x00b6, 0x00b7, /* B0 */ ++ 0x0451, 0x2116, 0x0454, 0x00bb, 0x0458, 0x0405, 0x0455, 0x0457, /* B8 */ ++ }; ++ ++ for(i=0; i<=0x7F; i++) ++ unicode_map[i] = i; ++ ++ for(i=0x80; i<=0xBF; i++) ++ unicode_map[i] = cyrillic_unicode_map[i-0x80]; ++ ++ for(i=0xC0; i<=0xFF; i++) ++ unicode_map[i] = i+0x350; ++ ++} ++ ++static void ++unicode_latin1( ++ char *arg ++) ++{ ++ int i; ++ static unsigned int latin1_unicode_map[] = { ++ 0x20ac, -1, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, /* 80 */ ++ 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x017d, 0x008f, /* 88 */ ++ 0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, /* 90 */ ++ 0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x009d, 0x017e, 0x0178, /* 98 */ ++ }; ++ ++ for(i=0; i<=0x7F; i++) ++ unicode_map[i] = i; ++ ++ for(i=0x80; i<=0x9F; i++) ++ unicode_map[i] = latin1_unicode_map[i-0x80]; ++ ++ for(i=0xA0; i<=0xFF; i++) ++ unicode_map[i] = i; ++} ++ ++static void ++unicode_adobestd( ++ char *arg ++) ++{ ++ int i; ++ static unsigned int adobestd_unicode_map[] = { ++ -1, 0x00a1, 0x00a2, 0x00a3, 0x2215, 0x00a5, 0x0192, 0x00a7, /* A0 */ ++ 0x00a4, 0x0027, 0x201c, 0x00ab, 0x2039, 0x203a, 0xfb01, 0xfb02, /* A8 */ ++ -1, 0x2013, 0x2020, 0x2021, 0x2219, -1, 0x00b6, 0x2022, /* B0 */ ++ 0x201a, 0x201e, 0x201d, 0x00bb, 0x2026, 0x2030, -1, 0x00bf, /* B8 */ ++ -1, 0x0060, 0x00b4, 0x02c6, 0x02dc, 0x02c9, 0x02d8, 0x02d9, /* C0 */ ++ 0x00a8, -1, 0x02da, 0x00b8, -1, 0x02dd, 0x02db, 0x02c7, /* C8 */ ++ 0x2014, -1, -1, -1, -1, -1, -1, -1, /* D0 */ ++ -1, -1, -1, -1, -1, -1, -1, -1, /* D8 */ ++ -1, 0x00c6, -1, 0x00aa, -1, -1, -1, -1, /* E0 */ ++ 0x0141, 0x00d8, 0x0152, 0x00ba, -1, -1, -1, -1, /* E8 */ ++ -1, 0x00e6, -1, -1, -1, 0x0131, -1, -1, /* F0 */ ++ 0x0142, 0x00f8, 0x0153, 0x00df, -1, -1, -1, -1, /* F8 */ ++ }; ++ ++ for(i=0; i<=0x7F; i++) ++ unicode_map[i] = i; ++ ++ unicode_map[0x27] = 0x2019; ++ unicode_map[0x60] = -1; ++ ++ /* 0x80 to 0x9F is a hole */ ++ ++ for(i=0xA0; i<=0xFF; i++) ++ unicode_map[i] = adobestd_unicode_map[i-0xA0]; ++} ++ ++/* ++ * Not all of the Adobe glyphs are in the Unicode ++ * standard maps, so the font creators have ++ * different ideas about their codes. Because ++ * of this we try to map based on the glyph ++ * names instead of Unicode codes. If there are ++ * no glyph names (ps_fmt_3!=0) we fall back ++ * to the code-based scheme. ++ */ ++ ++static int ++unicode_adobestd_byname( ++ char *name, ++ char *arg, ++ int where ++) ++{ ++ int i; ++ ++ /* names always take precedence over codes */ ++ if(where == UNICONV_BYNAME_AFTER) ++ return -1; ++ ++ for(i=32; i<256; i++) { ++ if(!strcmp(name, adobe_StandardEncoding[i])) ++ return i; ++ } ++ return -1; ++ ++} ++ ++static void ++unicode_latin2( ++ char *arg ++) ++{ ++ int i; ++ static unsigned int latin2_unicode_map[] = { ++ 0x00a0, 0x0104, 0x02d8, 0x0141, 0x00a4, 0x013d, 0x015a, 0x00a7, /* A0 */ ++ 0x00a8, 0x0160, 0x015e, 0x0164, 0x0179, 0x00ad, 0x017d, 0x017b, /* A8 */ ++ 0x00b0, 0x0105, 0x02db, 0x0142, 0x00b4, 0x013e, 0x015b, 0x02c7, /* B0 */ ++ 0x00b8, 0x0161, 0x015f, 0x0165, 0x017a, 0x02dd, 0x017e, 0x017c, /* B8 */ ++ 0x0154, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x0139, 0x0106, 0x00c7, /* C0 */ ++ 0x010c, 0x00c9, 0x0118, 0x00cb, 0x011a, 0x00cd, 0x00ce, 0x010e, /* C8 */ ++ 0x0110, 0x0143, 0x0147, 0x00d3, 0x00d4, 0x0150, 0x00d6, 0x00d7, /* D0 */ ++ 0x0158, 0x016e, 0x00da, 0x0170, 0x00dc, 0x00dd, 0x0162, 0x00df, /* D8 */ ++ 0x0155, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x013a, 0x0107, 0x00e7, /* E0 */ ++ 0x010d, 0x00e9, 0x0119, 0x00eb, 0x011b, 0x00ed, 0x00ee, 0x010f, /* E8 */ ++ 0x0111, 0x0144, 0x0148, 0x00f3, 0x00f4, 0x0151, 0x00f6, 0x00f7, /* F0 */ ++ 0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9, /* F8 */ ++ }; ++ ++ for(i=0; i<=0x7E; i++) ++ unicode_map[i] = i; ++ ++ /* 7F-9F are unused */ ++ ++ for(i=0xA0; i<=0xFF; i++) ++ unicode_map[i] = latin2_unicode_map[i-0xA0]; ++} ++ ++static void ++unicode_latin4( ++ char *arg ++) ++{ ++ int i; ++ static unsigned int latin4_unicode_map[] = { ++ 0x0080, 0x0081, 0x201a, 0x0192, -1, 0x2026, 0x2020, 0x2021, /* 80 */ ++ 0x02c6, 0x2030, -1, 0x2039, 0x0152, 0x008d, 0x008e, 0x008f, /* 88 */ ++ 0x201e, 0x201c, 0x2019, -1, 0x201d, 0x2022, 0x2013, 0x2014, /* 90 */ ++ 0x02dc, 0x2122, -1, 0x203a, 0x0153, 0x009d, 0x009e, 0x0178, /* 98 */ ++ 0x00a0, 0x0104, 0x0138, 0x0156, 0x00a4, 0x0128, 0x013b, 0x00a7, /* A0 */ ++ 0x00a8, 0x0160, 0x0112, 0x0122, 0x0166, 0x00ad, 0x017d, 0x00af, /* A8 */ ++ 0x00b0, 0x0105, 0x02db, 0x0157, 0x00b4, 0x0129, 0x013c, 0x02c7, /* B0 */ ++ 0x00b8, 0x0161, 0x0113, 0x0123, 0x0167, 0x014a, 0x017e, 0x014b, /* B8 */ ++ 0x0100, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x012e, /* C0 */ ++ 0x010c, 0x00c9, 0x0118, 0x00cb, 0x0116, 0x00cd, 0x00ce, 0x012a, /* C8 */ ++ 0x0110, 0x0145, 0x014c, 0x0136, 0x00d4, 0x00d5, 0x00d6, 0x00d7, /* D0 */ ++ 0x00d8, 0x0172, 0x00da, 0x00db, 0x00dc, 0x0168, 0x016a, 0x00df, /* D8 */ ++ 0x0101, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x012f, /* E0 */ ++ 0x010d, 0x00e9, 0x0119, 0x00eb, 0x0117, 0x00ed, 0x00ee, 0x012b, /* E8 */ ++ 0x0111, 0x0146, 0x014d, 0x0137, 0x00f4, 0x00f5, 0x00f6, 0x00f7, /* F0 */ ++ 0x00f8, 0x0173, 0x00fa, 0x00fb, 0x00fc, 0x0169, 0x016b, 0x02d9, /* F8 */ ++ }; ++ ++ for(i=0; i<=0x7F; i++) ++ unicode_map[i] = i; ++ ++ for(i=0x80; i<=0xFF; i++) ++ unicode_map[i] = latin4_unicode_map[i-0x80]; ++ ++#if 0 /* for documentation purposes only */ ++ case 0x201e: return 0x90; /* these two quotes are a hack only */ ++ case 0x201c: return 0x91; /* these two quotes are a hack only */ ++ case 0x00A0: return 0xA0; /* NO-BREAK SPACE */ ++ case 0x0104: return 0xA1; /* LATIN CAPITAL LETTER A WITH OGONEK */ ++ case 0x0138: return 0xA2; /* LATIN SMALL LETTER KRA */ ++ case 0x0156: return 0xA3; /* LATIN CAPITAL LETTER R WITH CEDILLA */ ++ case 0x00A4: return 0xA4; /* CURRENCY SIGN */ ++ case 0x0128: return 0xA5; /* LATIN CAPITAL LETTER I WITH TILDE */ ++ case 0x013B: return 0xA6; /* LATIN CAPITAL LETTER L WITH CEDILLA */ ++ case 0x00A7: return 0xA7; /* SECTION SIGN */ ++ case 0x00A8: return 0xA8; /* DIAERESIS */ ++ case 0x0160: return 0xA9; /* LATIN CAPITAL LETTER S WITH CARON */ ++ case 0x0112: return 0xAA; /* LATIN CAPITAL LETTER E WITH MACRON */ ++ case 0x0122: return 0xAB; /* LATIN CAPITAL LETTER G WITH CEDILLA */ ++ case 0x0166: return 0xAC; /* LATIN CAPITAL LETTER T WITH STROKE */ ++ case 0x00AD: return 0xAD; /* SOFT HYPHEN */ ++ case 0x017D: return 0xAE; /* LATIN CAPITAL LETTER Z WITH CARON */ ++ case 0x00AF: return 0xAF; /* MACRON */ ++ case 0x00B0: return 0xB0; /* DEGREE SIGN */ ++ case 0x0105: return 0xB1; /* LATIN SMALL LETTER A WITH OGONEK */ ++ case 0x02DB: return 0xB2; /* OGONEK */ ++ case 0x0157: return 0xB3; /* LATIN SMALL LETTER R WITH CEDILLA */ ++ case 0x00B4: return 0xB4; /* ACUTE ACCENT */ ++ case 0x0129: return 0xB5; /* LATIN SMALL LETTER I WITH TILDE */ ++ case 0x013C: return 0xB6; /* LATIN SMALL LETTER L WITH CEDILLA */ ++ case 0x02C7: return 0xB7; /* CARON */ ++ case 0x00B8: return 0xB8; /* CEDILLA */ ++ case 0x0161: return 0xB9; /* LATIN SMALL LETTER S WITH CARON */ ++ case 0x0113: return 0xBA; /* LATIN SMALL LETTER E WITH MACRON */ ++ case 0x0123: return 0xBB; /* LATIN SMALL LETTER G WITH CEDILLA */ ++ case 0x0167: return 0xBC; /* LATIN SMALL LETTER T WITH STROKE */ ++ case 0x014A: return 0xBD; /* LATIN CAPITAL LETTER ENG */ ++ case 0x017E: return 0xBE; /* LATIN SMALL LETTER Z WITH CARON */ ++ case 0x014B: return 0xBF; /* LATIN SMALL LETTER ENG */ ++ case 0x0100: return 0xC0; /* LATIN CAPITAL LETTER A WITH MACRON */ ++ case 0x00C1: return 0xC1; /* LATIN CAPITAL LETTER A WITH ACUTE */ ++ case 0x00C2: return 0xC2; /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ ++ case 0x00C3: return 0xC3; /* LATIN CAPITAL LETTER A WITH TILDE */ ++ case 0x00C4: return 0xC4; /* LATIN CAPITAL LETTER A WITH DIAERESIS */ ++ case 0x00C5: return 0xC5; /* LATIN CAPITAL LETTER A WITH RING ABOVE */ ++ case 0x00C6: return 0xC6; /* LATIN CAPITAL LIGATURE AE */ ++ case 0x012E: return 0xC7; /* LATIN CAPITAL LETTER I WITH OGONEK */ ++ case 0x010C: return 0xC8; /* LATIN CAPITAL LETTER C WITH CARON */ ++ case 0x00C9: return 0xC9; /* LATIN CAPITAL LETTER E WITH ACUTE */ ++ case 0x0118: return 0xCA; /* LATIN CAPITAL LETTER E WITH OGONEK */ ++ case 0x00CB: return 0xCB; /* LATIN CAPITAL LETTER E WITH DIAERESIS */ ++ case 0x0116: return 0xCC; /* LATIN CAPITAL LETTER E WITH DOT ABOVE */ ++ case 0x00CD: return 0xCD; /* LATIN CAPITAL LETTER I WITH ACUTE */ ++ case 0x00CE: return 0xCE; /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ ++ case 0x012A: return 0xCF; /* LATIN CAPITAL LETTER I WITH MACRON */ ++ case 0x0110: return 0xD0; /* LATIN CAPITAL LETTER D WITH STROKE */ ++ case 0x0145: return 0xD1; /* LATIN CAPITAL LETTER N WITH CEDILLA */ ++ case 0x014C: return 0xD2; /* LATIN CAPITAL LETTER O WITH MACRON */ ++ case 0x0136: return 0xD3; /* LATIN CAPITAL LETTER K WITH CEDILLA */ ++ case 0x00D4: return 0xD4; /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ ++ case 0x00D5: return 0xD5; /* LATIN CAPITAL LETTER O WITH TILDE */ ++ case 0x00D6: return 0xD6; /* LATIN CAPITAL LETTER O WITH DIAERESIS */ ++ case 0x00D7: return 0xD7; /* MULTIPLICATION SIGN */ ++ case 0x00D8: return 0xD8; /* LATIN CAPITAL LETTER O WITH STROKE */ ++ case 0x0172: return 0xD9; /* LATIN CAPITAL LETTER U WITH OGONEK */ ++ case 0x00DA: return 0xDA; /* LATIN CAPITAL LETTER U WITH ACUTE */ ++ case 0x00DB: return 0xDB; /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ ++ case 0x00DC: return 0xDC; /* LATIN CAPITAL LETTER U WITH DIAERESIS */ ++ case 0x0168: return 0xDD; /* LATIN CAPITAL LETTER U WITH TILDE */ ++ case 0x016A: return 0xDE; /* LATIN CAPITAL LETTER U WITH MACRON */ ++ case 0x00DF: return 0xDF; /* LATIN SMALL LETTER SHARP S */ ++ case 0x0101: return 0xE0; /* LATIN SMALL LETTER A WITH MACRON */ ++ case 0x00E1: return 0xE1; /* LATIN SMALL LETTER A WITH ACUTE */ ++ case 0x00E2: return 0xE2; /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ ++ case 0x00E3: return 0xE3; /* LATIN SMALL LETTER A WITH TILDE */ ++ case 0x00E4: return 0xE4; /* LATIN SMALL LETTER A WITH DIAERESIS */ ++ case 0x00E5: return 0xE5; /* LATIN SMALL LETTER A WITH RING ABOVE */ ++ case 0x00E6: return 0xE6; /* LATIN SMALL LIGATURE AE */ ++ case 0x012F: return 0xE7; /* LATIN SMALL LETTER I WITH OGONEK */ ++ case 0x010D: return 0xE8; /* LATIN SMALL LETTER C WITH CARON */ ++ case 0x00E9: return 0xE9; /* LATIN SMALL LETTER E WITH ACUTE */ ++ case 0x0119: return 0xEA; /* LATIN SMALL LETTER E WITH OGONEK */ ++ case 0x00EB: return 0xEB; /* LATIN SMALL LETTER E WITH DIAERESIS */ ++ case 0x0117: return 0xEC; /* LATIN SMALL LETTER E WITH DOT ABOVE */ ++ case 0x00ED: return 0xED; /* LATIN SMALL LETTER I WITH ACUTE */ ++ case 0x00EE: return 0xEE; /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ ++ case 0x012B: return 0xEF; /* LATIN SMALL LETTER I WITH MACRON */ ++ case 0x0111: return 0xF0; /* LATIN SMALL LETTER D WITH STROKE */ ++ case 0x0146: return 0xF1; /* LATIN SMALL LETTER N WITH CEDILLA */ ++ case 0x014D: return 0xF2; /* LATIN SMALL LETTER O WITH MACRON */ ++ case 0x0137: return 0xF3; /* LATIN SMALL LETTER K WITH CEDILLA */ ++ case 0x00F4: return 0xF4; /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ ++ case 0x00F5: return 0xF5; /* LATIN SMALL LETTER O WITH TILDE */ ++ case 0x00F6: return 0xF6; /* LATIN SMALL LETTER O WITH DIAERESIS */ ++ case 0x00F7: return 0xF7; /* DIVISION SIGN */ ++ case 0x00F8: return 0xF8; /* LATIN SMALL LETTER O WITH STROKE */ ++ case 0x0173: return 0xF9; /* LATIN SMALL LETTER U WITH OGONEK */ ++ case 0x00FA: return 0xFA; /* LATIN SMALL LETTER U WITH ACUTE */ ++ case 0x00FB: return 0xFB; /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ ++ case 0x00FC: return 0xFC; /* LATIN SMALL LETTER U WITH DIAERESIS */ ++ case 0x0169: return 0xFD; /* LATIN SMALL LETTER U WITH TILDE */ ++ case 0x016B: return 0xFE; /* LATIN SMALL LETTER U WITH MACRON */ ++ case 0x02D9: return 0xFF; /* DOT ABOVE */ ++#endif ++} ++ ++static void ++unicode_latin5( ++ char *arg ++) ++{ ++ int i; ++ static unsigned int latin5_unicode_map1[] = { ++ 0x0080, 0x0081, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, /* 80 */ ++ 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x008e, 0x008f, /* 88 */ ++ 0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, /* 90 */ ++ 0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x009d, 0x009e, 0x0178, /* 98 */ ++ }; ++ static unsigned int latin5_unicode_map2[] = { ++ 0x011e, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, /* D0 */ ++ 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x0130, 0x015e, 0x00df, /* D8 */ ++ 0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, /* E0 direct */ ++ 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, /* E8 direct */ ++ 0x011f, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, /* F0 */ ++ 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x0131, 0x015f, 0x00ff, /* F8 */ ++ }; ++ ++ for(i=0; i<=0x7F; i++) ++ unicode_map[i] = i; ++ ++ for(i=0x80; i<=0x9F; i++) ++ unicode_map[i] = latin5_unicode_map1[i-0x80]; ++ ++ for(i=0xA0; i<=0xCF; i++) ++ unicode_map[i] = i; ++ ++ for(i=0xD0; i<=0xFF; i++) ++ unicode_map[i] = latin5_unicode_map2[i-0xD0]; ++} ++ ++/* a way to select one 256-character plane from Unicode ++ * or other multi-byte encoding ++ */ ++ ++static void ++unicode_plane( ++ char *arg ++) ++{ ++ static unsigned plane; ++ int nchars; ++ int c1, c2, i; ++ ++ if(uni_lang_selected == 0) ++ return; /* don't participate in auto-guessing */ ++ ++ plane = 0; force_pid = force_eid = -1; ++ ++ c1 = sscanf(arg, "pid=%d,eid=%d%n", &force_pid, &force_eid, &nchars); ++ if(c1 == 2) { ++ arg += nchars; ++ if(*arg == ',') ++ arg++; ++ } ++ if(arg[0] == '0' && (arg[1]=='x' || arg[1]=='X') ) { ++ arg += 2; ++ c2 = sscanf(arg, "%x", &plane); ++ } else { ++ c2 = sscanf(arg, "%d", &plane); ++ } ++ ++ if( (c1!=2 && c1!=0) || (c1==0 && c2==0) ) { ++ fprintf(stderr, "**** option -l plane expects one of the following formats:\n"); ++ fprintf(stderr, " -l plane+0xNN - select hexadecimal number of plane of Unicode\n"); ++ fprintf(stderr, " -l plane+NN - select decimal number of plane of Unicode\n"); ++ fprintf(stderr, " -l plane+pid=N,eid=N - select plane 0 of specified encoding\n"); ++ fprintf(stderr, " -l plane+pid=N,eid=N,0xNN - select hex plane of TTF encoding with this PID/EID\n"); ++ fprintf(stderr, " -l plane+pid=N,eid=N,NN - select decimal plane of TTF encoding with this PID/EID\n"); ++ exit(1); ++ } ++ ++ if(c2!=0) { ++ if(strlen(arg) > sizeof(uni_suffix_buf)-2) { ++ fprintf(stderr, "**** plane number is too large\n"); ++ } ++ ++ sprintf(uni_suffix_buf, "-%s", arg); ++ uni_font_name_suffix = uni_suffix_buf; ++ } else { ++ uni_font_name_suffix = ""; ++ } ++ ++ plane <<= 8; ++ for(i=0; i<=0xFF; i++) ++ unicode_map[i] = plane | i; ++} ++ ++/* look up the 8-bit code by unicode */ ++ ++int ++unicode_rev_lookup( ++ int unival ++) ++{ ++ int res; ++ ++ if( ! IS_UNI_BUCKET(unival) ) ++ return -1; ++ ++ for (res = 0; res < enctabsz; res++) ++ if (unicode_map[res] == unival) ++ return res; ++ return -1; ++} ++ ++/* mark the buckets for quick lookup */ ++ ++static void ++unicode_prepare_buckets( ++ void ++) ++{ ++ int i; ++ ++ memset(uni_user_buckets, 0, sizeof uni_user_buckets); ++ for(i=0; i 126) { ++ sprintf(res+i, "\\x%02X", c); ++ i+=4; ++ } else { ++ res[i++] = c; ++ } ++ } ++ if(*s != 0) { ++ res[i++] = '.'; ++ res[i++] = '.'; ++ res[i++] = '.'; ++ } ++ res[i++] = 0; ++ return res; ++} ++ ++/* ++ * Scale the values according to the scale_factor ++ */ ++ ++double ++fscale( ++ double val ++) ++{ ++ return scale_factor * val; ++} ++ ++int ++iscale( ++ int val ++) ++{ ++ return (int) (val > 0 ? scale_factor * val + 0.5 ++ : scale_factor * val - 0.5); ++} ++ ++/* ++ * Try to force fixed width of characters ++ */ ++ ++static void ++alignwidths(void) ++{ ++ int i; ++ int n = 0, avg, max = 0, min = 3000, sum = 0, x; ++ ++ for (i = 0; i < numglyphs; i++) { ++ if (glyph_list[i].flags & GF_USED) { ++ x = glyph_list[i].width; ++ ++ if (x != 0) { ++ if (x < min) ++ min = x; ++ if (x > max) ++ max = x; ++ ++ sum += x; ++ n++; ++ } ++ } ++ } ++ ++ if (n == 0) ++ return; ++ ++ avg = sum / n; ++ ++ WARNING_3 fprintf(stderr, "widths: max=%d avg=%d min=%d\n", max, avg, min); ++ ++ /* if less than 5% variation from average */ ++ /* force fixed width */ ++ if (20 * (avg - min) < avg && 20 * (max - avg) < avg) { ++ for (i = 0; i < numglyphs; i++) { ++ if (glyph_list[i].flags & GF_USED) ++ glyph_list[i].width = avg; ++ } ++ fontm.is_fixed_pitch = 1; ++ } ++} ++ ++static void ++convert_glyf( ++ int glyphno ++) ++{ ++ GLYPH *g; ++ int ncurves; ++ ++ g = &glyph_list[glyphno]; ++ ++ ++ g->scaledwidth = iscale(g->width); ++ ++ g->entries = 0; ++ g->lastentry = 0; ++ g->path = 0; ++ if (g->ttf_pathlen != 0) { ++ cursw->glpath(glyphno, glyph_list); ++ g->lastentry = 0; ++ ++ if(ISDBG(BUILDG)) ++ dumppaths(g, NULL, NULL); ++ ++ assertpath(g->entries, __FILE__, __LINE__, g->name); ++ ++ fclosepaths(g); ++ assertpath(g->entries, __FILE__, __LINE__, g->name); ++ ++ /* float processing */ ++ if(smooth) { ++ ffixquadrants(g); ++ assertpath(g->entries, __FILE__, __LINE__, g->name); ++ ++ fsplitzigzags(g); ++ assertpath(g->entries, __FILE__, __LINE__, g->name); ++ ++ fforceconcise(g); ++ assertpath(g->entries, __FILE__, __LINE__, g->name); ++ ++ fstraighten(g); ++ assertpath(g->entries, __FILE__, __LINE__, g->name); ++ } ++ ++ pathtoint(g); ++ /* all processing past this point expects integer path */ ++ assertpath(g->entries, __FILE__, __LINE__, g->name); ++ ++#if 0 ++ fixcontours(g); ++ testfixcvdir(g); ++#endif ++ ++ /* int processing */ ++ if (smooth) { ++ smoothjoints(g); ++ assertpath(g->entries, __FILE__, __LINE__, g->name); ++ } ++ ++ ncurves = 0; ++ { ++ GENTRY *ge; ++ for(ge = g->entries; ge; ge = ge->next) ++ ncurves++; ++ } ++ if (ncurves > 200) { ++ WARNING_3 fprintf(stderr, ++ "** Glyph %s is too long, may display incorrectly\n", ++ g->name); ++ } ++ } else { ++ /* for buildstems */ ++ g->flags &= ~GF_FLOAT; ++ } ++} ++ ++static void ++handle_gnames(void) ++{ ++ int i, n, found, c, type; ++ ++ /* get the names from the font file */ ++ ps_fmt_3 = cursw->glnames(glyph_list); ++ ++/* These checks are not required by Xprt's PS DDX... */ ++#ifndef XP_PSTEXT ++ /* check for names with wrong characters */ ++ for (n = 0; n < numglyphs; n++) { ++ int c; ++ for (i = 0; (c = glyph_list[n].name[i]) != 0; i++) { ++ if (!(isalnum(c) || c == '.' || c == '_' || c == '-') ++ || i==0 && isdigit(c)) { /* must not start with a digit */ ++ WARNING_3 fprintf(stderr, "Glyph %d %s (%s), ", ++ n, isdigit(c) ? "name starts with a digit" : ++ "has bad characters in name", ++ nametoprint(glyph_list[n].name)); ++ glyph_list[n].name = malloc(16); ++ sprintf(glyph_list[n].name, "_b_%d", n); ++ WARNING_3 fprintf(stderr, "changing to %s\n", glyph_list[n].name); ++ break; ++ } ++ } ++ } ++ ++ if( !ps_fmt_3 ) { ++ /* check for duplicate names */ ++ for (n = 0; n < numglyphs; n++) { ++ found = 0; ++ for (i = 0; i < n && !found; i++) { ++ if (strcmp(glyph_list[i].name, glyph_list[n].name) == 0) { ++ if (( glyph_list[n].name = malloc(16) )==0) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ sprintf(glyph_list[n].name, "_d_%d", n); ++ ++ /* if the font has no names in it (what the native parser ++ * recognises as ps_fmt_3), FreeType returns all the ++ * names as .notdef, so don't complain in this case ++ */ ++ if(strcmp(glyph_list[i].name, ".notdef")) { ++ WARNING_3 fprintf(stderr, ++ "Glyph %d has the same name as %d: (%s), changing to %s\n", ++ n, i, ++ glyph_list[i].name, ++ glyph_list[n].name); ++ } ++ found = 1; ++ } ++ } ++ } ++ ++ } ++#endif /* !XP_PSTEXT */ ++ ++ /* start the encoding stuff */ ++ for (i = 0; i < ENCTABSZ; i++) { ++ encoding[i] = -1; ++ } ++ ++ /* do the 1st round of encoding by name */ ++ if(!ps_fmt_3 && uni_lang_selected && uni_lang_selected->convbyname) { ++ for (n = 0; n < numglyphs; n++) { ++ c = uni_lang_selected->convbyname(glyph_list[n].name, ++ uni_lang_arg, UNICONV_BYNAME_BEFORE); ++ if(c>=0 && cinit[i]; i++) { ++ for (n = 0; n < ENCTABSZ; n++) ++ unicode_map[n] = -1; ++ uni_lang_selected->init[i](uni_lang_arg); ++ unicode_prepare_buckets(); ++ type = cursw->glenc(glyph_list, encoding, unicode_map); ++ if( type == 0 ) ++ /* if we have an 8-bit encoding we don't need more tries */ ++ break; ++ } ++ } else { ++ /* language is unknown, try the first table of each */ ++ for(i=0; i < sizeof uni_lang/(sizeof uni_lang[0]); i++) { ++ if(uni_lang[i].init[0] == NULL) ++ continue; ++ for (n = 0; n < ENCTABSZ; n++) ++ unicode_map[n] = -1; ++ uni_lang[i].init[0](uni_lang_arg); ++ unicode_prepare_buckets(); ++ type = cursw->glenc(glyph_list, encoding, unicode_map); ++ if( type == 0 ) ++ /* if we have an 8-bit encoding we don't need more tries */ ++ break; ++ } ++ } ++ ++ if (ps_fmt_3) { ++ /* get rid of the old names, they are all "UNKNOWN" anyawy */ ++ for (i = 0; i < numglyphs; i++) { ++ glyph_list[i].name = 0; ++ } ++ if(type == 0) { ++ /* 8-bit - give 8859/1 names to the first 256 glyphs */ ++ for (i = 0; i < 256; i++) { /* here 256, not ENCTABSZ */ ++ if (encoding[i] > 0) { ++ glyph_list[encoding[i]].name = Fmt3Encoding[i]; ++ } ++ } ++ } else if(type == 1) { ++ /* Unicode - give 8859/1 names to the first 256 glyphs of Unicode */ ++ for (n = 0; n < 256; n++) { /* here 256, not ENCTABSZ */ ++ i = unicode_rev_lookup(n); ++ if (i>=0 && encoding[i] > 0) { ++ glyph_list[encoding[i]].name = Fmt3Encoding[i]; ++ } ++ } ++ } /* for other types of encodings just give generated names */ ++ /* assign unique names to the rest of the glyphs */ ++ for (i = 0; i < numglyphs; i++) { ++ if (glyph_list[i].name == 0) { ++ if (( glyph_list[i].name = malloc(16) )==0) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ sprintf(glyph_list[i].name, "_d_%d", i); ++ } ++ } ++ } ++ ++ /* do the 2nd round of encoding by name */ ++ if(uni_lang_selected && uni_lang_selected->convbyname) { ++ for (n = 0; n < numglyphs; n++) { ++ c = uni_lang_selected->convbyname(glyph_list[n].name, ++ uni_lang_arg, UNICONV_BYNAME_AFTER); ++ if(c>=0 && c 0) ++ glyph_list[0].name = ".notdef"; ++ if(numglyphs > 1) ++ glyph_list[1].name = ".null"; ++#endif /* !XP_PSTEXT */ ++ ++ for (i = 0; i < ENCTABSZ; i++) { ++ if ((encoding[i] != 0) && glyph_rename[i]) { ++ glyph_list[encoding[i]].name = glyph_rename[i]; ++ } ++ } ++} ++ ++static void ++usage(void) ++{ ++ ++#ifdef XP_PSTEXT ++ fputs("ft2pt1: Internal startup error\n", stderr); ++#else ++ ++#ifdef _GNU_SOURCE ++# define fplop(txt) fputs(txt, stderr); ++#else ++# define fplop(txt) ++#endif ++ ++ fputs("Use:\n", stderr); ++ fputs("ttf2pt1 [-] [-l language | -L file] []\n", stderr); ++ fputs(" or\n", stderr); ++ fputs("ttf2pt1 [-] [-l language | -L file] -\n", stderr); ++ fputs(" or\n", stderr); ++ fputs("ttf2pt1 [-] [-l language | -L file] - | t1asm > \n", stderr); ++ ++ fplop("\n"); ++ fplop("This build supports both short and long option names,\n"); ++ fplop("the long options are listed before corresponding short ones\n"); ++ ++ fplop(" --all-glyphs\n"); ++ fputs(" -a - include all glyphs, even those not in the encoding table\n", stderr); ++ fplop(" --pfb\n"); ++ fputs(" -b - produce a compressed .pfb file\n", stderr); ++ fplop(" --debug dbg_suboptions\n"); ++ fputs(" -d dbg_suboptions - debugging options, run ttf2pt1 -d? for help\n", stderr); ++ fplop(" --encode\n"); ++ fputs(" -e - produce a fully encoded .pfa file\n", stderr); ++ fplop(" --force-unicode\n"); ++ fputs(" -F - force use of Unicode encoding even if other MS encoding detected\n", stderr); ++ fplop(" --generate suboptions\n"); ++ fputs(" -G suboptions - control the file generation, run ttf2pt1 -G? for help\n", stderr); ++ fplop(" --language language\n"); ++ fputs(" -l language - convert Unicode to specified language, run ttf2pt1 -l? for list\n", stderr); ++ fplop(" --language-map file\n"); ++ fputs(" -L file - convert Unicode according to encoding description file\n", stderr); ++ fplop(" --limit =\n"); ++ fputs(" -m = - set maximal limit of given type to value, types:\n", stderr); ++ fputs(" h - maximal hint stack depth in the PostScript interpreter\n", stderr); ++ fplop(" --processing suboptions\n"); ++ fputs(" -O suboptions - control outline processing, run ttf2pt1 -O? for help\n", stderr); ++ fplop(" --parser name\n"); ++ fputs(" -p name - use specific front-end parser, run ttf2pt1 -p? for list\n", stderr); ++ fplop(" --uid id\n"); ++ fputs(" -u id - use this UniqueID, -u A means autogeneration\n", stderr); ++ fplop(" --vertical-autoscale size\n"); ++ fputs(" -v size - scale the font to make uppercase letters >size/1000 high\n", stderr); ++ fplop(" --version\n"); ++ fputs(" -V - print ttf2pt1 version number\n", stderr); ++ fplop(" --warning number\n"); ++ fputs(" -W number - set the level of permitted warnings (0 - disable)\n", stderr); ++ fputs("Obsolete options (will be removed in future releases):\n", stderr); ++ fplop(" --afm\n"); ++ fputs(" -A - write the .afm file to STDOUT instead of the font, now -GA\n", stderr); ++ fputs(" -f - don't try to guess the value of the ForceBold hint, now -Ob\n", stderr); ++ fputs(" -h - disable autogeneration of hints, now -Oh\n", stderr); ++ fputs(" -H - disable hint substitution, now -Ou\n", stderr); ++ fputs(" -o - disable outline optimization, now -Oo\n", stderr); ++ fputs(" -s - disable outline smoothing, now -Os\n", stderr); ++ fputs(" -t - disable auto-scaling to 1000x1000 standard matrix, now -Ot\n", stderr); ++ fputs(" -w - correct the glyph widths (use only for buggy fonts), now -OW\n", stderr); ++ fputs("With no , write to with suffix replaced.\n", stderr); ++ fputs("The last '-' means 'use STDOUT'.\n", stderr); ++ ++#undef fplop ++ ++#endif /* XP_PSTEXT */ ++} ++ ++static void ++printversion(void) ++{ ++ fprintf(stderr, "ttf2pt1 %s\n", TTF2PT1_VERSION); ++} ++ ++/* initialize a table of suboptions */ ++static void ++init_subo_tbl( ++ struct subo_case *tbl ++) ++{ ++ int i; ++ ++ for(i=0; tbl[i].disbl != 0; i++) { ++ tbl[i].disbl = tolower(tbl[i].disbl); ++ tbl[i].enbl = toupper(tbl[i].disbl); ++ *(tbl[i].valp) = tbl[i].dflt; ++ } ++} ++ ++/* print the default value of the suboptions */ ++static void ++print_subo_dflt( ++ FILE *f, ++ struct subo_case *tbl ++) ++{ ++ int i; ++ ++ for(i=0; tbl[i].disbl != 0; i++) { ++ if(tbl[i].dflt) ++ putc(tbl[i].enbl, f); ++ else ++ putc(tbl[i].disbl, f); ++ } ++} ++ ++/* print the usage message for the suboptions */ ++static void ++print_subo_usage( ++ FILE *f, ++ struct subo_case *tbl ++) ++{ ++#ifdef XP_PSTEXT ++ fputs("ft2pt1: Internal startup error\n", stderr); ++#else ++ int i; ++ ++ fprintf(f,"The lowercase suboptions disable features, corresponding\n"); ++ fprintf(f,"uppercase suboptions enable them. The supported suboptions,\n"); ++ fprintf(f,"their default states and the features they control are:\n"); ++ for(i=0; tbl[i].disbl != 0; i++) { ++ fprintf(f," %c/%c - [%s] %s\n", tbl[i].disbl, tbl[i].enbl, ++ tbl[i].dflt ? "enabled" : "disabled", tbl[i].descr); ++ } ++#endif /* XP_PSTEXT */ ++} ++ ++/* find and set the entry according to suboption, ++ * return the found entry (or if not found return NULL) ++ */ ++struct subo_case * ++set_subo( ++ struct subo_case *tbl, ++ int subopt ++) ++{ ++ int i; ++ ++ for(i=0; tbl[i].disbl != 0; i++) { ++ if(subopt == tbl[i].disbl) { ++ *(tbl[i].valp) = 0; ++ return &tbl[i]; ++ } else if(subopt == tbl[i].enbl) { ++ *(tbl[i].valp) = 1; ++ return &tbl[i]; ++ } ++ } ++ return NULL; ++} ++ ++ ++#ifdef XP_PSTEXT ++FT_Face xp_pstext_ft_face = NULL; /* used by ft.c */ ++FontPtr xp_xtf = NULL; ++const char *xp_psfontname = NULL; ++unsigned long xp_font_block_offset = 0UL; ++ ++int ++ft2pt1_main( ++ int argc, ++ char **argv, ++ FTFontPtr tf, ++ const char *download_psfontname, ++ unsigned long download_font_block_offset ++) ++#else ++int ++main( ++ int argc, ++ char **argv ++) ++#endif /* XP_PSTEXT */ ++{ ++ long i, j; ++ time_t now; ++ char filename[4096]; ++ int c,nchars,nmetrics; ++ int ws; ++ int forcebold= -1; /* -1 means "don't know" */ ++ char *lang; ++ int oc; ++ int subid; ++ char *cmdline; ++#ifdef _GNU_SOURCE ++# define ttf2pt1_getopt(a, b, c, d, e) getopt_long(a, b, c, d, e) ++ static struct option longopts[] = { ++ { "afm", 0, NULL, 'A' }, ++ { "all-glyphs", 0, NULL, 'a' }, ++ { "pfb", 0, NULL, 'b' }, ++ { "debug", 1, NULL, 'd' }, ++ { "encode", 0, NULL, 'e' }, ++ { "force-unicode", 0, NULL, 'F' }, ++ { "generate", 1, NULL, 'G' }, ++ { "language", 1, NULL, 'l' }, ++ { "language-map", 1, NULL, 'L' }, ++ { "limit", 1, NULL, 'm' }, ++ { "processing", 1, NULL, 'O' }, ++ { "parser", 1, NULL, 'p' }, ++ { "uid", 1, NULL, 'u' }, ++ { "vertical-autoscale", 1, NULL, 'v' }, ++ { "version", 0, NULL, 'V' }, ++ { "warning", 1, NULL, 'W' }, ++ { NULL, 0, NULL, 0 } ++ }; ++#else ++# define ttf2pt1_getopt(a, b, c, d, e) getopt(a, b, c) ++#endif ++ /* table of Outline Processing (may think also as Optimization) options */ ++ static struct subo_case opotbl[] = { ++ { 'b', 0/*auto-set*/, &trybold, 1, "guessing of the ForceBold hint" }, ++ { 'h', 0/*auto-set*/, &hints, 1, "autogeneration of hints" }, ++ { 'u', 0/*auto-set*/, &subhints, 1, "hint substitution technique" }, ++ { 'o', 0/*auto-set*/, &optimize, 1, "space optimization of font files" }, ++ { 's', 0/*auto-set*/, &smooth, 1, "smoothing and repair of outlines" }, ++ { 't', 0/*auto-set*/, &transform, 1, "auto-scaling to the standard matrix 1000x1000" }, ++ { 'w', 0/*auto-set*/, &correctwidth, 0, "correct the glyph widths (use only for buggy fonts)" }, ++ { 'v', 0/*auto-set*/, &vectorize, 0, "vectorize (trace) the bitmaps" }, ++#ifdef USE_AUTOTRACE ++ { 'z', 0/*auto-set*/, &use_autotrace, 0, "use the autotrace library on bitmaps (works badly)" }, ++#endif /*USE_AUTOTRACE*/ ++ { 0, 0, 0, 0, 0} /* terminator */ ++ }; ++ /* table of the File Generation options */ ++ static struct subo_case fgotbl[] = { ++ { 'f', 0/*auto-set*/, &gen_pfa, 1, "generate the font file (.t1a, .pfa or .pfb)" }, ++ { 'a', 0/*auto-set*/, &gen_afm, 1, "generate the Adobe metrics file (.afm)" }, ++ { 'e', 0/*auto-set*/, &gen_dvienc, 0, "generate the dvips encoding file (.enc)" }, ++ { 0, 0, 0, 0, 0} /* terminator */ ++ }; ++ int *genlast = NULL; ++ ++#ifdef XP_PSTEXT ++ xp_pstext_ft_face = tf->instance->face->face; ++ xp_xtf = tf; ++ xp_psfontname = download_psfontname; ++ xp_font_block_offset = download_font_block_offset; ++#endif /* XP_PSTEXT */ ++ ++ init_subo_tbl(opotbl); /* initialize sub-options of -O */ ++ init_subo_tbl(fgotbl); /* initialize sub-options of -G */ ++ ++ /* save the command line for the record ++ * (we don't bother about escaping the shell special characters) ++ */ ++ ++ j = 0; ++ for(i=1; ivalp) ) ++ genlast = s->valp; ++ } ++ break; ++ } ++ case 'h': ++ fputs("Warning: option -h is obsolete, use -Oh instead\n", stderr); ++ hints = 0; ++ break; ++ case 'H': ++ fputs("Warning: meaning of option -H has been changed to its opposite\n", stderr); ++ fputs("Warning: option -H is obsolete, use -Ou instead\n", stderr); ++ subhints = 0; ++ break; ++ case 'f': ++ fputs("Warning: option -f is obsolete, use -Ob instead\n", stderr); ++ trybold = 0; ++ break; ++ case 'w': ++ fputs("Warning: option -w is obsolete, use -OW instead\n", stderr); ++ correctwidth = 1; ++ break; ++ case 'u': ++ if(wantuid) { ++ fprintf(stderr, "**** UniqueID may be specified only once ****\n"); ++ exit(1); ++ } ++ wantuid = 1; ++ if(optarg[0]=='A' && optarg[1]==0) ++ strUID=0; /* will be generated automatically */ ++ else { ++ strUID=optarg; ++ for(i=0; optarg[i]!=0; i++) ++ if( !isdigit(optarg[i]) ) { ++ fprintf(stderr, "**** UniqueID must be numeric or A for automatic ****\n"); ++ exit(1); ++ } ++ } ++ break; ++ case 'v': ++ correctvsize = atoi(optarg); ++ if(correctvsize <= 0 && correctvsize > 1000) { ++ fprintf(stderr, "**** wrong vsize '%d', ignored ****\n", correctvsize); ++ correctvsize=0; ++ } ++ break; ++ case 'p': ++ if(cursw!=0) { ++ fprintf(stderr, "**** only one front-end parser be used ****\n"); ++ exit(1); ++ } ++ ++ { /* separate parser from parser-specific argument */ ++ char *p = strchr(optarg, LANG_ARG_SEP); ++ if(p != 0) { ++ *p = 0; ++ front_arg = p+1; ++ } else ++ front_arg = ""; ++ } ++ for(i=0; frontswtab[i] != NULL; i++) ++ if( !strcmp(frontswtab[i]->name, optarg) ) { ++ cursw = frontswtab[i]; ++ break; ++ } ++ ++ if(cursw==0) { ++ if (strcmp(optarg, "?")) ++ fprintf(stderr, "**** unknown front-end parser '%s' ****\n", optarg); ++ fputs("the following front-ends are supported now:\n", stderr); ++ for(i=0; frontswtab[i] != NULL; i++) { ++ fprintf(stderr," %s (%s)\n file suffixes: ", ++ frontswtab[i]->name, ++ frontswtab[i]->descr ? frontswtab[i]->descr : "no description" ++ ); ++ for(j=0; jsuffix[j]) ++ fprintf(stderr, "%s ", frontswtab[i]->suffix[j]); ++ fprintf(stderr, "\n"); ++ } ++ exit(1); ++ } ++ break; ++ case 'l': ++ if(uni_lang_selected!=0) { ++ fprintf(stderr, "**** only one language option may be used ****\n"); ++ exit(1); ++ } ++ ++ { /* separate language from language-specific argument */ ++ char *p = strchr(optarg, LANG_ARG_SEP); ++ if(p != 0) { ++ *p = 0; ++ uni_lang_arg = p+1; ++ } else ++ uni_lang_arg = ""; ++ } ++ for(i=0; i < sizeof uni_lang/(sizeof uni_lang[0]); i++) ++ if( !strcmp(uni_lang[i].name, optarg) ) { ++ uni_lang_selected = &uni_lang[i]; ++ uni_sample = uni_lang[i].sample_upper; ++ break; ++ } ++ ++ if(uni_lang_selected==0) { ++ if (strcmp(optarg, "?")) ++ fprintf(stderr, "**** unknown language '%s' ****\n", optarg); ++ fputs(" the following languages are supported now:\n", stderr); ++ for(i=0; i < sizeof uni_lang/(sizeof uni_lang[0]); i++) ++ fprintf(stderr," %s (%s)\n", ++ uni_lang[i].name, ++ uni_lang[i].descr ? uni_lang[i].descr : "no description" ++ ); ++ exit(1); ++ } ++ break; ++ case 'L': ++ if(uni_lang_selected!=0) { ++ fprintf(stderr, "**** only one language option may be used ****\n"); ++ exit(1); ++ } ++ uni_lang_selected = &uni_lang_user; ++ uni_lang_arg = optarg; ++ break; ++ case 'V': ++ printversion(); ++ exit(0); ++ break; ++ default: ++ usage(); ++ exit(1); ++ break; ++ } ++ } ++ argc-=optind-1; /* the rest of code counts from argv[0] */ ++ argv+=optind-1; ++ ++ if (absolute && encode) { ++ fprintf(stderr, "**** options -a and -e are incompatible ****\n"); ++ exit(1); ++ } ++ if ((argc != 2) && (argc != 3)) { ++ usage(); ++ exit(1); ++ } ++ ++ /* try to guess the language by the locale used */ ++ if(uni_lang_selected==0 && (lang=getenv("LANG"))!=0 ) { ++ for(i=0; i < sizeof uni_lang/sizeof(struct uni_language); i++) { ++ if( !strncmp(uni_lang[i].name, lang, strlen(uni_lang[i].name)) ) { ++ uni_lang_selected = &uni_lang[i]; ++ goto got_a_language; ++ } ++ } ++ /* no full name ? try aliases */ ++ for(i=0; i < sizeof uni_lang/sizeof(struct uni_language); i++) { ++ for(c=0; csuffix[j] ++ && !strcmp(p, frontswtab[i]->suffix[j]) ) { ++ cursw = frontswtab[i]; ++ WARNING_1 fprintf(stderr, "Auto-detected front-end parser '%s'\n", ++ cursw->name); ++ WARNING_1 fprintf(stderr, " (use ttf2pt1 -p? to get the full list of available front-ends)\n"); ++ break; ++ } ++ } ++ free(s); ++ } ++ ++ if(cursw==0) { ++ cursw = frontswtab[0]; ++ WARNING_1 fprintf(stderr, "Can't detect front-end parser, using '%s' by default\n", ++ cursw->name); ++ WARNING_1 fprintf(stderr, " (use ttf2pt1 -p? to get the full list of available front-ends)\n"); ++ } ++ } ++ ++ /* open the input file */ ++ cursw->open(argv[1], front_arg); ++ ++ /* Get base name of output file (if not specified) ++ * by removing (known) suffixes ++ */ ++ if (argc == 2) { ++ char *p; ++ argv[2] = strdup (argv[1]); ++ p = strrchr(argv[2], '.'); ++ if (p != NULL) ++ for (j = 0; (j < MAXSUFFIX) && (cursw->suffix[j]); j++) ++ if (!strcmp(p+1, cursw->suffix[j])) { ++ *p = '\0'; ++ break; ++ } ++ } ++ ++ if ((null_file = fopen(BITBUCKET, "w")) == NULL) { ++ fprintf(stderr, "**** Cannot open %s ****\n", ++ BITBUCKET); ++ exit(1); ++ } ++ ++ if (argv[2][0] == '-' && argv[2][1] == 0) { ++#ifdef WINDOWS ++ if(encode) { ++ fprintf(stderr, "**** can't write encoded file to stdout ***\n"); ++ exit(1); ++ } ++#endif /* WINDOWS */ ++ pfa_file = afm_file = dvienc_file = null_file; ++ ++ if(wantafm || genlast == &gen_afm) { /* print .afm instead of .pfa */ ++ afm_file=stdout; ++ } else if(genlast == &gen_dvienc) { /* print .enc instead of .pfa */ ++ dvienc_file=stdout; ++ } else { ++ pfa_file=stdout; ++ } ++ } else { ++#ifndef WINDOWS ++ snprintf(filename, sizeof filename, "%s.%s", argv[2], encode ? (pfbflag ? "pfb" : "pfa") : "t1a" ); ++#else /* WINDOWS */ ++ snprintf(filename, sizeof filename, "%s.t1a", argv[2]); ++#endif /* WINDOWS */ ++ if(gen_pfa) { ++ if ((pfa_file = fopen(filename, "w+b")) == NULL) { ++ fprintf(stderr, "**** Cannot create %s ****\n", filename); ++ exit(1); ++ } else { ++ WARNING_2 fprintf(stderr, "Creating file %s\n", filename); ++ } ++ } else ++ pfa_file = null_file; ++ ++ if(gen_afm) { ++ snprintf(filename, sizeof filename, "%s.afm", argv[2]) ; ++ if ((afm_file = fopen(filename, "w+")) == NULL) { ++ fprintf(stderr, "**** Cannot create %s ****\n", filename); ++ exit(1); ++ } ++ } else ++ afm_file = null_file; ++ ++ if(gen_dvienc) { ++ snprintf(filename, sizeof filename, "%s.enc", argv[2]) ; ++ if ((dvienc_file = fopen(filename, "w+")) == NULL) { ++ fprintf(stderr, "**** Cannot create %s ****\n", filename); ++ exit(1); ++ } ++ } else ++ dvienc_file = null_file; ++ } ++ ++ /* ++ * Now check whether we want a fully encoded .pfa file ++ */ ++#ifndef WINDOWS ++ if (encode && pfa_file != null_file) { ++ int p[2]; ++ extern FILE *ifp, *ofp; /* from t1asm.c */ ++ ++ ifp=stdin; ++ ofp=stdout; ++ ++ if (pipe(p) < 0) { ++ perror("**** Cannot create pipe ****\n"); ++ exit(1); ++ } ++ ofp = pfa_file; ++ ifp = fdopen(p[0], "r"); ++ if (ifp == NULL) { ++ perror("**** Cannot use pipe for reading ****\n"); ++ exit(1); ++ } ++ pfa_file = fdopen(p[1], "w"); ++ if (pfa_file == NULL) { ++ perror("**** Cannot use pipe for writing ****\n"); ++ exit(1); ++ } ++ switch (fork()) { ++ case -1: ++ perror("**** Cannot fork the assembler process ****\n"); ++ exit(1); ++ case 0: /* child */ ++ fclose(pfa_file); ++ exit(runt1asm(pfbflag)); ++ default: /* parent */ ++ fclose(ifp); fclose(ofp); ++ } ++ } ++#endif /* WINDOWS */ ++ ++ numglyphs = cursw->nglyphs(); ++ ++ WARNING_3 fprintf(stderr, "numglyphs = %d\n", numglyphs); ++ ++ glyph_list = (GLYPH *) calloc(numglyphs, sizeof(GLYPH)); ++ ++ /* initialize non-0 fields */ ++ for (i = 0; i < numglyphs; i++) { ++ GLYPH *g; ++ ++ g = &glyph_list[i]; ++ g->char_no = -1; ++ g->orig_code = -1; ++ g->name = "UNKNOWN"; ++ g->flags = GF_FLOAT; /* we start with float representation */ ++ } ++ ++ handle_gnames(); ++ ++ cursw->glmetrics(glyph_list); ++ cursw->fnmetrics(&fontm); ++ ++ original_scale_factor = 1000.0 / (double) fontm.units_per_em; ++ ++ if(transform == 0) ++ scale_factor = 1.0; /* don't transform */ ++ else ++ scale_factor = original_scale_factor; ++ ++ if(correctvsize && uni_sample!=0) { /* only for known languages */ ++ /* try to adjust the scale factor to make a typical ++ * uppercase character of hight at least (correctvsize), this ++ * may improve the appearance of the font but also ++ * make it weird, use with caution ++ */ ++ int ysz; ++ ++ ysz = iscale(glyph_list[encoding[uni_sample]].yMax); ++ if( yszmapping, i); ++ ++ if( ftindex < numglyphs ) { ++ glyph_list[ftindex].flags |= GF_USED; ++ } ++ } ++ ++ /* also always include .notdef */ ++ { ++ int notdef_found = FALSE; ++ ++ for (i = 0; i < numglyphs; i++) { ++ if(!strcmp(glyph_list[i].name, ".notdef")) { ++ glyph_list[i].flags |= GF_USED; ++ notdef_found = TRUE; ++ break; ++ } ++ } ++ ++ if( !notdef_found ) ++ { ++ /* No ".notdef" found ? ++ * Then copy outlines of char 0 to the first "free" slot and make ++ * it our ".notdef" char. ++ */ ++ for (i = 0; i < numglyphs; i++) { ++ if((glyph_list[i].flags & GF_USED) == 0) { ++ glyph_list[i] = glyph_list[0]; ++ glyph_list[i].flags |= GF_USED; ++ glyph_list[i].name = ".notdef"; ++ notdef_found = TRUE; ++ break; ++ } ++ } ++ } ++ ++ if( !notdef_found ) ++ { ++ /* This shoudl never happen... */ ++ fprintf(stderr, "ft2pt1: '.notdef' missing in generated font.\n"); ++ } ++ } ++#else ++ if(allglyphs) { ++ for (i = 0; i < numglyphs; i++) { ++ glyph_list[i].flags |= GF_USED; ++ } ++ } else { ++ for (i = 0; i < ENCTABSZ; i++) { ++ glyph_list[encoding[i]].flags |= GF_USED; ++ } ++ ++ /* also always include .notdef */ ++ for (i = 0; i < numglyphs; i++) ++ if(!strcmp(glyph_list[i].name, ".notdef")) { ++ glyph_list[i].flags |= GF_USED; ++ break; ++ } ++ } ++#endif /* XP_ONLY_BLOCKS */ ++ ++ for (i = 0; i < numglyphs; i++) { ++ if (glyph_list[i].flags & GF_USED) { ++ DBG_TO_GLYPH(&glyph_list[i]); ++ convert_glyf(i); ++ DBG_FROM_GLYPH(&glyph_list[i]); ++ } ++ } ++ ++ italic_angle = fontm.italic_angle; ++ ++ if (italic_angle > 45.0 || italic_angle < -45.0) ++ italic_angle = 0.0; /* consider buggy */ ++ ++ if (hints) { ++ findblues(); ++ for (i = 0; i < numglyphs; i++) { ++ if (glyph_list[i].flags & GF_USED) { ++ DBG_TO_GLYPH(&glyph_list[i]); ++ buildstems(&glyph_list[i]); ++ assertpath(glyph_list[i].entries, __FILE__, __LINE__, glyph_list[i].name); ++ DBG_FROM_GLYPH(&glyph_list[i]); ++ } ++ } ++ stemstatistics(); ++ } else { ++ for(i=0; i<4; i++) ++ bbox[i] = iscale(fontm.bbox[i]); ++ } ++ /* don't touch the width of fixed width fonts */ ++ if( fontm.is_fixed_pitch ) ++ correctwidth=0; ++ docorrectwidth(); /* checks correctwidth inside */ ++ if (reverse) ++ for (i = 0; i < numglyphs; i++) { ++ if (glyph_list[i].flags & GF_USED) { ++ DBG_TO_GLYPH(&glyph_list[i]); ++ reversepaths(&glyph_list[i]); ++ assertpath(glyph_list[i].entries, __FILE__, __LINE__, glyph_list[i].name); ++ DBG_FROM_GLYPH(&glyph_list[i]); ++ } ++ } ++ ++ ++#if 0 ++ /* ++ ** It seems to bring troubles. The problem is that some ++ ** styles of the font may be recognized as fixed-width ++ ** while other styles of the same font as proportional. ++ ** So it's better to be commented out yet. ++ */ ++ if (tryfixed) ++ alignwidths(); ++#endif ++ ++ if(trybold) { ++ forcebold = fontm.force_bold; ++ } ++ ++#ifdef XP_PSTEXT ++ fprintf(pfa_file, "%%!PS-AdobeFont-1.0: %s\n", fontm.name_ps); ++#else ++ fprintf(pfa_file, "%%!PS-AdobeFont-1.0: %s %s\n", fontm.name_ps, fontm.name_copyright); ++ time(&now); ++ fprintf(pfa_file, "%%%%CreationDate: %s", ctime(&now)); ++ fprintf(pfa_file, "%% Converted by ttf2pt1 %s/%s\n", TTF2PT1_VERSION, cursw->name); ++ fprintf(pfa_file, "%% Args: %s\n", cmdline); ++ fprintf(pfa_file, "%%%%EndComments\n"); ++#endif /* XP_PSTEXT */ ++ fprintf(pfa_file, "12 dict begin\n/FontInfo 9 dict dup begin\n"); ++ ++ WARNING_3 fprintf(stderr, "FontName %s%s\n", fontm.name_ps, uni_font_name_suffix); ++ ++ ++ fprintf(pfa_file, " /version (%s) readonly def\n", fontm.name_version); ++ ++ fprintf(pfa_file, " /Notice (%s) readonly def\n", fontm.name_copyright); ++ ++ fprintf(pfa_file, " /FullName (%s) readonly def\n", fontm.name_full); ++ fprintf(pfa_file, " /FamilyName (%s) readonly def\n", fontm.name_family); ++ ++ if(wantuid) { ++ if(strUID) ++ fprintf(pfa_file, " /UniqueID %s def\n", strUID); ++ else { ++ numUID=0; ++ for(i=0; fontm.name_full[i]!=0; i++) { ++ numUID *= 37; /* magic number, good for hash */ ++ numUID += fontm.name_full[i]-' '; ++ /* if the name is long the first chars ++ * may be lost forever, so re-insert ++ * them thus making kind of CRC ++ */ ++ numUID += (numUID>>24) & 0xFF; ++ } ++ /* the range for private UIDs is 4 000 000 - 4 999 999 */ ++ fprintf(pfa_file, " /UniqueID %lu def\n", numUID%1000000+4000000); ++ } ++ } ++ ++ fprintf(pfa_file, " /Weight (%s) readonly def\n", fontm.name_style); ++ ++ fprintf(pfa_file, " /ItalicAngle %f def\n", italic_angle); ++ fprintf(pfa_file, " /isFixedPitch %s def\n", ++ fontm.is_fixed_pitch ? "true" : "false"); ++ ++ /* we don't print out the unused glyphs */ ++ nchars = 0; ++ for (i = 0; i < numglyphs; i++) { ++ if (glyph_list[i].flags & GF_USED) { ++ nchars++; ++ } ++ } ++ ++ fprintf(afm_file, "StartFontMetrics 4.1\n"); ++ fprintf(afm_file, "FontName %s%s\n", fontm.name_ps, uni_font_name_suffix); ++ fprintf(afm_file, "FullName %s\n", fontm.name_full); ++ fprintf(afm_file, "Notice %s\n", fontm.name_copyright); ++ fprintf(afm_file, "EncodingScheme FontSpecific\n"); ++ fprintf(afm_file, "FamilyName %s\n", fontm.name_family); ++ fprintf(afm_file, "Weight %s\n", fontm.name_style); ++ fprintf(afm_file, "Version %s\n", fontm.name_version); ++ fprintf(afm_file, "Characters %d\n", nchars); ++ fprintf(afm_file, "ItalicAngle %.1f\n", italic_angle); ++ ++ fprintf(afm_file, "Ascender %d\n", iscale(fontm.ascender)); ++ fprintf(afm_file, "Descender %d\n", iscale(fontm.descender)); ++ ++ fprintf(pfa_file, " /UnderlinePosition %d def\n", ++ iscale(fontm.underline_position)); ++ ++ fprintf(pfa_file, " /UnderlineThickness %hd def\n", ++ iscale(fontm.underline_thickness)); ++ ++ fprintf(pfa_file, "end readonly def\n"); ++ ++ fprintf(afm_file, "UnderlineThickness %d\n", ++ iscale(fontm.underline_thickness)); ++ ++ fprintf(afm_file, "UnderlinePosition %d\n", ++ iscale(fontm.underline_position)); ++ ++ fprintf(afm_file, "IsFixedPitch %s\n", ++ fontm.is_fixed_pitch ? "true" : "false"); ++ fprintf(afm_file, "FontBBox %d %d %d %d\n", ++ bbox[0], bbox[1], bbox[2], bbox[3]); ++ ++ fprintf(pfa_file, "/FontName /%s%s def\n", fontm.name_ps, uni_font_name_suffix); ++ fprintf(pfa_file, "/PaintType 0 def\n/StrokeWidth 0 def\n"); ++ /* I'm not sure if these are fixed */ ++ fprintf(pfa_file, "/FontType 1 def\n"); ++ ++ if (transform) { ++ fprintf(pfa_file, "/FontMatrix [0.001 0 0 0.001 0 0] def\n"); ++ } else { ++ fprintf(pfa_file, "/FontMatrix [%9.7f 0 0 %9.7f 0 0] def\n", ++ original_scale_factor / 1000.0, original_scale_factor / 1000.0); ++ } ++ ++ fprintf(pfa_file, "/FontBBox {%d %d %d %d} readonly def\n", ++ bbox[0], bbox[1], bbox[2], bbox[3]); ++ ++ fprintf(pfa_file, "/Encoding 256 array\n"); ++ /* determine number of elements for metrics table */ ++ nmetrics = 256; ++ for (i = 0; i < numglyphs; i++) { ++ if( glyph_list[i].flags & GF_USED ++ && glyph_list[i].char_no == -1 ) { ++ nmetrics++; ++ } ++ } ++ fprintf(afm_file, "StartCharMetrics %d\n", nmetrics); ++ ++ fprintf(dvienc_file, "/%s%sEncoding [\n", ++ fontm.name_ps, uni_font_name_suffix); ++ ++#ifdef XP_PSTEXT ++ { ++ int linewidth = 0; ++ for (i = 0; i < 256; i++) { /* here 256, not ENCTABSZ */ ++ linewidth += strlen(glyph_list[encoding[i]].name) + 14 + 8; ++ fprintf(pfa_file, "dup %d /%s put%s", ++ i, ++ glyph_list[encoding[i]].name, ++ (linewidth > 70 || i == 255)?(linewidth = 0, "\n"):("\t")); ++ if( glyph_list[encoding[i]].flags & GF_USED ) { ++ print_glyph_metrics(i, encoding[i]); ++ } ++ if (encoding[i]) ++ fprintf (dvienc_file, "/index0x%04X\n", encoding[i]); ++ else ++ fprintf (dvienc_file, "/.notdef\n"); ++ } ++ } ++#else ++ for (i = 0; i < 256; i++) { /* here 256, not ENCTABSZ */ ++ fprintf(pfa_file, ++ "dup %d /%s put\n", i, glyph_list[encoding[i]].name); ++ if( glyph_list[encoding[i]].flags & GF_USED ) { ++ print_glyph_metrics(i, encoding[i]); ++ } ++ if (encoding[i]) ++ fprintf (dvienc_file, "/index0x%04X\n", encoding[i]); ++ else ++ fprintf (dvienc_file, "/.notdef\n"); ++ } ++#endif /* XP_PSTEXT */ ++ /* print the metrics for glyphs not in encoding table */ ++ for(i=0; ikerning(glyph_list); ++ print_kerning(afm_file); ++ } ++ ++ fprintf(afm_file, "EndFontMetrics\n"); ++ if(afm_file != null_file) ++ fclose(afm_file); ++ ++ fprintf(dvienc_file, "] def\n"); ++ if(dvienc_file != null_file) ++ fclose(dvienc_file); ++ ++ WARNING_1 fprintf(stderr, "Finished - font files created\n"); ++ ++ cursw->close(); ++ ++#ifndef WINDOWS ++ while (wait(&ws) > 0) { ++ } ++#else ++ if (encode && pfa_file != null_file) { ++ extern FILE *ifp, *ofp; /* from t1asm.c */ ++ ++ snprintf(filename, sizeof filename, "%s.%s", argv[2], pfbflag ? "pfb" : "pfa" ); ++ ++ if ((ofp = fopen(filename, "w+b")) == NULL) { ++ fprintf(stderr, "**** Cannot create %s ****\n", filename); ++ exit(1); ++ } else { ++ WARNING_2 fprintf(stderr, "Creating file %s\n", filename); ++ } ++ ++ snprintf(filename, sizeof filename, "%s.t1a", argv[2]); ++ ++ if ((ifp = fopen(filename, "rb")) == NULL) { ++ fprintf(stderr, "**** Cannot read %s ****\n", filename); ++ exit(1); ++ } else { ++ WARNING_2 fprintf(stderr, "Converting file %s\n", filename); ++ } ++ ++ runt1asm(pfbflag); ++ ++ WARNING_2 fprintf(stderr, "Removing file %s\n", filename); ++ if(unlink(filename) < 0) ++ WARNING_1 fprintf(stderr, "Unable to remove file %s\n", filename); ++ } ++#endif /* WINDOWS */ ++ ++ fclose(null_file); ++ return 0; ++} +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/ttf2pt1_convert.1 xserver/hw/xprint/extras/ttf2pt1/ttf2pt1_convert.1 +--- xserver-old/hw/xprint/extras/ttf2pt1/ttf2pt1_convert.1 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/ttf2pt1_convert.1 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,512 @@ ++.rn '' }` ++''' $RCSfile$$Revision$$Date$ ++''' ++''' $Log$ ++''' Revision 1.1.4.1 2004/04/21 10:03:13 gisburn ++''' Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=530 - Land XPRINT branch on XORG-CURRENT ++''' ++''' Revision 1.1 2003/06/04 00:33:54 roland ++''' Fix for http://xprint.mozdev.org/bugs/show_bug.cgi?id=3846 - RFE: Upload Freetype --> PS Type1 font converter "ttf2pt1" ... ++''' ++''' ++.de Sh ++.br ++.if t .Sp ++.ne 5 ++.PP ++\fB\\$1\fR ++.PP ++.. ++.de Sp ++.if t .sp .5v ++.if n .sp ++.. ++.de Ip ++.br ++.ie \\n(.$>=3 .ne \\$3 ++.el .ne 3 ++.IP "\\$1" \\$2 ++.. ++.de Vb ++.ft CW ++.nf ++.ne \\$1 ++.. ++.de Ve ++.ft R ++ ++.fi ++.. ++''' ++''' ++''' Set up \*(-- to give an unbreakable dash; ++''' string Tr holds user defined translation string. ++''' Bell System Logo is used as a dummy character. ++''' ++.tr \(*W-|\(bv\*(Tr ++.ie n \{\ ++.ds -- \(*W- ++.ds PI pi ++.if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch ++.if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch ++.ds L" "" ++.ds R" "" ++''' \*(M", \*(S", \*(N" and \*(T" are the equivalent of ++''' \*(L" and \*(R", except that they are used on ".xx" lines, ++''' such as .IP and .SH, which do another additional levels of ++''' double-quote interpretation ++.ds M" """ ++.ds S" """ ++.ds N" """"" ++.ds T" """"" ++.ds L' ' ++.ds R' ' ++.ds M' ' ++.ds S' ' ++.ds N' ' ++.ds T' ' ++'br\} ++.el\{\ ++.ds -- \(em\| ++.tr \*(Tr ++.ds L" `` ++.ds R" '' ++.ds M" `` ++.ds S" '' ++.ds N" `` ++.ds T" '' ++.ds L' ` ++.ds R' ' ++.ds M' ` ++.ds S' ' ++.ds N' ` ++.ds T' ' ++.ds PI \(*p ++'br\} ++.\" If the F register is turned on, we'll generate ++.\" index entries out stderr for the following things: ++.\" TH Title ++.\" SH Header ++.\" Sh Subsection ++.\" Ip Item ++.\" X<> Xref (embedded ++.\" Of course, you have to process the output yourself ++.\" in some meaninful fashion. ++.if \nF \{ ++.de IX ++.tm Index:\\$1\t\\n%\t"\\$2" ++.. ++.nr % 0 ++.rr F ++.\} ++.TH TTF2PT1_CONVERT 1 "version 3.4.4-SNAP-030526" "May 26, 2003" "TTF2PT1 Font Converter" ++.UC ++.if n .hy 0 ++.if n .na ++.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' ++.de CQ \" put $1 in typewriter font ++.ft CW ++'if n "\c ++'if t \\&\\$1\c ++'if n \\&\\$1\c ++'if n \&" ++\\&\\$2 \\$3 \\$4 \\$5 \\$6 \\$7 ++'.ft R ++.. ++.\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2 ++. \" AM - accent mark definitions ++.bd B 3 ++. \" fudge factors for nroff and troff ++.if n \{\ ++. ds #H 0 ++. ds #V .8m ++. ds #F .3m ++. ds #[ \f1 ++. ds #] \fP ++.\} ++.if t \{\ ++. ds #H ((1u-(\\\\n(.fu%2u))*.13m) ++. ds #V .6m ++. ds #F 0 ++. ds #[ \& ++. ds #] \& ++.\} ++. \" simple accents for nroff and troff ++.if n \{\ ++. ds ' \& ++. ds ` \& ++. ds ^ \& ++. ds , \& ++. ds ~ ~ ++. ds ? ? ++. ds ! ! ++. ds / ++. ds q ++.\} ++.if t \{\ ++. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" ++. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' ++. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' ++. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' ++. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' ++. ds ? \s-2c\h'-\w'c'u*7/10'\u\h'\*(#H'\zi\d\s+2\h'\w'c'u*8/10' ++. ds ! \s-2\(or\s+2\h'-\w'\(or'u'\v'-.8m'.\v'.8m' ++. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' ++. ds q o\h'-\w'o'u*8/10'\s-4\v'.4m'\z\(*i\v'-.4m'\s+4\h'\w'o'u*8/10' ++.\} ++. \" troff and (daisy-wheel) nroff accents ++.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' ++.ds 8 \h'\*(#H'\(*b\h'-\*(#H' ++.ds v \\k:\h'-(\\n(.wu*9/10-\*(#H)'\v'-\*(#V'\*(#[\s-4v\s0\v'\*(#V'\h'|\\n:u'\*(#] ++.ds _ \\k:\h'-(\\n(.wu*9/10-\*(#H+(\*(#F*2/3))'\v'-.4m'\z\(hy\v'.4m'\h'|\\n:u' ++.ds . \\k:\h'-(\\n(.wu*8/10)'\v'\*(#V*4/10'\z.\v'-\*(#V*4/10'\h'|\\n:u' ++.ds 3 \*(#[\v'.2m'\s-2\&3\s0\v'-.2m'\*(#] ++.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] ++.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' ++.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' ++.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] ++.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] ++.ds ae a\h'-(\w'a'u*4/10)'e ++.ds Ae A\h'-(\w'A'u*4/10)'E ++.ds oe o\h'-(\w'o'u*4/10)'e ++.ds Oe O\h'-(\w'O'u*4/10)'E ++. \" corrections for vroff ++.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' ++.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' ++. \" for low resolution devices (crt and lpr) ++.if \n(.H>23 .if \n(.V>19 \ ++\{\ ++. ds : e ++. ds 8 ss ++. ds v \h'-1'\o'\(aa\(ga' ++. ds _ \h'-1'^ ++. ds . \h'-1'. ++. ds 3 3 ++. ds o a ++. ds d- d\h'-1'\(ga ++. ds D- D\h'-1'\(hy ++. ds th \o'bp' ++. ds Th \o'LP' ++. ds ae ae ++. ds Ae AE ++. ds oe oe ++. ds Oe OE ++.\} ++.rm #[ #] #H #V #F C ++.SH "NAME" ++\fBttf2pt1_convert\fR \- convenience font conversion script ++.SH "SYNOPSIS" ++ttf2pt1_convert \fB[config-file]\fR ++.SH "DESCRIPTION" ++`\fBConvert\fR\*(R' is the master conversion script provided with ttf2pt1. ++When installed into a public directory it's named `\fBttf2pt1_convert\fR\*(R' ++to avoid name collisions with the other programs. ++.PP ++If the configuration file is not specified as an argument then the file ++`\f(CWconvert.cfg\fR\*(R' in the current directory is used. This file contains ++a set of configuration variables. The distribution contains a sample file ++file `\f(CWconvert.cfg.sample\fR\*(R'. Please copy it to `\f(CWconvert.cfg\fR\*(R', ++look inside it and change the configuration variables. The more stable ++configuration variables, such as the path names of the scripts and ++encoding files are located in `\f(CWconvert\fR\*(R' itself, they are ++automatically updated when installing \fBttf2pt1\fR. ++.PP ++Put all the TTF fonts you want to convert into some directory (this ++may be just the directory that already contains all the Windows ++fonts on a mounted FAT filesystem). If you have fonts in different ++source encoding then put the fonts in each of the encodings ++into a separate directory. Up to 10 source directories are ++supported. If you (in a rather unlikely case) have more source ++directories then you can make two separate runs of the converter, ++converting up to 10 directories at a time. ++.PP ++The variables in the configuration file are: ++.Ip "\(bu" 2 ++\fB\f(CWSRCDIRS\fR\fR \- the list of directories (with absolute paths) with ++\s-1TTF\s0 fonts. Each line contains at least 3 fields: the name of the directory, ++the language of the fonts in it (if you have fonts for different ++languages you have to put them into the separate directories) and the ++encoding of the fonts. Again, if you have some of the \s-1TTF\s0 typefaces in ++one encoding, and some in another (say, \s-1CP\s0\-1251 and \s-1KOI\s0\-8), you have ++to put them into the separate source directories. Some lines may contain ++4 fields. Then the fourth field is the name of the external map to ++convert the Unicode fonts into the desirable encoding. This map is ++used instead of the built-in map for the specified language. ++.Sp ++*8* ++An interesting thing is that some languages have more than one ++widely used character encodings. For example, the widely used ++encodings for Russian are \s-1IBM\s0 \s-1CP\s0\-866 (\s-1MS\s0\-\s-1DOS\s0 and Unix), \s-1KOI\s0\-8 ++(Unix and \s-1VAX\s0, also the standard Internet encoding), \s-1IBM\s0 \s-1CP\s0\-1251 (\s-1MS\s0 Windows). ++That's why I have provided the means to generate the converted fonts ++in more than one encoding. See the file encodings/\s-1README\s0 for ++details about the encoding tables. Actually, if you plan to use ++these fonts with Netscape Navigator better use the aliases ++cp-866 instead of ibm-866 and windows-1251 instead of ibm-1251 ++because that's what Netscape wants. ++.Ip "\(bu" 2 ++\fB\f(CWDSTDIR\fR\fR \- directory for the resulting Type1 fonts. Be careful! ++This directory gets completely wiped out before conversion, ++so don't use any already existing directory for this purpose. ++.Ip "\(bu" 2 ++\fB\f(CWDSTENC\fI{language}\fR\fR\fR \- the list of encodings in which the destination ++fonts will be generated for each language. Each font of that ++language will be generated in each of the specified ++encodings. If you don't want any translation, just specify both ++\f(CWSRCENC\fR and \f(CWDSTENC\fR as iso8859-1 (or if you want any other encoding ++specified in the fonts.dir, copy the description of 8859-1 with ++new name and use this new name for \f(CWSRCENC\fR and \f(CWDSTENC\fR). ++.Ip "\(bu" 2 ++\fB\f(CWFOUNDRY\fR\fR \- the foundry name to be used in the fonts.dir file. I have ++set it to `fromttf\*(R' to avoid name conflicts with any existing font for ++sure. But this foundry name is not registered in X11 standards and ++if you want to get the full standard compliance or have a font server ++that enforces such a compliance, use `misc\*(R'. ++.PP ++The next few parameters control the general behavior of the converter. ++They default values are set to something reasonable. ++.Ip "\(bu" 2 ++\fB\f(CWCORRECTWIDTH\fR\fR \- if the value is set to \fB\f(CWYES\fR\fR then use the ++converter option \f(CW\fB-w\fR\fR, otherwise don't use it. See the description of ++this option in the \s-1README\s0 file. ++.Ip "\(bu" 2 ++\fB\f(CWREMOVET1A\fR\fR \- if the value is set to \fB\f(CWYES\fR\fR then after ++conversion remove the un-encoded \f(CW.t1a\fR font files and the ++intermediate \f(CW.xpfa\fR font metric files. ++.Ip "\(bu" 2 ++\fB\f(CWINSTALLFONTMAP\fR\fR \- a Ghostscript parameter, if the value is set to ++\fB\f(CWYES\fR\fR then install the entries for the new fonts ++right into the main \f(CWFontmap\fR file. Otherwise just leave ++the file \f(CWFontmap.ttf\fR in the Ghostscript configuration ++directory. ++.Ip "\(bu" 2 ++\fB\f(CWHINTSUBST\fR\fR \- if the value is set to \fB\f(CWYES\fR\fR use the option ++\f(CW\fB-H\fR\fR, otherwise don't use it. This option enables the ++hint substitution technique. If you have not installed the X11 patch ++described above, use this option with great caution. See further ++description of this option in the \s-1README\s0 file. ++.Ip "\(bu" 2 ++\fB\f(CWENFORCEISO\fR\fR \- if the value is set to \fB\f(CWYES\fR\fR then ++disguise the resulting fonts as the fonts in ISOLatin1 encoding. Historically ++this was neccessary due to the way the installer scripts created the ++X11 font configuration files. It is not neccessary any more for this ++purpose. But if you plan to use these fonts with some other application ++that expects ISOLatin1 encoding then better enable this option. ++.Ip "\(bu" 2 ++\fB\f(CWALLGLYPHS\fR\fR \- if the value is set to \fB\f(CWYES\fR\fR then ++include all the glyphs from the source fonts into the resulting fonts, even ++if these glyphs are inaccessible. If it's set to \fB\f(CWNO\fR\fR then ++include only the glyphs which have codes assigned to them. The glyphs ++without codes can not be used directly. But some clever programs, ++such as the Type 1 library from XFree86 3.9 and higher can change ++the encoding on the fly and use another set of glyphs. If you have not ++installed the X11 patch described above, use this option with great ++caution. See further description of the option option \f(CW\fB-a\fR\fR in the ++\s-1README\s0 file. ++.Ip "\(bu" 2 ++\fB\f(CWGENUID\fR\fR \- if the value is set to \fB\f(CWYES\fR\fR then use ++the option \f(CW\fB-uA\fR\fR of the converter to generate UniqueIDs for ++the converted fonts. The standard X11 Type 1 library does not use ++this \s-1ID\s0, so it may only be neccessary for the other applications. ++The script is clever enough to generate different UniqueID for the ++same font converted to multiple encodings. Also after conversion it ++checks all the fonts generacted during the session for duplicated ++UniqueID and shows those. Still, this does not quarantee that these ++UniqueIDs won't overlap with some other fonts. The UniqueIDs are ++generated as hash values from the font names, so it's guaranteed ++that if the `\f(CWconvert\fR\*(R' script runs multiple times it will ++generate the same UniqueIDs during each run. See further description ++of this option in the \s-1README\s0 file. ++.Ip "\(bu" 2 ++\fB\f(CWGENUID\fR\fR \- if the value is set to \fB\f(CWYES\fR\fR then create ++the \f(CW.pfb\fR files, otherwise the \f(CW.pfa\fR files. The \f(CW.pfb\fR ++files are more compact but contain binary data, so you may experience some ++troubles when transferring them through the network. ++.PP ++The following parameters are used to locate the other scripts and ++configuration files. By default the scripts do a bit of guessing for them: ++they search in the \fBttf2pt1\fR installation directory if \fBttf2pt1\fR ++was installed or otherwise suppose that you are running `\f(CWconvert\fR\*(R' with ++`\f(CWscripts\fR\*(R' subdirectory being the current directory. ++.Ip "\(bu" 2 ++\fB\f(CWENCDIR\fR\fR \- directory containing the descriptions of encodings ++.Ip "\(bu" 2 ++\fB\f(CWMAPDIR\fR\fR \- directory containing the external map files ++.PP ++Besides that a few parameters are built into the `\f(CWconvert\fR\*(R' script itself. ++You probably won't need to change them: ++.Ip "\(bu" 2 ++\f(CW\fBT1ASM\fR\fR, \f(CW\fBTTF2PT1\fR\fR, \f(CW\fBTRANS\fR\fR, \f(CW\fBT1FDIR\fR\fR, \f(CW\fBFORCEISO\fR\fR \- paths to the other script ++.PP ++Also there are a few parameters controlling the installation of ++fonts for Ghostscript. Please look at their description in the ++Ghostscript section of documentation or in the \fBttf2pt1_x2gs(1)\fR ++manual page before running `\f(CWconvert\fR\*(R'. If these parameters are ++set, `\f(CWconvert\fR\*(R' will call the `\f(CWx2gs\fR\*(R' script automatically ++to install the newly converted fonts in Ghostscript. ++.PP ++After creating the configuration file run the `\f(CWconvert\fR\*(R' script. Look at ++the result and the log file in \f(CWDSTDIR\fR. ++.PP ++Add the directory with newly converted fonts to the configuration ++of X server or font server. For most of the systems this step is ++very straightforward. For \s-1HP\s0\-\s-1UX\s0 it's rather tricky and poorly ++documented, so the file \s-1FONTS\s0.hpux gives a short description. ++.PP ++If you don't have the privileges of the root user, you still can ++configure your private font server. Just use some non-standard ++port number (see \s-1FONTS\s0.hpux for an example, exept that you won't ++need all the \s-1HP\s0\-related stuff on any other system). ++.SH "FILES" ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR/\s0scripts/convert.cfg.sample ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR/\s0scripts/* ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR/README\s0 ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR/FONTS\s0 ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR\s0/* ++.Ip "\(bu" 2 ++\s-1TTF2PT1_BINDIR/\s0ttf2pt1 ++.SH "SEE ALSO" ++.Ip "\(bu" 4 ++the \fIttf2pt1(1)\fR manpage ++.Ip "\(bu" 4 ++the \fIttf2pt1_x2gs(1)\fR manpage ++.Ip "\(bu" 4 ++the \fIt1asm(1)\fR manpage ++.SH "BUGS" ++.Sh "Known problems" ++.Ip "\(bu" 4 ++One catch is that the X11 Type 1 font library has a rather low limit ++on the font size. Because of this the fonts with more complicated ++outlines and the enabled hint substitution may not fit into ++this limit. The same applies to the fonts with very complicated ++outlines or with very many glyphs (especially the fonts with ++over 256 glyphs). So you will need to excercise caution with ++these options if you plan using these fonts with X11. Some vendors ++such as \s-1HP\s0 provide the Type 1 implementation licensed from Adobe ++which should have no such problem. ++.Sp ++But there is a solution even for the generic X11. A patch located ++in the subdirectory `\f(CWapp/X11\fR\*(R' fixes this problem as well ++as some other minor problems. Its description is provided in ++app/X11/\s-1README\s0. ++.Sp ++To fix the X11 font library, you have to get the X11 sources. I ++can recommend the ftp sites of the XFree86 project ftp://ftp.xfree86.org ++or of the Open Group ftp://ftp.x.org. This patch was made on the sources ++of XFree86 so you may have better success with applying it to the ++XFree86 distribution. After you have got the sources, make sure ++that you can compile them. Then apply the patch as described. ++Make sure that it was applied properly. Compile the sources again ++(actually, you need only the fonts library, the fonts server, and ++possibly the X server). It would be prudent now to save your old ++font library, font server and, possibly, X server. Then install ++the new recently compiled versions of these files. Of course, ++if you know someone who already has compiled these files for the ++same \s-1OS\s0 as yours, you can just copy the binary fles from him. ++.Sp ++Alas, building the X11 system from the source code is not the ++easiest thing in the world and if you have no experience it ++can be quite difficult. In this case just avoid the aforementioned ++features or check each converted font to make sure that it ++works properly. ++.Ip "\(bu" 4 ++The Type1 font library from the standard X11 distribution ++does not work on \s-1HP\s0\-\s-1UX\s0 (at least, up to 10.01). The font server ++supplied with \s-1HP\s0\-\s-1UX\s0 up to 10.01 is also broken. Starting from ++\s-1HP\s0\-\s-1UX\s0 10.20 (I don't know about 10.10) they supply a proprietary font ++library and the converted fonts work fine with it, provided that ++they are configured properly (see the file \s-1FONTS\s0.hpux). ++.Ip "\(bu" 4 ++The \f(CWfonts.scale\fR files created by the older versions of the ++\f(CWttf2pt1\fR installation program (up to release 3.1) have conflicted ++with the language definitions of the \f(CWXfsft\fR font server and ++parts of it included into XFree86. To overcome this incompatibility ++the never versions creats the \f(CWfonts.scale\fR file describing all the ++fonts as belonging to the \f(CWadobe-fontspecific\fR encoding and ++the \f(CWfonts.alias\fR file with the proper names. The drawback of ++this solution is that \f(CWxlsfonts\fR gives the list of twice more ++fonts. But as a side effect the option \f(CW\fBENFORCEISO\fR\fR in ++`\f(CWconvert.cfg\fR\*(R' is not required for X11 any more. ++.Ip "\(bu" 4 ++The conversion script has no support for Eastern multi-plane fonts. ++Contribution of such a support would be welcome. ++ ++.rn }` '' ++.IX Title "TTF2PT1_CONVERT 1" ++.IX Name "B - convenience font conversion script" ++ ++.IX Header "NAME" ++ ++.IX Header "SYNOPSIS" ++ ++.IX Header "DESCRIPTION" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Header "FILES" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Header "SEE ALSO" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Header "BUGS" ++ ++.IX Subsection "Known problems" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/ttf2pt1_x2gs.1 xserver/hw/xprint/extras/ttf2pt1/ttf2pt1_x2gs.1 +--- xserver-old/hw/xprint/extras/ttf2pt1/ttf2pt1_x2gs.1 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/ttf2pt1_x2gs.1 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,319 @@ ++.rn '' }` ++''' $RCSfile$$Revision$$Date$ ++''' ++''' $Log$ ++''' Revision 1.1.4.1 2004/04/21 10:03:13 gisburn ++''' Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=530 - Land XPRINT branch on XORG-CURRENT ++''' ++''' Revision 1.1 2003/06/04 00:33:54 roland ++''' Fix for http://xprint.mozdev.org/bugs/show_bug.cgi?id=3846 - RFE: Upload Freetype --> PS Type1 font converter "ttf2pt1" ... ++''' ++''' ++.de Sh ++.br ++.if t .Sp ++.ne 5 ++.PP ++\fB\\$1\fR ++.PP ++.. ++.de Sp ++.if t .sp .5v ++.if n .sp ++.. ++.de Ip ++.br ++.ie \\n(.$>=3 .ne \\$3 ++.el .ne 3 ++.IP "\\$1" \\$2 ++.. ++.de Vb ++.ft CW ++.nf ++.ne \\$1 ++.. ++.de Ve ++.ft R ++ ++.fi ++.. ++''' ++''' ++''' Set up \*(-- to give an unbreakable dash; ++''' string Tr holds user defined translation string. ++''' Bell System Logo is used as a dummy character. ++''' ++.tr \(*W-|\(bv\*(Tr ++.ie n \{\ ++.ds -- \(*W- ++.ds PI pi ++.if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch ++.if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch ++.ds L" "" ++.ds R" "" ++''' \*(M", \*(S", \*(N" and \*(T" are the equivalent of ++''' \*(L" and \*(R", except that they are used on ".xx" lines, ++''' such as .IP and .SH, which do another additional levels of ++''' double-quote interpretation ++.ds M" """ ++.ds S" """ ++.ds N" """"" ++.ds T" """"" ++.ds L' ' ++.ds R' ' ++.ds M' ' ++.ds S' ' ++.ds N' ' ++.ds T' ' ++'br\} ++.el\{\ ++.ds -- \(em\| ++.tr \*(Tr ++.ds L" `` ++.ds R" '' ++.ds M" `` ++.ds S" '' ++.ds N" `` ++.ds T" '' ++.ds L' ` ++.ds R' ' ++.ds M' ` ++.ds S' ' ++.ds N' ` ++.ds T' ' ++.ds PI \(*p ++'br\} ++.\" If the F register is turned on, we'll generate ++.\" index entries out stderr for the following things: ++.\" TH Title ++.\" SH Header ++.\" Sh Subsection ++.\" Ip Item ++.\" X<> Xref (embedded ++.\" Of course, you have to process the output yourself ++.\" in some meaninful fashion. ++.if \nF \{ ++.de IX ++.tm Index:\\$1\t\\n%\t"\\$2" ++.. ++.nr % 0 ++.rr F ++.\} ++.TH TTF2PT1_X2GS 1 "version 3.4.4-SNAP-030526" "May 26, 2003" "TTF2PT1 Font Converter" ++.UC ++.if n .hy 0 ++.if n .na ++.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' ++.de CQ \" put $1 in typewriter font ++.ft CW ++'if n "\c ++'if t \\&\\$1\c ++'if n \\&\\$1\c ++'if n \&" ++\\&\\$2 \\$3 \\$4 \\$5 \\$6 \\$7 ++'.ft R ++.. ++.\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2 ++. \" AM - accent mark definitions ++.bd B 3 ++. \" fudge factors for nroff and troff ++.if n \{\ ++. ds #H 0 ++. ds #V .8m ++. ds #F .3m ++. ds #[ \f1 ++. ds #] \fP ++.\} ++.if t \{\ ++. ds #H ((1u-(\\\\n(.fu%2u))*.13m) ++. ds #V .6m ++. ds #F 0 ++. ds #[ \& ++. ds #] \& ++.\} ++. \" simple accents for nroff and troff ++.if n \{\ ++. ds ' \& ++. ds ` \& ++. ds ^ \& ++. ds , \& ++. ds ~ ~ ++. ds ? ? ++. ds ! ! ++. ds / ++. ds q ++.\} ++.if t \{\ ++. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" ++. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' ++. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' ++. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' ++. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' ++. ds ? \s-2c\h'-\w'c'u*7/10'\u\h'\*(#H'\zi\d\s+2\h'\w'c'u*8/10' ++. ds ! \s-2\(or\s+2\h'-\w'\(or'u'\v'-.8m'.\v'.8m' ++. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' ++. ds q o\h'-\w'o'u*8/10'\s-4\v'.4m'\z\(*i\v'-.4m'\s+4\h'\w'o'u*8/10' ++.\} ++. \" troff and (daisy-wheel) nroff accents ++.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' ++.ds 8 \h'\*(#H'\(*b\h'-\*(#H' ++.ds v \\k:\h'-(\\n(.wu*9/10-\*(#H)'\v'-\*(#V'\*(#[\s-4v\s0\v'\*(#V'\h'|\\n:u'\*(#] ++.ds _ \\k:\h'-(\\n(.wu*9/10-\*(#H+(\*(#F*2/3))'\v'-.4m'\z\(hy\v'.4m'\h'|\\n:u' ++.ds . \\k:\h'-(\\n(.wu*8/10)'\v'\*(#V*4/10'\z.\v'-\*(#V*4/10'\h'|\\n:u' ++.ds 3 \*(#[\v'.2m'\s-2\&3\s0\v'-.2m'\*(#] ++.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] ++.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' ++.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' ++.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] ++.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] ++.ds ae a\h'-(\w'a'u*4/10)'e ++.ds Ae A\h'-(\w'A'u*4/10)'E ++.ds oe o\h'-(\w'o'u*4/10)'e ++.ds Oe O\h'-(\w'O'u*4/10)'E ++. \" corrections for vroff ++.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' ++.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' ++. \" for low resolution devices (crt and lpr) ++.if \n(.H>23 .if \n(.V>19 \ ++\{\ ++. ds : e ++. ds 8 ss ++. ds v \h'-1'\o'\(aa\(ga' ++. ds _ \h'-1'^ ++. ds . \h'-1'. ++. ds 3 3 ++. ds o a ++. ds d- d\h'-1'\(ga ++. ds D- D\h'-1'\(hy ++. ds th \o'bp' ++. ds Th \o'LP' ++. ds ae ae ++. ds Ae AE ++. ds oe oe ++. ds Oe OE ++.\} ++.rm #[ #] #H #V #F C ++.SH "NAME" ++\fBttf2pt1_x2gs\fR \- font installer for Ghostscript ++.SH "SYNOPSIS" ++ttf2pt1_x2gs \fB[config-file]\fR ++.SH "DESCRIPTION" ++The fonts generated with \fBttf2pt1\fR work fine with Ghostscript by ++themselves. The script `\fBx2gs\fR\*(R' (or `\fBttf2pt1_x2gs\fR\*(R' when installed ++into a public directory, to avoid name conflicts with other ++programs) links the font files from the X11 direcotry into the Ghostscript ++directory and automatically creates the description file (\f(CWFontmap\fR) ++in Ghostscript format. ++.PP ++If the configuration file is not specified as an argument then the file ++`\f(CWconvert.cfg\fR\*(R' in the current directory is used, just like the ++`\f(CWconvert\fR\*(R' script does. Indeed, this configuration file is used for ++both scripts. ++.PP ++The Ghostscript-related parameters in the configuration file are: ++.PP ++\fB\f(CWDSTDIR\fR\fR \- the X11 font directory used by `\f(CWx2gs\fR\*(R' as the ++source of the fonts. This parameter is common with the X11 ++configuration. ++.PP ++\fB\f(CWGSDIR\fR\fR \- the base directory of Ghostsript. If this ++parameter is set to an empty string then `\f(CWconvert\fR\*(R' won't ++call `\f(CWx2gs\fR\*(R'. So if you want to get only the X11 fonts ++installed then set this parameter to an empty string. This ++directory may vary on various system, so please check your ++system and set this value accordingly before running the script. ++.PP ++\fB\f(CWGSFONTDIR\fR\fR \- the font directory of Ghostscript. In the standard ++Ghostscript installation it's a subdirectory of \f(CWGSDIR\fR ++but some systems may use completely different directories. ++.PP ++\fB\f(CWGSCONFDIR\fR\fR \- the configuration subdirectory of Ghostscript ++that contains the \f(CWFontmap\fR file. ++.PP ++\fB\f(CWINSTALLFONTMAP\fR\fR \- if the value is set to \fB\f(CWYES\fR\fR then ++install the entries for the new fonts right into the main ++\f(CWFontmap\fR file. Otherwise just leave the file \f(CWFontmap.ttf\fR ++in the Ghostscript configuration directory. ++.PP ++After preparing the configuration file run the script. It symbolicaly links ++all the font files and creates the description file \f(CWFontmap.ttf\fR in ++\f(CWGSCONDFIR\fR. After that there are two choices. ++.PP ++If the option \f(CWINSTALLFONTMAP\fR was set to \f(CWYES\fR then ++the font descriptions are also automatically installed into the ++master \f(CWFontmap\fR file. The script is clever enough to ++detect if it was run multiple times with the same directories ++and if so it replaces the old \f(CWFontmap\fR entries with ++the new ones instead of just accumulating all of them. You ++may also run it multiple times for multiple X11 directories ++and all the results will be properly collected in the \f(CWFontmap\fR. ++But it's your responsibility to watch that the names of the ++font files don't overlap. If the X11 font directory gets ++renamed then you have to remove its font entries from the ++\f(CWFontmap\fR and only after that re-run `\f(CWx2gs\fR\*(R' ++for the new directory. ++.PP ++On the other hand if the option \f(CWINSTALLFONTMAP\fR was set to ++\f(CWNO\fR then go to the \f(CWGSCONFDIR\fR directory and insert the ++contents of \f(CWFontmap.ttf\fR into the \f(CWFontmap\fR file ++manually. This step may be left manual to make the installation ++a little bit more safe. ++.PP ++After that you may also want to redefine some of the aliases in ++\f(CWFontmap\fR to refer to the newly installed fonts. ++But the redefinition of the aliases may be dangerous if the width of ++characters in the new font will be different from the old font. ++Alas, there is no visible solution of this problem yet. ++.SH "FILES" ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR/\s0scripts/convert.cfg.sample ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR/\s0scripts/* ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR/README\s0 ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR/FONTS\s0 ++.Ip "\(bu" 2 ++\s-1TTF2PT1_SHAREDIR\s0/* ++.Ip "\(bu" 2 ++\s-1TTF2PT1_BINDIR/\s0ttf2pt1 ++.SH "SEE ALSO" ++.Ip "\(bu" 4 ++the \fIttf2pt1(1)\fR manpage ++.Ip "\(bu" 4 ++the \fIttf2pt1_convert(1)\fR manpage ++.Ip "\(bu" 4 ++the \fIt1asm(1)\fR manpage ++ ++.rn }` '' ++.IX Title "TTF2PT1_X2GS 1" ++.IX Name "B - font installer for Ghostscript" ++ ++.IX Header "NAME" ++ ++.IX Header "SYNOPSIS" ++ ++.IX Header "DESCRIPTION" ++ ++.IX Header "FILES" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Header "SEE ALSO" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ ++.IX Item "\(bu" ++ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/ttf.c xserver/hw/xprint/extras/ttf2pt1/ttf.c +--- xserver-old/hw/xprint/extras/ttf2pt1/ttf.c 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/ttf.c 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,1480 @@ ++/* ++ * True Type Font to Adobe Type 1 font converter ++ * By Mark Heath ++ * Based on ttf2pfa by Andrew Weeks ++ * With help from Frank M. Siegert ++ * ++ * see COPYRIGHT ++ * ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifndef WINDOWS ++# include ++# include ++#else ++# include "windows.h" ++#endif ++ ++#include "ttf.h" ++#include "pt1.h" ++#include "global.h" ++ ++/* prototypes of call entries */ ++static void openfont(char *fname, char *arg); ++static void closefont( void); ++static int getnglyphs ( void); ++static int glnames( GLYPH *glyph_list); ++static void glmetrics( GLYPH *glyph_list); ++static int glenc( GLYPH *glyph_list, int *encoding, int *unimap); ++static void fnmetrics( struct font_metrics *fm); ++static void glpath( int glyphno, GLYPH *glyph_list); ++static void kerning( GLYPH *glyph_list); ++ ++/* globals */ ++ ++/* front-end descriptor */ ++struct frontsw ttf_sw = { ++ /*name*/ "ttf", ++ /*descr*/ "built-in TTF support", ++ /*suffix*/ { "ttf" }, ++ /*open*/ openfont, ++ /*close*/ closefont, ++ /*nglyphs*/ getnglyphs, ++ /*glnames*/ glnames, ++ /*glmetrics*/ glmetrics, ++ /*glenc*/ glenc, ++ /*fnmetrics*/ fnmetrics, ++ /*glpath*/ glpath, ++ /*kerning*/ kerning, ++}; ++ ++/* statics */ ++ ++static FILE *ttf_file; ++static int ttf_nglyphs, long_offsets; ++ ++static TTF_DIRECTORY *directory; ++static TTF_DIR_ENTRY *dir_entry; ++static char *filebuffer; ++static char *filebuffer_end; ++static TTF_NAME *name_table = NULL; ++static TTF_NAME_REC *name_record; ++static TTF_HEAD *head_table = NULL; ++static TTF_HHEA *hhea_table = NULL; ++static TTF_KERN *kern_table = NULL; ++static TTF_CMAP *cmap_table = NULL; ++static LONGHORMETRIC *hmtx_table = NULL; ++static TTF_GLYF *glyf_table; ++static BYTE *glyf_start = NULL; ++static TTF_MAXP *maxp_table = NULL; ++static TTF_POST_HEAD *post_table = NULL; ++static union { ++ USHORT *sp; ++ ULONG *lp; ++} loca_table; ++#define short_loca_table loca_table.sp ++#define long_loca_table loca_table.lp ++ ++static short cmap_n_segs; ++static USHORT *cmap_seg_start, *cmap_seg_end; ++static short *cmap_idDelta, *cmap_idRangeOffset; ++static TTF_CMAP_FMT0 *encoding0; ++static int enc_type; ++ ++static char name_buffer[2000]; ++static char *name_fields[8]; ++ ++static int enc_found_ms, enc_found_mac; ++ ++static char *mac_glyph_names[258] = { ++ ".notdef", ".null", "CR", ++ "space", "exclam", "quotedbl", "numbersign", ++ "dollar", "percent", "ampersand", "quotesingle", ++ "parenleft", "parenright", "asterisk", "plus", ++ "comma", "hyphen", "period", "slash", ++ "zero", "one", "two", "three", ++ "four", "five", "six", "seven", ++ "eight", "nine", "colon", "semicolon", ++ "less", "equal", "greater", "question", ++ "at", "A", "B", "C", ++ "D", "E", "F", "G", ++ "H", "I", "J", "K", ++ "L", "M", "N", "O", ++ "P", "Q", "R", "S", ++ "T", "U", "V", "W", ++ "X", "Y", "Z", "bracketleft", ++ "backslash", "bracketright", "asciicircum", "underscore", ++ "grave", "a", "b", "c", ++ "d", "e", "f", "g", ++ "h", "i", "j", "k", ++ "l", "m", "n", "o", ++ "p", "q", "r", "s", ++ "t", "u", "v", "w", ++ "x", "y", "z", "braceleft", ++ "bar", "braceright", "asciitilde", "Adieresis", ++ "Aring", "Ccedilla", "Eacute", "Ntilde", ++ "Odieresis", "Udieresis", "aacute", "agrave", ++ "acircumflex", "adieresis", "atilde", "aring", ++ "ccedilla", "eacute", "egrave", "ecircumflex", ++ "edieresis", "iacute", "igrave", "icircumflex", ++ "idieresis", "ntilde", "oacute", "ograve", ++ "ocircumflex", "odieresis", "otilde", "uacute", ++ "ugrave", "ucircumflex", "udieresis", "dagger", ++ "degree", "cent", "sterling", "section", ++ "bullet", "paragraph", "germandbls", "registered", ++ "copyright", "trademark", "acute", "dieresis", ++ "notequal", "AE", "Oslash", "infinity", ++ "plusminus", "lessequal", "greaterequal", "yen", ++ "mu", "partialdiff", "summation", "product", ++ "pi", "integral", "ordfeminine", "ordmasculine", ++ "Omega", "ae", "oslash", "questiondown", ++ "exclamdown", "logicalnot", "radical", "florin", ++ "approxequal", "increment", "guillemotleft", "guillemotright", ++ "ellipsis", "nbspace", "Agrave", "Atilde", ++ "Otilde", "OE", "oe", "endash", ++ "emdash", "quotedblleft", "quotedblright", "quoteleft", ++ "quoteright", "divide", "lozenge", "ydieresis", ++ "Ydieresis", "fraction", "currency", "guilsinglleft", ++ "guilsinglright", "fi", "fl", "daggerdbl", ++ "periodcentered", "quotesinglbase", "quotedblbase", "perthousand", ++ "Acircumflex", "Ecircumflex", "Aacute", "Edieresis", ++ "Egrave", "Iacute", "Icircumflex", "Idieresis", ++ "Igrave", "Oacute", "Ocircumflex", "applelogo", ++ "Ograve", "Uacute", "Ucircumflex", "Ugrave", ++ "dotlessi", "circumflex", "tilde", "macron", ++ "breve", "dotaccent", "ring", "cedilla", ++ "hungarumlaut", "ogonek", "caron", "Lslash", ++ "lslash", "Scaron", "scaron", "Zcaron", ++ "zcaron", "brokenbar", "Eth", "eth", ++ "Yacute", "yacute", "Thorn", "thorn", ++ "minus", "multiply", "onesuperior", "twosuperior", ++ "threesuperior", "onehalf", "onequarter", "threequarters", ++ "franc", "Gbreve", "gbreve", "Idot", ++ "Scedilla", "scedilla", "Cacute", "cacute", ++ "Ccaron", "ccaron", "dmacron" ++}; ++ ++/* other prototypes */ ++static void draw_composite_glyf( GLYPH *g, GLYPH *glyph_list, int glyphno, ++ double *matrix, int level); ++static void draw_simple_glyf( GLYPH *g, GLYPH *glyph_list, int glyphno, ++ double *matrix); ++static double f2dot14( short x); ++ ++/* get the TTF description table address and length for this index */ ++ ++static void ++get_glyf_table( ++ int glyphno, ++ TTF_GLYF **tab, ++ int *len ++) ++{ ++ if(tab!=NULL) { ++ if (long_offsets) { ++ *tab = (TTF_GLYF *) (glyf_start + ntohl(long_loca_table[glyphno])); ++ } else { ++ *tab = (TTF_GLYF *) (glyf_start + (ntohs(short_loca_table[glyphno]) << 1)); ++ } ++ } ++ if(len!=NULL) { ++ if (long_offsets) { ++ *len = ntohl(long_loca_table[glyphno + 1]) - ntohl(long_loca_table[glyphno]); ++ } else { ++ *len = (ntohs(short_loca_table[glyphno + 1]) - ntohs(short_loca_table[glyphno])) << 1; ++ } ++ } ++} ++ ++static void ++handle_name(void) ++{ ++ int j, k, lang, len, platform; ++ char *p, *string_area; ++ char *nbp = name_buffer; ++ int found3 = 0; ++ ++ string_area = (char *) name_table + ntohs(name_table->offset); ++ name_record = &(name_table->nameRecords); ++ ++ for (j = 0; j < 8; j++) { ++ name_fields[j] = ""; ++ } ++ ++ for (j = 0; j < ntohs(name_table->numberOfNameRecords); j++) { ++ ++ platform = ntohs(name_record->platformID); ++ ++ if (platform == 3) { ++ ++ found3 = 1; ++ lang = ntohs(name_record->languageID) & 0xff; ++ len = ntohs(name_record->stringLength); ++ if (lang == 0 || lang == 9) { ++ k = ntohs(name_record->nameID); ++ if (k < 8) { ++ name_fields[k] = nbp; ++ ++ p = string_area + ntohs(name_record->stringOffset); ++ for (k = 0; k < len; k++) { ++ if (p[k] != '\0') { ++ if (p[k] == '(') { ++ *nbp = '['; ++ } else if (p[k] == ')') { ++ *nbp = ']'; ++ } else { ++ *nbp = p[k]; ++ } ++ nbp++; ++ } ++ } ++ *nbp = '\0'; ++ nbp++; ++ } ++ } ++ } ++ name_record++; ++ } ++ ++ string_area = (char *) name_table + ntohs(name_table->offset); ++ name_record = &(name_table->nameRecords); ++ ++ if (!found3) { ++ for (j = 0; j < ntohs(name_table->numberOfNameRecords); j++) { ++ ++ platform = ntohs(name_record->platformID); ++ ++ if (platform == 1) { ++ ++ found3 = 1; ++ lang = ntohs(name_record->languageID) & 0xff; ++ len = ntohs(name_record->stringLength); ++ if (lang == 0 || lang == 9) { ++ k = ntohs(name_record->nameID); ++ if (k < 8) { ++ name_fields[k] = nbp; ++ ++ p = string_area + ntohs(name_record->stringOffset); ++ for (k = 0; k < len; k++) { ++ if (p[k] != '\0') { ++ if (p[k] == '(') { ++ *nbp = '['; ++ } else if (p[k] == ')') { ++ *nbp = ']'; ++ } else { ++ *nbp = p[k]; ++ } ++ nbp++; ++ } ++ } ++ *nbp = '\0'; ++ nbp++; ++ } ++ } ++ } ++ name_record++; ++ } ++ } ++ if (!found3) { ++ fprintf(stderr, "**** Cannot decode font name fields ****\n"); ++ exit(1); ++ } ++ if (name_fields[4][0] == 0) { /* Full Name empty, use Family Name */ ++ name_fields[4] = name_fields[1]; ++ } ++ if (name_fields[6][0] == 0) { /* Font Name empty, use Full Name */ ++ name_fields[6] = name_fields[4]; ++ if (name_fields[6][0] == 0) { /* oops, empty again */ ++ WARNING_1 fprintf(stderr, "Font name is unknown, setting to \"Unknown\"\n"); ++ name_fields[6] = "Unknown"; ++ } ++ } ++ p = name_fields[6]; ++ /* must not start with a digit */ ++ if(isdigit(*p)) ++ *p+= 'A'-'0'; /* change to a letter */ ++ while (*p != '\0') { ++ if (!isalnum(*p) || *p=='_') { ++ *p = '-'; ++ } ++ p++; ++ } ++} ++ ++static void ++handle_head(void) ++{ ++ long_offsets = ntohs(head_table->indexToLocFormat); ++ if (long_offsets != 0 && long_offsets != 1) { ++ fprintf(stderr, "**** indexToLocFormat wrong ****\n"); ++ exit(1); ++ } ++} ++ ++/* limit the recursion level to avoid cycles */ ++#define MAX_COMPOSITE_LEVEL 20 ++ ++static void ++draw_composite_glyf( ++ GLYPH *g, ++ GLYPH *glyph_list, ++ int glyphno, ++ double *orgmatrix, ++ int level ++) ++{ ++ int len; ++ short ncontours; ++ USHORT flagbyte, glyphindex; ++ double arg1, arg2; ++ BYTE *ptr; ++ char *bptr; ++ SHORT *sptr; ++ double matrix[6], newmatrix[6]; ++ ++ get_glyf_table(glyphno, &glyf_table, &len); ++ ++ if(len<=0) /* nothing to do */ ++ return; ++ ++ ncontours = ntohs(glyf_table->numberOfContours); ++ if (ncontours >= 0) { /* simple case */ ++ draw_simple_glyf(g, glyph_list, glyphno, orgmatrix); ++ return; ++ } ++ ++ if(ISDBG(COMPOSITE) && level ==0) ++ fprintf(stderr, "* %s [ %.2f %.2f %.2f %.2f %.2f %.2f ]\n", g->name, ++ orgmatrix[0], orgmatrix[1], orgmatrix[2], orgmatrix[3], ++ orgmatrix[4], orgmatrix[5]); ++ ++ /* complex case */ ++ if(level >= MAX_COMPOSITE_LEVEL) { ++ WARNING_1 fprintf(stderr, ++ "*** Glyph %s: stopped (possibly infinite) recursion at depth %d\n", ++ g->name, level); ++ return; ++ } ++ ++ ptr = ((BYTE *) glyf_table + sizeof(TTF_GLYF)); ++ sptr = (SHORT *) ptr; ++ do { ++ flagbyte = ntohs(*sptr); ++ sptr++; ++ glyphindex = ntohs(*sptr); ++ sptr++; ++ ++ if (flagbyte & ARG_1_AND_2_ARE_WORDS) { ++ arg1 = (short)ntohs(*sptr); ++ sptr++; ++ arg2 = (short)ntohs(*sptr); ++ sptr++; ++ } else { ++ bptr = (char *) sptr; ++ arg1 = (signed char) bptr[0]; ++ arg2 = (signed char) bptr[1]; ++ sptr++; ++ } ++ matrix[1] = matrix[2] = 0.0; ++ ++ if (flagbyte & WE_HAVE_A_SCALE) { ++ matrix[0] = matrix[3] = f2dot14(*sptr); ++ sptr++; ++ } else if (flagbyte & WE_HAVE_AN_X_AND_Y_SCALE) { ++ matrix[0] = f2dot14(*sptr); ++ sptr++; ++ matrix[3] = f2dot14(*sptr); ++ sptr++; ++ } else if (flagbyte & WE_HAVE_A_TWO_BY_TWO) { ++ matrix[0] = f2dot14(*sptr); ++ sptr++; ++ matrix[2] = f2dot14(*sptr); ++ sptr++; ++ matrix[1] = f2dot14(*sptr); ++ sptr++; ++ matrix[3] = f2dot14(*sptr); ++ sptr++; ++ } else { ++ matrix[0] = matrix[3] = 1.0; ++ } ++ ++ /* ++ * See * ++ * http://fonts.apple.com/TTRefMan/RM06/Chap6g ++ * lyf.html * matrix[0,1,2,3,4,5]=a,b,c,d,m,n ++ */ ++ ++ if (fabs(matrix[0]) > fabs(matrix[1])) ++ matrix[4] = fabs(matrix[0]); ++ else ++ matrix[4] = fabs(matrix[1]); ++ if (fabs(fabs(matrix[0]) - fabs(matrix[2])) <= 33. / 65536.) ++ matrix[4] *= 2.0; ++ ++ if (fabs(matrix[2]) > fabs(matrix[3])) ++ matrix[5] = fabs(matrix[2]); ++ else ++ matrix[5] = fabs(matrix[3]); ++ if (fabs(fabs(matrix[2]) - fabs(matrix[3])) <= 33. / 65536.) ++ matrix[5] *= 2.0; ++ ++ /* ++ * fprintf (stderr,"Matrix Opp %hd ++ * %hd\n",arg1,arg2); ++ */ ++#if 0 ++ fprintf(stderr, "Matrix: %f %f %f %f %f %f\n", ++ matrix[0], matrix[1], matrix[2], matrix[3], ++ matrix[4], matrix[5]); ++ fprintf(stderr, "Offset: %f %f (%s)\n", ++ arg1, arg2, ++ ((flagbyte & ARGS_ARE_XY_VALUES) ? "XY" : "index")); ++#endif ++ ++ if (flagbyte & ARGS_ARE_XY_VALUES) { ++ matrix[4] *= arg1; ++ matrix[5] *= arg2; ++ } else { ++ WARNING_1 fprintf(stderr, ++ "*** Glyph %s: reusing scale from another glyph is unsupported\n", ++ g->name); ++ /* ++ * must extract values from a glyph ++ * but it seems to be too much pain ++ * and it's not clear now that it ++ * would be really used in any ++ * interesting font ++ */ ++ } ++ ++ /* at this point arg1,arg2 contain what logically should be matrix[4,5] */ ++ ++ /* combine matrices */ ++ ++ newmatrix[0] = orgmatrix[0]*matrix[0] + orgmatrix[2]*matrix[1]; ++ newmatrix[1] = orgmatrix[0]*matrix[2] + orgmatrix[2]*matrix[3]; ++ ++ newmatrix[2] = orgmatrix[1]*matrix[0] + orgmatrix[3]*matrix[1]; ++ newmatrix[3] = orgmatrix[1]*matrix[2] + orgmatrix[3]*matrix[3]; ++ ++ newmatrix[4] = orgmatrix[0]*matrix[4] + orgmatrix[2]*matrix[5] + orgmatrix[4]; ++ newmatrix[5] = orgmatrix[1]*matrix[4] + orgmatrix[3]*matrix[5] + orgmatrix[5]; ++ ++ if(ISDBG(COMPOSITE)) { ++ fprintf(stderr, "%*c+-> %2d %s [ %.2f %.2f %.2f %.2f %.2f %.2f ]\n", ++ level+1, ' ', level, glyph_list[glyphindex].name, ++ matrix[0], matrix[1], matrix[2], matrix[3], ++ matrix[4], matrix[5]); ++ fprintf(stderr, "%*c = [ %.2f %.2f %.2f %.2f %.2f %.2f ]\n", ++ level+1, ' ', ++ newmatrix[0], newmatrix[1], newmatrix[2], newmatrix[3], ++ newmatrix[4], newmatrix[5]); ++ } ++ draw_composite_glyf(g, glyph_list, glyphindex, newmatrix, level+1); ++ ++ } while (flagbyte & MORE_COMPONENTS); ++} ++ ++static void ++draw_simple_glyf( ++ GLYPH *g, ++ GLYPH *glyph_list, ++ int glyphno, ++ double *matrix ++) ++{ ++ int i, j, k, k1, len, first, cs, ce; ++ /* We assume that hsbw always sets to(0, 0) */ ++ double xlast = 0, ylast = 0; ++ int finished, nguide, contour_start, contour_end; ++ short ncontours, n_inst, last_point; ++ USHORT *contour_end_pt; ++ BYTE *ptr; ++#define GLYFSZ 2000 ++ short xabs[GLYFSZ], yabs[GLYFSZ], xrel[GLYFSZ], yrel[GLYFSZ]; ++ double xcoord[GLYFSZ], ycoord[GLYFSZ]; ++ BYTE flags[GLYFSZ]; ++ double tx, ty; ++ int needreverse = 0; /* transformation may require ++ * that */ ++ GENTRY *lge; ++ ++ lge = g->lastentry; ++ ++ get_glyf_table(glyphno, &glyf_table, &len); ++ ++ if (len <= 0) { ++ WARNING_1 fprintf(stderr, ++ "**** Composite glyph %s refers to non-existent glyph %s, ignored\n", ++ g->name, ++ glyph_list[glyphno].name); ++ return; ++ } ++ ncontours = ntohs(glyf_table->numberOfContours); ++ if (ncontours < 0) { ++ WARNING_1 fprintf(stderr, ++ "**** Composite glyph %s refers to composite glyph %s, ignored\n", ++ g->name, ++ glyph_list[glyphno].name); ++ return; ++ } ++ contour_end_pt = (USHORT *) ((char *) glyf_table + sizeof(TTF_GLYF)); ++ ++ last_point = ntohs(contour_end_pt[ncontours - 1]); ++ n_inst = ntohs(contour_end_pt[ncontours]); ++ ++ ptr = ((BYTE *) contour_end_pt) + (ncontours << 1) + n_inst + 2; ++ j = k = 0; ++ while (k <= last_point) { ++ flags[k] = ptr[j]; ++ ++ if (ptr[j] & REPEAT) { ++ for (k1 = 0; k1 < ptr[j + 1]; k1++) { ++ k++; ++ flags[k] = ptr[j]; ++ } ++ j++; ++ } ++ j++; ++ k++; ++ } ++ ++ for (k = 0; k <= last_point; k++) { ++ if (flags[k] & XSHORT) { ++ if (flags[k] & XSAME) { ++ xrel[k] = ptr[j]; ++ } else { ++ xrel[k] = -ptr[j]; ++ } ++ j++; ++ } else if (flags[k] & XSAME) { ++ xrel[k] = 0.0; ++ } else { ++ xrel[k] = (short)( ptr[j] * 256 + ptr[j + 1] ); ++ j += 2; ++ } ++ if (k == 0) { ++ xabs[k] = xrel[k]; ++ } else { ++ xabs[k] = xrel[k] + xabs[k - 1]; ++ } ++ ++ } ++ ++ for (k = 0; k <= last_point; k++) { ++ if (flags[k] & YSHORT) { ++ if (flags[k] & YSAME) { ++ yrel[k] = ptr[j]; ++ } else { ++ yrel[k] = -ptr[j]; ++ } ++ j++; ++ } else if (flags[k] & YSAME) { ++ yrel[k] = 0; ++ } else { ++ yrel[k] = ptr[j] * 256 + ptr[j + 1]; ++ j += 2; ++ } ++ if (k == 0) { ++ yabs[k] = yrel[k]; ++ } else { ++ yabs[k] = yrel[k] + yabs[k - 1]; ++ } ++ } ++ ++ if (matrix) { ++ for (i = 0; i <= last_point; i++) { ++ tx = xabs[i]; ++ ty = yabs[i]; ++ xcoord[i] = fscale(matrix[0] * tx + matrix[2] * ty + matrix[4]); ++ ycoord[i] = fscale(matrix[1] * tx + matrix[3] * ty + matrix[5]); ++ } ++ } else { ++ for (i = 0; i <= last_point; i++) { ++ xcoord[i] = fscale(xabs[i]); ++ ycoord[i] = fscale(yabs[i]); ++ } ++ } ++ ++ i = j = 0; ++ first = 1; ++ ++ while (i <= ntohs(contour_end_pt[ncontours - 1])) { ++ contour_end = ntohs(contour_end_pt[j]); ++ ++ if (first) { ++ fg_rmoveto(g, xcoord[i], ycoord[i]); ++ xlast = xcoord[i]; ++ ylast = ycoord[i]; ++ contour_start = i; ++ first = 0; ++ } else if (flags[i] & ONOROFF) { ++ fg_rlineto(g, xcoord[i], ycoord[i]); ++ xlast = xcoord[i]; ++ ylast = ycoord[i]; ++ } else { ++ cs = i - 1; ++ finished = nguide = 0; ++ while (!finished) { ++ if (i == contour_end + 1) { ++ ce = contour_start; ++ finished = 1; ++ } else if (flags[i] & ONOROFF) { ++ ce = i; ++ finished = 1; ++ } else { ++ i++; ++ nguide++; ++ } ++ } ++ ++ switch (nguide) { ++ case 0: ++ fg_rlineto(g, xcoord[ce], ycoord[ce]); ++ xlast = xcoord[ce]; ++ ylast = ycoord[ce]; ++ break; ++ ++ case 1: ++ fg_rrcurveto(g, ++ (xcoord[cs] + 2.0 * xcoord[cs + 1]) / 3.0, ++ (ycoord[cs] + 2.0 * ycoord[cs + 1]) / 3.0, ++ (2.0 * xcoord[cs + 1] + xcoord[ce]) / 3.0, ++ (2.0 * ycoord[cs + 1] + ycoord[ce]) / 3.0, ++ xcoord[ce], ++ ycoord[ce] ++ ); ++ xlast = xcoord[ce]; ++ ylast = ycoord[ce]; ++ ++ break; ++ ++ case 2: ++ fg_rrcurveto(g, ++ (-xcoord[cs] + 4.0 * xcoord[cs + 1]) / 3.0, ++ (-ycoord[cs] + 4.0 * ycoord[cs + 1]) / 3.0, ++ (4.0 * xcoord[cs + 2] - xcoord[ce]) / 3.0, ++ (4.0 * ycoord[cs + 2] - ycoord[ce]) / 3.0, ++ xcoord[ce], ++ ycoord[ce] ++ ); ++ xlast = xcoord[ce]; ++ ylast = ycoord[ce]; ++ break; ++ ++ case 3: ++ fg_rrcurveto(g, ++ (xcoord[cs] + 2.0 * xcoord[cs + 1]) / 3.0, ++ (ycoord[cs] + 2.0 * ycoord[cs + 1]) / 3.0, ++ (5.0 * xcoord[cs + 1] + xcoord[cs + 2]) / 6.0, ++ (5.0 * ycoord[cs + 1] + ycoord[cs + 2]) / 6.0, ++ (xcoord[cs + 1] + xcoord[cs + 2]) / 2.0, ++ (ycoord[cs + 1] + ycoord[cs + 2]) / 2.0 ++ ); ++ ++ fg_rrcurveto(g, ++ (xcoord[cs + 1] + 5.0 * xcoord[cs + 2]) / 6.0, ++ (ycoord[cs + 1] + 5.0 * ycoord[cs + 2]) / 6.0, ++ (5.0 * xcoord[cs + 2] + xcoord[cs + 3]) / 6.0, ++ (5.0 * ycoord[cs + 2] + ycoord[cs + 3]) / 6.0, ++ (xcoord[cs + 3] + xcoord[cs + 2]) / 2.0, ++ (ycoord[cs + 3] + ycoord[cs + 2]) / 2.0 ++ ); ++ ++ fg_rrcurveto(g, ++ (xcoord[cs + 2] + 5.0 * xcoord[cs + 3]) / 6.0, ++ (ycoord[cs + 2] + 5.0 * ycoord[cs + 3]) / 6.0, ++ (2.0 * xcoord[cs + 3] + xcoord[ce]) / 3.0, ++ (2.0 * ycoord[cs + 3] + ycoord[ce]) / 3.0, ++ xcoord[ce], ++ ycoord[ce] ++ ); ++ ylast = ycoord[ce]; ++ xlast = xcoord[ce]; ++ ++ break; ++ ++ default: ++ k1 = cs + nguide; ++ fg_rrcurveto(g, ++ (xcoord[cs] + 2.0 * xcoord[cs + 1]) / 3.0, ++ (ycoord[cs] + 2.0 * ycoord[cs + 1]) / 3.0, ++ (5.0 * xcoord[cs + 1] + xcoord[cs + 2]) / 6.0, ++ (5.0 * ycoord[cs + 1] + ycoord[cs + 2]) / 6.0, ++ (xcoord[cs + 1] + xcoord[cs + 2]) / 2.0, ++ (ycoord[cs + 1] + ycoord[cs + 2]) / 2.0 ++ ); ++ ++ for (k = cs + 2; k <= k1 - 1; k++) { ++ fg_rrcurveto(g, ++ (xcoord[k - 1] + 5.0 * xcoord[k]) / 6.0, ++ (ycoord[k - 1] + 5.0 * ycoord[k]) / 6.0, ++ (5.0 * xcoord[k] + xcoord[k + 1]) / 6.0, ++ (5.0 * ycoord[k] + ycoord[k + 1]) / 6.0, ++ (xcoord[k] + xcoord[k + 1]) / 2.0, ++ (ycoord[k] + ycoord[k + 1]) / 2.0 ++ ); ++ ++ } ++ ++ fg_rrcurveto(g, ++ (xcoord[k1 - 1] + 5.0 * xcoord[k1]) / 6.0, ++ (ycoord[k1 - 1] + 5.0 * ycoord[k1]) / 6.0, ++ (2.0 * xcoord[k1] + xcoord[ce]) / 3.0, ++ (2.0 * ycoord[k1] + ycoord[ce]) / 3.0, ++ xcoord[ce], ++ ycoord[ce] ++ ); ++ xlast = xcoord[ce]; ++ ylast = ycoord[ce]; ++ ++ break; ++ } ++ } ++ if (i >= contour_end) { ++ g_closepath(g); ++ first = 1; ++ i = contour_end + 1; ++ j++; ++ } else { ++ i++; ++ } ++ } ++ ++ if (matrix) { ++ /* guess whether do we need to reverse the results */ ++ ++ double x[3], y[3]; ++ int max = 0, from, to; ++ ++ /* transform a triangle going in proper direction */ ++ /* ++ * the origin of triangle is in (0,0) so we know it in ++ * advance ++ */ ++ ++ x[0] = y[0] = 0; ++ x[1] = matrix[0] * 0 + matrix[2] * 300; ++ y[1] = matrix[1] * 0 + matrix[3] * 300; ++ x[2] = matrix[0] * 300 + matrix[2] * 0; ++ y[2] = matrix[1] * 300 + matrix[3] * 0; ++ ++ /* then find the topmost point */ ++ for (i = 0; i < 3; i++) ++ if (y[i] > y[max]) ++ max = i; ++ from = (max + 3 - 1) % 3; ++ to = (max + 1) % 3; ++ ++ needreverse = 0; ++ ++ /* special cases for horizontal lines */ ++ if (y[max] == y[from]) { ++ if (x[max] < y[from]) ++ needreverse = 1; ++ } else if (y[to] == y[from]) { ++ if (x[to] < x[max]) ++ needreverse = 1; ++ } else { /* generic case */ ++ if ((x[to] - x[max]) * (y[max] - y[from]) ++ > (x[max] - x[from]) * (y[to] - y[max])) ++ needreverse = 1; ++ } ++ ++ if (needreverse) { ++ if (lge) { ++ assertpath(lge->next, __FILE__, __LINE__, g->name); ++ reversepathsfromto(lge->next, NULL); ++ } else { ++ assertpath(g->entries, __FILE__, __LINE__, g->name); ++ reversepaths(g); ++ } ++ } ++ } ++} ++ ++static double ++f2dot14( ++ short x ++) ++{ ++ short y = ntohs(x); ++ return (y >> 14) + ((y & 0x3fff) / 16384.0); ++} ++ ++ ++/* check that the pointer points within the file */ ++/* returns 0 if pointer is good, 1 if bad */ ++static int ++badpointer( ++ void *ptr ++) ++{ ++ return (ptr < (void *)filebuffer || ptr >= (void *)filebuffer_end); ++} ++ ++/* ++ * Externally accessible methods ++ */ ++ ++/* ++ * Open font and prepare to return information to the main driver. ++ * May print error and warning messages. ++ * Exit on error. ++ */ ++ ++static void ++openfont( ++ char *fname, ++ char *arg /* unused now */ ++) ++{ ++ int i, j; ++ struct stat statbuf; ++ static struct { ++ void **tbpp; /* pointer to pointer to the table */ ++ char name[5]; /* table name */ ++ char optional; /* flag: table may be missing */ ++ } tables[] = { ++ { (void **)&name_table, "name", 0 }, ++ { (void **)&head_table, "head", 0 }, ++ { (void **)&hhea_table, "hhea", 0 }, ++ { (void **)&post_table, "post", 0 }, ++ { (void **)&glyf_start, "glyf", 0 }, ++ { (void **)&cmap_table, "cmap", 0 }, ++ { (void **)&kern_table, "kern", 1 }, ++ { (void **)&maxp_table, "maxp", 0 }, ++ { (void **)&hmtx_table, "hmtx", 0 }, ++ { (void **)&long_loca_table, "loca", 0 }, ++ { NULL, "", 0 } /* end of table */ ++ }; ++ ++ if (stat(fname, &statbuf) == -1) { ++ fprintf(stderr, "**** Cannot access %s ****\n", fname); ++ exit(1); ++ } ++ if ((filebuffer = malloc(statbuf.st_size)) == NULL) { ++ fprintf(stderr, "**** Cannot malloc space for file ****\n"); ++ exit(1); ++ } ++ ++ filebuffer_end = filebuffer + statbuf.st_size; ++ ++ if ((ttf_file = fopen(fname, "rb")) == NULL) { ++ fprintf(stderr, "**** Cannot open file '%s'\n", fname); ++ exit(1); ++ } else { ++ WARNING_2 fprintf(stderr, "Processing file %s\n", fname); ++ } ++ ++ if (fread(filebuffer, 1, statbuf.st_size, ttf_file) != statbuf.st_size) { ++ fprintf(stderr, "**** Could not read whole file \n"); ++ exit(1); ++ } ++ fclose(ttf_file); ++ ++ directory = (TTF_DIRECTORY *) filebuffer; ++ ++ if (ntohl(directory->sfntVersion) != 0x00010000) { ++ fprintf(stderr, ++ "**** Unknown File Version number [%x], or not a TrueType file\n", ++ directory->sfntVersion); ++ exit(1); ++ } ++ ++ /* clear the tables */ ++ for(j=0; tables[j].tbpp != NULL; j++) ++ *(tables[j].tbpp) = NULL; ++ ++ dir_entry = &(directory->list); ++ ++ for (i = 0; i < ntohs(directory->numTables); i++) { ++ ++ for(j=0; tables[j].tbpp != NULL; j++) ++ if (memcmp(dir_entry->tag, tables[j].name, 4) == 0) { ++ *(tables[j].tbpp) = (void *) (filebuffer + ntohl(dir_entry->offset)); ++ break; ++ } ++ ++ if (memcmp(dir_entry->tag, "EBDT", 4) == 0 || ++ memcmp(dir_entry->tag, "EBLC", 4) == 0 || ++ memcmp(dir_entry->tag, "EBSC", 4) == 0) { ++ WARNING_1 fprintf(stderr, "Font contains bitmaps\n"); ++ } ++ dir_entry++; ++ } ++ ++ for(j=0; tables[j].tbpp != NULL; j++) ++ if(!tables[j].optional && badpointer( *(tables[j].tbpp) )) { ++ fprintf(stderr, "**** File contains no required table '%s'\n", tables[j].name); ++ exit(1); ++ } ++ ++ handle_name(); ++ ++ handle_head(); ++ ++ ttf_nglyphs = ntohs(maxp_table->numGlyphs); ++ ++ enc_found_ms = enc_found_mac = 0; ++} ++ ++/* ++ * Close font. ++ * Exit on error. ++ */ ++ ++static void ++closefont( ++ void ++) ++{ ++ return; /* empty operation */ ++} ++ ++/* ++ * Get the number of glyphs in font. ++ */ ++ ++static int ++getnglyphs ( ++ void ++) ++{ ++ return ttf_nglyphs; ++} ++ ++/* ++ * Get the names of the glyphs. ++ * Returns 0 if the names were assigned, non-zero if the font ++ * provides no glyph names. ++ */ ++ ++static int ++glnames( ++ GLYPH *glyph_list ++) ++{ ++ int i, len, n, npost; ++ unsigned int format; ++ USHORT *name_index; ++ char *ptr, *p; ++ char **ps_name_ptr = (char **) malloc(ttf_nglyphs * sizeof(char *)); ++ int n_ps_names; ++ int ps_fmt_3 = 0; ++ ++ format = ntohl(post_table->formatType); ++ ++ if (format == 0x00010000) { ++ for (i = 0; i < 258 && i < ttf_nglyphs; i++) { ++ glyph_list[i].name = mac_glyph_names[i]; ++ } ++ } else if (format == 0x00020000) { ++ npost = ntohs(post_table->numGlyphs); ++ if (ttf_nglyphs != npost) { ++ /* This is an error in the font, but we can now cope */ ++ WARNING_1 fprintf(stderr, "**** Postscript table size mismatch %d/%d ****\n", ++ npost, ttf_nglyphs); ++ } ++ n_ps_names = 0; ++ name_index = &(post_table->glyphNameIndex); ++ ++ /* This checks the integrity of the post table */ ++ for (i=0; i n_ps_names + 257) { ++ n_ps_names = n - 257; ++ } ++ } ++ ++ ptr = (char *) post_table + 34 + (ttf_nglyphs << 1); ++ i = 0; ++ while (*ptr > 0 && i < n_ps_names) { ++ len = *ptr; ++ /* previously the program wrote nulls into the table. If the table ++ was corrupt, this could put zeroes anywhere, leading to obscure bugs, ++ so now I malloc space for the names. Yes it is much less efficient */ ++ ++ if ((p = malloc(len+1)) == NULL) { ++ fprintf (stderr, "****malloc failed %s line %d\n", __FILE__, __LINE__); ++ exit(255); ++ } ++ ++ ps_name_ptr[i] = p; ++ strncpy(p, ptr+1, len); ++ p[len] = '\0'; ++ i ++; ++ ptr += len + 1; ++ } ++ ++ if (i != n_ps_names) ++ { ++ WARNING_2 fprintf (stderr, "** Postscript Name mismatch %d != %d **\n", ++ i, n_ps_names); ++ n_ps_names = i; ++ } ++ ++ /* ++ * for (i=0; inumGlyphs); ++ for (i = 0; i < ttf_nglyphs; i++) { ++ glyph_list[i].name = mac_glyph_names[i + ptr[i]]; ++ } ++ } else { ++ fprintf(stderr, ++ "**** Postscript table in wrong format %x ****\n", ++ format); ++ exit(1); ++ } ++ ++ return ps_fmt_3; ++} ++ ++/* ++ * Get the metrics of the glyphs. ++ */ ++ ++static void ++glmetrics( ++ GLYPH *glyph_list ++) ++{ ++ int i; ++ int n_hmetrics = ntohs(hhea_table->numberOfHMetrics); ++ GLYPH *g; ++ LONGHORMETRIC *hmtx_entry = hmtx_table; ++ FWORD *lsblist; ++ ++ for (i = 0; i < n_hmetrics; i++) { ++ g = &(glyph_list[i]); ++ g->width = ntohs(hmtx_entry->advanceWidth); ++ g->lsb = ntohs(hmtx_entry->lsb); ++ hmtx_entry++; ++ } ++ ++ lsblist = (FWORD *) hmtx_entry; ++ hmtx_entry--; ++ ++ for (i = n_hmetrics; i < ttf_nglyphs; i++) { ++ g = &(glyph_list[i]); ++ g->width = ntohs(hmtx_entry->advanceWidth); ++ g->lsb = ntohs(lsblist[i - n_hmetrics]); ++ } ++ ++ for (i = 0; i < ttf_nglyphs; i++) { ++ g = &(glyph_list[i]); ++ get_glyf_table(i, &glyf_table, &g->ttf_pathlen); ++ ++ g->xMin = (short)ntohs(glyf_table->xMin); ++ g->xMax = (short)ntohs(glyf_table->xMax); ++ g->yMin = (short)ntohs(glyf_table->yMin); ++ g->yMax = (short)ntohs(glyf_table->yMax); ++ } ++ ++} ++ ++ ++static void ++handle_ms_encoding( ++ GLYPH *glyph_list, ++ int *encoding, ++ int *unimap ++) ++{ ++ int j, k, kk, set_ok; ++ USHORT start, end, ro; ++ short delta, n; ++ ++ for (j = 0; j < cmap_n_segs - 1; j++) { ++ start = ntohs(cmap_seg_start[j]); ++ end = ntohs(cmap_seg_end[j]); ++ delta = ntohs(cmap_idDelta[j]); ++ ro = ntohs(cmap_idRangeOffset[j]); ++ ++ for (k = start; k <= end; k++) { ++ if (ro == 0) { ++ n = k + delta; ++ } else { ++ n = ntohs(*((ro >> 1) + (k - start) + ++ &(cmap_idRangeOffset[j]))); ++ if (delta != 0) ++ { ++ /* Not exactly sure how to deal with this circumstance, ++ I suspect it never occurs */ ++ n += delta; ++ fprintf (stderr, ++ "rangeoffset and delta both non-zero - %d/%d", ++ ro, delta); ++ } ++ } ++ if(n<0 || n>=ttf_nglyphs) { ++ WARNING_1 fprintf(stderr, "Font contains a broken glyph code mapping, ignored\n"); ++ continue; ++ } ++ if (glyph_list[n].orig_code != -1) { ++#if 0 ++ if (strcmp(glyph_list[n].name, ".notdef") != 0) { ++ WARNING_2 fprintf(stderr, ++ "Glyph %s has >= two encodings (A), %4.4x & %4.4x\n", ++ glyph_list[n].name, ++ glyph_list[n].orig_code, ++ k); ++ } ++#endif ++ set_ok = 0; ++ } else { ++ set_ok = 1; ++ } ++ if (enc_type==1 || forcemap) { ++ kk = unicode_rev_lookup(k); ++ if(ISDBG(UNICODE)) ++ fprintf(stderr, "Unicode %s - 0x%04x\n",glyph_list[n].name,k); ++ if (set_ok) { ++ glyph_list[n].orig_code = k; ++ /* glyph_list[n].char_no = kk; */ ++ } ++ if (kk >= 0 && kk < ENCTABSZ && encoding[kk] == -1) ++ encoding[kk] = n; ++ } else { ++ if ((k & 0xff00) == 0xf000) { ++ if( encoding[k & 0x00ff] == -1 ) { ++ encoding[k & 0x00ff] = n; ++ if (set_ok) { ++ /* glyph_list[n].char_no = k & 0x00ff; */ ++ glyph_list[n].orig_code = k; ++ } ++ } ++ } else { ++ if (set_ok) { ++ /* glyph_list[n].char_no = k; */ ++ glyph_list[n].orig_code = k; ++ } ++ WARNING_2 fprintf(stderr, ++ "Glyph %s has non-symbol encoding %4.4x\n", ++ glyph_list[n].name, ++ k & 0xffff); ++ /* ++ * just use the code ++ * as it is ++ */ ++ if ((k & ~0xff) == 0 && encoding[k] == -1 ) ++ encoding[k] = n; ++ } ++ } ++ } ++ } ++} ++ ++static void ++handle_mac_encoding( ++ GLYPH *glyph_list, ++ int *encoding, ++ int *unimap ++) ++{ ++ short n; ++ int j, size; ++ ++ size = ntohs(encoding0->length) - 6; ++ for (j = 0; j < size; j++) { ++ n = encoding0->glyphIdArray[j]; ++ if (glyph_list[n].char_no != -1) { ++ WARNING_2 fprintf(stderr, ++ "Glyph %s has >= two encodings (B), %4.4x & %4.4x\n", ++ glyph_list[n].name, ++ glyph_list[n].char_no, ++ j); ++ } else { ++ if (j < ENCTABSZ) { ++ if(encoding[j] == -1) { ++ glyph_list[n].char_no = j; ++ encoding[j] = n; ++ } ++ } ++ } ++ } ++} ++ ++/* ++ * Get the original encoding of the font. ++ * Returns 1 for if the original encoding is Unicode, 2 if the ++ * original encoding is other 16-bit, 0 if 8-bit. ++ */ ++ ++static int ++glenc( ++ GLYPH *glyph_list, ++ int *encoding, ++ int *unimap ++) ++{ ++ int num_tables = ntohs(cmap_table->numberOfEncodingTables); ++ BYTE *ptr; ++ int i, format, offset, seg_c2, found; ++ int platform, encoding_id; ++ TTF_CMAP_ENTRY *table_entry; ++ TTF_CMAP_FMT4 *encoding4; ++ ++ if(enc_found_ms) { ++ handle_ms_encoding(glyph_list, encoding, unimap); ++ return enc_type; ++ } else if(enc_found_mac) { ++ handle_mac_encoding(glyph_list, encoding, unimap); ++ return 0; ++ } ++ ++ if(force_pid != -1 && force_pid != 3) { ++ fputs("*** Only platform ID == 3 is supported\n", stderr); ++ exit(1); ++ } ++ ++ enc_type = 0; ++ found = 0; ++ ++ for (i = 0; i < num_tables && !found; i++) { ++ table_entry = &(cmap_table->encodingTable[i]); ++ offset = ntohl(table_entry->offset); ++ encoding4 = (TTF_CMAP_FMT4 *) ((BYTE *) cmap_table + offset); ++ format = ntohs(encoding4->format); ++ platform = ntohs(table_entry->platformID); ++ encoding_id = ntohs(table_entry->encodingID); ++ ++ if (platform == 3 && format == 4) { ++ if(force_pid == 3) { ++ if(encoding_id != force_eid) ++ continue; ++ WARNING_1 fprintf(stderr, "Found Encoding PID=%d/EID=%d\n", ++ force_pid, force_eid); ++ enc_type = 1; ++ } else { ++ switch (encoding_id) { ++ case 0: ++ WARNING_1 fputs("Found Symbol Encoding\n", stderr); ++ break; ++ case 1: ++ WARNING_1 fputs("Found Unicode Encoding\n", stderr); ++ enc_type = 1; ++ break; ++ default: ++ WARNING_1 { ++ fprintf(stderr, ++ "****MS Encoding ID %d not supported****\n", ++ encoding_id); ++ fputs("Treating it like Symbol encoding\n", stderr); ++ } ++ break; ++ } ++ } ++ ++ found = 1; ++ seg_c2 = ntohs(encoding4->segCountX2); ++ cmap_n_segs = seg_c2 >> 1; ++ ptr = (BYTE *) encoding4 + 14; ++ cmap_seg_end = (USHORT *) ptr; ++ cmap_seg_start = (USHORT *) (ptr + seg_c2 + 2); ++ cmap_idDelta = (short *) (ptr + (seg_c2 * 2) + 2); ++ cmap_idRangeOffset = (short *) (ptr + (seg_c2 * 3) + 2); ++ enc_found_ms = 1; ++ ++ handle_ms_encoding(glyph_list, encoding, unimap); ++ } ++ } ++ ++ if (!found) { ++ if(force_pid != -1) { ++ fprintf(stderr, "*** TTF encoding table PID=%d/EID=%d not found\n", ++ force_pid, force_eid); ++ exit(1); ++ } ++ ++ WARNING_1 fputs("No Microsoft encoding, looking for MAC encoding\n", stderr); ++ for (i = 0; i < num_tables && !found; i++) { ++ table_entry = &(cmap_table->encodingTable[i]); ++ offset = ntohl(table_entry->offset); ++ encoding0 = (TTF_CMAP_FMT0 *) ((BYTE *) cmap_table + offset); ++ format = ntohs(encoding0->format); ++ platform = ntohs(table_entry->platformID); ++ encoding_id = ntohs(table_entry->encodingID); ++ ++ if (format == 0) { ++ found = 1; ++ enc_found_mac = 1; ++ ++ handle_mac_encoding(glyph_list, encoding, unimap); ++ } ++ } ++ } ++ if (!found) { ++ fprintf(stderr, "**** No Recognised Encoding Table ****\n"); ++ exit(1); ++ } ++ ++ return enc_type; ++} ++ ++/* ++ * Get the font metrics ++ */ ++static void ++fnmetrics( ++ struct font_metrics *fm ++) ++{ ++ char *str; ++ static int fieldstocheck[]= {2,4,6}; ++ int i, j, len; ++ ++ fm->italic_angle = (short) (ntohs(post_table->italicAngle.upper)) + ++ ((short) ntohs(post_table->italicAngle.lower) / 65536.0); ++ fm->underline_position = (short) ntohs(post_table->underlinePosition); ++ fm->underline_thickness = (short) ntohs(post_table->underlineThickness); ++ fm->is_fixed_pitch = ntohl(post_table->isFixedPitch); ++ ++ fm->ascender = (short)ntohs(hhea_table->ascender); ++ fm->descender = (short)ntohs(hhea_table->descender); ++ ++ fm->units_per_em = ntohs(head_table->unitsPerEm); ++ ++ fm->bbox[0] = (short) ntohs(head_table->xMin); ++ fm->bbox[1] = (short) ntohs(head_table->yMin); ++ fm->bbox[2] = (short) ntohs(head_table->xMax); ++ fm->bbox[3] = (short) ntohs(head_table->yMax); ++ ++ fm->name_copyright = name_fields[0]; ++ fm->name_family = name_fields[1]; ++ fm->name_style = name_fields[2]; ++ fm->name_full = name_fields[4]; ++ fm->name_version = name_fields[5]; ++ fm->name_ps = name_fields[6]; ++ ++ /* guess the boldness from the font names */ ++ fm->force_bold=0; ++ ++ for(i=0; !fm->force_bold && i= len || !islower(str[j+4])) ++ ) { ++ fm->force_bold=1; ++ break; ++ } ++ } ++ } ++} ++ ++/* ++ * Get the path of contrours for a glyph. ++ */ ++ ++static void ++glpath( ++ int glyphno, ++ GLYPH *glyf_list ++) ++{ ++ double matrix[6]; ++ GLYPH *g; ++ ++ g = &glyph_list[glyphno]; ++ ++ matrix[0] = matrix[3] = 1.0; ++ matrix[1] = matrix[2] = matrix[4] = matrix[5] = 0.0; ++ draw_composite_glyf(g, glyf_list, glyphno, matrix, 0 /*level*/); ++} ++ ++/* ++ * Get the kerning data. ++ */ ++ ++static void ++kerning( ++ GLYPH *glyph_list ++) ++{ ++ TTF_KERN_SUB *subtable; ++ TTF_KERN_ENTRY *kern_entry; ++ int i, j; ++ int ntables; ++ int npairs; ++ char *ptr; ++ ++ if(kern_table == NULL) { ++ WARNING_1 fputs("No Kerning data\n", stderr); ++ return; ++ } ++ if(badpointer(kern_table)) { ++ fputs("**** Defective Kerning table, ignored\n", stderr); ++ return; ++ } ++ ++ ntables = ntohs(kern_table->nTables); ++ ptr = (char *) kern_table + 4; ++ ++ for (i = 0; i < ntables; i++) { ++ subtable = (TTF_KERN_SUB *) ptr; ++ if ((ntohs(subtable->coverage) & 0xff00) == 0) { ++ npairs = (short) ntohs(subtable->nPairs); ++ kern_entry = (TTF_KERN_ENTRY *) (ptr + sizeof(TTF_KERN_SUB)); ++ ++ kern_entry = (TTF_KERN_ENTRY *) (ptr + sizeof(TTF_KERN_SUB)); ++ for (j = 0; j < npairs; j++) { ++ if( kern_entry->value != 0) ++ addkernpair(ntohs(kern_entry->left), ++ ntohs(kern_entry->right), (short)ntohs(kern_entry->value)); ++ kern_entry++; ++ } ++ } ++ ptr += subtable->length; ++ } ++} ++ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/ttf.h xserver/hw/xprint/extras/ttf2pt1/ttf.h +--- xserver-old/hw/xprint/extras/ttf2pt1/ttf.h 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/ttf.h 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,183 @@ ++/* ++ * see COPYRIGHT ++ */ ++ ++/* these definitions are mostly taken from Microsoft's True Type ++ documentation. ++*/ ++ ++#ifdef XP_PSTEXT ++typedef unsigned char BYTE; ++typedef signed char CHAR; ++typedef unsigned short USHORT; ++typedef signed short SHORT; ++typedef unsigned int ULONG; ++typedef signed int LONG; ++typedef SHORT FWORD; ++typedef USHORT UFWORD; ++#else ++#define BYTE unsigned char ++#define CHAR signed char ++#define USHORT unsigned short ++#define SHORT signed short ++#define ULONG unsigned int ++#define LONG signed int ++#define FWORD SHORT ++#define UFWORD USHORT ++#endif /* XP_PSTEXT */ ++ ++#define ONOROFF 0x01 ++#define XSHORT 0x02 ++#define YSHORT 0x04 ++#define REPEAT 0x08 ++#define XSAME 0x10 ++#define YSAME 0x20 ++ ++#define ARG_1_AND_2_ARE_WORDS 0x0001 ++#define ARGS_ARE_XY_VALUES 0x0002 ++#define XY_BOUND_TO_GRID 0x0004 ++#define WE_HAVE_A_SCALE 0x0008 ++#define MORE_COMPONENTS 0x0020 ++#define WE_HAVE_AN_X_AND_Y_SCALE 0x0040 ++#define WE_HAVE_A_TWO_BY_TWO 0x0080 ++#define WE_HAVE_INSTRUCTIONS 0x0100 ++#define USE_MY_METRICS 0x0200 ++ ++typedef struct short_2 { ++ SHORT upper; ++ USHORT lower; ++} FIXED ; ++ ++typedef struct longhormetric { ++ UFWORD advanceWidth; ++ FWORD lsb; ++} LONGHORMETRIC; ++ ++typedef struct ttf_hhea { ++ BYTE version[4]; ++ SHORT ascender, descender, lineGap; ++ USHORT advnaceWidthMax; ++ SHORT minLSB, minRSB, xMaxExtent; ++ SHORT caretSlopeRise, caretSlopeRun; ++ SHORT reserved[5]; ++ SHORT metricDataFormat; ++ USHORT numberOfHMetrics; ++} TTF_HHEA; ++ ++typedef struct ttf_dir_entry { ++ char tag[4]; ++ ULONG checksum; ++ ULONG offset; ++ ULONG length; ++} TTF_DIR_ENTRY ; ++ ++typedef struct ttf_directory { ++ ULONG sfntVersion; ++ USHORT numTables; ++ USHORT searchRange; ++ USHORT entrySelector; ++ USHORT rangeShift; ++ TTF_DIR_ENTRY list; ++} TTF_DIRECTORY ; ++ ++typedef struct ttf_name_rec { ++ USHORT platformID; ++ USHORT encodingID; ++ USHORT languageID; ++ USHORT nameID; ++ USHORT stringLength; ++ USHORT stringOffset; ++} TTF_NAME_REC; ++ ++typedef struct ttf_name { ++ USHORT format; ++ USHORT numberOfNameRecords; ++ USHORT offset; ++ TTF_NAME_REC nameRecords; ++} TTF_NAME ; ++ ++typedef struct ttf_head { ++ ULONG version; ++ ULONG fontRevision; ++ ULONG checksumAdjust; ++ ULONG magicNo; ++ USHORT flags; ++ USHORT unitsPerEm; ++ BYTE created[8]; ++ BYTE modified[8]; ++ FWORD xMin, yMin, xMax, yMax; ++ USHORT macStyle, lowestRecPPEM; ++ SHORT fontDirection, indexToLocFormat, glyphDataFormat; ++} TTF_HEAD ; ++ ++typedef struct ttf_kern { ++ USHORT version, nTables; ++} TTF_KERN ; ++ ++typedef struct ttf_kern_sub { ++ USHORT version, length, coverage; ++ USHORT nPairs, searchRange, entrySelector, rangeShift; ++} TTF_KERN_SUB; ++ ++typedef struct ttf_kern_entry { ++ USHORT left, right; ++ FWORD value; ++} TTF_KERN_ENTRY; ++ ++typedef struct ttf_cmap_fmt0 { ++ USHORT format; ++ USHORT length; ++ USHORT version; ++ BYTE glyphIdArray[256]; ++} TTF_CMAP_FMT0; ++ ++typedef struct ttf_cmap_fmt4 { ++ USHORT format; ++ USHORT length; ++ USHORT version; ++ USHORT segCountX2; ++ USHORT searchRange; ++ USHORT entrySelector; ++ USHORT rangeShift; ++} TTF_CMAP_FMT4; ++ ++typedef struct ttf_cmap_entry { ++ USHORT platformID; ++ USHORT encodingID; ++ ULONG offset; ++} TTF_CMAP_ENTRY; ++ ++typedef struct ttf_cmap { ++ USHORT version; ++ USHORT numberOfEncodingTables; ++ TTF_CMAP_ENTRY encodingTable[1]; ++} TTF_CMAP ; ++ ++typedef struct ttf_glyf { ++ SHORT numberOfContours; ++ FWORD xMin, yMin, xMax, yMax; ++} TTF_GLYF ; ++ ++typedef struct ttf_maxp { ++ ULONG version; ++ USHORT numGlyphs, maxPoints, maxContours; ++ USHORT maxCompositePoints, maxCompositeContours; ++ USHORT maxZones, maxTwilightPoints, maxStorage; ++ USHORT maxFunctionDefs, maxInstructionsDefs; ++ USHORT maxSizeOfInstructions, maxComponentElements; ++ USHORT maxComponentDepth; ++} TTF_MAXP ; ++ ++typedef struct ttf_post_head { ++ ULONG formatType; ++ FIXED italicAngle; ++ FWORD underlinePosition; ++ FWORD underlineThickness; ++ ULONG isFixedPitch; ++ ULONG minMemType42; ++ ULONG maxMemType42; ++ ULONG minMemType1; ++ ULONG maxMemType1; ++ USHORT numGlyphs; ++ USHORT glyphNameIndex; ++} TTF_POST_HEAD ; +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/version.h xserver/hw/xprint/extras/ttf2pt1/version.h +--- xserver-old/hw/xprint/extras/ttf2pt1/version.h 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/version.h 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,7 @@ ++/* ++ * see COPYRIGHT ++ */ ++ ++ ++/* version number */ ++#define TTF2PT1_VERSION "3.4.4-SNAP-030526" +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/winbuild.bat xserver/hw/xprint/extras/ttf2pt1/winbuild.bat +--- xserver-old/hw/xprint/extras/ttf2pt1/winbuild.bat 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/winbuild.bat 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,11 @@ ++rem file to build ttf2pt1 with Visual C++ ++ ++cl -DWINDOWS -c bdf.c ++cl -DWINDOWS -c ttf2pt1.c ++cl -DWINDOWS -c pt1.c ++cl -DWINDOWS -c ttf.c ++cl -DWINDOWS -c t1asm.c ++cl -DWINDOWS -c bitmap.c ++cl -o ttf2pt1 ttf2pt1.obj pt1.obj t1asm.obj ttf.obj bdf.obj bitmap.obj ++cl -o t1asm -DWINDOWS -DSTANDALONE t1asm.c ++ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/windows.h xserver/hw/xprint/extras/ttf2pt1/windows.h +--- xserver-old/hw/xprint/extras/ttf2pt1/windows.h 1970-01-01 10:00:00.000000000 +1000 ++++ xserver/hw/xprint/extras/ttf2pt1/windows.h 2006-06-27 13:10:26.000000000 +1000 +@@ -0,0 +1,93 @@ ++/* ++ * Implementation of things missing in Windows ++ */ ++ ++#ifndef M_PI ++#define M_PI 3.14159265358979323846 ++#endif ++ ++#undef ntohs ++#undef ntohl ++#undef htonl ++ ++#ifdef WINDOWS_FUNCTIONS ++/* byte order */ ++ ++static unsigned short StoM(unsigned short inv) { ++ union iconv { ++ unsigned short ui; ++ unsigned char uc[2]; ++ } *inp, outv; ++ ++ inp = (union iconv *)&inv; ++ ++ outv.uc[0] = inp->uc[1]; ++ outv.uc[1] = inp->uc[0]; ++ ++ return (outv.ui); ++} ++ ++static unsigned int ItoM(unsigned int inv) { ++ union iconv { ++ unsigned int ui; ++ unsigned char uc[4]; ++ } *inp, outv; ++ ++ inp = (union iconv *)&inv; ++ ++ outv.uc[0] = inp->uc[3]; ++ outv.uc[1] = inp->uc[2]; ++ outv.uc[2] = inp->uc[1]; ++ outv.uc[3] = inp->uc[0]; ++ ++ return (outv.ui); ++} ++ ++unsigned short ntohs(unsigned short inv) { return StoM(inv); } ++unsigned long ntohl(unsigned long inv) { return ItoM(inv); } ++unsigned long htonl(unsigned long inv) { return ItoM(inv); } ++ ++char *optarg; ++int optind=1; ++ ++char getopt(int argc, char **argv, char *args) { ++ int n,nlen=strlen(args),nLen=0; ++ char nCmd; ++ ++ if (argv[optind] && *argv[optind]=='-') { ++ nCmd=*((argv[optind]+1)); ++ ++ for (n=0;ndrawable.x - ptOldOrg.x, + pWin->drawable.y - ptOldOrg.y); +- DamageDamageRegion (&pWin->drawable, prgnSrc); ++ if (pWin->redirectDraw && cw->update == CompositeRedirectAutomatic) ++ DamageDamageRegion (&pWin->drawable, prgnSrc); + } + cs->CopyWindow = pScreen->CopyWindow; + pScreen->CopyWindow = compCopyWindow; +@@ -655,7 +658,8 @@ + /* + * Report that as damaged so it will be redrawn + */ +- DamageDamageRegion (&pWin->drawable, &damage); ++ if (cw->update == CompositeRedirectAutomatic) ++ DamageDamageRegion (&pWin->drawable, &damage); + REGION_UNINIT (pScreen, &damage); + /* + * Save the new border clip region --- xorg-server-1.4.1~git20080131.orig/debian/patches/107_fedora_dont_backfill_bg_none.patch +++ xorg-server-1.4.1~git20080131/debian/patches/107_fedora_dont_backfill_bg_none.patch @@ -0,0 +1,23 @@ +Disable backfilling of windows created with bg=none, which otherwise +would force a framebuffer readback. + +Index: xorg-server-1.2.0/composite/compalloc.c +=================================================================== +--- foo/composite/compalloc.c.orig 2007-09-18 18:16:24.000000000 -0700 ++++ foo/composite/compalloc.c 2007-09-18 18:16:48.000000000 -0700 +@@ -471,6 +471,7 @@ compNewPixmap (WindowPtr pWin, int x, in + pPixmap->screen_x = x; + pPixmap->screen_y = y; + ++#if 0 + if (pParent->drawable.depth == pWin->drawable.depth) + { + GCPtr pGC = GetScratchGC (pWin->drawable.depth, pScreen); +@@ -529,6 +530,7 @@ compNewPixmap (WindowPtr pWin, int x, in + if (pDstPicture) + FreePicture (pDstPicture, 0); + } ++#endif + return pPixmap; + } + --- xorg-server-1.4.1~git20080131.orig/debian/patches/13_debian_add_xkbpath_env_variable.diff +++ xorg-server-1.4.1~git20080131/debian/patches/13_debian_add_xkbpath_env_variable.diff @@ -0,0 +1,31 @@ +Index: xorg-server/xkb/xkbInit.c +=================================================================== +--- xorg-server.orig/xkb/xkbInit.c 2007-08-16 22:37:00.000000000 -0400 ++++ xorg-server/xkb/xkbInit.c 2007-08-16 22:47:28.000000000 -0400 +@@ -835,6 +835,14 @@ + extern unsigned char XkbDfltAccessXOptions; + + int ++xkbInitGlobals() ++{ ++ char * xkbpath= getenv("XKBPATH"); ++ if (xkbpath!=NULL) ++ XkbBaseDirectory= xkbpath; ++} ++ ++int + XkbProcessArguments(int argc,char *argv[],int i) + { + if (strcmp(argv[i],"-kb")==0) { +Index: xorg-server/os/utils.c +=================================================================== +--- xorg-server.orig/os/utils.c 2007-08-16 22:37:00.000000000 -0400 ++++ xorg-server/os/utils.c 2007-08-16 22:47:28.000000000 -0400 +@@ -683,6 +683,7 @@ + */ + void InitGlobals(void) + { ++ xkbInitGlobals(); + ddxInitGlobals(); + } + --- xorg-server-1.4.1~git20080131.orig/debian/patches/92_xprint-security-holes-fix.patch +++ xorg-server-1.4.1~git20080131/debian/patches/92_xprint-security-holes-fix.patch @@ -0,0 +1,158 @@ +diff -ruN xorg-server-1.0.2-old/hw/xprint/config/C/print/attributes/printer xorg-server-1.0.2/hw/xprint/config/C/print/attributes/printer +--- xorg-server-old/hw/xprint/config/C/print/attributes/printer 2004-04-24 04:46:58.000000000 +1000 ++++ xorg-server/hw/xprint/config/C/print/attributes/printer 2006-04-14 21:38:06.000000000 +1000 +@@ -22,19 +22,18 @@ + + + # Sample entry for the "PSspooldir" model +-# Just add a printer called "xp_ps_spooldir_tmp_Xprintjobs" to "Xprinters" ++# Just add a printer called "xp_ps_spooldir_HOME_Xprintjobs" to "Xprinters" + # and you will get an extra printer which files the PostScript jobs +-# in the "/tmp/Xprintjobs/" directory. +-xp_ps_spooldir_tmp_Xprintjobs.xp-model-identifier: PSspooldir ++# in the "$HOME/Xprintjobs/" directory. ++xp_ps_spooldir_HOME_Xprintjobs.xp-model-identifier: PSspooldir + + # Sample entry for the "PS2PDFspooldir-GS" model +-# Just add a printer called "xp_pdf_spooldir_tmp_Xprintjobs" to "Xprinters" ++# Just add a printer called "xp_pdf_spooldir_HOME_Xprintjobs" to "Xprinters" + # and you will get an extra printer which convertes the PostScript jobs +-# to PDF using "ps2pdf" and files them into the "/tmp/Xprintjobs/" directory. ++# to PDF using "ps2pdf" and files them into the "$HOME/Xprintjobs/" directory. + # NOTE: Future versions of Xprint will use the PDF DDX instead directly + # instead of relying on GhostScript/ps2pdf... +-xp_pdf_spooldir_tmp_Xprintjobs.xp-model-identifier: PS2PDFspooldir-GS +- ++xp_pdf_spooldir_HOME_Xprintjobs.xp-model-identifier: PS2PDFspooldir-GS + + # IMPORTANT EXAMPLES + # +diff -ruN xorg-server-old/hw/xprint/config/C/print/Makefile.am xorg-server/hw/xprint/config/C/print/Makefile.am +--- xorg-server-old/hw/xprint/config/C/print/Makefile.am 2005-09-29 06:38:42.000000000 +1000 ++++ xorg-server/hw/xprint/config/C/print/Makefile.am 2006-04-14 21:41:10.000000000 +1000 +@@ -4,7 +4,7 @@ + + + Xprinters.ghostscript: $(srcdir)/Xprinters +- sed < $(srcdir)/Xprinters "s/#Printer xp_pdf_spooldir_tmp_Xprintjobs/Printer xp_pdf_spooldir_tmp_Xprintjobs/" > Xprinters.ghostscript ++ sed < $(srcdir)/Xprinters "s/#Printer xp_pdf_spooldir_HOME_Xprintjobs/Printer xp_pdf_spooldir_HOME_Xprintjobs/" > Xprinters.ghostscript + + + +diff -ruN xorg-server-old/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/model-config xorg-server/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/model-config +--- xorg-server-old/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/model-config 2004-04-24 04:52:27.000000000 +1000 ++++ xorg-server/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/model-config 2006-04-14 21:50:19.000000000 +1000 +@@ -20,7 +20,7 @@ + # + # Attributes supported for this printer model + *content-orientations-supported: portrait landscape reverse-portrait reverse-landscape +-*descriptor: PDF job spool dir /tmp/Xprintjobs ++*descriptor: PDF job spool dir $HOME/Xprintjobs + *document-formats-supported: {POSTSCRIPT 2} + *input-trays-supported: + *medium-source-sizes-supported: \ +@@ -45,7 +45,7 @@ + } + + *plexes-supported: simplex duplex tumble +-*printer-model: "PDF job spool dir /tmp/Xprintjobs" ++*printer-model: "PDF job spool dir $HOME/Xprintjobs" + # 75, 100, 120, 150, 180, 200, 240, 300, 360, 400, 600, 720, + # 940, 1200 and 2440 are supported DPI values, we limit it here + # to some common values: +@@ -60,7 +60,7 @@ + # Note that "%xpconfigdir%" is currently only supported in Xprt servers build + # from xprint.mozdev.org sources, other platforms have replace it with the + # absolute path name to the script +-*xp-spooler-command: %xpconfigdir%/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh -d /tmp/Xprintjobs -s .pdf -u 077 -p %printer-name% -c %copy-count% -t %job-name% -o "%options%" ++*xp-spooler-command: %xpconfigdir%/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh -s .pdf -u 077 -p %printer-name% -c %copy-count% -t %job-name% -o "%options%" + + # NOTE: xp-psddx-* attributes are EXPERIMENTAL for now. + # xp-psddx-download-fonts defines which fonts should be downloaded as outlines +diff -ruN xorg-server-old/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh xorg-server/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh +--- xorg-server-old/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh 2004-04-24 04:52:27.000000000 +1000 ++++ xorg-server/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh 2006-04-14 21:53:19.000000000 +1000 +@@ -3,7 +3,7 @@ + export PATH + + verbose_msgs="false" +-DEFAULT_SPOOLDIR=/tmp/Xprintjobs ++DEFAULT_SPOOLDIR=`perl -e '@x = getpwuid($>); print $x[7]'`/Xprintjobs + + usage() + { +@@ -74,7 +74,6 @@ + + if [ ! -d "${DEFAULT_SPOOLDIR}" ] ; then + mkdir "${DEFAULT_SPOOLDIR}" +- chmod a+rwxt "${DEFAULT_SPOOLDIR}" + fi + + if [ "${permmask}" != "" ] ; then +diff -ruN xorg-server-old/hw/xprint/config/C/print/models/PSspooldir/model-config xorg-server/hw/xprint/config/C/print/models/PSspooldir/model-config +--- xorg-server-old/hw/xprint/config/C/print/models/PSspooldir/model-config 2004-04-24 04:54:16.000000000 +1000 ++++ xorg-server/hw/xprint/config/C/print/models/PSspooldir/model-config 2006-04-14 21:57:02.000000000 +1000 +@@ -19,7 +19,7 @@ + # + # Attributes supported for this printer model + *content-orientations-supported: portrait landscape reverse-portrait reverse-landscape +-*descriptor: PostScript job spool dir /tmp/Xprintjobs ++*descriptor: PostScript job spool dir $HOME/Xprintjobs + *document-formats-supported: {POSTSCRIPT 2} + *input-trays-supported: + *medium-source-sizes-supported: \ +@@ -44,7 +44,7 @@ + } + + *plexes-supported: simplex duplex tumble +-*printer-model: "PostScript job spool dir /tmp/Xprintjobs" ++*printer-model: "PostScript job spool dir $HOME/Xprintjobs" + # 75, 100, 120, 150, 180, 200, 240, 300, 360, 400, 600, 720, + # 940, 1200 and 2440 are supported DPI values, we limit it here + # to some common values: +@@ -59,7 +59,7 @@ + # Note that "%xpconfigdir%" is currently only supported in Xprt servers build + # from xprint.mozdev.org sources, other platforms have replace it with the + # absolute path name to the script +-*xp-spooler-command: %xpconfigdir%/C/print/models/PSspooldir/spooltodir.sh -d /tmp/Xprintjobs -s .ps -u 077 -p %printer-name% -c %copy-count% -t %job-name% -o "%options%" ++*xp-spooler-command: %xpconfigdir%/C/print/models/PSspooldir/spooltodir.sh -s .ps -u 077 -p %printer-name% -c %copy-count% -t %job-name% -o "%options%" + + # NOTE: xp-psddx-* attributes are EXPERIMENTAL for now. + # xp-psddx-download-fonts defines which fonts should be downloaded as outlines +diff -ruN xorg-server-old/hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh xorg-server/hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh +--- xorg-server-old/hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh 2004-04-24 04:54:16.000000000 +1000 ++++ xorg-server/hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh 2006-04-14 21:58:06.000000000 +1000 +@@ -3,7 +3,7 @@ + export PATH + + verbose_msgs="false" +-DEFAULT_SPOOLDIR=/tmp/Xprintjobs ++DEFAULT_SPOOLDIR=`perl -e '@x = getpwuid($>); print $x[7]'`/Xprintjobs + + usage() + { +@@ -74,7 +74,6 @@ + + if [ ! -d "${DEFAULT_SPOOLDIR}" ] ; then + mkdir "${DEFAULT_SPOOLDIR}" +- chmod a+rwxt "${DEFAULT_SPOOLDIR}" + fi + + if [ "${permmask}" != "" ] ; then +diff -ruN xorg-server-old/hw/xprint/config/C/print/Xprinters xorg-server/hw/xprint/config/C/print/Xprinters +--- xorg-server-old/hw/xprint/config/C/print/Xprinters 2004-04-24 04:46:31.000000000 +1000 ++++ xorg-server/hw/xprint/config/C/print/Xprinters 2006-04-14 22:04:56.000000000 +1000 +@@ -30,10 +30,10 @@ + + ######################################################################## + # Preconfigured entry for the PSspooldir model +-# (which sends jobs to /tmp/Xprintjobs instead to a physical printer) ++# (which sends jobs to $HOME/Xprintjobs instead to a physical printer) + ######################################################################## +-#Printer xp_pdf_spooldir_tmp_Xprintjobs +-Printer xp_ps_spooldir_tmp_Xprintjobs ++#Printer xp_pdf_spooldir_HOME_Xprintjobs ++Printer xp_ps_spooldir_HOME_Xprintjobs + + ######################################################################## + # Add individual printers to the list of printers managed by the --- xorg-server-1.4.1~git20080131.orig/debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch +++ xorg-server-1.4.1~git20080131/debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch @@ -0,0 +1,46 @@ +From a01ca030c7a1f38e411281d888f0acf2c3fb40f3 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Thu, 13 Mar 2008 13:38:02 -0400 +Subject: [PATCH] Disable XAA offscreen pixmaps by default. + +Say Option "XaaOffscreenPixmaps" to turn them back on. +--- + hw/xfree86/xaa/xaaInitAccel.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c +index 1b7c154..f3c8f56 100644 +--- a/hw/xfree86/xaa/xaaInitAccel.c ++++ b/hw/xfree86/xaa/xaaInitAccel.c +@@ -43,7 +43,8 @@ typedef enum { + XAAOPT_WRITE_BITMAP, + XAAOPT_WRITE_PIXMAP, + XAAOPT_PIXMAP_CACHE, +- XAAOPT_OFFSCREEN_PIXMAPS ++ XAAOPT_OFFSCREEN_PIXMAPS, ++ XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE + } XAAOpts; + + static const OptionInfoRec XAAOptions[] = { +@@ -89,6 +90,8 @@ static const OptionInfoRec XAAOptions[] = { + OPTV_BOOLEAN, {0}, FALSE }, + {XAAOPT_OFFSCREEN_PIXMAPS, "XaaNoOffscreenPixmaps", + OPTV_BOOLEAN, {0}, FALSE }, ++ {XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE, "XaaOffscreenPixmaps", ++ OPTV_BOOLEAN, {0}, FALSE }, + { -1, NULL, + OPTV_NONE, {0}, FALSE } + }; +@@ -532,8 +532,8 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec) + #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0) + + if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy && +- !xf86ReturnOptValBool(options, XAAOPT_OFFSCREEN_PIXMAPS, +- FALSE)) { ++ xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE)) ++ { + XAAMSG("\tOffscreen Pixmaps\n"); + } else { + infoRec->Flags &= ~OFFSCREEN_PIXMAPS; +-- +1.5.4.3 --- xorg-server-1.4.1~git20080131.orig/debian/patches/47_fbdevhw_magic_numbers.diff +++ xorg-server-1.4.1~git20080131/debian/patches/47_fbdevhw_magic_numbers.diff @@ -0,0 +1,17 @@ +* Fri May 11 2007 Adam Jackson 1.3.0.0-5 +- xserver-1.3.0-fbdevhw-magic-numbers.patch: If the fbdev driver claims to + have a zero pixel clock, believe it. Fixes Xen paravirt. (#238451) + +Might fix #422430 + +--- xorg-server-1.3.0.0/./hw/xfree86/fbdevhw/fbdevhw.c.jx 2007-03-26 23:32:36.000000000 -0400 ++++ xorg-server-1.3.0.0/./hw/xfree86/fbdevhw/fbdevhw.c 2007-05-11 15:10:05.000000000 -0400 +@@ -258,7 +258,7 @@ + static void + fbdev2xfree_timing(struct fb_var_screeninfo *var, DisplayModePtr mode) + { +- mode->Clock = var->pixclock ? 1000000000/var->pixclock : 28000000; ++ mode->Clock = var->pixclock ? 1000000000/var->pixclock : 0; + mode->HDisplay = var->xres; + mode->HSyncStart = mode->HDisplay+var->right_margin; + mode->HSyncEnd = mode->HSyncStart+var->hsync_len; --- xorg-server-1.4.1~git20080131.orig/debian/patches/156_resize_composite_overlay.diff +++ xorg-server-1.4.1~git20080131/debian/patches/156_resize_composite_overlay.diff @@ -0,0 +1,58 @@ +From: Maarten Maathuis +Date: Sun, 17 Feb 2008 10:21:01 +0000 (+0100) +Subject: Resize composite overlay window when the root window changes. +X-Git-Tag: xf-3_9_16Z / xf-3_9_16d / xf-3_9_16e / xf-3_9_16f +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=3db5930c61aeb849de3b21e7ba0d86d3c0cf72bb + +Resize composite overlay window when the root window changes. + +- This allows some compositing managers to work, even after randr12 has changed the root window size. +- Thanks to ajax for figuring out the best place to put this. +- Example: + - xf86RandR12SetMode() calls EnableDisableFBAccess(). + - That calls xf86SetRootClip() which in turn calls ResizeChildrenWinSize(). + - The final step is the call to PositionWindow(). +(cherry picked from commit 70c0592a97c7dc9db0576d32b3bdbe4766520509) +--- + +--- a/composite/compwindow.c ++++ b/composite/compwindow.c +@@ -165,6 +165,29 @@ compCheckRedirect (WindowPtr pWin) + return TRUE; + } + ++static int ++updateOverlayWindow(ScreenPtr pScreen) ++{ ++ CompScreenPtr cs; ++ WindowPtr pWin; /* overlay window */ ++ XID vlist[2]; ++ ++ cs = GetCompScreen(pScreen); ++ if ((pWin = cs->pOverlayWin) != NULL) { ++ if ((pWin->drawable.width == pScreen->width) && ++ (pWin->drawable.height == pScreen->height)) ++ return Success; ++ ++ /* Let's resize the overlay window. */ ++ vlist[0] = pScreen->width; ++ vlist[1] = pScreen->height; ++ return ConfigureWindow(pWin, CWWidth | CWHeight, vlist, wClient(pWin)); ++ } ++ ++ /* Let's be on the safe side and not assume an overlay window is always allocated. */ ++ return Success; ++} ++ + Bool + compPositionWindow (WindowPtr pWin, int x, int y) + { +@@ -203,6 +226,8 @@ compPositionWindow (WindowPtr pWin, int + cs->PositionWindow = pScreen->PositionWindow; + pScreen->PositionWindow = compPositionWindow; + compCheckTree (pWin->drawable.pScreen); ++ if (updateOverlayWindow(pScreen) != Success) ++ ret = FALSE; + return ret; + } + --- xorg-server-1.4.1~git20080131.orig/debian/patches/101_fedora-apm-typedefs.patch +++ xorg-server-1.4.1~git20080131/debian/patches/101_fedora-apm-typedefs.patch @@ -0,0 +1,40 @@ +From 3fd969f08e4f550ac28fee3bbdbe55e9db872091 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 3 Dec 2007 14:00:25 -0500 +Subject: [PATCH] apm_event_t workaround + +--- + hw/kdrive/linux/linux.c | 2 ++ + hw/xfree86/os-support/linux/lnx_apm.c | 3 +++ + 2 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c +index 23cd8f5..2f9cb62 100644 +--- a/hw/kdrive/linux/linux.c ++++ b/hw/kdrive/linux/linux.c +@@ -275,6 +275,8 @@ LinuxApmBlock (pointer blockData, OSTimePtr pTimeout, pointer pReadmask) + + static Bool LinuxApmRunning; + ++#define apm_event_t unsigned short ++ + static void + LinuxApmWakeup (pointer blockData, int result, pointer pReadmask) + { +diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c +index 16ac80d..6bcae47 100644 +--- a/hw/xfree86/os-support/linux/lnx_apm.c ++++ b/hw/xfree86/os-support/linux/lnx_apm.c +@@ -39,6 +39,9 @@ static PMClose lnxAPMOpen(void); + static void lnxCloseAPM(void); + static pointer APMihPtr = NULL; + ++/* XXX this is wrong, do not ever commit me upstream */ ++#define apm_event_t unsigned short ++ + static struct { + apm_event_t apmLinux; + pmEvent xf86; +-- +1.5.2.4 + --- xorg-server-1.4.1~git20080131.orig/debian/patches/133_psb_auto.patch +++ xorg-server-1.4.1~git20080131/debian/patches/133_psb_auto.patch @@ -0,0 +1,28 @@ +This patch adds autodetection support for the Poulsbo ("psb") driver +needed by moblin.org for the Intel mobile chipset. Rather than add an +else if, I restructured things with a case statement to make it conform +in style to the savage driver section. + +Bryce Harrington 23-Aug-2007 + +--- xorg-server-1.3.0.0.dfsg-12ubuntu1/hw/xfree86/common/xf86AutoConfig.c.orig 2007-08-23 10:05:57.000000000 -0700 ++++ xorg-server-1.3.0.0.dfsg-12ubuntu1/hw/xfree86/common/xf86AutoConfig.c 2007-08-23 10:13:43.000000000 -0700 +@@ -173,9 +173,15 @@ videoPtrToDriverName(pciVideoPtr info) + case 0x102c: return "chips"; + case 0x1013: return "cirrus"; + case 0x8086: +- if ((info->chipType == 0x00d1) || (info->chipType == 0x7800)) +- return "i740"; +- else return "i810"; ++ switch (info->chipType) ++ { ++ case 0x00d1: case 0x7800: ++ return "i740"; ++ case 0x8108: ++ return "psb"; ++ default: ++ return "i810"; ++ } + case 0x102b: return "mga"; + case 0x10c8: return "neomagic"; + case 0x105d: return "i128"; --- xorg-server-1.4.1~git20080131.orig/debian/patches/14_default_screen_section.diff +++ xorg-server-1.4.1~git20080131/debian/patches/14_default_screen_section.diff @@ -0,0 +1,57 @@ +--- xorg-server.orig/hw/xfree86/common/xf86Config.c ++++ xorg-server/hw/xfree86/common/xf86Config.c +@@ -1800,11 +1800,6 @@ + if (!servlayoutp) + return FALSE; + +- if (conf_screen == NULL) { +- xf86ConfigError("No Screen sections present\n"); +- return FALSE; +- } +- + /* + * which screen section is the active one? + * +@@ -1892,6 +1887,12 @@ + XF86ConfAdaptorLinkPtr conf_adaptor; + Bool defaultMonitor = FALSE; + ++ if (!conf_screen) { ++ conf_screen = xnfcalloc(1, sizeof(XF86ConfScreenRec)); ++ conf_screen->scrn_identifier = "Default Screen Section"; ++ xf86Msg(X_DEFAULT, "No screen section available. Using defaults.\n"); ++ } ++ + xf86Msg(from, "|-->Screen \"%s\" (%d)\n", conf_screen->scrn_identifier, + scrnum); + /* +--- xorg-server.orig/hw/xfree86/parser/Screen.c ++++ xorg-server/hw/xfree86/parser/Screen.c +@@ -498,12 +498,6 @@ + XF86ConfDevicePtr device; + XF86ConfAdaptorLinkPtr adaptor; + +- if (!screen) +- { +- xf86validationError ("At least one Screen section is required."); +- return (FALSE); +- } +- + while (screen) + { + if (screen->scrn_obso_driver && !screen->scrn_identifier) +@@ -512,13 +506,7 @@ + monitor = xf86findMonitor (screen->scrn_monitor_str, p->conf_monitor_lst); + if (screen->scrn_monitor_str) + { +- if (!monitor) +- { +- xf86validationError (UNDEFINED_MONITOR_MSG, +- screen->scrn_monitor_str, screen->scrn_identifier); +- return (FALSE); +- } +- else ++ if (monitor) + { + screen->scrn_monitor = monitor; + if (!xf86validateMonitor(p, screen)) --- xorg-server-1.4.1~git20080131.orig/debian/patches/149_add_quirks_for_physical_screen_size_issues.patch +++ xorg-server-1.4.1~git20080131/debian/patches/149_add_quirks_for_physical_screen_size_issues.patch @@ -0,0 +1,291 @@ +From: Eric Anholt +Date: Thu, 11 Oct 2007 23:48:56 +0000 (-0700) +Subject: Bug #10304,12784,11603: Add quirks for several physical size issues. +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=fc092334ac0a323b80a9602cb8bf60ca9dee3bfa + +Bug #10304,12784,11603: Add quirks for several physical size issues. + +A lot of EDID writers apparently end up stuffing centimeters (like the +maximum image size field) into the detailed timings, instead of millimeters. +Some of them only get it wrong in one direction. Also, add a quirk to let +us mark the largest 75hz mode as preferred, which will often be used for +EDID 1.0 CRTs. +--- + +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -2134,8 +2134,12 @@ _X_EXPORT xf86MonPtr + xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus) + { + ScrnInfoPtr scrn = output->scrn; ++ xf86MonPtr mon; + +- return xf86DoEDID_DDC2 (scrn->scrnIndex, pDDCBus); ++ mon = xf86DoEDID_DDC2 (scrn->scrnIndex, pDDCBus); ++ xf86DDCApplyQuirks (scrn->scrnIndex, pDDCBus); ++ ++ return mon; + } + + static char *_xf86ConnectorNames[] = { "None", "VGA", "DVI-I", "DVI-D", +--- a/hw/xfree86/modes/xf86EdidModes.c ++++ b/hw/xfree86/modes/xf86EdidModes.c +@@ -54,6 +54,16 @@ typedef enum { + DDC_QUIRK_PREFER_LARGE_60 = 1 << 0, + /* 135MHz clock is too high, drop a bit */ + DDC_QUIRK_135_CLOCK_TOO_HIGH = 1 << 1, ++ /* Prefer the largest mode at 75 Hz */ ++ DDC_QUIRK_PREFER_LARGE_75 = 1 << 2, ++ /* Convert detailed timing's horizontal from units of cm to mm */ ++ DDC_QUIRK_DETAILED_H_IN_CM = 1 << 3, ++ /* Convert detailed timing's vertical from units of cm to mm */ ++ DDC_QUIRK_DETAILED_V_IN_CM = 1 << 4, ++ /* Detailed timing descriptors have bogus size values, so just take the ++ * maximum size and use that. ++ */ ++ DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE = 1 << 5, + } ddc_quirk_t; + + static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC) +@@ -81,6 +91,52 @@ static Bool quirk_prefer_large_60 (int s + return FALSE; + } + ++static Bool quirk_prefer_large_75 (int scrnIndex, xf86MonPtr DDC) ++{ ++ /* Bug #11603: Funai Electronics PM36B */ ++ if (memcmp (DDC->vendor.name, "FCM", 4) == 0 && ++ DDC->vendor.prod_id == 13600) ++ return TRUE; ++ ++ return FALSE; ++} ++ ++static Bool quirk_detailed_h_in_cm (int scrnIndex, xf86MonPtr DDC) ++{ ++ /* Bug #10304: "LGPhilipsLCD LP154W01-A5" */ ++ /* Bug #12784: "LGPhilipsLCD LP154W01-TLA2" */ ++ if (memcmp (DDC->vendor.name, "LPL", 4) == 0 && ++ DDC->vendor.prod_id == 0) ++ return TRUE; ++ ++ /* Bug #11603: Funai Electronics PM36B */ ++ if (memcmp (DDC->vendor.name, "FCM", 4) == 0 && ++ DDC->vendor.prod_id == 13600) ++ return TRUE; ++ ++ return FALSE; ++} ++ ++static Bool quirk_detailed_v_in_cm (int scrnIndex, xf86MonPtr DDC) ++{ ++ /* Bug #11603: Funai Electronics PM36B */ ++ if (memcmp (DDC->vendor.name, "FCM", 4) == 0 && ++ DDC->vendor.prod_id == 13600) ++ return TRUE; ++ ++ return FALSE; ++} ++ ++static Bool quirk_detailed_use_maximum_size (int scrnIndex, xf86MonPtr DDC) ++{ ++ /* Bug #10304: LGPhilipsLCD LP154W01-A5 */ ++ if (memcmp (DDC->vendor.name, "LPL", 4) == 0 && ++ DDC->vendor.prod_id == 0) ++ return TRUE; ++ ++ return FALSE; ++} ++ + static Bool quirk_135_clock_too_high (int scrnIndex, xf86MonPtr DDC) + { + /* Envision Peripherals, Inc. EN-7100e. See bug #9550. */ +@@ -106,6 +162,22 @@ static const ddc_quirk_map_t ddc_quirks[ + quirk_135_clock_too_high, DDC_QUIRK_135_CLOCK_TOO_HIGH, + "Recommended 135MHz pixel clock is too high" + }, ++ { ++ quirk_prefer_large_75, DDC_QUIRK_PREFER_LARGE_75, ++ "Detailed timing is not preferred, use largest mode at 75Hz" ++ }, ++ { ++ quirk_detailed_h_in_cm, DDC_QUIRK_DETAILED_H_IN_CM, ++ "Detailed timings give horizontal size in cm." ++ }, ++ { ++ quirk_detailed_v_in_cm, DDC_QUIRK_DETAILED_V_IN_CM, ++ "Detailed timings give vertical size in cm." ++ }, ++ { ++ quirk_detailed_use_maximum_size, DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE, ++ "Detailed timings give sizes in cm." ++ }, + { + NULL, DDC_QUIRK_NONE, + "No known quirks" +@@ -303,6 +375,98 @@ DDCGuessRangesFromModes(int scrnIndex, M + } + } + ++static ddc_quirk_t ++xf86DDCDetectQuirks(int scrnIndex, xf86MonPtr DDC, Bool verbose) ++{ ++ ddc_quirk_t quirks; ++ int i; ++ ++ quirks = DDC_QUIRK_NONE; ++ for (i = 0; ddc_quirks[i].detect; i++) { ++ if (ddc_quirks[i].detect (scrnIndex, DDC)) { ++ if (verbose) { ++ xf86DrvMsg (scrnIndex, X_INFO, " EDID quirk: %s\n", ++ ddc_quirks[i].description); ++ } ++ quirks |= ddc_quirks[i].quirk; ++ } ++ } ++ ++ return quirks; ++} ++ ++/** ++ * Applies monitor-specific quirks to the decoded EDID information. ++ * ++ * Note that some quirks applying to the mode list are still implemented in ++ * xf86DDCGetModes. ++ */ ++void ++xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC) ++{ ++ ddc_quirk_t quirks = xf86DDCDetectQuirks (scrnIndex, DDC, FALSE); ++ int i; ++ ++ for (i = 0; i < DET_TIMINGS; i++) { ++ struct detailed_monitor_section *det_mon = &DDC->det_mon[i]; ++ ++ if (det_mon->type != DT) ++ continue; ++ ++ if (quirks & DDC_QUIRK_DETAILED_H_IN_CM) ++ det_mon->section.d_timings.h_size *= 10; ++ ++ if (quirks & DDC_QUIRK_DETAILED_V_IN_CM) ++ det_mon->section.d_timings.v_size *= 10; ++ ++ if (quirks & DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE) { ++ det_mon->section.d_timings.h_size = 10 * DDC->features.hsize; ++ det_mon->section.d_timings.v_size = 10 * DDC->features.vsize; ++ } ++ } ++} ++ ++/** ++ * Walks the modes list, finding the mode with the largest area which is ++ * closest to the target refresh rate, and marks it as the only preferred mode. ++*/ ++static void ++xf86DDCSetPreferredRefresh(int scrnIndex, DisplayModePtr modes, ++ float target_refresh) ++{ ++ DisplayModePtr mode, best = modes; ++ ++ for (mode = modes; mode; mode = mode->next) ++ { ++ mode->type &= ~M_T_PREFERRED; ++ ++ if (mode == best) continue; ++ ++ if (mode->HDisplay * mode->VDisplay > ++ best->HDisplay * best->VDisplay) ++ { ++ best = mode; ++ continue; ++ } ++ if (mode->HDisplay * mode->VDisplay == ++ best->HDisplay * best->VDisplay) ++ { ++ double mode_refresh = xf86ModeVRefresh (mode); ++ double best_refresh = xf86ModeVRefresh (best); ++ double mode_dist = fabs(mode_refresh - target_refresh); ++ double best_dist = fabs(best_refresh - target_refresh); ++ ++ if (mode_dist < best_dist) ++ { ++ best = mode; ++ continue; ++ } ++ } ++ } ++ if (best) ++ best->type |= M_T_PREFERRED; ++} ++ + _X_EXPORT DisplayModePtr + xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC) + { +@@ -312,15 +476,9 @@ xf86DDCGetModes(int scrnIndex, xf86MonPt + + xf86DrvMsg (scrnIndex, X_INFO, "EDID vendor \"%s\", prod id %d\n", + DDC->vendor.name, DDC->vendor.prod_id); +- quirks = DDC_QUIRK_NONE; +- for (i = 0; ddc_quirks[i].detect; i++) +- if (ddc_quirks[i].detect (scrnIndex, DDC)) +- { +- xf86DrvMsg (scrnIndex, X_INFO, " EDID quirk: %s\n", +- ddc_quirks[i].description); +- quirks |= ddc_quirks[i].quirk; +- } +- ++ ++ quirks = xf86DDCDetectQuirks(scrnIndex, DDC, TRUE); ++ + preferred = PREFERRED_TIMING_MODE(DDC->features.msc); + if (quirks & DDC_QUIRK_PREFER_LARGE_60) + preferred = 0; +@@ -357,32 +515,11 @@ xf86DDCGetModes(int scrnIndex, xf86MonPt + Modes = xf86ModesAdd(Modes, Mode); + + if (quirks & DDC_QUIRK_PREFER_LARGE_60) +- { +- DisplayModePtr best = Modes; +- for (Mode = Modes; Mode; Mode = Mode->next) +- { +- if (Mode == best) continue; +- if (Mode->HDisplay * Mode->VDisplay > best->HDisplay * best->VDisplay) +- { +- best = Mode; +- continue; +- } +- if (Mode->HDisplay * Mode->VDisplay == best->HDisplay * best->VDisplay) +- { +- double mode_refresh = xf86ModeVRefresh (Mode); +- double best_refresh = xf86ModeVRefresh (best); +- double mode_dist = fabs(mode_refresh - 60.0); +- double best_dist = fabs(best_refresh - 60.0); +- if (mode_dist < best_dist) +- { +- best = Mode; +- continue; +- } +- } +- } +- if (best) +- best->type |= M_T_PREFERRED; +- } ++ xf86DDCSetPreferredRefresh(scrnIndex, Modes, 60); ++ ++ if (quirks & DDC_QUIRK_PREFER_LARGE_75) ++ xf86DDCSetPreferredRefresh(scrnIndex, Modes, 75); ++ + return Modes; + } + +--- a/hw/xfree86/modes/xf86Modes.h ++++ b/hw/xfree86/modes/xf86Modes.h +@@ -95,4 +95,7 @@ xf86GetMonitorModes (ScrnInfoPtr pScrn, + DisplayModePtr + xf86GetDefaultModes (Bool interlaceAllowed, Bool doubleScanAllowed); + ++void ++xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC); ++ + #endif /* _XF86MODES_H_ */ --- xorg-server-1.4.1~git20080131.orig/debian/patches/51_xkb-and-loathing.diff +++ xorg-server-1.4.1~git20080131/debian/patches/51_xkb-and-loathing.diff @@ -0,0 +1,46 @@ +* Mon Apr 30 2007 Adam Jackson 1.3.0.0-3 +- xserver-1.3.0-xkb-and-loathing.patch: Ignore (not just block) SIGALRM + around calls to Popen()/Pclose(). Fixes a hang in openoffice when + opening menus. + +http://cvs.fedora.redhat.com/viewcvs/devel/xorg-x11-server/xserver-1.3.0-xkb-and-loathing.patch?view=markup +https://bugs.freedesktop.org/show_bug.cgi?id=10525 + +Fixes #433131 + +--- xorg-server-1.3.0.0/os/utils.c.jx 2007-04-25 13:28:05.000000000 -0400 ++++ xorg-server-1.3.0.0/os/utils.c 2007-04-30 14:33:04.000000000 -0400 +@@ -1726,6 +1726,8 @@ + int pid; + } *pidlist; + ++static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */ ++ + pointer + Popen(char *command, char *type) + { +@@ -1747,11 +1749,15 @@ + return NULL; + } + ++ /* Ignore the smart scheduler while this is going on */ ++ old_alarm = signal(SIGALRM, SIG_IGN); ++ + switch (pid = fork()) { + case -1: /* error */ + close(pdes[0]); + close(pdes[1]); + xfree(cur); ++ signal(SIGALRM, old_alarm); + return NULL; + case 0: /* child */ + if (setgid(getgid()) == -1) +@@ -1927,6 +1933,8 @@ + /* allow EINTR again */ + OsReleaseSignals (); + ++ signal(SIGALRM, old_alarm); ++ + return pid == -1 ? -1 : pstat; + } + --- xorg-server-1.4.1~git20080131.orig/debian/patches/07_autoconfig_screen_with_device_section.diff +++ xorg-server-1.4.1~git20080131/debian/patches/07_autoconfig_screen_with_device_section.diff @@ -0,0 +1,27 @@ +Index: xorg-server/hw/xfree86/common/xf86Config.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-09-27 22:18:22.000000000 -0400 ++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-09-27 22:20:32.000000000 -0400 +@@ -1927,11 +1927,20 @@ + if (!configMonitor(screenp->monitor,conf_screen->scrn_monitor)) + return FALSE; + } ++ /* Configure the device. If there isn't one configured, attach to the ++ * first inactive one that we can configure. If there's none that work, ++ * set it to NULL so that the section can be autoconfigured later */ + screenp->device = xnfcalloc(1, sizeof(GDevRec)); +- if (configDevice(screenp->device,conf_screen->scrn_device, TRUE)) ++ if ((!conf_screen->scrn_device) && (xf86configptr->conf_device_lst)) { ++ conf_screen->scrn_device = xf86configptr->conf_device_lst; ++ xf86Msg(X_DEFAULT, "No device specified for screen \"%s\".\n" ++ "\tUsing the first device section listed.\n", screenp->id); ++ } ++ if (configDevice(screenp->device,conf_screen->scrn_device, TRUE)) { + screenp->device->myScreenSection = screenp; +- else ++ } else { + screenp->device = NULL; ++ } + screenp->options = conf_screen->scrn_option_lst; + + /* --- xorg-server-1.4.1~git20080131.orig/debian/patches/93_xprint_fonts_fix +++ xorg-server-1.4.1~git20080131/debian/patches/93_xprint_fonts_fix @@ -0,0 +1,12 @@ +diff -ruN xorg-server-old/hw/xprint/ps/psout_ft.c xorg-server/hw/xprint/ps/psout_ft.c +--- xorg-server-old/hw/xprint/ps/psout_ft.c 2006-04-02 10:09:43.000000000 +1000 ++++ xorg-server/hw/xprint/ps/psout_ft.c 2006-04-14 22:22:42.000000000 +1000 +@@ -280,6 +280,8 @@ + else + { + sprintf(buf, "%s", baseFontName); ++ xfree(self->FontName); ++ self->FontName = NULL; + } + + if( self->FontSize == -1 ) --- xorg-server-1.4.1~git20080131.orig/debian/patches/154_fix_rotation_for_multimon.diff +++ xorg-server-1.4.1~git20080131/debian/patches/154_fix_rotation_for_multimon.diff @@ -0,0 +1,27 @@ +From: Maarten Maathuis +Date: Sun, 17 Feb 2008 17:47:28 +0000 (+0100) +Subject: Fix rotation for multi-monitor situation. +X-Git-Tag: xf-3_9_16Z / xf-3_9_16d / xf-3_9_16e / xf-3_9_16f +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=dc30ade6496c7cc24e38c419e229159525fe042f + +Fix rotation for multi-monitor situation. + +- The (x,y)-coordinates of the crtc were not being passed as xFixed values, which made it an obscure bug to find. +- Fix bug #13787. +(cherry picked from commit a48cc88ea2674c28b69b8d738b168cbafcf4001f) +--- + +--- a/hw/xfree86/modes/xf86Rotate.c ++++ b/hw/xfree86/modes/xf86Rotate.c +@@ -579,9 +579,9 @@ xf86CrtcRotate (xf86CrtcPtr crtc, Displa + } + else + { +- PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, crtc->x, crtc->y); ++ PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, F(crtc->x), F(crtc->y)); + PictureTransformIsInverse ("offset", &crtc_to_fb, &fb_to_crtc); +- ++ + /* + * these are the size of the shadow pixmap, which + * matches the mode, not the pre-rotated copy in the --- xorg-server-1.4.1~git20080131.orig/debian/patches/159_xkb_default_to_null.diff +++ xorg-server-1.4.1~git20080131/debian/patches/159_xkb_default_to_null.diff @@ -0,0 +1,114 @@ +From: Peter Hutterer +Date: Thu, 7 Feb 2008 05:18:04 +0000 (+1030) +Subject: xkb: when copying the keymap, make sure the structs default to 0/NULL. +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=7018f280406eb0ef899a4046de274cfdd582881b + +xkb: when copying the keymap, make sure the structs default to 0/NULL. + +It actually does help if a pointer is NULL rather than pointing to nirvana +when you're trying to free it lateron. Who would have thought? +--- + +--- a/xkb/xkbUtils.c ++++ b/xkb/xkbUtils.c +@@ -1730,9 +1730,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr + else { + if (dst->geom->sz_shapes) { + xfree(dst->geom->shapes); +- dst->geom->shapes = NULL; + } +- ++ dst->geom->shapes = NULL; + dst->geom->num_shapes = 0; + dst->geom->sz_shapes = 0; + } +@@ -1781,6 +1780,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr + } + + dst->geom->num_sections = 0; ++ dst->geom->sections = NULL; + } + + if (src->geom->num_sections) { +@@ -1792,6 +1792,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr + tmp = xalloc(src->geom->num_sections * sizeof(XkbSectionRec)); + if (!tmp) + return FALSE; ++ memset(tmp, 0, src->geom->num_sections * sizeof(XkbSectionRec)); + dst->geom->sections = tmp; + dst->geom->num_sections = src->geom->num_sections; + +@@ -1828,6 +1829,10 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr + return FALSE; + dsection->doodads = tmp; + } ++ else { ++ dsection->doodads = NULL; ++ } ++ + for (k = 0, + sdoodad = ssection->doodads, + ddoodad = dsection->doodads; +@@ -1855,9 +1860,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr + else { + if (dst->geom->sz_sections) { + xfree(dst->geom->sections); +- dst->geom->sections = NULL; + } + ++ dst->geom->sections = NULL; + dst->geom->num_sections = 0; + dst->geom->sz_sections = 0; + } +@@ -1886,6 +1891,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr + } + } + } ++ dst->geom->num_doodads = 0; ++ dst->geom->doodads = NULL; + } + + if (src->geom->num_doodads) { +@@ -1898,7 +1905,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr + sizeof(XkbDoodadRec)); + if (!tmp) + return FALSE; +- bzero(tmp, src->geom->num_doodads * sizeof(XkbDoodadRec)); ++ memset(tmp, 0, src->geom->num_doodads * sizeof(XkbDoodadRec)); + dst->geom->doodads = tmp; + + dst->geom->sz_doodads = src->geom->num_doodads; +@@ -1927,9 +1934,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr + else { + if (dst->geom->sz_doodads) { + xfree(dst->geom->doodads); +- dst->geom->doodads = NULL; + } + ++ dst->geom->doodads = NULL; + dst->geom->num_doodads = 0; + dst->geom->sz_doodads = 0; + } +@@ -1957,10 +1964,10 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr + dst->geom->num_key_aliases = dst->geom->sz_key_aliases; + } + else { +- if (dst->geom->sz_key_aliases && dst->geom->key_aliases) { ++ if (dst->geom->key_aliases) { + xfree(dst->geom->key_aliases); +- dst->geom->key_aliases = NULL; + } ++ dst->geom->key_aliases = NULL; + dst->geom->num_key_aliases = 0; + dst->geom->sz_key_aliases = 0; + } +@@ -1991,8 +1998,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr + else { + if (dst->geom->label_font) { + xfree(dst->geom->label_font); +- dst->geom->label_font = NULL; + } ++ dst->geom->label_font = NULL; + dst->geom->label_color = NULL; + dst->geom->base_color = NULL; + } --- xorg-server-1.4.1~git20080131.orig/debian/patches/106_ubuntu_fpic_libxf86config.patch +++ xorg-server-1.4.1~git20080131/debian/patches/106_ubuntu_fpic_libxf86config.patch @@ -0,0 +1,26 @@ +Index: xorg-server-1.3.0.0.dfsg/hw/xfree86/parser/Makefile.am +=================================================================== +--- xorg-server-1.3.0.0.dfsg.orig/hw/xfree86/parser/Makefile.am 2007-02-16 16:03:12.000000000 +0000 ++++ xorg-server-1.3.0.0.dfsg/hw/xfree86/parser/Makefile.am 2007-05-26 18:17:17.000000000 +0000 +@@ -26,7 +26,7 @@ + DRI.c \ + Extensions.c + +-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) ++AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC + + EXTRA_DIST = \ + Configint.h \ +Index: xorg-server-1.3.0.0.dfsg/hw/xfree86/parser/Makefile.in +=================================================================== +--- xorg-server-1.3.0.0.dfsg.orig/hw/xfree86/parser/Makefile.in 2007-05-26 18:11:37.000000000 +0000 ++++ xorg-server-1.3.0.0.dfsg/hw/xfree86/parser/Makefile.in 2007-05-26 18:22:15.000000000 +0000 +@@ -577,7 +375,7 @@ + DRI.c \ + Extensions.c + +-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) ++AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC + EXTRA_DIST = \ + Configint.h \ + configProcs.h \ --- xorg-server-1.4.1~git20080131.orig/debian/patches/164_fix_context_sharing.diff +++ xorg-server-1.4.1~git20080131/debian/patches/164_fix_context_sharing.diff @@ -0,0 +1,35 @@ +From: Alan Hourihane +Date: Wed, 27 Feb 2008 16:49:34 +0000 (+0000) +Subject: Fix context sharing between direct/indirect contexts +X-Git-Tag: xf-3_9_16Z / xf-3_9_16d / xf-3_9_16e / xf-3_9_16f +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=a65d4aed06acd839fb21153f74144498abda3e18 + +Fix context sharing between direct/indirect contexts +--- + +Index: xorg-server/GL/glx/glxdri.c +=================================================================== +--- xorg-server.orig/GL/glx/glxdri.c 2008-04-09 11:10:49.000000000 +0300 ++++ xorg-server/GL/glx/glxdri.c 2008-04-09 11:10:49.000000000 +0300 +@@ -617,6 +617,9 @@ + else + sharePrivate = NULL; + ++ if (baseShareContext && baseShareContext->isDirect) ++ return NULL; ++ + context = xalloc(sizeof *context); + if (context == NULL) + return NULL; +@@ -636,6 +639,11 @@ + 0, /* render type */ + sharePrivate, + &context->driContext); ++ ++ if (!context->driContext.private) { ++ xfree(context); ++ return NULL; ++ } + + context->driContext.mode = modes; + --- xorg-server-1.4.1~git20080131.orig/debian/patches/105_reduce_wakeups_from_smart_scheduler.diff +++ xorg-server-1.4.1~git20080131/debian/patches/105_reduce_wakeups_from_smart_scheduler.diff @@ -0,0 +1,146 @@ +From: Arjan van de Ven +Date: Sun, 28 Oct 2007 08:37:52 +0000 (+0100) +Subject: reduce wakeups from smart scheduler +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=2338d5c9914e2a43c3a4f7ee0f4355ad0a1ad9e7 + +reduce wakeups from smart scheduler + +The smart scheduler itimer currently always fires after each request +(which in turn causes the CPU to wake out of idle, burning precious +power). Rather than doing this, just stop the timer before going into +the select() portion of the WaitFor loop. It's a cheap system call, and +it will only get called if there's no more commands batched up from the +active fd. + +This change also allows some of the functions to be simplified; +setitimer() will only fail if it's passed invalid data, and we don't do +that... so make it void and remove all the conditional code that deals +with failure. + +The change also allows us to remove a few variables that were used for +housekeeping between the signal handler and the main loop. + +Signed-off-by: Keith Packard +--- + +--- a/include/dixstruct.h ++++ b/include/dixstruct.h +@@ -150,11 +150,9 @@ extern long SmartScheduleTime; + extern long SmartScheduleInterval; + extern long SmartScheduleSlice; + extern long SmartScheduleMaxSlice; +-extern unsigned long SmartScheduleIdleCount; + extern Bool SmartScheduleDisable; +-extern Bool SmartScheduleIdle; +-extern Bool SmartScheduleTimerStopped; +-extern Bool SmartScheduleStartTimer(void); ++extern void SmartScheduleStartTimer(void); ++extern void SmartScheduleStopTimer(void); + #define SMART_MAX_PRIORITY (20) + #define SMART_MIN_PRIORITY (-20) + +--- a/os/WaitFor.c ++++ b/os/WaitFor.c +@@ -217,7 +217,8 @@ WaitForSomething(int *pClientsReady) + XFD_COPYSET(&AllSockets, &LastSelectMask); + #ifdef SMART_SCHEDULE + } +- SmartScheduleIdle = TRUE; ++ SmartScheduleStopTimer (); ++ + #endif + BlockHandler((pointer)&wt, (pointer)&LastSelectMask); + if (NewOutputPending) +@@ -237,13 +238,7 @@ WaitForSomething(int *pClientsReady) + selecterr = GetErrno(); + WakeupHandler(i, (pointer)&LastSelectMask); + #ifdef SMART_SCHEDULE +- if (i >= 0) +- { +- SmartScheduleIdle = FALSE; +- SmartScheduleIdleCount = 0; +- if (SmartScheduleTimerStopped) +- (void) SmartScheduleStartTimer (); +- } ++ SmartScheduleStartTimer (); + #endif + if (i <= 0) /* An error or timeout occurred */ + { +--- a/os/utils.c ++++ b/os/utils.c +@@ -1513,10 +1513,6 @@ XNFstrdup(const char *s) + + #ifdef SMART_SCHEDULE + +-unsigned long SmartScheduleIdleCount; +-Bool SmartScheduleIdle; +-Bool SmartScheduleTimerStopped; +- + #ifdef SIGVTALRM + #define SMART_SCHEDULE_POSSIBLE + #endif +@@ -1526,7 +1522,7 @@ Bool SmartScheduleTimerStopped; + #define SMART_SCHEDULE_TIMER ITIMER_REAL + #endif + +-static void ++void + SmartScheduleStopTimer (void) + { + #ifdef SMART_SCHEDULE_POSSIBLE +@@ -1537,38 +1533,28 @@ SmartScheduleStopTimer (void) + timer.it_value.tv_sec = 0; + timer.it_value.tv_usec = 0; + (void) setitimer (ITIMER_REAL, &timer, 0); +- SmartScheduleTimerStopped = TRUE; + #endif + } + +-Bool ++void + SmartScheduleStartTimer (void) + { + #ifdef SMART_SCHEDULE_POSSIBLE + struct itimerval timer; + +- SmartScheduleTimerStopped = FALSE; + timer.it_interval.tv_sec = 0; + timer.it_interval.tv_usec = SmartScheduleInterval * 1000; + timer.it_value.tv_sec = 0; + timer.it_value.tv_usec = SmartScheduleInterval * 1000; +- return setitimer (ITIMER_REAL, &timer, 0) >= 0; ++ setitimer (ITIMER_REAL, &timer, 0); + #endif +- return FALSE; + } + + #ifdef SMART_SCHEDULE_POSSIBLE + static void + SmartScheduleTimer (int sig) + { +- int olderrno = errno; +- + SmartScheduleTime += SmartScheduleInterval; +- if (SmartScheduleIdle) +- { +- SmartScheduleStopTimer (); +- } +- errno = olderrno; + } + #endif + +@@ -1592,14 +1578,6 @@ SmartScheduleInit (void) + perror ("sigaction for smart scheduler"); + return FALSE; + } +- /* Set up the virtual timer */ +- if (!SmartScheduleStartTimer ()) +- { +- perror ("scheduling timer"); +- return FALSE; +- } +- /* stop the timer and wait for WaitForSomething to start it */ +- SmartScheduleStopTimer (); + return TRUE; + #else + return FALSE; --- xorg-server-1.4.1~git20080131.orig/debian/patches/03_auto_load_driver.diff +++ xorg-server-1.4.1~git20080131/debian/patches/03_auto_load_driver.diff @@ -0,0 +1,335 @@ +Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-09-20 21:41:34.000000000 -0400 ++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-09-20 23:00:23.000000000 -0400 +@@ -39,6 +39,7 @@ + #include "xf86Config.h" + #include "xf86Priv.h" + #include "xf86_OSlib.h" ++#include "dirent.h" + + /* Sections for the default built-in configuration. */ + +@@ -287,3 +288,207 @@ + + return (ret == CONFIG_OK); + } ++ ++int ++xchomp(char *line) ++{ ++ size_t len = 0; ++ ++ if (!line) { ++ return 1; ++ } ++ ++ len = strlen(line); ++ if (line[len - 1] == '\n' && len > 0) { ++ line[len - 1] = '\0'; ++ return 0; ++ } ++} ++ ++GDevPtr ++autoConfigDevice(GDevPtr preconf_device) ++{ ++ GDevPtr ptr = NULL; ++ confScreenPtr scrn = NULL; ++ ++ if (!xf86configptr) { ++ return NULL; ++ } ++ ++ /* If there's a configured section with no driver chosen, use it */ ++ if (preconf_device) { ++ ptr = preconf_device; ++ } else { ++ ptr = (GDevPtr)xalloc(sizeof(GDevRec)); ++ if (!ptr) { ++ return NULL; ++ } ++ memset((GDevPtr)ptr, 0, sizeof(GDevRec)); ++ ptr->chipID = -1; ++ ptr->chipRev = -1; ++ ptr->irq = -1; ++ ++ ptr->active = TRUE; ++ ptr->claimed = FALSE; ++ ptr->identifier = "Autoconfigured Video Device"; ++ ptr->driver = NULL; ++ } ++ if (!ptr->driver) { ++ ptr->driver = chooseVideoDriver(); ++ } ++ ++ /* TODO Handle multiple screen sections */ ++ if (xf86ConfigLayout.screens && !xf86ConfigLayout.screens->screen->device) { ++ xf86ConfigLayout.screens->screen->device = ptr; ++ ptr->myScreenSection = xf86ConfigLayout.screens->screen; ++ } ++ xf86Msg(X_DEFAULT, "Assigned the driver to the xf86ConfigLayout\n"); ++ ++ return ptr; ++} ++ ++char* ++chooseVideoDriver(void) ++{ ++ pciVideoPtr *pciptr, info = NULL; ++ DIR *idsdir; ++ FILE *fp; ++ struct dirent *direntry; ++ char *line = NULL; ++ char *chosen_driver = NULL; ++ size_t len; ++ ssize_t read; ++ char path_name[256], vendor_str[5], chip_str[5]; ++ int vendor, chip; ++ int i, j; ++ char *matches[20]; /* If we have more than 20 drivers we're in trouble */ ++ ++ for (i=0 ; i<20 ; i++) ++ matches[i] = NULL; ++ ++ /* Find the primary device, and get some information about it. */ ++ if (xf86PciVideoInfo) { ++ for (pciptr = xf86PciVideoInfo; (info = *pciptr); pciptr++) { ++ if (xf86IsPrimaryPci(info)) { ++ break; ++ } ++ } ++ if (!info) { ++ ErrorF("Primary device is not PCI\n"); ++ } ++ } else { ++ ErrorF("xf86PciVideoInfo is not set\n"); ++ } ++ ++ if (!info) { ++ ErrorF("Could not get primary PCI info\n"); ++ goto end; ++ } ++ ++ idsdir = opendir("/usr/share/xserver-xorg/pci"); ++ if (idsdir) { ++ direntry = readdir(idsdir); ++ /* Read the directory */ ++ while (direntry) { ++ if (direntry->d_name[0] == '.') { ++ direntry = readdir(idsdir); ++ continue; ++ } ++ len = strlen(direntry->d_name); ++ /* A tiny bit of sanity checking. We should probably do better */ ++ if (strncmp(&(direntry->d_name[len-4]), ".ids", 4) == 0) { ++ /* We need the full path name to open the file */ ++ strncpy(path_name, "/usr/share/xserver-xorg/pci/", 256); ++ strncat(path_name, direntry->d_name, (256 - strlen(path_name))); ++ fp = fopen(path_name, "r"); ++ if (fp == NULL) { ++ xf86Msg(X_ERROR, "Could not open %s for reading. Exiting.\n", path_name); ++ goto end; ++ } ++ /* Read the file */ ++ while ((read = getline(&line, &len, fp)) != -1) { ++ xchomp(line); ++ if (isdigit(line[0])) { ++ strncpy(vendor_str, line, 4); ++ vendor_str[4] = '\0'; ++ vendor = (int)strtol(vendor_str, NULL, 16); ++ if ((strlen(&line[4])) == 0) { ++ chip_str[0] = '\0'; ++ chip = -1; ++ } else { ++ /* Handle trailing whitespace */ ++ if (isspace(line[4])) { ++ chip_str[0] = '\0'; ++ chip = -1; ++ } else { ++ /* Ok, it's a real ID */ ++ strncpy(chip_str, &line[4], 4); ++ chip_str[4] = '\0'; ++ chip = (int)strtol(chip_str, NULL, 16); ++ } ++ } ++ if (vendor == info->vendor && ++ (chip == info->chipType || chip == -1)) { ++ i = 0; ++ while (matches[i]) { ++ i++; ++ } ++ matches[i] = (char*)xalloc(sizeof(char) * strlen(direntry->d_name) - 3); ++ if (!matches[i]) { ++ xf86Msg(X_ERROR, "Could not allocate space for the module name. Exiting.\n"); ++ goto end; ++ } ++ /* hack off the .ids suffix. This should guard ++ * against other problems, but it will end up ++ * taking off anything after the first '.' */ ++ for (j = 0; j < (strlen(direntry->d_name) - 3) ; j++) { ++ if (direntry->d_name[j] == '.') { ++ matches[i][j] = '\0'; ++ break; ++ } else { ++ matches[i][j] = direntry->d_name[j]; ++ } ++ } ++ xf86Msg(X_INFO, "Matched %s from file name %s in autoconfig\n", matches[i], direntry->d_name); ++ ++ } ++ } else { ++ /* TODO Handle driver overrides here */ ++ } ++ } ++ fclose(fp); ++ } ++ direntry = readdir(idsdir); ++ } ++ } ++ ++ /* TODO Handle multiple drivers claiming to support the same PCI ID */ ++ if (matches[0]) { ++ chosen_driver = matches[0]; ++ } else { ++ #if defined __i386__ || defined __amd64__ || defined __hurd__ ++ chosen_driver = "vesa"; ++ #elif defined __alpha__ ++ chosen_driver = "vga"; ++ #elif defined __sparc__ ++ chosen_driver = "sunffb"; ++ #else ++ chosen_driver = "fbdev"; ++ #endif ++ } ++ ++ xf86Msg(X_DEFAULT, "Matched %s for the autoconfigured driver\n", chosen_driver); ++ ++ end: ++ i = 0; ++ while (matches[i]) { ++ if (matches[i] != chosen_driver) { ++ xfree(matches[i]); ++ } ++ i++; ++ } ++ xfree(line); ++ closedir(idsdir); ++ ++ return chosen_driver; ++} +Index: xorg-server/hw/xfree86/common/xf86Config.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-09-20 21:41:34.000000000 -0400 ++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-09-20 23:00:23.000000000 -0400 +@@ -1928,8 +1928,10 @@ + return FALSE; + } + screenp->device = xnfcalloc(1, sizeof(GDevRec)); +- configDevice(screenp->device,conf_screen->scrn_device, TRUE); +- screenp->device->myScreenSection = screenp; ++ if (configDevice(screenp->device,conf_screen->scrn_device, TRUE)) ++ screenp->device->myScreenSection = screenp; ++ else ++ screenp->device = NULL; + screenp->options = conf_screen->scrn_option_lst; + + /* +@@ -2218,13 +2220,17 @@ + { + int i; + ++ if (!conf_device) { ++ return FALSE; ++ } ++ + if (active) + xf86Msg(X_CONFIG, "| |-->Device \"%s\"\n", + conf_device->dev_identifier); + else + xf86Msg(X_CONFIG, "|-->Inactive Device \"%s\"\n", + conf_device->dev_identifier); +- ++ + devicep->identifier = conf_device->dev_identifier; + devicep->vendor = conf_device->dev_vendor; + devicep->board = conf_device->dev_board; +Index: xorg-server/hw/xfree86/common/xf86Config.h +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-09-20 21:41:34.000000000 -0400 ++++ xorg-server/hw/xfree86/common/xf86Config.h 2007-09-20 21:41:57.000000000 -0400 +@@ -34,6 +34,8 @@ + #define _xf86_config_h + + #include "xf86Optrec.h" ++#include "xf86Parser.h" ++#include "xf86str.h" + + #ifdef HAVE_PARSER_DECLS + /* +@@ -76,5 +78,8 @@ + ConfigStatus xf86HandleConfigFile(Bool); + + Bool xf86AutoConfig(void); ++GDevPtr autoConfigDevice(GDevPtr preconf_device); ++char* chooseVideoDriver(void); ++int xchomp(char *line); + + #endif /* _xf86_config_h */ +Index: xorg-server/hw/xfree86/common/xf86Init.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-09-20 21:41:34.000000000 -0400 ++++ xorg-server/hw/xfree86/common/xf86Init.c 2007-09-20 23:00:15.000000000 -0400 +@@ -347,6 +347,16 @@ + } + + /* Load all driver modules specified in the config file */ ++ /* If there aren't any specified in the config file, autoconfig them */ ++ /* FIXME: Does not handle multiple active screen sections, but I'm not ++ * sure if we really want to handle that case*/ ++ GDevPtr configured_device = xf86ConfigLayout.screens->screen->device; ++ if ((!configured_device) || (!configured_device->driver)) { ++ if (!autoConfigDevice(configured_device)) { ++ xf86Msg(X_ERROR, "Automatic driver configuration failed\n"); ++ return ; ++ } ++ } + if ((modulelist = xf86DriverlistFromConfig())) { + xf86LoadModules(modulelist, NULL); + xfree(modulelist); +Index: xorg-server/hw/xfree86/parser/Screen.c +=================================================================== +--- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-09-20 21:41:34.000000000 -0400 ++++ xorg-server/hw/xfree86/parser/Screen.c 2007-09-20 21:41:57.000000000 -0400 +@@ -526,15 +526,7 @@ + } + } + +- device = xf86findDevice (screen->scrn_device_str, p->conf_device_lst); +- if (!device) +- { +- xf86validationError (UNDEFINED_DEVICE_MSG, +- screen->scrn_device_str, screen->scrn_identifier); +- return (FALSE); +- } +- else +- screen->scrn_device = device; ++ screen->scrn_device= xf86findDevice (screen->scrn_device_str, p->conf_device_lst); + + adaptor = screen->scrn_adaptor_lst; + while (adaptor) +Index: xorg-server/hw/xfree86/parser/read.c +=================================================================== +--- xorg-server.orig/hw/xfree86/parser/read.c 2007-09-20 21:41:34.000000000 -0400 ++++ xorg-server/hw/xfree86/parser/read.c 2007-09-20 21:41:57.000000000 -0400 +@@ -80,8 +80,8 @@ + static int + xf86validateConfig (XF86ConfigPtr p) + { +- if (!xf86validateDevice (p)) +- return FALSE; ++ /*if (!xf86validateDevice (p)) ++ return FALSE;*/ + if (!xf86validateScreen (p)) + return FALSE; + if (!xf86validateInput (p)) --- xorg-server-1.4.1~git20080131.orig/debian/patches/121_only_switch_vt_when_active.diff +++ xorg-server-1.4.1~git20080131/debian/patches/121_only_switch_vt_when_active.diff @@ -0,0 +1,31 @@ +diff -urP xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c xorg-server-1.1.1+/hw/xfree86/os-support/linux/lnx_init.c +--- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c 2006-07-05 14:31:41.000000000 -0400 ++++ xorg-server-1.1.1+/hw/xfree86/os-support/linux/lnx_init.c 2006-09-21 01:23:57.000000000 -0400 +@@ -345,10 +345,25 @@ + + if (VTSwitch) + { ++ struct vt_stat vts; ++ + /* +- * Perform a switch back to the active VT when we were started ++ * Perform a switch back to the active VT when we were started. ++ * We cannot rely on vtSema to determine if the server was the ++ * active VT at the time of shutdown since it has already been ++ * released. Instead, we manually check the current VT and ++ * compare it with the VT we were running on. + */ +- if (activeVT >= 0) { ++ if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts) < 0) ++ { ++ /* If this failed, fall back to old behaviour ++ * of always switching. */ ++ xf86Msg(X_WARNING,"xf86OpenConsole: VT_GETSTATE failed: %s\n", ++ strerror(errno)); ++ vts.v_active = xf86Info.vtno; ++ } ++ ++ if (activeVT >= 0 && vts.v_active == xf86Info.vtno) { + if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, activeVT) < 0) + xf86Msg(X_WARNING, "xf86CloseConsole: VT_ACTIVATE failed: %s\n", + strerror(errno)); --- xorg-server-1.4.1~git20080131.orig/debian/patches/161_fix_big_endian_cursor.diff +++ xorg-server-1.4.1~git20080131/debian/patches/161_fix_big_endian_cursor.diff @@ -0,0 +1,25 @@ +From: Michel Dänzer +Date: Thu, 20 Mar 2008 13:18:29 +0000 (-0400) +Subject: Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=da973e962d09854b571320dee7dd9569060bc39e + +Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB + +This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian +platforms) fixes it for me with the radeon driver and doesn't break intel. + +Correct patch this time :) +--- + +--- a/hw/xfree86/modes/xf86Cursors.c ++++ b/hw/xfree86/modes/xf86Cursors.c +@@ -137,7 +137,8 @@ cursor_bitpos (int flags, int x, Bool ma + mask = !mask; + if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED) + x = (x & ~3) | (3 - (x & 3)); +- if (flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) ++ if (((flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) == 0) == ++ (X_BYTE_ORDER == X_BIG_ENDIAN)) + x = (x & ~7) | (7 - (x & 7)); + if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1) + x = (x << 1) + mask; --- xorg-server-1.4.1~git20080131.orig/debian/patches/155_exa_fix_off-by-one.diff +++ xorg-server-1.4.1~git20080131/debian/patches/155_exa_fix_off-by-one.diff @@ -0,0 +1,21 @@ +From d502521c3669f3f22b94c39a64ab63bfd92c6a97 Mon Sep 17 00:00:00 2001 +From: Pierre Willenbrock +Date: Tue, 23 Oct 2007 14:45:13 +0000 +Subject: EXA: Fix off-by-one in polyline drawing. + +--- +diff --git a/exa/exa_accel.c b/exa/exa_accel.c +index 52cc5c4..5fb72d7 100644 +--- a/exa/exa_accel.c ++++ b/exa/exa_accel.c +@@ -658,7 +658,7 @@ exaPolylines(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + x1 = ppt[0].x; + y1 = ppt[0].y; + /* If we have any non-horizontal/vertical, fall back. */ +- for (i = 0; i < npt; i++) { ++ for (i = 0; i < npt - 1; i++) { + if (mode == CoordModePrevious) { + x2 = x1 + ppt[i + 1].x; + y2 = y1 + ppt[i + 1].y; +-- +cgit v0.7.2-37-g538c --- xorg-server-1.4.1~git20080131.orig/debian/patches/123_no_composite_for_xvfb_run.patch +++ xorg-server-1.4.1~git20080131/debian/patches/123_no_composite_for_xvfb_run.patch @@ -0,0 +1,11 @@ +--- debian/local/xvfb-run 2006-10-13 18:42:49.000000000 +0200 ++++ xorg-server-1.1.1/debian/local/xvfb-run 2006-10-13 18:42:37.000000000 +0200 +@@ -16,7 +16,7 @@ + AUTHFILE= + ERRORFILE=/dev/null + STARTWAIT=3 +-XVFBARGS="-screen 0 640x480x8" ++XVFBARGS="-screen 0 640x480x8 -extension Composite" + LISTENTCP="-nolisten tcp" + XAUTHPROTO=. + --- xorg-server-1.4.1~git20080131.orig/debian/patches/139_fedora_xserver-1.3.0-document-fontpath-correctly.patch +++ xorg-server-1.4.1~git20080131/debian/patches/139_fedora_xserver-1.3.0-document-fontpath-correctly.patch @@ -0,0 +1,43 @@ +diff -up xorg-server-1.3.0.0/hw/xfree86/doc/man/xorg.conf.man.pre.jx xorg-server-1.3.0.0/hw/xfree86/doc/man/xorg.conf.man.pre +--- xorg-server-1.3.0.0/hw/xfree86/doc/man/xorg.conf.man.pre.jx 2006-12-22 03:06:49.000000000 -0500 ++++ xorg-server-1.3.0.0/hw/xfree86/doc/man/xorg.conf.man.pre 2007-08-23 15:27:47.000000000 -0400 +@@ -308,11 +308,11 @@ font path elements: + .PP + .RS 4 + .nf +-.I __projectroot__/lib/X11/fonts/misc/ +-.I __projectroot__/lib/X11/fonts/TTF/ +-.I __projectroot__/lib/X11/fonts/Type1/ +-.I __projectroot__/lib/X11/fonts/75dpi/ +-.I __projectroot__/lib/X11/fonts/100dpi/ ++.I __projectroot__/share/X11/fonts/misc/ ++.I __projectroot__/share/X11/fonts/TTF/ ++.I __projectroot__/share/X11/fonts/Type1/ ++.I __projectroot__/share/X11/fonts/75dpi/ ++.I __projectroot__/share/X11/fonts/100dpi/ + .fi + .RE + .PP +@@ -320,14 +320,14 @@ The recommended font path contains the f + .PP + .RS 4 + .nf +-.I __projectroot__/lib/X11/fonts/local/ +-.I __projectroot__/lib/X11/fonts/misc/ +-.I __projectroot__/lib/X11/fonts/75dpi/:unscaled +-.I __projectroot__/lib/X11/fonts/100dpi/:unscaled +-.I __projectroot__/lib/X11/fonts/Type1/ +-.I __projectroot__/lib/X11/fonts/Speedo/ +-.I __projectroot__/lib/X11/fonts/75dpi/ +-.I __projectroot__/lib/X11/fonts/100dpi/ ++.I __projectroot__/share/X11/fonts/local/ ++.I __projectroot__/share/X11/fonts/misc/ ++.I __projectroot__/share/X11/fonts/75dpi/:unscaled ++.I __projectroot__/share/X11/fonts/100dpi/:unscaled ++.I __projectroot__/share/X11/fonts/Type1/ ++.I __projectroot__/share/X11/fonts/Speedo/ ++.I __projectroot__/share/X11/fonts/75dpi/ ++.I __projectroot__/share/X11/fonts/100dpi/ + .fi + .RE + .PP --- xorg-server-1.4.1~git20080131.orig/debian/patches/44_preferredmode_infinite_loop.diff +++ xorg-server-1.4.1~git20080131/debian/patches/44_preferredmode_infinite_loop.diff @@ -0,0 +1,31 @@ +From 29e0e180729a4f0cc020985a4de4c8bc4b9c7f5f Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Mon, 22 Oct 2007 13:38:16 -0700 +Subject: [PATCH] Leave hardware-specified preferred modes alone when user preference exists. + +Instead of removing the preference bit marking the hardware declared mode +preference, leave it in place and just move the user preferred mode to the +front of the list while marking it with the USERPREF bit which will cause it +to be selected by the initial mode selection code. +--- + hw/xfree86/modes/xf86Crtc.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 0a48d5b..bb416fd 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -1417,9 +1417,8 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) + output->probed_modes = mode; + } + mode->type |= (M_T_PREFERRED|M_T_USERPREF); ++ break; + } +- else +- mode->type &= ~M_T_PREFERRED; + } + } + +-- +1.5.3.6 + --- xorg-server-1.4.1~git20080131.orig/debian/patches/162_cve-2007-6429.diff +++ xorg-server-1.4.1~git20080131/debian/patches/162_cve-2007-6429.diff @@ -0,0 +1,39 @@ +From: Matthias Hopf +Date: Mon, 21 Jan 2008 15:13:21 +0000 (+0100) +Subject: CVE-2007-6429: Always test for size+offset wrapping. +X-Git-Tag: xf-3_9_16Z / xf-3_9_16d / xf-3_9_16e / xf-3_9_16f +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=44f46bfb981ca69515dafc520f62f33654711194 + +CVE-2007-6429: Always test for size+offset wrapping. +--- + +--- a/Xext/shm.c ++++ b/Xext/shm.c +@@ -753,10 +753,10 @@ CreatePmap: + if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) { + if (size < width * height) + return BadAlloc; +- /* thankfully, offset is unsigned */ +- if (stuff->offset + size < size) +- return BadAlloc; + } ++ /* thankfully, offset is unsigned */ ++ if (stuff->offset + size < size) ++ return BadAlloc; + + VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client); + +@@ -1098,10 +1098,10 @@ CreatePmap: + if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) { + if (size < width * height) + return BadAlloc; +- /* thankfully, offset is unsigned */ +- if (stuff->offset + size < size) +- return BadAlloc; + } ++ /* thankfully, offset is unsigned */ ++ if (stuff->offset + size < size) ++ return BadAlloc; + + VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client); + pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)( --- xorg-server-1.4.1~git20080131.orig/debian/patches/151_x86emu_handle_cpuid.patch +++ xorg-server-1.4.1~git20080131/debian/patches/151_x86emu_handle_cpuid.patch @@ -0,0 +1,230 @@ +From e76dd7d7991b32cfc0f64bddcdcee201f34a85c5 Mon Sep 17 00:00:00 2001 +From: Bart Trojanowski +Date: Sat, 2 Feb 2008 12:21:57 -0500 +Subject: [PATCH] X86EMU: handle CPUID instruction + +This bug is tracked here: +https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-amd/+bug/180742 + +After trying to switch from X to VT (or just quit) the video-amd driver +attempts to issue INT 10/0 to go to mode 3 (VGA). The emulator, running +the BIOS code, would then spit out: + + c000:0282: A2 ILLEGAL EXTENDED X86 OPCODE! + +The opcode was 0F A2, or CPUID; it was not implemented in the emulator. +This simple patch, against 1.3.0.0, handles the CPUID instruction in one of +two ways: + 1) if ran on __i386__ or __x86_64__ then it calls the CPUID instruction + directly. + 2) if ran elsewhere it returns a canned 486dx4 set of values for + function 1. + +This fix allows the video-amd driver to switch back to console mode, +with the GSW BIOS. + +Thanks to Symbio Technologies for funding my work, and ThinCan for +providing hardware :) + +Signed-off-by: Bart Trojanowski +--- + hw/xfree86/x86emu/ops2.c | 16 ++++++- + hw/xfree86/x86emu/prim_ops.c | 44 +++++++++++++++++ + hw/xfree86/x86emu/x86emu/prim_ops.h | 1 + + hw/xfree86/x86emu/x86emu/prim_x86_gcc.h | 79 +++++++++++++++++++++++++++++++ + 4 files changed, 139 insertions(+), 1 deletions(-) + create mode 100644 hw/xfree86/x86emu/x86emu/prim_x86_gcc.h + +diff --git a/hw/xfree86/x86emu/ops2.c b/hw/xfree86/x86emu/ops2.c +index 8c6c535..324de8a 100644 +--- a/hw/xfree86/x86emu/ops2.c ++++ b/hw/xfree86/x86emu/ops2.c +@@ -328,6 +328,20 @@ static void x86emuOp2_pop_FS(u8 X86EMU_UNUSED(op2)) + } + + /**************************************************************************** ++REMARKS: CPUID takes EAX/ECX as inputs, writes EAX/EBX/ECX/EDX as output ++Handles opcode 0x0f,0xa2 ++****************************************************************************/ ++static void x86emuOp2_cpuid(u8 X86EMU_UNUSED(op2)) ++{ ++ START_OF_INSTR(); ++ DECODE_PRINTF("CPUID\n"); ++ TRACE_AND_STEP(); ++ cpuid(); ++ DECODE_CLEAR_SEGOVR(); ++ END_OF_INSTR(); ++} ++ ++/**************************************************************************** + REMARKS: + Handles opcode 0x0f,0xa3 + ****************************************************************************/ +@@ -2734,7 +2748,7 @@ void (*x86emu_optab2[256])(u8) = + + /* 0xa0 */ x86emuOp2_push_FS, + /* 0xa1 */ x86emuOp2_pop_FS, +-/* 0xa2 */ x86emuOp2_illegal_op, ++/* 0xa2 */ x86emuOp2_cpuid, + /* 0xa3 */ x86emuOp2_bt_R, + /* 0xa4 */ x86emuOp2_shld_IMM, + /* 0xa5 */ x86emuOp2_shld_CL, +diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c +index 461e09e..07ccfe5 100644 +--- a/hw/xfree86/x86emu/prim_ops.c ++++ b/hw/xfree86/x86emu/prim_ops.c +@@ -102,6 +102,12 @@ + #define PRIM_OPS_NO_REDEFINE_ASM + #include "x86emu/x86emui.h" + ++#if defined(__GNUC__) ++# if defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__) ++# include "x86emu/prim_x86_gcc.h" ++# endif ++#endif ++ + /*------------------------- Global Variables ------------------------------*/ + + static u32 x86emu_parity_tab[8] = +@@ -2654,3 +2660,41 @@ DB( if (CHECK_SP_ACCESS()) + return res; + } + ++/**************************************************************************** ++REMARKS: ++CPUID takes EAX/ECX as inputs, writes EAX/EBX/ECX/EDX as output ++****************************************************************************/ ++void cpuid (void) ++{ ++ u32 feature = M.x86.R_EAX; ++#ifdef X86EMU_HAS_HW_CPUID ++ hw_cpuid(&M.x86.R_EAX, &M.x86.R_EBX, &M.x86.R_ECX, &M.x86.R_EDX); ++#endif ++ switch (feature) { ++ case 0: ++ M.x86.R_EAX = 1; // maximum function number we support ++#ifndef X86EMU_HAS_PRIM_CPUID ++ M.x86.R_EBX = 0x756e6547; ++ M.x86.R_ECX = 0x6c65746e; ++ M.x86.R_EDX = 0x49656e69; ++#endif ++ break; ++ case 1: ++#ifndef X86EMU_HAS_PRIM_CPUID ++ M.x86.R_EAX = 0x00000480; // 486dx4 ++ M.x86.R_EBX = 0x00000000; ++ M.x86.R_ECX = 0x00000000; ++ M.x86.R_EDX = 0x00000002; // VME ++#else ++ M.x86.R_EDX &= 0x00000012; // TSC and VME ++#endif ++ break; ++ default: ++ M.x86.R_EAX = 0; // don't support extended features ++ M.x86.R_EBX = 0; ++ M.x86.R_ECX = 0; ++ M.x86.R_EDX = 0; ++ break; ++ } ++} ++ +diff --git a/hw/xfree86/x86emu/x86emu/prim_ops.h b/hw/xfree86/x86emu/x86emu/prim_ops.h +index bea8357..6ac2a29 100644 +--- a/hw/xfree86/x86emu/x86emu/prim_ops.h ++++ b/hw/xfree86/x86emu/x86emu/prim_ops.h +@@ -133,6 +133,7 @@ void push_word (u16 w); + void push_long (u32 w); + u16 pop_word (void); + u32 pop_long (void); ++void cpuid (void); + + #ifdef __cplusplus + } /* End of "C" linkage for C++ */ +diff --git a/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h +new file mode 100644 +index 0000000..c085ddc +--- /dev/null ++++ b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h +@@ -0,0 +1,79 @@ ++/**************************************************************************** ++* ++* Inline helpers for x86emu ++* ++* Copyright (C) 2008 Bart Trojanowski, Symbio Technologies, LLC ++* ++* ======================================================================== ++* ++* Permission to use, copy, modify, distribute, and sell this software and ++* its documentation for any purpose is hereby granted without fee, ++* provided that the above copyright notice appear in all copies and that ++* both that copyright notice and this permission notice appear in ++* supporting documentation, and that the name of the authors not be used ++* in advertising or publicity pertaining to distribution of the software ++* without specific, written prior permission. The authors makes no ++* representations about the suitability of this software for any purpose. ++* It is provided "as is" without express or implied warranty. ++* ++* THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++* EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF ++* USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR ++* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++* PERFORMANCE OF THIS SOFTWARE. ++* ++* ======================================================================== ++* ++* Language: GNU C ++* Environment: GCC on i386 or x86-64 ++* Developer: Bart Trojanowski ++* ++* Description: This file defines a few x86 macros that can be used by the ++* emulator to execute native instructions. ++* ++* For PIC vs non-PIC code refer to: ++* http://sam.zoy.org/blog/2007-04-13-shlib-with-non-pic-code-have-inline-assembly-and-pic-mix-well ++* ++****************************************************************************/ ++#ifndef __X86EMU_PRIM_X86_GCC_H ++#define __X86EMU_PRIM_X86_GCC_H ++ ++#include "x86emu/types.h" ++ ++#if !defined(__GNUC__) || !(defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__)) ++#error This file is intended to be used by gcc on i386 or x86-64 system ++#endif ++ ++#if defined(__PIC__) && defined(__i386__) ++ ++#define X86EMU_HAS_HW_CPUID 1 ++static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d) ++{ ++ __asm__ __volatile__ ("pushl %%ebx \n\t" ++ "cpuid \n\t" ++ "movl %%ebx, %1 \n\t" ++ "popl %%ebx \n\t" ++ : "=a" (*a), "=r" (*b), ++ "=c" (*c), "=d" (*d) ++ : "a" (*a), "c" (*c) ++ : "cc"); ++} ++ ++#else // ! (__PIC__ && __i386__) ++ ++#define X86EMU_HAS_HW_CPUID 1 ++static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d) ++{ ++ __asm__ __volatile__ ("cpuid" ++ : "=a" (*a), "=b" (*b), ++ "=c" (*c), "=d" (*d) ++ : "a" (*a), "c" (*c) ++ : "cc"); ++} ++ ++#endif // __PIC__ && __i386__ ++ ++ ++#endif // __X86EMU_PRIM_X86_GCC_H +-- +1.5.3.7.1150.g149d432 + --- xorg-server-1.4.1~git20080131.orig/debian/patches/146_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch +++ xorg-server-1.4.1~git20080131/debian/patches/146_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch @@ -0,0 +1,190 @@ +From 6061612987ebba7ca65835e658b8d969be13a22d Mon Sep 17 00:00:00 2001 +From: Bart Trojanowski +Date: Fri, 11 Jan 2008 11:52:59 -0500 +Subject: [PATCH] X86EMU: added blacklist for I/O port in 0-0xFF range + +Signed-off-by: Bart Trojanowski + +Work funded by: Symbio Technologies + +There seems to be an inconsistency between what the x86emu gets from the +PCI handling code and by accessing hardware directly. x86emu relies on +a set of functions to emulate PCI access. When things goes wrong, the +emulator is asked to execute an OUT instruction on port 0x20. + +I've put together a patch against xserver-xorg package that prevents +accesses to BAD registers. This turns a freeze into a segfault in X. + +http://www.jukie.net/~bart/patches/xorg-server/20080111/0001-X86EMU- +added-blacklist-for-I-O-port-in-0-0xFF-range.patch + +It does not address the DDC not working, I hope that after fixing the +bugs in x86emu, things may improve. + +Anyway, I am continuing to investigate the real cause of the PCI access +issue. To find out more read this thread: + +http://lists.freedesktop.org/archives/xorg/2008-January/031811.html + +-Bart + + +diff -Nurp xorg-server-1.4.1~git20080118/hw/xfree86/int10/helper_exec.c xorg-server-1.4.1~git20080118-working/hw/xfree86/int10/helper_exec.c +--- xorg-server-1.4.1~git20080118/hw/xfree86/int10/helper_exec.c 2008-01-18 13:23:40.000000000 -0800 ++++ xorg-server-1.4.1~git20080118-working/hw/xfree86/int10/helper_exec.c 2008-01-22 09:53:27.000000000 -0800 +@@ -21,6 +21,8 @@ + #define PRINT_PORT 0 + + #include ++#include ++#include + + #include + #include "xf86.h" +@@ -210,6 +212,72 @@ stack_trace(xf86Int10InfoPtr pInt) + xf86ErrorFVerb(3, "\n"); + } + ++enum port_action_e { ++ PORT_ACTION_PERMIT, ++ PORT_ACTION_WARN, ++ PORT_ACTION_BAIL, ++ PORT_ACTION_MAX ++}; ++ ++static const struct port_range { ++ CARD16 start, end; ++ enum port_action_e access; ++} port_range_table[] = { ++ // NOTE: port ranges are non overlapping and sorted ++ { 0x00, 0x1f, PORT_ACTION_BAIL }, // DMA ++ { 0x20, 0x21, PORT_ACTION_BAIL }, // PIC ++ { 0x40, 0x47, PORT_ACTION_BAIL }, // PIT 1&2 ++ { 0x50, 0x53, PORT_ACTION_BAIL }, ++ { 0x70, 0x77, PORT_ACTION_BAIL }, // CMOS/RTC ++ { 0x81, 0x8f, PORT_ACTION_BAIL }, // DIAG REGS ++ { 0xa0, 0xa1, PORT_ACTION_BAIL }, // PIC2 ++ { 0xc0, 0xdf, PORT_ACTION_BAIL }, // DMA ++}; ++#define ARRAY_SIZE(X) (sizeof((X)) / (sizeof(*(X)))) ++#define ARRAY_END(X) (&((X)[ARRAY_SIZE(X)])) ++ ++static void assert_port_access_allowed (CARD16 port, CARD16 width) ++{ ++ CARD16 access_start, access_end; ++ const struct port_range *pr, *pr_start, *pr_end; ++ ++ access_start = port; ++ access_end = port + width - 1; ++ ++ // TODO: if the list gets too long we should do a binary search ++ // or convert the port list to a bitmap representation ++ pr_start = port_range_table; ++ pr_end = ARRAY_END(port_range_table); ++ ++ for (pr = pr_start; pr < pr_end; pr++) { ++ if (access_end < pr->start) ++ continue; ++ if (access_start > pr->end) ++ break; ++ ++ // we are in the pr range now ++ switch (pr->access) { ++ default: ++ continue; ++ case PORT_ACTION_BAIL: ++ case PORT_ACTION_WARN: ++ break; ++ } ++ ++ ErrorF("Emulator asked to make a suspect %saccess to " ++ "port %u (0x%04x)%s\n", ++ (width == 1) ? "byte " : ++ (width == 2) ? "word " : ++ (width == 4) ? "long " : "", ++ port, port, ++ (pr->access == PORT_ACTION_BAIL) ++ ? "; terminating." : "ignoring."); ++ ++ if (pr->access == PORT_ACTION_BAIL) ++ kill(getpid(), SIGSEGV); ++ } ++} ++ + int + port_rep_inb(xf86Int10InfoPtr pInt, + CARD16 port, CARD32 base, int d_f, CARD32 count) +@@ -319,7 +387,7 @@ x_inb(CARD16 port) + ErrorF(" inb(%#x) = %2.2x\n", port, val); + #ifdef __NOT_YET__ + } else if (port < 0x0100) { /* Don't interfere with mainboard */ +- val = 0; ++ val = 0; + xf86DrvMsgVerb(Int10Current->scrnIndex, X_NOT_IMPLEMENTED, 2, + "inb 0x%4.4x\n", port); + if (xf86GetVerbosity() > 3) { +@@ -327,10 +395,14 @@ x_inb(CARD16 port) + stack_trace(Int10Current); + } + #endif /* __NOT_YET__ */ +- } else if (!pciCfg1inb(port, &val)) { +- val = inb(Int10Current->ioBase + port); +- if (PRINT_PORT && DEBUG_IO_TRACE()) +- ErrorF(" inb(%#x) = %2.2x\n", port, val); ++ } else { ++ assert_port_access_allowed (port, sizeof(val)); ++ ++ if (!pciCfg1inb(port, &val)) { ++ val = inb(Int10Current->ioBase + port); ++ if (PRINT_PORT && DEBUG_IO_TRACE()) ++ ErrorF(" inb(%#x) = %2.2x\n", port, val); ++ } + } + return val; + } +@@ -349,10 +421,14 @@ x_inw(CARD16 port) + */ + X_GETTIMEOFDAY(&tv); + val = (CARD16)(tv.tv_usec / 3); +- } else if (!pciCfg1inw(port, &val)) { +- val = inw(Int10Current->ioBase + port); +- if (PRINT_PORT && DEBUG_IO_TRACE()) +- ErrorF(" inw(%#x) = %4.4x\n", port, val); ++ } else { ++ assert_port_access_allowed (port, sizeof(val)); ++ ++ if (!pciCfg1inw(port, &val)) { ++ val = inw(Int10Current->ioBase + port); ++ if (PRINT_PORT && DEBUG_IO_TRACE()) ++ ErrorF(" inw(%#x) = %4.4x\n", port, val); ++ } + } + return val; + } +@@ -384,6 +460,8 @@ x_outb(CARD16 port, CARD8 val) + } else if (!pciCfg1outb(port, val)) { + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" outb(%#x, %2.2x)\n", port, val); ++ ++ assert_port_access_allowed (port, sizeof(val)); + outb(Int10Current->ioBase + port, val); + } + } +@@ -404,6 +482,8 @@ x_inl(CARD16 port) + { + CARD32 val; + ++ assert_port_access_allowed (port, sizeof(val)); ++ + if (!pciCfg1in(port, &val)) { + val = inl(Int10Current->ioBase + port); + if (PRINT_PORT && DEBUG_IO_TRACE()) +@@ -418,6 +498,8 @@ x_outl(CARD16 port, CARD32 val) + if (!pciCfg1out(port, val)) { + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" outl(%#x, %8.8x)\n", port, val); ++ ++ assert_port_access_allowed (port, sizeof(val)); + outl(Int10Current->ioBase + port, val); + } + } --- xorg-server-1.4.1~git20080131.orig/debian/patches/152_xserver_exa_force_greedy.patch +++ xorg-server-1.4.1~git20080131/debian/patches/152_xserver_exa_force_greedy.patch @@ -0,0 +1,32 @@ +diff -Nurp xorg-server-patched/exa/exa.c xorg-server-working/exa/exa.c +--- xorg-server-patched/exa/exa.c 2008-02-19 11:16:26.000000000 -0800 ++++ xorg-server-working/exa/exa.c 2008-02-19 11:48:42.000000000 -0800 +@@ -643,6 +643,11 @@ exaDriverInit (ScreenPtr pScreen, + pScreen->devPrivates[exaScreenPrivateIndex].ptr = (pointer) pExaScr; + + pExaScr->migration = ExaMigrationAlways; ++ if (pScreenInfo->flags & EXA_MIGRATION_GREEDY) { ++ pExaScr->migration = ExaMigrationGreedy; ++ LogMessage(X_INFO, "EXA(%d): Forcing greedy migration option\n", ++ pScreen->myNum); ++ } + + exaDDXDriverInit(pScreen); + +diff -Nurp xorg-server-patched/exa/exa.h xorg-server-working/exa/exa.h +--- xorg-server-patched/exa/exa.h 2008-02-19 11:16:26.000000000 -0800 ++++ xorg-server-working/exa/exa.h 2008-02-19 11:19:36.000000000 -0800 +@@ -695,6 +695,13 @@ typedef struct _ExaDriver { + * (right-to-left, bottom-to-top). + */ + #define EXA_TWO_BITBLT_DIRECTIONS (1 << 2) ++ ++/** ++ * EXA_MIGRATION_GREEDY indicates to EXA that the driver prefers to ++ * use the "greedy" migration heuristic. This is to work around ++ * issues with EXA on the Intel 965 chipset. (LP: #177492) ++ */ ++#define EXA_MIGRATION_GREEDY (1 << 3) + /** @} */ + + ExaDriverPtr --- xorg-server-1.4.1~git20080131.orig/debian/patches/153_exa_skip_empty_glyphs.diff +++ xorg-server-1.4.1~git20080131/debian/patches/153_exa_skip_empty_glyphs.diff @@ -0,0 +1,20 @@ +From ce50bfd3369686cfecee5a138bd84ef1107a249d Mon Sep 17 00:00:00 2001 +From: Michel Dänzer +Date: Thu, 18 Oct 2007 15:44:48 +0000 +Subject: EXA: Skip empty glyphs. + +--- +diff --git a/exa/exa_render.c b/exa/exa_render.c +index 65e67d8..cc2f59d 100644 +--- a/exa/exa_render.c ++++ b/exa/exa_render.c +@@ -1246,6 +1246,7 @@ exaGlyphs (CARD8 op, + y1 = y - glyph->info.y; + + if (x1 >= pCmpDrw->width || y1 >= pCmpDrw->height || ++ glyph->info.width == 0 || glyph->info.height == 0 || + (x1 + glyph->info.width) <= 0 || (y1 + glyph->info.height) <= 0) + goto nextglyph; + +-- +cgit v0.7.2-37-g538c --- xorg-server-1.4.1~git20080131.orig/debian/patches/41_vbe_filter_less.diff +++ xorg-server-1.4.1~git20080131/debian/patches/41_vbe_filter_less.diff @@ -0,0 +1,46 @@ +* Fri Sep 22 2006 Adam Jackson 1.1.1-41.fc6 +- xorg-x11-server-1.1.1-vbe-filter-less.patch: Be gentler about rejecting + VESA modes early, since xf86ValidateModes should handle them just fine. + +http://cvs.fedora.redhat.com/viewcvs/devel/xorg-x11-server/xorg-x11-server-1.1.1-vbe-filter-less.patch?rev=1.1&view=auto +Debian bug #424684 (and maybe #428711) + +Index: xorg-server/hw/xfree86/vbe/vbeModes.c +=================================================================== +--- xorg-server.orig/hw/xfree86/vbe/vbeModes.c 2007-07-05 17:55:24.000000000 +0200 ++++ xorg-server/hw/xfree86/vbe/vbeModes.c 2007-07-05 17:57:01.000000000 +0200 +@@ -152,34 +152,6 @@ + xf86ErrorFVerb(DEBUG_VERB, "*"); + } + +- /* +- * Check if there's a valid monitor mode that this one can be matched +- * up with. The actual matching is done later. +- */ +- if (modeOK) { +- Bool sizeMatch = FALSE; +- modeOK = FALSE; +- for (p = pScrn->monitor->Modes; p != NULL; p = p->next) { +- if ((p->HDisplay != mode->XResolution) || +- (p->VDisplay != mode->YResolution) || +- (p->Flags & (V_INTERLACE | V_DBLSCAN | V_CLKDIV2))) +- continue; +- sizeMatch = TRUE; +- /* XXX could support the various V_ flags */ +- status = xf86CheckModeForMonitor(p, pScrn->monitor); +- if (status == MODE_OK) { +- modeOK = TRUE; +- break; +- } +- } +- if (sizeMatch && !modeOK) { +- xf86DrvMsg(pScrn->scrnIndex, X_INFO, +- "Not using built-in mode \"%dx%d\" (%s)\n", +- mode->XResolution, mode->YResolution, +- xf86ModeStatusToString(status)); +- } +- } +- + xf86ErrorFVerb(DEBUG_VERB, + "Mode: %x (%dx%d)\n", id, mode->XResolution, mode->YResolution); + xf86ErrorFVerb(DEBUG_VERB, --- xorg-server-1.4.1~git20080131.orig/debian/patches/08_better_dpms_logging.diff +++ xorg-server-1.4.1~git20080131/debian/patches/08_better_dpms_logging.diff @@ -0,0 +1,31 @@ +Index: xorg-server/hw/xfree86/common/xf86DPMS.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86DPMS.c 2008-01-07 20:19:47.000000000 -0500 ++++ xorg-server/hw/xfree86/common/xf86DPMS.c 2008-01-07 20:28:11.000000000 -0500 +@@ -61,6 +61,7 @@ + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + DPMSPtr pDPMS; + pointer DPMSOpt; ++ MessageType enabled_from = X_INFO; + + if (serverGeneration != DPMSGeneration) { + if ((DPMSIndex = AllocateScreenPrivateIndex()) < 0) +@@ -82,8 +83,8 @@ + = xf86SetBoolOption(pScrn->options, "dpms", FALSE)) + && !DPMSDisabledSwitch) + DPMSEnabled = TRUE; ++ enabled_from = X_CONFIG; + xf86MarkOptionUsed(DPMSOpt); +- xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n"); + } else if (DPMSEnabledSwitch) { + if (!DPMSDisabledSwitch) + DPMSEnabled = TRUE; +@@ -92,6 +93,8 @@ + else { + pDPMS->Enabled = defaultDPMSEnabled; + } ++ if (pDPMS->Enabled) ++ xf86DrvMsg(pScreen->myNum, enabled_from, "DPMS enabled\n"); + pDPMS->CloseScreen = pScreen->CloseScreen; + pScreen->CloseScreen = DPMSClose; + DPMSCount++; --- xorg-server-1.4.1~git20080131.orig/debian/patches/02_libvgahw_gcc4_volatile_fix.diff +++ xorg-server-1.4.1~git20080131/debian/patches/02_libvgahw_gcc4_volatile_fix.diff @@ -0,0 +1,70 @@ +gcc4 has issues with libvgahw.a. This patch is a workaround stolen from +https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=161242 (by Olivier +Baudron). See also Debian #318218 and bugs merged to it + +Index: xorg-server/hw/xfree86/vgahw/vgaHW.c +=================================================================== +--- xorg-server.orig/hw/xfree86/vgahw/vgaHW.c 2006-11-26 01:24:48.000000000 +0100 ++++ xorg-server/hw/xfree86/vgahw/vgaHW.c 2006-11-26 01:25:44.000000000 +0100 +@@ -434,12 +434,16 @@ + static void + mmioWriteAttr(vgaHWPtr hwp, CARD8 index, CARD8 value) + { ++ volatile CARD8 tmp; ++ + if (hwp->paletteEnabled) + index &= ~0x20; + else + index |= 0x20; + +- (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET); ++ /* gcc-4.0 -O2 is broken : needs a volatile assignment */ ++ tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET); ++ + moutb(VGA_ATTR_INDEX, index); + moutb(VGA_ATTR_DATA_W, value); + } +@@ -447,12 +451,16 @@ + static CARD8 + mmioReadAttr(vgaHWPtr hwp, CARD8 index) + { ++ volatile CARD8 tmp; ++ + if (hwp->paletteEnabled) + index &= ~0x20; + else + index |= 0x20; + +- (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET); ++ /* gcc-4.0 -O2 is broken : needs a volatile assignment */ ++ tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET); ++ + moutb(VGA_ATTR_INDEX, index); + return minb(VGA_ATTR_DATA_R); + } +@@ -472,7 +480,11 @@ + static void + mmioEnablePalette(vgaHWPtr hwp) + { +- (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET); ++ volatile CARD8 tmp; ++ ++ /* gcc-4.0 -O2 is broken : needs a volatile assignment */ ++ tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET); ++ + moutb(VGA_ATTR_INDEX, 0x00); + hwp->paletteEnabled = TRUE; + } +@@ -480,7 +492,11 @@ + static void + mmioDisablePalette(vgaHWPtr hwp) + { +- (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET); ++ volatile CARD8 tmp; ++ ++ /* gcc-4.0 -O2 is broken : needs a volatile assignment */ ++ tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET); ++ + moutb(VGA_ATTR_INDEX, 0x20); + hwp->paletteEnabled = FALSE; + } --- xorg-server-1.4.1~git20080131.orig/debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff +++ xorg-server-1.4.1~git20080131/debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff @@ -0,0 +1,131 @@ +https://bugs.freedesktop.org/show_bug.cgi?id=10625 + +From Keith Packard. +Prefers user-specified PreferredMode over EDID/BIOS specified preferred modes. +It should cause the config file to override the EDID/BIOS detected preferred modes. + +# modified: hw/xfree86/common/xf86str.h +# modified: hw/xfree86/modes/xf86Crtc.c +# modified: hw/xfree86/modes/xf86Crtc.h +# +diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h +index 086d2bf..31b6343 100644 +--- a/hw/xfree86/common/xf86str.h ++++ b/hw/xfree86/common/xf86str.h +@@ -132,6 +132,7 @@ typedef enum { + # define M_T_DEFAULT 0x10 /* (VESA) default modes */ + # define M_T_USERDEF 0x20 /* One of the modes from the config file */ + # define M_T_DRIVER 0x40 /* Supplied by the driver (EDID, etc) */ ++# define M_T_USERPREF 0x80 /* mode preferred by the user config */ + + /* Video mode */ + typedef struct _DisplayModeRec { +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index d375da8..7196a2e 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -711,7 +711,8 @@ xf86DefaultMode (xf86OutputPtr output, int width, int height) + for (mode = output->probed_modes; mode; mode = mode->next) + { + int dpi; +- int preferred = (mode->type & M_T_PREFERRED) != 0; ++ int preferred = (((mode->type & M_T_PREFERRED) != 0) + ++ ((mode->type & M_T_USERPREF) != 0)); + int diff; + + if (xf86ModeWidth (mode, output->initial_rotation) > width || +@@ -1415,7 +1416,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) + mode->prev = NULL; + output->probed_modes = mode; + } +- mode->type |= M_T_PREFERRED; ++ mode->type |= (M_T_PREFERRED|M_T_USERPREF); + } + else + mode->type &= ~M_T_PREFERRED; +@@ -1532,6 +1533,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); + int o, c; + DisplayModePtr target_mode = NULL; ++ int target_preferred = 0; + Rotation target_rotation = RR_Rotate_0; + xf86CrtcPtr *crtcs; + DisplayModePtr *modes; +@@ -1572,43 +1574,34 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + } + + /* +- * Let outputs with preferred modes drive screen size ++ * User preferred > preferred > other modes + */ + for (o = 0; o < config->num_output; o++) + { +- xf86OutputPtr output = config->output[o]; ++ xf86OutputPtr output = config->output[o]; ++ DisplayModePtr default_mode; ++ int default_preferred; + +- if (enabled[o] && +- xf86OutputHasPreferredMode (output, width, height)) ++ if (!enabled[o]) ++ continue; ++ default_mode = xf86DefaultMode (output, width, height); ++ if (!default_mode) ++ continue; ++ default_preferred = (((default_mode->type & M_T_PREFERRED) != 0) + ++ ((default_mode->type & M_T_USERPREF) != 0)); ++ if (default_preferred > target_preferred || !target_mode) + { +- target_mode = xf86DefaultMode (output, width, height); ++ target_mode = default_mode; ++ target_preferred = default_preferred; + target_rotation = output->initial_rotation; +- if (target_mode) +- { +- modes[o] = target_mode; +- config->compat_output = o; +- break; +- } +- } +- } +- if (!target_mode) +- { +- for (o = 0; o < config->num_output; o++) +- { +- xf86OutputPtr output = config->output[o]; +- if (enabled[o]) +- { +- target_mode = xf86DefaultMode (output, width, height); +- target_rotation = output->initial_rotation; +- if (target_mode) +- { +- modes[o] = target_mode; +- config->compat_output = o; +- break; +- } +- } ++ config->compat_output = o; + } + } ++ if (target_mode) ++ modes[config->compat_output] = target_mode; ++ /* ++ * Fill in other output modes ++ */ + for (o = 0; o < config->num_output; o++) + { + xf86OutputPtr output = config->output[o]; +diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h +index 9693e12..4c843cd 100644 +--- a/hw/xfree86/modes/xf86Crtc.h ++++ b/hw/xfree86/modes/xf86Crtc.h +@@ -39,6 +39,9 @@ + #ifndef M_T_DRIVER + #define M_T_DRIVER 0x40 + #endif ++#ifndef M_T_USERPREF ++#define M_T_USERPREF 0x80 ++#endif + #ifndef HARDWARE_CURSOR_ARGB + #define HARDWARE_CURSOR_ARGB 0x00004000 + #endif --- xorg-server-1.4.1~git20080131.orig/debian/patches/104_fedora_init_origins_fix.patch +++ xorg-server-1.4.1~git20080131/debian/patches/104_fedora_init_origins_fix.patch @@ -0,0 +1,27 @@ +Patch by krh@redhat.com: + + In a multihead setup, if only the first screen can be + initialized, but the second screen is mentioned first in the + ServerLayout section, the xf86InitOrigins() function will crash + because the screen referred to in the e.g. "RightOf" part is + non-existent. + +Index: a/hw/xfree86/common/xf86Cursor.c +=================================================================== +--- a/hw/xfree86/common/xf86Cursor.c.orig 2007-01-23 07:39:15.000000000 +0200 ++++ a/hw/xfree86/common/xf86Cursor.c 2007-02-08 15:45:02.000000000 +0200 +@@ -569,6 +569,14 @@ + + screen = &xf86ConfigLayout.screens[i]; + ++ if (screen->refscreen != NULL && ++ screen->refscreen->screennum >= xf86NumScreens) { ++ screensLeft &= ~(1 << i); ++ xf86Msg(X_WARNING, "Not including screen \"%s\" in origins calculation.\n", ++ screen->screen->id); ++ continue; ++ } ++ + switch(screen->where) { + case PosObsolete: + OldStyleConfig = TRUE; --- xorg-server-1.4.1~git20080131.orig/debian/patches/10_dont_look_in_home_for_config.diff +++ xorg-server-1.4.1~git20080131/debian/patches/10_dont_look_in_home_for_config.diff @@ -0,0 +1,12 @@ +Index: hw/xfree86/common/xf86Config.c +=================================================================== +--- hw/xfree86/common/xf86Config.c.orig 2007-08-16 22:47:18.000000000 -0400 ++++ hw/xfree86/common/xf86Config.c 2007-08-16 22:47:21.000000000 -0400 +@@ -92,7 +92,6 @@ + "/etc/X11/%R," "%P/etc/X11/%R," \ + "%E," "%F," \ + "/etc/X11/%F," "%P/etc/X11/%F," \ +- "%D/%X," \ + "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \ + "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \ + "%P/etc/X11/%X," \ --- xorg-server-1.4.1~git20080131.orig/debian/patches/150_edid_quirk_lp154w01.patch +++ xorg-server-1.4.1~git20080131/debian/patches/150_edid_quirk_lp154w01.patch @@ -0,0 +1,14 @@ +--- xorg-server-patched/hw/xfree86/modes/xf86EdidModes.c.orig 2008-02-14 17:21:03.000000000 -0800 ++++ xorg-server-patched/hw/xfree86/modes/xf86EdidModes.c 2008-02-14 17:22:43.000000000 -0800 +@@ -110,6 +110,11 @@ static Bool quirk_detailed_h_in_cm (int + DDC->vendor.prod_id == 0) + return TRUE; + ++ /* LP Bug #127827; "LGPhilipsLCD LP154W01-TLAE" */ ++ if (memcmp (DDC->vendor.name, "LPL", 4) == 0 && ++ DDC->vendor.prod_id == 10752) ++ return TRUE; ++ + /* Bug #11603: Funai Electronics PM36B */ + if (memcmp (DDC->vendor.name, "FCM", 4) == 0 && + DDC->vendor.prod_id == 13600) --- xorg-server-1.4.1~git20080131.orig/debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff +++ xorg-server-1.4.1~git20080131/debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff @@ -0,0 +1,36 @@ +Upstream commit 56f21bda1ce95741c88c423b60bd709eef26eb12 was supposed to +only avoid multiple scans of the PCI devices, but it actually also added +an "optimization" based on using sysfs files instead of /proc. However, +this code is broken, for instance because there are no ioctl handler on +/sys/bus/pci/devices/*/config files while there some on /proc/bus/pci/* + +It breaks the Xserver on architectures that require such ioctls to scan +the PCI devices and/or deal with PCI domains: +#422077: xserver-xorg: Fatal server error on sparc: xf86MapPciMem failed +#422095: xserver-xorg-core: fails to start on powerpc, no devices detected + +The following patch forces the server to behave as if we were running on +a 2.4 kernel while scanning PCI devices, so that the sysfs code is disabled. + +Upstream doesn't apply this patch since they want to fix the sysfs-code. +See https://bugs.freedesktop.org/show_bug.cgi?id=7248 + +Thanks to Jim Watson for testing! + +--- + hw/xfree86/os-support/bus/linuxPci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: xorg-server-1.3.0.0.dfsg/hw/xfree86/os-support/bus/linuxPci.c +=================================================================== +--- xorg-server-1.3.0.0.dfsg.orig/hw/xfree86/os-support/bus/linuxPci.c 2007-05-10 21:51:55.000000000 +0200 ++++ xorg-server-1.3.0.0.dfsg/hw/xfree86/os-support/bus/linuxPci.c 2007-05-10 21:52:13.000000000 +0200 +@@ -148,7 +148,7 @@ + int domain, bus, dev, func; + char file[64]; + struct stat ignored; +- static int is26 = -1; ++ static int is26 = 0; + + domain = PCI_DOM_FROM_TAG(tag); + bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)); --- xorg-server-1.4.1~git20080131.orig/debian/patches/120_fedora_xserver-xaa-evict-pixmaps.patch +++ xorg-server-1.4.1~git20080131/debian/patches/120_fedora_xserver-xaa-evict-pixmaps.patch @@ -0,0 +1,79 @@ +From fb3008787193b79909fe922577794f7d4a656922 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Thu, 1 Nov 2007 15:18:31 -0400 +Subject: [PATCH] Add pixmap eviction call for XAA. + +DRI drivers without zero-copy EXT_texture_from_pixmap need to copy the +texture image out of video memory to bind it. Ick. Add a hack to +evict XAA pixmaps and disable the pixmap cache when the first texture +is bound. +--- + GL/glx/glxdri.c | 16 ++++++++++++++++ + hw/xfree86/xaa/xaaInit.c | 24 ++++++++++++++++++++++++ + 2 files changed, 40 insertions(+), 0 deletions(-) + +diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c +index c0da07b..6c4faed 100644 +--- a/GL/glx/glxdri.c ++++ b/GL/glx/glxdri.c +@@ -360,6 +360,22 @@ __glXDRIbindTexImage(__GLXcontext *baseContext, + + pixmap = (PixmapPtr) glxPixmap->pDraw; + ++ if (!screen->texOffsetStart) { ++ /* When the GLX_EXT_texture_from_pixmap is used, as it's ++ * implemented here, we want to pull pixmap out of video memory ++ * and into host memory. */ ++ extern void XAAEvictPixmaps(void); ++ static int evictedPixmaps = 0; ++ ++ if (!evictedPixmaps) { ++ __glXDRIenterServer(GL_FALSE); ++ if (dlsym(RTLD_DEFAULT, "XAAEvictPixmaps")) ++ XAAEvictPixmaps(); ++ __glXDRIleaveServer(GL_FALSE); ++ evictedPixmaps = TRUE; ++ } ++ } ++ + if (screen->texOffsetStart && screen->driScreen.setTexOffset) { + __GLXpixmap **texOffsetOverride = screen->texOffsetOverride; + int i, firstEmpty = 16, texname; +diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c +index 4222425..602b525 100644 +--- a/hw/xfree86/xaa/xaaInit.c ++++ b/hw/xfree86/xaa/xaaInit.c +@@ -88,6 +88,30 @@ XAADestroyInfoRec(XAAInfoRecPtr infoRec) + xfree(infoRec); + } + ++void ++XAAEvictPixmaps(void) ++{ ++ XAAScreenPtr pScreenPriv; ++ XAAInfoRecPtr infoRec; ++ ScreenPtr pScreen; ++ int i; ++ ++ xf86MsgVerb(X_INFO, 3, "XAA: Evicting pixmaps\n"); ++ ++ for (i = 0; i < screenInfo.numScreens; i++) { ++ pScreen = screenInfo.screens[i]; ++ infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); ++ ++ pScreenPriv = pScreen->devPrivates[XAAScreenIndex].ptr; ++ infoRec = pScreenPriv->AccelInfoRec; ++ ++ infoRec->offscreenDepths = 0; ++ infoRec->Flags &= ~OFFSCREEN_PIXMAPS; ++ ++ XAAMoveOutOffscreenPixmaps(pScreen); ++ XAAInvalidatePixmapCache(pScreen); ++ } ++} + + Bool + XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) +-- +1.5.3.4 + --- xorg-server-1.4.1~git20080131.orig/debian/patches/147_X86EMU-pass-the-correct-bus-dev-fn-tag-to-pci-emula.patch +++ xorg-server-1.4.1~git20080131/debian/patches/147_X86EMU-pass-the-correct-bus-dev-fn-tag-to-pci-emula.patch @@ -0,0 +1,96 @@ +From 9c17439807c80876bf7027b17859714b31401ab9 Mon Sep 17 00:00:00 2001 +From: Bart Trojanowski +Date: Fri, 11 Jan 2008 19:59:54 -0500 +Subject: [PATCH] X86EMU: pass the correct bus:dev:fn tag to pci emulation + +Signed-off-by: Bart Trojanowski + +Work funded by: Symbio Technologies + +There seems to be an inconsistency between what the x86emu gets from the +PCI handling code and by accessing hardware directly. x86emu relies on +a set of functions to emulate PCI access. When things goes wrong, the +emulator is asked to execute an OUT instruction on port 0x20. + +I've put together a patch against xserver-xorg package that prevents +accesses to BAD registers. This turns a freeze into a segfault in X. + +http://www.jukie.net/~bart/patches/xorg-server/20080111/0001-X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch + +It does not address the DDC not working, I hope that after fixing the +bugs in x86emu, things may improve. + +Anyway, I am continuing to investigate the real cause of the PCI access +issue. To find out more read this thread: + +http://lists.freedesktop.org/archives/xorg/2008-January/031811.html + +-Bart + +diff -Nurp xorg-server-1.4.1~git20080118-patched/hw/xfree86/int10/helper_exec.c xorg-server-1.4.1~git20080118-working/hw/xfree86/int10/helper_exec.c +--- xorg-server-1.4.1~git20080118-patched/hw/xfree86/int10/helper_exec.c 2008-01-22 10:22:26.000000000 -0800 ++++ xorg-server-1.4.1~git20080118-working/hw/xfree86/int10/helper_exec.c 2008-01-22 11:00:52.000000000 -0800 +@@ -542,7 +542,8 @@ Mem_wl(CARD32 addr, CARD32 val) + + static CARD32 PciCfg1Addr = 0; + +-#define OFFSET(Cfg1Addr) (Cfg1Addr & 0xff) ++#define PCI_OFFSET(x) ((x) & 0x000000ff) ++#define PCI_TAG(x) ((x) & 0x00ffff00) + + static int + pciCfg1in(CARD16 addr, CARD32 *val) +@@ -552,7 +553,7 @@ pciCfg1in(CARD16 addr, CARD32 *val) + return 1; + } + if (addr == 0xCFC) { +- *val = pciReadLong(Int10Current->Tag, OFFSET(PciCfg1Addr)); ++ *val = pciReadLong(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr)); + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" cfg_inl(%#x) = %8.8x\n", PciCfg1Addr, *val); + return 1; +@@ -570,7 +571,7 @@ pciCfg1out(CARD16 addr, CARD32 val) + if (addr == 0xCFC) { + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" cfg_outl(%#x, %8.8x)\n", PciCfg1Addr, val); +- pciWriteLong(Int10Current->Tag, OFFSET(PciCfg1Addr), val); ++ pciWriteLong(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr), val); + return 1; + } + return 0; +@@ -588,7 +589,7 @@ pciCfg1inw(CARD16 addr, CARD16 *val) + } + if ((addr >= 0xCFC) && (addr <= 0xCFF)) { + offset = addr - 0xCFC; +- *val = pciReadWord(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset); ++ *val = pciReadWord(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr) + offset); + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" cfg_inw(%#x) = %4.4x\n", PciCfg1Addr + offset, *val); + return 1; +@@ -611,7 +612,7 @@ pciCfg1outw(CARD16 addr, CARD16 val) + offset = addr - 0xCFC; + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" cfg_outw(%#x, %4.4x)\n", PciCfg1Addr + offset, val); +- pciWriteWord(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset, val); ++ pciWriteWord(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr) + offset, val); + return 1; + } + return 0; +@@ -629,7 +630,7 @@ pciCfg1inb(CARD16 addr, CARD8 *val) + } + if ((addr >= 0xCFC) && (addr <= 0xCFF)) { + offset = addr - 0xCFC; +- *val = pciReadByte(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset); ++ *val = pciReadByte(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr) + offset); + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" cfg_inb(%#x) = %2.2x\n", PciCfg1Addr + offset, *val); + return 1; +@@ -652,7 +653,7 @@ pciCfg1outb(CARD16 addr, CARD8 val) + offset = addr - 0xCFC; + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" cfg_outb(%#x, %2.2x)\n", PciCfg1Addr + offset, val); +- pciWriteByte(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset, val); ++ pciWriteByte(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr) + offset, val); + return 1; + } + return 0; --- xorg-server-1.4.1~git20080131.orig/debian/patches/series +++ xorg-server-1.4.1~git20080131/debian/patches/series @@ -0,0 +1,61 @@ +001_ubuntu_add_extra_modelines_from_xorg.patch -p1 +02_libvgahw_gcc4_volatile_fix.diff +03_auto_load_driver.diff +04_auto_load_driver_no_conf.diff +05_kill_type1.diff +06_use_proc_instead_of_sysfs_for_pci_domains.diff +07_autoconfig_screen_with_device_section.diff +08_better_dpms_logging.diff +10_dont_look_in_home_for_config.diff -p0 +13_debian_add_xkbpath_env_variable.diff +14_default_screen_section.diff +21_glx_align_fixes.patch +40_default_dpi_96.patch +41_vbe_filter_less.diff +42_dont_break_grab_and_focus_for_window_when_redirecting.diff +43_allow_override_BIOS_EDID_preferred_mode.diff +44_preferredmode_infinite_loop.diff +45_only_XF86_APM_CAPABILITY_CHANGED_for_video_change_acpi_events.diff +#47_fbdevhw_magic_numbers.diff +51_xkb-and-loathing.diff +91_ttf2pt1 +91_ttf2pt1_updates +92_xprint-security-holes-fix.patch +93_spooltodir_check_file_exists +93_xprint_fonts_fix +101_fedora-apm-typedefs.patch +102_ubuntu_sharevts_load_cpu.patch +103_fedora_openchrome.patch +104_fedora_init_origins_fix.patch +105_reduce_wakeups_from_smart_scheduler.diff +106_ubuntu_fpic_libxf86config.patch +107_fedora_dont_backfill_bg_none.patch +108_fedora_honor_displaysize.patch +109_glx_fail_if_no_texture_bound.diff +110_fedora_no_move_damage.patch +120_fedora_xserver-xaa-evict-pixmaps.patch +121_only_switch_vt_when_active.diff +123_no_composite_for_xvfb_run.patch +133_psb_auto.patch +139_fedora_xserver-1.3.0-document-fontpath-correctly.patch +142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch +144_fedora_xserver-1.3.0-xnest-exposures.patch +146_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch +147_X86EMU-pass-the-correct-bus-dev-fn-tag-to-pci-emula.patch +148_dix_touchscreen_fixes.diff +149_add_quirks_for_physical_screen_size_issues.patch +150_edid_quirk_lp154w01.patch +151_x86emu_handle_cpuid.patch +152_xserver_exa_force_greedy.patch +153_exa_skip_empty_glyphs.diff +154_fix_rotation_for_multimon.diff +155_exa_fix_off-by-one.diff +156_resize_composite_overlay.diff +157_fix_exa_pixmap_width.diff +158_xkb_wrapping.diff +159_xkb_default_to_null.diff +160_default_to_intel.diff +161_fix_big_endian_cursor.diff +162_cve-2007-6429.diff +163_fix_untrusted_access.diff +164_fix_context_sharing.diff --- xorg-server-1.4.1~git20080131.orig/debian/patches/001_ubuntu_add_extra_modelines_from_xorg.patch +++ xorg-server-1.4.1~git20080131/debian/patches/001_ubuntu_add_extra_modelines_from_xorg.patch @@ -0,0 +1,63 @@ +--- foo/hw/xfree86/common/extramodes.orig 2005-03-28 14:40:18.784980424 +1000 ++++ bar/hw/xfree86/common/extramodes 2005-03-28 15:04:04.731203648 +1000 +@@ -7,27 +7,53 @@ + # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz + ModeLine "832x624" 57.284 832 864 928 1152 624 625 628 667 -Hsync -Vsync + ++# 1280x768 @ 60Hz (LCD native res) hsync: 47.70kHz ++ModeLine "1280x768" 80.14 1280 1344 1480 1680 768 769 772 795 ++ ++# 1280x800 @ 60Hz (LCD native res) hsync: 49.68kHz ++ModeLine "1280x800" 83.46 1280 1344 1480 1680 800 801 804 828 ++ + # 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz +-ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync ++ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync ++ ++# 1152x864 @ 85Hz (Red Hat custom modeline) ++ModeLine "1152x864" 121.5 1152 1216 1344 1568 864 865 868 911 +hsync -vsync + + # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz + ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync +vsync + ++# 1400x1050 @ 70Hz (Red Hat custom modeline) hsync: 76.8kHz ++ModeLine "1400x1050" 151.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync +vsync ++ + # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz + ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync +vsync + ++# 1400x1050 @ 85Hz (Red Hat custom modeline) hsync: 93.2 kHz ++ModeLine "1400x1050" 184.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync +vsync ++ ++# 1440x900 @ 100Hz (17" iMac LCD) hsync: 67 kHz ++ModeLine "1440x900" 108.84 1440 1472 1880 1912 900 918 927 946 +hsync +vsync ++ + # 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz +-Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync ++ModeLine "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync ++ ++# 1680x1050 @ 60Hz (LCD native res) hsync: 64.22kHz ++ModeLine "1680x1050" 147.14 1680 1784 1968 2256 1050 1051 1054 1087 ++ ++# 1920x1200 @ 60Hz (LCD native res) hsync: 74.52kHz ++ModeLine "1920x1200" 193.16 1920 2048 2256 2592 1200 1201 1204 1242 ++ ++# 1920x1200 @ 70Hz (Red Hat custom modeline - bugzilla #53364) hsync: 87.50 KHz ++ModeLine "1920x1200" 230.0 1920 1936 2096 2528 1200 1201 1204 1250 -HSync -VSync + + # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz +-Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync ++ModeLine "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync + + # 2048x1536 @ 60Hz (VESA GTF) hsync: 95.3kHz +-Modeline "2048x1536" 266.95 2048 2200 2424 2800 1536 1537 1540 1589 -hsync +vsync ++ModeLine "2048x1536" 266.95 2048 2200 2424 2800 1536 1537 1540 1589 -hsync +vsync + + # 2048x1536 @ 75Hz (VESA GTF) hsync: 120.2kHz +-Modeline "2048x1536" 340.48 2048 2216 2440 2832 1536 1537 1540 1603 -hsync +vsync ++ModeLine "2048x1536" 340.48 2048 2216 2440 2832 1536 1537 1540 1603 -hsync +vsync + + # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz +-Modeline "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync +- ++ModeLine "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync --- xorg-server-1.4.1~git20080131.orig/debian/patches/04_auto_load_driver_no_conf.diff +++ xorg-server-1.4.1~git20080131/debian/patches/04_auto_load_driver_no_conf.diff @@ -0,0 +1,28 @@ +Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-08-23 22:28:33.000000000 -0400 ++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-08-23 22:30:10.000000000 -0400 +@@ -220,22 +220,7 @@ + char *driver = NULL; + ConfigStatus ret; + +- /* Find the primary device, and get some information about it. */ +- if (xf86PciVideoInfo) { +- for (pciptr = xf86PciVideoInfo; (info = *pciptr); pciptr++) { +- if (xf86IsPrimaryPci(info)) { +- break; +- } +- } +- if (!info) { +- ErrorF("Primary device is not PCI\n"); +- } +- } else { +- ErrorF("xf86PciVideoInfo is not set\n"); +- } +- +- if (info) +- driver = videoPtrToDriverName(info); ++ driver = chooseVideoDriver(); + + AppendToConfig(BUILTIN_MODULE_SECTION); + AppendToConfig(BUILTIN_MONITOR_SECTION); --- xorg-server-1.4.1~git20080131.orig/debian/patches/142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch +++ xorg-server-1.4.1~git20080131/debian/patches/142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch @@ -0,0 +1,30 @@ +diff --git a/composite/compext.c b/composite/compext.c +index 4c25cc7..af05b4a 100644 +--- a/composite/compext.c ++++ b/composite/compext.c +@@ -678,6 +678,25 @@ CompositeExtensionInit (void) + ExtensionEntry *extEntry; + int s; + ++ for (s = 0; s < screenInfo.numScreens; s++) { ++ ScreenPtr pScreen = screenInfo.screens[s]; ++ VisualPtr vis; ++ ++ /* Composite on 8bpp pseudocolor root windows appears to fail, so ++ * just disable it on anything pseudocolor for safety. ++ */ ++ for (vis = pScreen->visuals; vis->vid != pScreen->rootVisual; vis++) ++ ; ++ if ((vis->class | DynamicClass) == PseudoColor) ++ return; ++ ++ /* Ensure that Render is initialized, which is required for automatic ++ * compositing. ++ */ ++ if (GetPictureScreenIfSet(pScreen) == NULL) ++ return; ++ } ++ + CompositeClientWindowType = CreateNewResourceType (FreeCompositeClientWindow); + if (!CompositeClientWindowType) + return; --- xorg-server-1.4.1~git20080131.orig/debian/patches/103_fedora_openchrome.patch +++ xorg-server-1.4.1~git20080131/debian/patches/103_fedora_openchrome.patch @@ -0,0 +1,24 @@ +From 59681e08381f8ca83263a6313b43905909e68583 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Wed, 28 Nov 2007 12:09:16 -0500 +Subject: [PATCH] via -> openchrome + +--- + hw/xfree86/common/xf86AutoConfig.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c +index c6e1972..da6c3f3 100644 +--- a/hw/xfree86/common/xf86AutoConfig.c ++++ b/hw/xfree86/common/xf86AutoConfig.c +@@ -184,7 +184,7 @@ videoPtrToDriverName(struct pci_device *dev) + case 0x3d3d: return "glint"; + case 0x1023: return "trident"; + case 0x100c: return "tseng"; +- case 0x1106: return "via"; ++ case 0x1106: return "openchrome"; + case 0x15ad: return "vmware"; + default: break; + } +-- +1.5.3.4 --- xorg-server-1.4.1~git20080131.orig/debian/patches/09_debian_xserver_rtff.diff +++ xorg-server-1.4.1~git20080131/debian/patches/09_debian_xserver_rtff.diff @@ -0,0 +1,52 @@ +$Id: 910_debian_Xserver_RTFF.diff 486 2005-08-03 04:51:11Z dnusinow $ + +Give the user a far stronger clue as to what to do when their font configuration +is horribly screwed up; this patch by Branden Robinson. + +Index: dix/main.c +=================================================================== +--- dix/main.c.orig 2006-11-13 19:59:22.000000000 +0100 ++++ dix/main.c 2006-11-26 01:55:13.000000000 +0100 +@@ -407,10 +407,42 @@ + defaultFontPath); + } + if (!SetDefaultFont(defaultTextFont)) ++#ifdef DEBIAN ++ FatalError("could not open default font '%s';\n" ++"the X server's font paths might be misconfigured, remote font server(s)\n" ++"may be unreachable, and/or local fonts may not be installed or are not\n" ++"configured correctly.\n" ++"\n" ++"People inexperienced with the X Window System should have the\n" ++"\"xorg\" package installed.\n" ++"# apt-get install xorg\n" ++"\n" ++"Other useful commands to run include:\n" ++"$ dpkg --status x11-common\n" ++"$ dpkg --status xfonts-base\n" ++"$ zmore /usr/share/doc/x11-common/FAQ.gz", defaultTextFont); ++#else + FatalError("could not open default font '%s'", defaultTextFont); ++#endif + if (!(rootCursor = CreateRootCursor(defaultCursorFont, 0))) ++#ifdef DEBIAN ++ FatalError("could not open default cursor font '%s';\n" ++"the X server's font paths might be misconfigured, remote font server(s)\n" ++"may be unreachable, and/or local fonts may not be installed or are not\n" ++"configured correctly.\n" ++"\n" ++"People inexperienced with the X Window System should have the\n" ++"\"xorg\" package installed.\n" ++"# apt-get install xorg\n" ++"\n" ++"Other useful commands to run include:\n" ++"$ dpkg --status x11-common\n" ++"$ dpkg --status xfonts-base\n" ++"$ zmore /usr/share/doc/x11-common/FAQ.gz", defaultTextFont); ++#else + FatalError("could not open default cursor font '%s'", + defaultCursorFont); ++#endif + #ifdef DPMSExtension + /* check all screens, looking for DPMS Capabilities */ + DPMSCapableFlag = DPMSSupported(); --- xorg-server-1.4.1~git20080131.orig/debian/patches/91_ttf2pt1_updates +++ xorg-server-1.4.1~git20080131/debian/patches/91_ttf2pt1_updates @@ -0,0 +1,39 @@ +diff -ruN xserver-old/hw/xprint/extras/ttf2pt1/ft.c xorg-server/hw/xprint/extras/ttf2pt1/ft.c +--- xorg-server-old/hw/xprint/extras/ttf2pt1/ft.c 2006-06-27 13:14:02.000000000 +1000 ++++ xorg-server/hw/xprint/extras/ttf2pt1/ft.c 2006-06-27 13:18:56.000000000 +1000 +@@ -36,15 +36,15 @@ + + #ifdef XP_PSTEXT + #include "os.h" +-#include "Xproto.h" +-#include "font.h" +-#include "fontstruct.h" +-#include "fntfilst.h" +-#include "fontutil.h" +-#include "fontenc.h" +-#include "ft.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#include + #define NOT_IN_FTFUNCS +-#include "ftfuncs.h" ++#include + #endif /* XP_PSTEXT */ + + #include "pt1.h" +diff -ruN xorg-server-old/hw/xprint/extras/ttf2pt1/ttf2pt1.c xorg-server/hw/xprint/extras/ttf2pt1/ttf2pt1.c +--- xorg-server-old/hw/xprint/extras/ttf2pt1/ttf2pt1.c 2006-06-27 13:14:02.000000000 +1000 ++++ xorg-server/hw/xprint/extras/ttf2pt1/ttf2pt1.c 2006-06-27 13:15:49.000000000 +1000 +@@ -1698,7 +1698,7 @@ + + #ifdef XP_PSTEXT + FT_Face xp_pstext_ft_face = NULL; /* used by ft.c */ +-FontPtr xp_xtf = NULL; ++FTFontPtr xp_xtf = NULL; + const char *xp_psfontname = NULL; + unsigned long xp_font_block_offset = 0UL; + --- xorg-server-1.4.1~git20080131.orig/debian/patches/158_xkb_wrapping.diff +++ xorg-server-1.4.1~git20080131/debian/patches/158_xkb_wrapping.diff @@ -0,0 +1,62 @@ +diff --git a/include/xkbsrv.h b/include/xkbsrv.h +index ef99e94..040bb93 100644 +--- a/include/xkbsrv.h ++++ b/include/xkbsrv.h +@@ -237,6 +237,14 @@ typedef struct _XkbSrvLedInfo { + typedef struct + { + ProcessInputProc processInputProc; ++ /* If processInputProc is set to something different than realInputProc, ++ * UNWRAP and COND_WRAP will not touch processInputProc and update only ++ * realInputProc. This ensures that ++ * processInputProc == (frozen ? EnqueueEvent : realInputProc) ++ * ++ * WRAP_PROCESS_INPUT_PROC should only be called during initialization, ++ * since it may destroy this invariant. ++ */ + ProcessInputProc realInputProc; + DeviceUnwrapProc unwrapProc; + } xkbDeviceInfoRec, *xkbDeviceInfoPtr; +@@ -254,14 +262,14 @@ typedef struct + device->public.processInputProc = proc; \ + oldprocs->processInputProc = \ + oldprocs->realInputProc = device->public.realInputProc; \ +- if (proc != device->public.enqueueInputProc) \ +- device->public.realInputProc = proc; \ ++ device->public.realInputProc = proc; \ + oldprocs->unwrapProc = device->unwrapProc; \ + device->unwrapProc = unwrapproc; + + #define UNWRAP_PROCESS_INPUT_PROC(device, oldprocs, backupproc) \ +- backupproc = device->public.processInputProc; \ +- device->public.processInputProc = oldprocs->processInputProc; \ ++ backupproc = device->public.realInputProc; \ ++ if (device->public.processInputProc == device->public.realInputProc)\ ++ device->public.processInputProc = oldprocs->realInputProc; \ + device->public.realInputProc = oldprocs->realInputProc; \ + device->unwrapProc = oldprocs->unwrapProc; + +diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c +index 890cf42..8c72874 100644 +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -49,15 +49,14 @@ xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, + pointer data) + { + xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(device); +- ProcessInputProc tmp = device->public.processInputProc; +- ProcessInputProc dummy; /* unused, but neede for macro */ ++ ProcessInputProc backupproc; + if(xkbPrivPtr->unwrapProc) + xkbPrivPtr->unwrapProc = NULL; + +- UNWRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, dummy); ++ UNWRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, backupproc); + proc(device,data); +- WRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, +- tmp,xkbUnwrapProc); ++ COND_WRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, ++ backupproc,xkbUnwrapProc); + } + + --- xorg-server-1.4.1~git20080131.orig/debian/patches/157_fix_exa_pixmap_width.diff +++ xorg-server-1.4.1~git20080131/debian/patches/157_fix_exa_pixmap_width.diff @@ -0,0 +1,23 @@ +From bc2d516f16d94c805b4dfa8e5b9eef40ff0cbe98 Mon Sep 17 00:00:00 2001 +From: Eric Anholt +Date: Fri, 17 Aug 2007 19:14:16 +0000 +Subject: Fix overly-restrictive integer overflow check in EXA pixmap creation. + +The result was that at 32bpp, pixmaps of width 8192 or greater couldn't be +created, due to treating a pitch value as a width. +--- +diff --git a/exa/exa.c b/exa/exa.c +index aa42b92..b2faf2f 100644 +--- a/exa/exa.c ++++ b/exa/exa.c +@@ -253,7 +253,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth) + pExaScr->info->pixmapPitchAlign); + pExaPixmap->fb_size = pExaPixmap->fb_pitch * h; + +- if (pExaPixmap->fb_pitch > 32767) { ++ if (pExaPixmap->fb_pitch > 131071) { + fbDestroyPixmap(pPixmap); + return NULL; + } +-- +cgit v0.7.2-37-g538c --- xorg-server-1.4.1~git20080131.orig/debian/patches/109_glx_fail_if_no_texture_bound.diff +++ xorg-server-1.4.1~git20080131/debian/patches/109_glx_fail_if_no_texture_bound.diff @@ -0,0 +1,54 @@ +From 095850596114178119a8cc854716ce0cc6e05121 Mon Sep 17 00:00:00 2001 +From: Michel Dänzer +Date: Fri, 24 Aug 2007 11:04:48 +0000 +Subject: __glXDRIbindTexImage: Fail if no texture bound to pixmap's texture target. + +We would most likely crash somewhere in Mesa if we tried to continue in this +case. +--- +diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c +index 685683d..c1f3eb7 100644 +--- a/GL/glx/glxdri.c ++++ b/GL/glx/glxdri.c +@@ -374,17 +374,25 @@ __glXDRIbindTexImage(__GLXcontext *baseContext, + { + RegionPtr pRegion = NULL; + PixmapPtr pixmap; +- int bpp, override = 0; ++ int bpp, override = 0, texname; + GLenum format, type; + ScreenPtr pScreen = glxPixmap->pScreen; + __GLXDRIscreen * const screen = + (__GLXDRIscreen *) __glXgetActiveScreen(pScreen->myNum); + ++ CALL_GetIntegerv(GET_DISPATCH(), (glxPixmap->target == GL_TEXTURE_2D ? ++ GL_TEXTURE_BINDING_2D : ++ GL_TEXTURE_BINDING_RECTANGLE_NV, ++ &texname)); ++ ++ if (!texname) ++ return __glXError(GLXBadContextState); ++ + pixmap = (PixmapPtr) glxPixmap->pDraw; + + if (screen->texOffsetStart && screen->driScreen.setTexOffset) { + __GLXpixmap **texOffsetOverride = screen->texOffsetOverride; +- int i, firstEmpty = 16, texname; ++ int i, firstEmpty = 16; + + for (i = 0; i < 16; i++) { + if (texOffsetOverride[i] == glxPixmap) +@@ -409,11 +417,6 @@ alreadyin: + + glxPixmap->pDRICtx = &((__GLXDRIcontext*)baseContext)->driContext; + +- CALL_GetIntegerv(GET_DISPATCH(), (glxPixmap->target == GL_TEXTURE_2D ? +- GL_TEXTURE_BINDING_2D : +- GL_TEXTURE_BINDING_RECTANGLE_NV, +- &texname)); +- + if (texname == glxPixmap->texname) + return Success; + +-- +cgit v0.7.2-37-g538c --- xorg-server-1.4.1~git20080131.orig/debian/patches/144_fedora_xserver-1.3.0-xnest-exposures.patch +++ xorg-server-1.4.1~git20080131/debian/patches/144_fedora_xserver-1.3.0-xnest-exposures.patch @@ -0,0 +1,20 @@ +--- xorg-server-1.2.99.905/hw/xnest/Events.c.jx 2007-01-31 19:55:51.000000000 -0500 ++++ xorg-server-1.2.99.905/hw/xnest/Events.c 2007-04-09 18:42:51.000000000 -0400 +@@ -85,7 +85,7 @@ + while (XCheckIfEvent(xnestDisplay, &X, xnestExposurePredicate, NULL)) { + pWin = xnestWindowPtr(X.xexpose.window); + +- if (pWin) { ++ if (pWin && X.xexpose.width && X.xexpose.height) { + Box.x1 = pWin->drawable.x + wBorderWidth(pWin) + X.xexpose.x; + Box.y1 = pWin->drawable.y + wBorderWidth(pWin) + X.xexpose.y; + Box.x2 = Box.x1 + X.xexpose.width; +@@ -93,7 +93,7 @@ + + REGION_INIT(pWin->drawable.pScreen, &Rgn, &Box, 1); + +- miWindowExposures(pWin, &Rgn, NullRegion); ++ miSendExposures(pWin, &Rgn, Box.x2, Box.y2); + } + } + } --- xorg-server-1.4.1~git20080131.orig/debian/patches/42_dont_break_grab_and_focus_for_window_when_redirecting.diff +++ xorg-server-1.4.1~git20080131/debian/patches/42_dont_break_grab_and_focus_for_window_when_redirecting.diff @@ -0,0 +1,35 @@ +commit a6a7fadbb03ee99312dfb15ac478ab3c414c1c0b +Author: Kristian Høgsberg +Date: Wed Jan 16 20:24:11 2008 -0500 + + Don't break grab and focus state for a window when redirecting it. + + Composite uses an unmap/map cycle to trigger backing pixmap allocation + and cliprect recomputation when a window is redirected or unredirected. + To avoid protocol visible side effects, map and unmap events are + disabled temporarily. However, when a window is unmapped it is also + removed from grabs and loses focus, but these state changes are not + disabled. + + This change supresses the unmap side effects during the composite + unmap/map cycle and fixes this bug: + + http://bugzilla.gnome.org/show_bug.cgi?id=488264 + + where compiz would cause gnome-screensaver to lose its grab when + compiz unredirects the fullscreen lock window. + +diff --git a/dix/window.c b/dix/window.c +index 33cf76b..1ccf126 100644 +--- a/dix/window.c ++++ b/dix/window.c +@@ -2993,7 +2993,8 @@ UnrealizeTree( + } + #endif + (* Unrealize)(pChild); +- DeleteWindowFromAnyEvents(pChild, FALSE); ++ if (MapUnmapEventsEnabled(pWin)) ++ DeleteWindowFromAnyEvents(pChild, FALSE); + if (pChild->viewable) + { + #ifdef DO_SAVE_UNDERS --- xorg-server-1.4.1~git20080131.orig/debian/xserver-xfbdev.install +++ xorg-server-1.4.1~git20080131/debian/xserver-xfbdev.install @@ -0,0 +1 @@ +usr/bin/Xfbdev --- xorg-server-1.4.1~git20080131.orig/debian/serverminver +++ xorg-server-1.4.1~git20080131/debian/serverminver @@ -0,0 +1 @@ +2:1.4 --- xorg-server-1.4.1~git20080131.orig/debian/xprint-common-overrides +++ xorg-server-1.4.1~git20080131/debian/xprint-common-overrides @@ -0,0 +1,2 @@ +# xfonts-encodings is not a font package +xprint-common binary: package-depends-on-an-x-font-package depends: xfonts-encodings --- xorg-server-1.4.1~git20080131.orig/debian/xserver-xephyr.install +++ xorg-server-1.4.1~git20080131/debian/xserver-xephyr.install @@ -0,0 +1 @@ +usr/bin/Xephyr --- xorg-server-1.4.1~git20080131.orig/debian/compat +++ xorg-server-1.4.1~git20080131/debian/compat @@ -0,0 +1 @@ +4 --- xorg-server-1.4.1~git20080131.orig/debian/xprint-common.README.Debian +++ xorg-server-1.4.1~git20080131/debian/xprint-common.README.Debian @@ -0,0 +1,82 @@ +xprint for Debian +=========================== + +This package supplies Xprt, the Xprint server. It is able to work with the +mozilla printing system, allowing non-latin characters and MathML to be +printed, among other improvements over the default mozilla printing driver. + + +Running the Xprint server +----------------------- + +The Xprint server is started and stopped via /etc/init.d/xprint, +provided in package xprint-common. + +As of version 0.0.8, Xprint supports TrueType fonts. + +Xprint requires a print server such as lprng or CUPS to be installed. It +uses lpc or lpstat to identify available printers. + +The Xprint server is not registered in /etc/inetd.conf. If you require the use +of the Xprint server across a network, you will be responsible for +this yourself (use update-inetd to register the server). Note that +this question is not the same as using a networked printer via a local +Xprint server. The printers themselves are configured via /etc/cups/printers.conf, +/etc/printcap or similar, independently of Xprint. + + +----------------------------- +Xprint server will not start: +Error: could not open default font 'fixed' + +Some users have reported experiencing this problem, which prevents Xprt from +starting. We have not yet been able to precisely pinpoint the cause of the +problem. It appears to happen when some TrueType fonts are not correctly +installed. It may be that Xprt finds the bad fonts and quits working through +the font list, rather than simply ignoring the bad fonts as it ought to. Hence +Xprt does not manage to get to the font directory in the font list containing +the fixed fonts. + +Some users have reported a workaround in /etc/init.d/xprint: +In line 343, use + "sort -u -r" +instead of + "sort -u" + +This has not been patched in to the package since it does not actually fix +the problem, it simply provides an alternative means of (hopefully) finding a +fixed font, by reversing the order in which font directories are searched. + + + +Running Xprint clients +---------------------- + +Client programs such as mozilla will require the Xprint server to be +identified in variable XPSERVERLIST. This variable is automatically defined +for all X sessions in /etc/X11/Xsession.d/92xprint-xpserverlist.sh. If +required, the value for this variable can be obtained manually using +/etc/init.d/xprint, via "/etc/init.d/xprint get_xpserverlist". + +You may find it helpful to define your default printer, with, for example, + export LPDEST=lp +Unfortunately, default printers set within CUPS are not currently +recognised. + +You can test that Xprt is working by running xplsprinters. +xphelloworld prints a simple test page. Both these test programs are provided +by xprint, along with a handful of others. + + +Printing Problems +----------------- + +If you experience the problem that words are run together on the +printed page with no spaces between them, then please read +README.printing-problems for further instructions. + +This file also describes how to change the printer resolution settings if your +image on paper is printed too large or too small. + + + -- Drew Parsons , 17 Feb 2005 --- xorg-server-1.4.1~git20080131.orig/debian/xprint-overrides +++ xorg-server-1.4.1~git20080131/debian/xprint-overrides @@ -0,0 +1,2 @@ +# piss-off +xprint binary: description-starts-with-package-name --- xorg-server-1.4.1~git20080131.orig/debian/xserver-xorg-core.bug.script +++ xorg-server-1.4.1~git20080131/debian/xserver-xorg-core.bug.script @@ -0,0 +1,122 @@ +#!/bin/sh + +# $Id$ + +PATH="/sbin:$PATH" +CONFIG_DIR=/etc/X11 +SERVER_SYMLINK="$CONFIG_DIR/X" +XORGCONFIG="$CONFIG_DIR/xorg.conf" +CONFIG_AUX_DIR=/var/lib/x11 +SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.md5sum" +SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.roster" +XORGCONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XORGCONFIG##*/}.md5sum" +XORGCONFIG_ROSTER="$CONFIG_AUX_DIR/${XORGCONFIG##*/}.roster" + +exec >&3 + +if [ -e "$SERVER_SYMLINK_ROSTER" ]; then + printf "Contents of $SERVER_SYMLINK_ROSTER:\n" + cat "$SERVER_SYMLINK_ROSTER" +else + printf "$SERVER_SYMLINK_ROSTER does not exist.\n" +fi + +printf "\n" + +if [ -e "$SERVER_SYMLINK" ]; then + if [ -e "$SERVER_SYMLINK_CHECKSUM" ]; then + if [ "$(readlink "$SERVER_SYMLINK" | md5sum)" = \ + "$(cat "$SERVER_SYMLINK_CHECKSUM")" ]; then + printf "%s target unchanged from checksum in %s.\n" \ + "$SERVER_SYMLINK" "$SERVER_SYMLINK_CHECKSUM" + else + printf "%s target does not match checksum in %s.\n" \ + "$SERVER_SYMLINK" "$SERVER_SYMLINK_CHECKSUM" + fi + else + printf "$SERVER_SYMLINK_CHECKSUM does not exist.\n" + fi + printf "\n" + printf "X server symlink status:\n" + ls -dl "$SERVER_SYMLINK" + ls -dl "$(readlink "$SERVER_SYMLINK")" +else + printf "$SERVER_SYMLINK does not exist.\n" +fi + +if ! [ -L "$SERVER_SYMLINK" ]; then + printf "$SERVER_SYMLINK is not a symlink.\n" +fi + +if ! [ -x "$SERVER_SYMLINK" ]; then + printf "$SERVER_SYMLINK is not executable.\n" +fi + +printf "\n" + +if [ -e "$XORGCONFIG_ROSTER" ]; then + printf "Contents of $XORGCONFIG_ROSTER:\n" + cat "$XORGCONFIG_ROSTER" +else + printf "$XORGCONFIG_ROSTER does not exist.\n" +fi + +printf "\n" + +if which lspci > /dev/null 2>&1; then + printf "VGA-compatible devices on PCI bus:\n" + LC_ALL=C lspci | grep 'VGA compatible controller:' + LC_ALL=C lspci -n | grep 'Class 0300:' +else + printf "The lspci command was not found; not including PCI data.\n" +fi + +printf "\n" + +if [ -e "$XORGCONFIG" ]; then + if [ -e "$XORGCONFIG_CHECKSUM" ]; then + if [ "$(md5sum "$XORGCONFIG")" = "$(cat "$XORGCONFIG_CHECKSUM")" ]; then + printf "%s unchanged from checksum in %s.\n" "$XORGCONFIG" \ + "$XORGCONFIG_CHECKSUM" + else + printf "%s does not match checksum in %s.\n" "$XORGCONFIG" \ + "$XORGCONFIG_CHECKSUM" + fi + else + printf "$XORGCONFIG_CHECKSUM does not exist.\n" + fi + printf "\n" + printf "Xorg X server configuration file status:\n" + ls -dl "$XORGCONFIG" + printf "\n" + printf "Contents of $XORGCONFIG:\n" + iconv -c -t ascii "$XORGCONFIG" + printf "\n" +else + printf "$XORGCONFIG does not exist.\n" +fi + +printf "\n" + +XORG_LOGS=$(ls -dt /var/log/Xorg.*.log 2>/dev/null) + +if [ -n "$XORG_LOGS" ]; then + printf "Xorg X server log files on system:\n" + ls -dlrt /var/log/Xorg.*.log 2>/dev/null + printf "\n" + for LOG in $XORG_LOGS; do + if [ -f "$LOG" ]; then + printf "Contents of most recent Xorg X server log file\n" + printf "%s:\n" "$LOG" + cat "$LOG" + # the log files are large; only show the most recent + break + fi + done +else + printf "No Xorg X server log files found.\n" +fi + +printf "\n" + +# vim:set ai et sts=4 sw=4 tw=0: --- xorg-server-1.4.1~git20080131.orig/debian/xserver-xorg-core.install +++ xorg-server-1.4.1~git20080131/debian/xserver-xorg-core.install @@ -0,0 +1,17 @@ +etc/X11/xserver/SecurityPolicy +usr/lib/xorg/modules/*.so +usr/lib/xorg/modules/extensions/*.so +usr/lib/xorg/modules/fonts/* +usr/lib/xorg/modules/linux/*.so +usr/lib/xorg/modules/freebsd/*.so +usr/lib/xorg/modules/multimedia/*.so +usr/bin/Xorg +usr/share/man/man1/Xserver.1 +usr/share/man/man1/Xorg.1 +usr/share/man/man4/exa.4 +usr/share/man/man4/fbdevhw.4 +usr/share/man/man5/xorg.conf.5 +usr/bin/cvt +usr/bin/gtf +usr/share/man/man1/cvt.1 +usr/share/man/man1/gtf.1 --- xorg-server-1.4.1~git20080131.orig/debian/xsfbs/xsfbs.mk +++ xorg-server-1.4.1~git20080131/debian/xsfbs/xsfbs.mk @@ -0,0 +1,365 @@ +#!/usr/bin/make -f + +# Debian X Strike Force Build System (XSFBS): Make portion + +# Copyright 1996 Stephen Early +# Copyright 1997 Mark Eichin +# Copyright 1998-2005, 2007 Branden Robinson +# Copyright 2005 David Nusinow +# +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# Originally by Stephen Early +# Modified by Mark W. Eichin +# Modified by Adam Heath +# Modified by Branden Robinson +# Modified by Fabio Massimo Di Nitto +# Modified by David Nusinow +# Acknowledgements to Manoj Srivastava. + +# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. +export DH_OPTIONS + +# force quilt to not use ~/.quiltrc +QUILT = quilt --quiltrc /dev/null +# force QUILT_PATCHES to the default in case it is exported in the environment +QUILT_PATCHES = patches/ + +# Set up parameters for the upstream build environment. + +# Determine (source) package name from Debian changelog. +SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Source:' | awk '{print $$2}') + +# Determine package version from Debian changelog. +SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Version:' | awk '{print $$2}') + +# Determine upstream version number. +UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') + +# Determine the source version without the epoch for make-orig-tar-gz +NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') + +# Figure out who's building this package. +BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) + +# Find out if this is an official build; an official build has nothing but +# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the +# version number. Anything else indicates an unofficial build. +OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) + +# Set up parameters for the Debian build environment. + +# Determine our architecture. +BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) +# Work around some old-time dpkg braindamage. +BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) +# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. +ifdef DEB_HOST_ARCH + ARCH:=$(DEB_HOST_ARCH) +else + # dpkg-cross sets the ARCH environment variable; if set, use it. + ifdef ARCH + ARCH:=$(ARCH) + else + ARCH:=$(BUILD_ARCH) + endif +endif + +# $(STAMP_DIR) houses stamp files for complex targets. +STAMP_DIR:=stampdir + +# $(SOURCE_DIR) houses one or more source trees. +SOURCE_DIR:=build-tree + +# $(SOURCE_TREE) is the location of the source tree to be compiled. If there +# is more than one, others are found using this name plus a suffix to indicate +# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The +# "setup" target is responsible for creating such trees. +#SOURCE_TREE:=$(SOURCE_DIR)/xc +#FIXME We need to define this in our debian/rules file + +# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place +# their files. +DEBTREEDIR:=$(CURDIR)/debian/tmp + +# All "important" targets have four lines: +# 1) A target name that is invoked by a package-building tool or the user. +# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. +# 2) A line delcaring 1) as a phony target (".PHONY:"). +# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may +# depend on other targets. +# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the +# "$(STAMP_DIR)/" prefix is omitted. +# +# This indirection is needed so that the "stamp" files that signify when a rule +# is done can be located in a separate "stampdir". Recall that make has no way +# to know when a goal has been met for a phony target (like "build" or +# "install"). +# +# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" +# so that the target will not be run again. Removing the file will make Make +# run the target over. + +# All phony targets should be declared as dependencies of .PHONY, even if they +# do not have "($STAMP_DIR)/"-prefixed counterparts. + +# Define a harmless default rule to keep things from going nuts by accident. +.PHONY: default +default: + +# Set up the $(STAMP_DIR) directory. +.PHONY: stampdir +stampdir_targets+=stampdir +stampdir: $(STAMP_DIR)/stampdir +$(STAMP_DIR)/stampdir: + mkdir $(STAMP_DIR) + >$@ + +# Set up the package build directory as quilt expects to find it. +.PHONY: prepare +stampdir_targets+=prepare +prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches $(STAMP_DIR)/log +$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir + if [ ! -e $(STAMP_DIR)/patches ]; then \ + mkdir $(STAMP_DIR)/patches; \ + ln -s $(STAMP_DIR)/patches .pc; \ + echo 2 >$(STAMP_DIR)/patches/.version; \ + fi; \ + if [ ! -e $(STAMP_DIR)/log ]; then \ + mkdir $(STAMP_DIR)/log; \ + fi; \ + if [ -e debian/patches ] && [ ! -e patches ]; then \ + ln -s debian/patches patches; \ + fi; \ + >$@ + +# Apply all patches to the upstream source. +.PHONY: patch +stampdir_targets+=patch +patch: $(STAMP_DIR)/patch +$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare + if ! [ `which quilt` ]; then \ + echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ + exit 1; \ + fi; \ + if $(QUILT) next >/dev/null 2>&1; then \ + echo -n "Applying patches..."; \ + if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ + cat $(STAMP_DIR)/log/patch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/patch; \ + echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "No patches to apply"; \ + fi; \ + >$@ + +# Revert all patches to the upstream source. +.PHONY: unpatch +unpatch: + rm -f $(STAMP_DIR)/patch + @echo -n "Unapplying patches..."; \ + if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \ + if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "nothing to do."; \ + fi + +# Clean the generated maintainer scripts. +.PHONY: cleanscripts +cleanscripts: + rm -f $(STAMP_DIR)/genscripts + rm -f debian/*.config \ + debian/*.postinst \ + debian/*.postrm \ + debian/*.preinst \ + debian/*.prerm + +# Clean the package build tree. +.PHONY: xsfclean +xsfclean: cleanscripts unpatch + dh_testdir + rm -f .pc patches + rm -rf $(STAMP_DIR) $(SOURCE_DIR) + rm -rf imports + dh_clean debian/shlibs.local \ + debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \ + debian/po/pothead + +# Generate the debconf templates POT file header. +debian/po/pothead: debian/po/pothead.in + sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \ + -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@ + +# Update POT and PO files. +.PHONY: updatepo +updatepo: debian/po/pothead + debian/scripts/debconf-updatepo --pot-header=pothead --verbose + +# Use the MANIFEST files to determine whether we're shipping everything we +# expect to ship, and not shipping anything we don't expect to ship. +.PHONY: check-manifest +stampdir_targets+=check-manifest +check-manifest: $(STAMP_DIR)/check-manifest +$(STAMP_DIR)/check-manifest: $(STAMP_DIR)/install + # Compare manifests. + (cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) \ + >debian/MANIFEST.$(ARCH).new + # Construct MANIFEST files from MANIFEST.$(ARCH).in and + # MANIFEST.$(ARCH).all or MANIFEST.all. + if expr "$(findstring -DBuildFonts=NO,$(IMAKE_DEFINES))" \ + : "-DBuildFonts=NO" >/dev/null 2>&1; then \ + LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH); \ + else \ + if [ -e debian/MANIFEST.$(ARCH).all ]; then \ + LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \ + else \ + LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all >debian/MANIFEST.$(ARCH); \ + fi; \ + fi + # Confirm that the installed file list has not changed. + if [ -e debian/MANIFEST.$(ARCH) ]; then \ + if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then \ + diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new || DIFFSTATUS=$$?; \ + case $${DIFFSTATUS:-0} in \ + 0) ;; \ + 1) if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \ + echo 'MANIFEST check failed; ignoring problem because \$$IGNORE_MANIFEST_CHANGES set' >&2; \ + echo 'Please ensure that the package maintainer has an up-to-date version of the' >&2; \ + echo 'MANIFEST.$(ARCH).in file.' >&2; \ + else \ + echo 'MANIFEST check failed; please see debian/README' >&2; \ + exit 1; \ + fi; \ + ;; \ + *) echo "diff reported unexpected exit status $$DIFFSTATUS when performing MANIFEST check" >&2; \ + exit 1; \ + ;; \ + esac; \ + fi; \ + fi + >$@ + +# Because we build (and install) different files depending on whether or not +# any architecture-independent packages are being created, the list of files we +# expect to see will differ; see the discussion of the "build" target above. +.PHONY: check-manifest-arch check-manifest-indep +check-manifest-arch: IMAKE_DEFINES+= -DBuildSpecsDocs=NO -DBuildFonts=NO -DInstallHardcopyDocs=NO +check-manifest-arch: check-manifest +check-manifest-indep: check-manifest + +# Remove files from the upstream source tree that we don't need, or which have +# licensing problems. It must be run before creating the .orig.tar.gz. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: prune-upstream-tree +prune-upstream-tree: + # Ensure we're in the correct directory. + dh_testdir + grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf + +# Verify that there are no offsets or fuzz in the patches we apply. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: patch-audit +patch-audit: prepare unpatch + @echo -n "Auditing patches..."; \ + >$(STAMP_DIR)/log/patch; \ + FUZZY=; \ + while [ -n "$$($(QUILT) next)" ]; do \ + RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ + case "$$RESULT" in \ + succeeded) \ + echo "fuzzy patch: $$($(QUILT) top)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ + FUZZY=yes; \ + ;; \ + FAILED) \ + echo "broken patch: $$($(QUILT) next)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ + exit 1; \ + ;; \ + esac; \ + done; \ + if [ -n "$$FUZZY" ]; then \ + echo "there were fuzzy patches; please fix."; \ + exit 1; \ + else \ + echo "done."; \ + fi + +# Generate the maintainer scripts. +.PHONY: genscripts +stampdir_targets+=genscripts +genscripts: $(STAMP_DIR)/genscripts +$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir + for FILE in debian/*.config.in \ + debian/*.postinst.in \ + debian/*.postrm.in \ + debian/*.preinst.in \ + debian/*.prerm.in; do \ + if [ -e "$$FILE" ]; then \ + MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ + sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ + cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ + sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ + sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ + -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ + -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \ + <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ + rm $$MAINTSCRIPT.tmp; \ + fi; \ + done + # Validate syntax of generated shell scripts. + #sh debian/scripts/validate-posix-sh debian/*.config \ + # debian/*.postinst \ + # debian/*.postrm \ + # debian/*.preinst \ + # debian/*.prerm + >$@ + +# Generate the shlibs.local file. +debian/shlibs.local: + cat debian/*.shlibs >$@ + +SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) +INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) +SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +ifeq ($(PACKAGE),) +PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) +endif + +.PHONY: serverabi +serverabi: +ifeq ($(SERVERMINVERS),) + @echo error: xserver-xorg-dev needs to be installed + @exit 1 +else + echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars +endif + +include debian/xsfbs/xsfbs-autoreconf.mk + +# vim:set noet ai sts=8 sw=8 tw=0: --- xorg-server-1.4.1~git20080131.orig/debian/xsfbs/xsfbs.sh +++ xorg-server-1.4.1~git20080131/debian/xsfbs/xsfbs.sh @@ -0,0 +1,900 @@ +# $Id$ + +# This is the X Strike Force shell library for X Window System package +# maintainer scripts. It serves to define shell functions commonly used by +# such packages, and performs some error checking necessary for proper operation +# of those functions. By itself, it does not "do" much; the maintainer scripts +# invoke the functions defined here to accomplish package installation and +# removal tasks. + +# If you are reading this within a Debian package maintainer script (e.g., +# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can +# skip past this library by scanning forward in this file to the string +# "GOBSTOPPER". + +SOURCE_VERSION=@SOURCE_VERSION@ +OFFICIAL_BUILD=@OFFICIAL_BUILD@ + +# Use special abnormal exit codes so that problems with this library are more +# easily tracked down. +SHELL_LIB_INTERNAL_ERROR=86 +SHELL_LIB_THROWN_ERROR=74 +SHELL_LIB_USAGE_ERROR=99 + +# old -> new variable names +if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then + DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" +fi +if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then + DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" +fi + +# initial sanity checks +if [ -z "$THIS_PACKAGE" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of this package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +if [ -z "$THIS_SCRIPT" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of the +"$THIS_PACKAGE" package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +ARCHITECTURE="$(dpkg --print-installation-architecture)" + +if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then + RECONFIGURE="true" +else + RECONFIGURE= +fi + +if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then + FIRSTINST="yes" +fi + +if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then + UPGRADE="yes" +fi + +trap "message;\ + message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ + message;\ + exit 1" HUP INT QUIT TERM + +reject_nondigits () { + # syntax: reject_nondigits [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters other than decimal digits and barf if any are found + while [ -n "$1" ]; do + # does the operand contain anything but digits? + if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then + # can't use die(), because it wraps message() which wraps this function + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ + "possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +reject_whitespace () { + # syntax: reject_whitespace [ operand ] + # + # scan operand (typically a shell variable whose value cannot be trusted) for + # whitespace characters and barf if any are found + if [ -n "$1" ]; then + # does the operand contain any whitespace? + if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then + # can't use die(), because I want to avoid forward references + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \ + "possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + fi +} + +reject_unlikely_path_chars () { + # syntax: reject_unlikely_path_chars [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters unlikely to be seen in a path and which the shell might + # interpret and barf if any are found + while [ -n "$1" ]; do + # does the operand contain any funny characters? + if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then + # can't use die(), because I want to avoid forward references + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ + "encountered possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the +# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while +# the script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +message () { + # pretty-print messages of arbitrary length + reject_nondigits "$COLUMNS" + echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 +} + +observe () { + # syntax: observe message ... + # + # issue observational message suitable for logging someday when support for + # it exists in dpkg + if [ -n "$DEBUG_XORG_PACKAGE" ]; then + message "$THIS_PACKAGE $THIS_SCRIPT note: $*" + fi +} + +warn () { + # syntax: warn message ... + # + # issue warning message suitable for logging someday when support for + # it exists in dpkg; also send to standard error + message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" +} + +die () { + # syntax: die message ... + # + # exit script with error message + message "$THIS_PACKAGE $THIS_SCRIPT error: $*" + exit $SHELL_LIB_THROWN_ERROR +} + +internal_error () { + # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message + message "internal error: $*" + if [ -n "$OFFICIAL_BUILD" ]; then + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + fi + exit $SHELL_LIB_INTERNAL_ERROR +} + +usage_error () { + message "usage error: $*" + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + exit $SHELL_LIB_USAGE_ERROR +} + + +maplink () { + # returns what symlink should point to; i.e., what the "sane" answer is + # Keep this in sync with the debian/*.links files. + # This is only needed for symlinks to directories. + # + # XXX: Most of these look wrong in the X11R7 world and need to be fixed. + # If we've stopped using this function, fixing it might enable us to re-enable + # it again and catch more errors. + case "$1" in + /etc/X11/xkb/compiled) echo /var/lib/xkb ;; + /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;; + /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;; + /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;; + /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;; + /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;; + /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;; + /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;; + /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;; + /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;; + /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;; + /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;; + /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;; + /usr/bin/X11) echo ../X11R6/bin ;; + /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;; + /usr/include/X11) echo ../X11R6/include/X11 ;; + /usr/lib/X11) echo ../X11R6/lib/X11 ;; + *) internal_error "maplink() called with unknown path \"$1\"" ;; + esac +} + +analyze_path () { + # given a supplied set of pathnames, break each one up by directory and do an + # ls -dl on each component, cumulatively; i.e. + # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin + # Thanks to Randolph Chung for this clever hack. + + #local f g + + while [ -n "$1" ]; do + reject_whitespace "$1" + _g= + message "Analyzing $1:" + for _f in $(echo "$1" | tr / \ ); do + if [ -e /$_g$_f ]; then + ls -dl /$_g$_f /$_g$_f.dpkg-* 2> /dev/null || true + _g=$_g$_f/ + else + message "/$_g$_f: nonexistent; directory contents of /$_g:" + ls -l /$_g + break + fi + done + shift + done +} + +find_culprits () { + #local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ + # msg + + reject_whitespace "$1" + message "Searching for overlapping packages..." + _dpkg_info_dir=/var/lib/dpkg/info + if [ -d $_dpkg_info_dir ]; then + if [ "$(echo $_dpkg_info_dir/*.list)" != "$_dpkg_info_dir/*.list" ]; then + _possible_culprits=$(ls -1 $_dpkg_info_dir/*.list | egrep -v \ + "(xbase-clients|x11-common|xfs|xlibs)") + if [ -n "$_possible_culprits" ]; then + _smoking_guns=$(grep -l "$1" $_possible_culprits || true) + if [ -n "$_smoking_guns" ]; then + _bad_packages=$(printf "\\n") + for f in $_smoking_guns; do + # too bad you can't nest parameter expansion voodoo + p=${f%*.list} # strip off the trailing ".list" + _package=${p##*/} # strip off the directories + _bad_packages=$(printf "%s\n%s" "$_bad_packages" "$_package") + done + _msg=$(cat < /dev/null 2>&1; then + message "The readlink command was not found. Please install version" \ + "1.13.1 or later of the debianutils package." + readlink () { + # returns what symlink in $1 actually points to + perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1" + } +fi + +check_symlink () { + # syntax: check_symlink symlink + # + # See if specified symlink points where it is supposed to. Return 0 if it + # does, and 1 if it does not. + # + # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb(). + + #local symlink + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "check_symlink() called with wrong number of arguments;" \ + "expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + _symlink="$1" + + if [ "$(maplink "$_symlink")" = "$(readlink "$_symlink")" ]; then + return 0 + else + return 1 + fi +} + +check_symlinks_and_warn () { + # syntax: check_symlinks_and_warn symlink ... + # + # For each argument, check for symlink sanity, and warn if it isn't sane. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install". + + #local errmsg symlink + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "check_symlinks_and_warn() called with wrong number of" \ + "arguments; expected at least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + while [ -n "$1" ]; do + _symlink="$1" + if [ -L "$_symlink" ]; then + if ! check_symlink "$_symlink"; then + observe "$_symlink symbolic link points to wrong location" \ + "$(readlink "$_symlink"); removing" + rm "$_symlink" + fi + elif [ -e "$_symlink" ]; then + _errmsg="$_symlink exists and is not a symbolic link; this package cannot" + _errmsg="$_errmsg be installed until this" + if [ -f "$_symlink" ]; then + _errmsg="$_errmsg file" + elif [ -d "$_symlink" ]; then + _errmsg="$_errmsg directory" + else + _errmsg="$_errmsg thing" + fi + _errmsg="$_errmsg is removed" + die "$_errmsg" + fi + shift + done +} + +check_symlinks_and_bomb () { + # syntax: check_symlinks_and_bomb symlink ... + # + # For each argument, check for symlink sanity, and bomb if it isn't sane. + # + # Call this function from a postinst script. + + #local problem symlink + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "check_symlinks_and_bomb() called with wrong number of" + "arguments; expected at least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + while [ -n "$1" ]; do + _problem= + _symlink="$1" + if [ -L "$_symlink" ]; then + if ! check_symlink "$_symlink"; then + _problem=yes + warn "$_symlink symbolic link points to wrong location" \ + "$(readlink "$_symlink")" + fi + elif [ -e "$_symlink" ]; then + _problem=yes + warn "$_symlink is not a symbolic link" + else + _problem=yes + warn "$_symlink symbolic link does not exist" + fi + if [ -n "$_problem" ]; then + analyze_path "$_symlink" "$(readlink "$_symlink")" + find_culprits "$_symlink" + die "bad symbolic links on system" + fi + shift + done +} + +font_update () { + # run $UPDATECMDS in $FONTDIRS + + #local dir cmd shortcmd x_font_dir_prefix + + _x_font_dir_prefix="/usr/share/fonts/X11" + + if [ -z "$UPDATECMDS" ]; then + usage_error "font_update() called but \$UPDATECMDS not set" + fi + if [ -z "$FONTDIRS" ]; then + usage_error "font_update() called but \$FONTDIRS not set" + fi + + reject_unlikely_path_chars "$UPDATECMDS" + reject_unlikely_path_chars "$FONTDIRS" + + for _dir in $FONTDIRS; do + if [ -d "$_x_font_dir_prefix/$_dir" ]; then + for _cmd in $UPDATECMDS; do + if which "$_cmd" > /dev/null 2>&1; then + _shortcmd=${_cmd##*/} + observe "running $_shortcmd in $_dir font directory" + _cmd_opts= + if [ "$_shortcmd" = "update-fonts-alias" ]; then + _cmd_opts=--x11r7-layout + fi + if [ "$_shortcmd" = "update-fonts-dir" ]; then + _cmd_opts=--x11r7-layout + fi + if [ "$_shortcmd" = "update-fonts-scale" ]; then + _cmd_opts=--x11r7-layout + fi + $_cmd $_cmd_opts $_dir || warn "$_cmd $_cmd_opts $_dir" \ + "failed; font directory data may not" \ + "be up to date" + else + warn "$_cmd not found; not updating corresponding $_dir font" \ + "directory data" + fi + done + else + warn "$_dir is not a directory; not updating font directory data" + fi + done +} + +remove_conffile_prepare () { + # syntax: remove_conffile_prepare filename official_md5sum ... + # + # Check a conffile "filename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + #local conffile current_checksum + + # validate arguments + if [ $# -lt 2 ]; then + usage_error "remove_conffile_prepare() called with wrong number of" \ + "arguments; expected at least 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + _conffile="$1" + shift + + # does the _conffile even exist? + if [ -e "$_conffile" ]; then + # calculate its checksum + _current_checksum=$(md5sum < "$_conffile" | sed 's/[[:space:]].*//') + # compare it to each supplied checksum + while [ -n "$1" ]; do + if [ "$_current_checksum" = "$1" ]; then + # we found a match; move the confffile and stop looking + observe "preparing obsolete conffile $_conffile for removal" + mv "$_conffile" "$_conffile.$THIS_PACKAGE-tmp" + break + fi + shift + done + fi +} + +remove_conffile_commit () { + # syntax: remove_conffile_commit filename + # + # Complete the removal of a conffile "filename" that has become obsolete. + # + # Call this function from a postinst script after having used + # remove_conffile_prepare() in the preinst. + + #local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_commit() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + _conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, remove it + if [ -e "$_conffile.$THIS_PACKAGE-tmp" ]; then + observe "committing removal of obsolete conffile $_conffile" + rm "$_conffile.$THIS_PACKAGE-tmp" + fi +} + +remove_conffile_rollback () { + # syntax: remove_conffile_rollback filename + # + # Roll back the removal of a conffile "filename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" is after having used remove_conffile_prepare() in the + # preinst. + + #local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_rollback() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + _conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, move it + # back + if [ -e "$_conffile.$THIS_PACKAGE-tmp" ]; then + observe "rolling back removal of obsolete conffile $_conffile" + mv "$_conffile.$THIS_PACKAGE-tmp" "$_conffile" + fi +} + +replace_conffile_with_symlink_prepare () { + # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \ + # official_md5sum ... + # + # Check a conffile "oldfilename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. Otherwise copy it + # to newfilename and let dpkg handle it through conffiles mechanism. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + #local conffile current_checksum + + # validate arguments + if [ $# -lt 3 ]; then + usage_error "replace_conffile_with_symlink_prepare() called with wrong" \ + " number of arguments; expected at least 3, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + _oldconffile="$1" + shift + _newconffile="$1" + shift + + remove_conffile_prepare "$_oldconffile" "$@" + # If $_oldconffile still exists, then md5sums didn't match. + # Copy it to new one. + if [ -f "$_oldconffile" ]; then + cp "$_oldconffile" "$_newconffile" + fi + +} + +replace_conffile_with_symlink_commit () { + # syntax: replace_conffile_with_symlink_commit oldfilename + # + # Complete the removal of a conffile "oldfilename" that has been + # replaced by a symlink. + # + # Call this function from a postinst script after having used + # replace_conffile_with_symlink_prepare() in the preinst. + + #local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "replace_conffile_with_symlink_commit() called with wrong" \ + "number of arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + _conffile="$1" + + remove_conffile_commit "$_conffile" +} + +replace_conffile_with_symlink_rollback () { + # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename + # + # Roll back the replacing of a conffile "oldfilename" with symlink to + # "newfilename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" and verify $2 to ensure the package failed to upgrade + # from a version (or install over a version removed-but-not-purged) prior + # to the one in which the conffile was obsoleted. + # You should have used replace_conffile_with_symlink_prepare() in the + # preinst. + + #local conffile + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "replace_conffile_with_symlink_rollback() called with wrong" \ + "number of arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + _oldconffile="$1" + _newconffile="$2" + + remove_conffile_rollback "$_oldconffile" + if [ -f "$_newconffile" ]; then + rm "$_newconffile" + fi +} + +run () { + # syntax: run command [ argument ... ] + # + # Run specified command with optional arguments and report its exit status. + # Useful for commands whose exit status may be nonzero, but still acceptable, + # or commands whose failure is not fatal to us. + # + # NOTE: Do *not* use this function with db_get or db_metaget commands; in + # those cases the return value of the debconf command *must* be checked + # before the string returned by debconf is used for anything. + + #local retval + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "run() called with wrong number of arguments; expected at" \ + "least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + "$@" || _retval=$? + + if [ ${_retval:-0} -ne 0 ]; then + observe "command \"$*\" exited with status $_retval" + fi +} + +register_x_lib_dir_with_ld_so () { + # syntax: register_x_lib_dir_with_ld_so + # + # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared + # libraries. + # + # Call this function from the postinst script of a package that places a + # shared library in /usr/X11R6/lib, before invoking ldconfig. + + #local dir ldsoconf + + _dir="/usr/X11R6/lib" + _ldsoconf="/etc/ld.so.conf" + + # is the line not already present? + if ! fgrep -qsx "$_dir" "$_ldsoconf"; then + observe "adding $_dir directory to $_ldsoconf" + echo "$_dir" >> "$_ldsoconf" + fi +} + +deregister_x_lib_dir_with_ld_so () { + # syntax: deregister_x_lib_dir_with_ld_so + # + # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared + # libraries, if and only if no shared libaries remain there. + # + # Call this function from the postrm script of a package that places a shared + # library in /usr/X11R6/lib, in the event "$1" is "remove", and before + # invoking ldconfig. + + #local dir ldsoconf fgrep_status cmp_status + + _dir="/usr/X11R6/lib" + _ldsoconf="/etc/ld.so.conf" + + # is the line present? + if fgrep -qsx "$_dir" "$_ldsoconf"; then + # are there any shared objects in the directory? + if [ "$(echo "$_dir"/lib*.so.*.*)" = "$_dir/lib*.so.*.*" ]; then + # glob expansion produced nothing, so no shared libraries are present + observe "removing $_dir directory from $_ldsoconf" + # rewrite the file (very carefully) + set +e + fgrep -svx "$_dir" "$_ldsoconf" > "$_ldsoconf.dpkg-tmp" + _fgrep_status=$? + set -e + case $_fgrep_status in + 0|1) ;; # we don't actually care if any lines matched or not + *) die "error reading \"$_ldsoconf\"; fgrep exited with status" \ + "$_fgrep_status" ;; + esac + set +e + cmp -s "$_ldsoconf.dpkg-tmp" "$_ldsoconf" + _cmp_status=$? + set -e + case $_cmp_status in + 0) rm "$_ldsoconf.dpkg-tmp" ;; # files are identical + 1) mv "$_ldsoconf.dpkg-tmp" "$_ldsoconf" ;; # files differ + *) die "error comparing \"$_ldsoconf.dpkg-tmp\" to \"$_ldsoconf\";" \ + "cmp exited with status $_cmp_status" ;; + esac + fi + fi +} + +make_symlink_sane () { + # syntax: make_symlink_sane symlink target + # + # Ensure that the symbolic link symlink exists, and points to target. + # + # If symlink does not exist, create it and point it at target. + # + # If symlink exists but is not a symbolic link, back it up. + # + # If symlink exists, is a symbolic link, but points to the wrong location, fix + # it. + # + # If symlink exists, is a symbolic link, and already points to target, do + # nothing. + # + # This function wouldn't be needed if ln had an -I, --idempotent option. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "make_symlink_sane() called with wrong number of arguments;" \ + "expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + #local symlink target + + _symlink="$1" + _target="$2" + + if [ -L "$_symlink" ] && [ "$(readlink "$_symlink")" = "$_target" ]; then + observe "link from $_symlink to $_target already exists" + else + observe "creating symbolic link from $_symlink to $_target" + mkdir -p "${_target%/*}" "${_symlink%/*}" + ln -s -b -S ".dpkg-old" "$_target" "$_symlink" + fi +} + +migrate_dir_to_symlink () { + # syntax: migrate_dir_to_symlink old_location new_location + # + # Per Debian Policy section 6.5.4, "A directory will never be replaced by a + # symbolic link to a directory or vice versa; instead, the existing state + # (symlink or not) will be left alone and dpkg will follow the symlink if + # there is one." + # + # We have to do it ourselves. + # + # This function moves the contents of old_location, a directory, into + # new_location, a directory, then makes old_location a symbolic link to + # new_location. + # + # old_location need not exist, but if it does, it must be a directory (or a + # symlink to a directory). If it is not, it is backed up. If new_location + # exists already and is not a directory, it is backed up. + # + # This function should be called from a package's preinst so that other + # packages unpacked after this one --- but before this package's postinst runs + # --- are unpacked into new_location even if their payloads contain + # old_location filespecs. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "migrate_dir_to_symlink() called with wrong number of" + "arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local _new _old + + _old="$1" + _new="$2" + + # Is old location a symlink? + if [ -L "$_old" ]; then + # Does it already point to new location? + if [ "$(readlink "$_old")" = "$_new" ]; then + # Nothing to do; migration has already been done. + observe "migration of $_old to $_new already done" + return 0 + else + # Back it up. + warn "backing up symbolic link $_old as $_old.dpkg-old" + mv -b "$_old" "$_old.dpkg-old" + fi + fi + + # Does old location exist, but is not a directory? + if [ -e "$_old" ] && ! [ -d "$_old" ]; then + # Back it up. + warn "backing up non-directory $_old as $_old.dpkg-old" + mv -b "$_old" "$_old.dpkg-old" + fi + + observe "migrating $_old to $_new" + + # Is new location a symlink? + if [ -L "$_new" ]; then + # Does it point the wrong way, i.e., back to where we're migrating from? + if [ "$(readlink "$_new")" = "$_old" ]; then + # Get rid of it. + observe "removing symbolic link $_new which points to $_old" + rm "$_new" + else + # Back it up. + warn "backing up symbolic link $_new as $_new.dpkg-old" + mv -b "$_new" "$_new.dpkg-old" + fi + fi + + # Does new location exist, but is not a directory? + if [ -e "$_new" ] && ! [ -d "$_new" ]; then + warn "backing up non-directory $_new as $_new.dpkg-old" + mv -b "$_new" "$_new.dpkg-old" + fi + + # Create new directory if it does not yet exist. + if ! [ -e "$_new" ]; then + observe "creating $_new" + mkdir -p "$_new" + fi + + # Copy files in old location to new location. Back up any filenames that + # already exist in the new location with the extension ".dpkg-old". + observe "copying files from $_old to $_new" + if ! (cd "$_old" && cp -a -b -S ".dpkg-old" . "$_new"); then + die "error(s) encountered while copying files from $_old to $_new" + fi + + # Remove files at old location. + observe "removing $_old" + rm -r "$_old" + + # Create symlink from old location to new location. + make_symlink_sane "$_old" "$_new" +} + +# vim:set ai et sw=2 ts=2 tw=80: + +# GOBSTOPPER: The X Strike Force shell library ends here. --- xorg-server-1.4.1~git20080131.orig/debian/xsfbs/xsfbs-autoreconf.mk +++ xorg-server-1.4.1~git20080131/debian/xsfbs/xsfbs-autoreconf.mk @@ -0,0 +1,150 @@ +#!/usr/bin/make -f +# $Id$ + +# Automagical conversion of autoreconf results into quilt patches. + +# Copyright 2006 Eugene Konev +# +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# The idea behind this is storing changes produced by autoreconf as a +# separate patch on quilt stack (on top of stack actually). +# The only usable target here is 'autoreconf`. Other targets are not +# supposed to be called directly. DO NOT invoke them, unless you know what +# you are doing. +# The autoreconf target will check if files with names in $(RECONF_CHECKFILES) +# were changed during patching (from upstream version or from previously +# autoreconfed version) and call actual autoreconfing if they were. +# The actual autoreconfing target (doautoreconf) WILL FAIL after +# calling autoreconf and pushing changes into quilt stack by design. It +# should never be invoked by automatic build process. +# The proposed use is adding autoreconf into clean's prerequisites before +# xsfclean like: +# - clean: xsfclean +# + clean: autoreconf xsfclean +# This will ensure it is called when you build package with dpkg-buildpackage. + +# This dir will be used for producing diff of autoreconfed tree +RECONF_DIR := xsfautoreconf + +# This files will be checked for changes +RECONF_CHECKFILES += configure.ac Makefile.am + +# This files will not be hardlinked but copied +RECONF_NOLINKFILES += aclocal.m4 + +# This files/dirs will be pruned after autoreconf run +RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~ + +# Internal target. Never invoke directly. +stampdir_target+=check.md5sum +$(STAMP_DIR)/check.md5sum: + dh_testdir + $(MAKE) -f debian/rules prepare + for F in $(RECONF_CHECKFILES); do \ + find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \ + LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \ + done + +# Internal target. Never invoke directly. +$(STAMP_DIR)/clean.md5sum: + dh_testdir + $(MAKE) -f debian/rules unpatch + rm -f $(STAMP_DIR)/check.md5sum + $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum + mv $(STAMP_DIR)/check.md5sum $@ + +# Internal target. Never invoke directly. +debian/patches/patched.md5sum: + dh_testdir + [ -f $(STAMP_DIR)/clean.md5sum ] || \ + $(MAKE) -f debian/rules $(STAMP_DIR)/clean.md5sum + + $(MAKE) -f debian/rules patch + rm -f $(STAMP_DIR)/check.md5sum + $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum + if ! diff $(STAMP_DIR)/clean.md5sum \ + $(STAMP_DIR)/check.md5sum > /dev/null; then \ + $(MAKE) -f debian/rules doautoreconf; \ + else \ + mv $(STAMP_DIR)/check.md5sum $@; \ + fi + +# Internal target. Never invoke directly. +,PHONY: doautoreconf +doautoreconf: patch + quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1 || true + if quilt applied | grep ^autoreconf.diff$$ > /dev/null; then \ + quilt pop -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \ + quilt rename -p autoreconf.diff autoreconf-old.diff \ + >>$(STAMP_DIR)/log/autoreconf 2>&1; \ + quilt delete autoreconf-old.diff >>$(STAMP_DIR)/log/autoreconf 2>&1; \ + quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \ + fi + + if [ -e $(RECONF_DIR) ]; then \ + echo "ERROR: $(RECONF_DIR) already exists. Cleanup by hand"; \ + exit 1; \ + fi + + mkdir -p $(RECONF_DIR)/before + find . -maxdepth 1 -mindepth 1 ! -wholename ./$(RECONF_DIR) \ + -a ! -wholename ./debian -a ! -wholename ./patches \ + -a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \ + xargs -i{} cp -al {} $(RECONF_DIR)/before/ + + for F in $(RECONF_PRUNEFILES); do \ + find $(RECONF_DIR)/before -name $$F -print | \ + xargs --no-run-if-empty rm -r; \ + done + + cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after + + for F in $(RECONF_NOLINKFILES); do \ + find . -wholename ./$(RECONF_DIR) -prune -o -wholename ./debian \ + -prune -o -wholename ./$(STAMP_DIR) -prune -o -name $$F \ + -print | \ + xargs --no-run-if-empty -i{} cp --remove-destination {} \ + $(RECONF_DIR)/after/{}; \ + done + + cd $(RECONF_DIR)/after && autoreconf -v --install && \ + for F in $(RECONF_PRUNEFILES); do \ + find . -name $$F -print | \ + xargs --no-run-if-empty rm -r; \ + done + + cd $(RECONF_DIR) && diff -Nru before after > autoreconf.diff || true + + quilt import $(RECONF_DIR)/autoreconf.diff \ + >>$(STAMP_DIR)/log/autoreconf 2>&1 + + mv $(STAMP_DIR)/check.md5sum debian/patches/patched.md5sum + + rm -r $(RECONF_DIR) && rm -f patches/autoreconf-old.diff + + @echo + @echo "****************************************************************" + @echo " This target is made to fail INTENTIONALLY. It should NEVER " + @echo " be invoked during automatic builds. " + @echo + @echo " This target was invoked because you added/removed/changed " + @echo " patches which modify either configure.ac or Makefile.am and, " + @echo " thus, require autoreconf run. And all autoreconfing should " + @echo " happen before uploading. " + @echo + @echo " (See also debian/xsfbs/xsfbs-autoreconf.mk) " + @echo + @echo " If you see this message, autoreconfing actually SUCCEEDED, " + @echo " and your build should finish successfully, when rerun. " + @echo "****************************************************************" + @echo + exit 1; + +.PHONY: autoreconf +autoreconf: debian/patches/patched.md5sum patch $(STAMP_DIR)/check.md5sum + if ! diff $(STAMP_DIR)/check.md5sum \ + debian/patches/patched.md5sum > /dev/null; then \ + $(MAKE) -f debian/rules doautoreconf; \ + fi --- xorg-server-1.4.1~git20080131.orig/debian/watch +++ xorg-server-1.4.1~git20080131/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://xorg.freedesktop.org/releases/individual/xserver/ xorg-server-(.*)\.tar\.gz --- xorg-server-1.4.1~git20080131.orig/debian/xprint.install +++ xorg-server-1.4.1~git20080131/debian/xprint.install @@ -0,0 +1 @@ +usr/bin/Xprt --- xorg-server-1.4.1~git20080131.orig/debian/xserver-xorg-dev.install +++ xorg-server-1.4.1~git20080131/debian/xserver-xorg-dev.install @@ -0,0 +1,3 @@ +usr/include/xorg/* +usr/lib/pkgconfig/xorg-server.pc +usr/share/aclocal/* --- xorg-server-1.4.1~git20080131.orig/debian/xprint-common.links +++ xorg-server-1.4.1~git20080131/debian/xprint-common.links @@ -0,0 +1,5 @@ +etc/Xprint/C/print/attributes usr/share/Xprint/xserver/C/print/attributes +etc/Xprint/C/print/Xprinters usr/share/Xprint/xserver/C/print/Xprinters +etc/Xprint/C/print/ddx-config usr/share/Xprint/xserver/C/print/ddx-config +etc/Xprint/en_US/print/attributes usr/share/Xprint/xserver/en_US/print/attributes +usr/share/Xprint/xserver/README usr/share/doc/xprint-common/README --- xorg-server-1.4.1~git20080131.orig/debian/xprint-common.default +++ xorg-server-1.4.1~git20080131/debian/xprint-common.default @@ -0,0 +1,10 @@ +# If you do not want Xprint to automatically start, then set START_XPRINT=0 +# By default, START_XPRINT=1, enabling Xprt, the Xprint server, to be started. + +# Note that this can be more effectively done by removing the start-up symlinks +# to /etc/init.d/xprint, e.g. +# rm /etc/rc[1-6].d/*xprint* + +# If you always want Xprint to run, you may safely remove this file. + +START_XPRINT=1 --- xorg-server-1.4.1~git20080131.orig/debian/README.printing-problems +++ xorg-server-1.4.1~git20080131/debian/README.printing-problems @@ -0,0 +1,162 @@ +Printing Problems +----------------- + +This file is a mini-FAQ for two printing problems: + +Q1) Spaces between words are lost (words run together) + +Q2) Image is too big (font size too large) + OR + Image is too small (only takes up 1/4 of the page) + + +======================================================================= +Q1) Spaces between words are lost (words run together) + +At the time of the release of sarge, there is an unresolved problem +printing certain webpages from firefox using Xprint. The problem has been +reproduced with mozilla-firefox (0.9.3-2) and xprint (0.1.0.alpha1), +although the situation seems to have improved with firefox 1.0.1. + +mozilla proper (mozilla-browser 2:1.7.2-2) does not exhibit the +problem, it prints fine on the package maintainer's system, although +others have unfortunately reported seeing the problem there. + +The symptom of the problem is that spaces between words are lost, +words are printed strung all together. The font may be sans-serif, +where serif font is displayed on screen. + +The problem appears to happen on pages where the font is not +explicitly chosen in the HTML code. An example is Debian's home page, +www.debian.org. Other pages which specify the font to be used do not +seem to be affected. + +There are three known workarounds for the problem. + +1) Only use the default fonts in mozilla/firefox. + + The printing error will start happening if you change font settings + using Edit->Preferences (in particular if you set the serif font). + Changing the setting back again to the default value of "serif" will + not fix the problem. + + This is because setting the font places a "font.name.serif.x-western" + entry into ~/.mozilla/firefox/default.***/prefs.js. Even if the value + of the entry is "serif", it's mere presence will ruin printing. + + The workaround is to manually delete the "font.name.serif.x-western" + entry from prefs.js. + + This seems to fix the problem with the Debian home page, but depending + the page and language you want to print with you might find you will need + to delete other font.name entries as well. + +2) Remove Xprint's own font directory. + + Xprint contains font information in the directory + /usr/share/Xprint/xserver/C/print/models/PSdefault/fonts + If this directory is removed, then firefox prints www.debian.org + with correct spacing between words. The font used is sans-serif. + Xprint obtains information about fonts from other parts of the system. + + Since this workaround has not been fully tested and its consequences + are not fully understood (other locales and printer models in + Xprint link to this directory), the fonts directory will be left + intact for the official release of Xprint in Debian. + + A side-effect is that the date stamps for news entries on + www.debian.org are rendered using sans-serif font, where they + ought to be, I believe, rendered using a monospace font. + + +3) Use default stylesheet settings for firefox. + + User directories for firefox contain sample default style settings + in the chrome directory, at + ~/.firefox/default//chrome/userContent-example.css + This file, userContent-example.css, can be renamed to userContent.css, + and the following style added: + +@media print { + body { + font-family: times, serif; + } + tt, pre { + font-family: courier, monospace; + } +} + + This will instruct firefox to use serif font for the main text of web + pages where the default font is not specified. The spacing between + words will be rendered correctly. + + System administrators wishing to provide this style snippet + automatically to all users will want to make the adjustments in + /usr/lib/mozilla-firefox/defaults/profile/chrome/ + + Note, the same can be done for mozilla proper, if needed. + + +The problem is being tracked on the Debian Bug Tracking System at bugs +#235592 and #251067, and upstream at +http://xprint.freedesktop.org/bugzilla/show_bug.cgi?id=1112 + + +======================================================================== +Q2) Image is too big (font size too large) + OR + Image is too small (only takes up 1/4 of the page) + +This question is a standard Xprint FAQ (Q70). + +The problem means your default printer resolution is set to the wrong +value. The value is set in /etc/Xprint/C/print/attributes/document (or possibly +en_US/print/... rather than C/print/..., depending on your locale): + +*default-printer-resolution: 600 + +The standard default value is set to 600dpi. If your printer can only handle +300dpi, then four pixels (2x2) will be used for every one in your image, making +it print on paper larger than it ought to. The solution is to change the default +resolution to 300. + +Likewise if the default value is set to 300, but your printer can only handle +600dpi, then the pixels will only take up half the space on paper that they are +supposed to, so the image will only occupy a quarter of the page (1/2 x 1/2). +This problem was often reported under previous versions of Xprint, before the +default resolution was set to 600. In the latest version we have made the +assumption that 300dpi printers are today relatively rare, and so have set the +default value to 600. A side-effect is the first problem discussed in the +previous paragraph, for 300dpi-only printers. + +For your convenience, a debconf question has been provided enabling you to set +the default resolution at installation time (or after running +"dpkg-reconfigure xprint-common"). + +Note that these problems do not affect all printers. Some 600dpi printers will +happily render 300dpi images, using a 2x2 block for each pixel in the image to +give a normal physical image size on paper. + +Your printer's resolutions may possibly also need to be set consistently in the +underlying spooler. For instance CUPS settings can usually be accessed at +http://localhost:631/printers (use the "Configure Printer" link). + +If you have different printers which need to be run at different resolutions, +you will need to manually set a value for default-printer-resolution for each printer +separately (that is, for each one which differs from the default value). +See FAQ Q211. For instance, if the printer named "old_printer" needs to run at +300 dpi, while others work at 600dpi, then you need to use: +*default-printer-resolution: 600 +old_printer.default-printer-resolution: 300 + +We can't please everybody all the time! Please set your default resolution +according to your own needs. We hope that in a future version, Xprint will be +able to set these values dynamically from the underlying printing spooler +(CUPS, if not others). Watch http://bugzilla.mozdev.org/show_bug.cgi?id=5517 +for further developments. + + + +Good luck! + +Drew Parsons , 15 Mar 2005. --- xorg-server-1.4.1~git20080131.orig/debian/xprint.changelog.Debian +++ xorg-server-1.4.1~git20080131/debian/xprint.changelog.Debian @@ -0,0 +1,810 @@ +xprint (1:1.1.99.3+git20060910-9) unstable; urgency=low + + * Galician debconf translation. Thanks Jacobo Tarrio. Closes: #408216. + * Patch 60_font_links makes symlinks to font files relative to local + directory, for easier management. Also ensures + NewCenturySchlbk-BoldItalic.pmf is installed. Closes: #412990. + + -- Drew Parsons Sat, 3 Mar 2007 00:32:11 +1100 + +xprint (1:1.1.99.3+git20060910-8) unstable; urgency=low + + * Spanish debconf translation. Thanks Fernando Cereza. Closes: #402984. + + -- Drew Parsons Tue, 2 Jan 2007 22:29:25 +1100 + +xprint (1:1.1.99.3+git20060910-7) unstable; urgency=low + + * Patch 50_byteswap.patch enables Xprint with GLX support on Hurd + and GNU/FreeBSD. Closes: #400869. + + -- Drew Parsons Fri, 1 Dec 2006 14:21:16 +1100 + +xprint (1:1.1.99.3+git20060910-6) unstable; urgency=low + + * Xprint 1.1.99.3 actually Build-Depends: mesa (>= 6.5.1). + Closes: #395519. + + -- Drew Parsons Sun, 12 Nov 2006 14:53:25 +1100 + +xprint (1:1.1.99.3+git20060910-5) unstable; urgency=low + + * Even though --disable-record is used, record is still built. This + is probably a bug in upstream Makefile.am, or possibly recordproto + ought to be added to the REQUIRED_MODULES in configure.ac. + Workaround with Build-Depends: x11proto-record-dev. + + -- Drew Parsons Mon, 2 Oct 2006 14:14:17 +1000 + +xprint (1:1.1.99.3+git20060910-4) unstable; urgency=low + + * Connect tabbed blocks in debian/rules in order to properly disable + dri, Xorg, Xvfb and Xnest at configure step. + * Refine extension dependencies and disables in line with what + Xprint actually supports, as defined in mi/miinitext.c. + + -- Drew Parsons Mon, 2 Oct 2006 02:12:13 +1000 + +xprint (1:1.1.99.3+git20060910-3) unstable; urgency=low + + * Restore OpenGL support. "Because I can". + * Incidentally, bugs fixed previously in experimental can be closed + by using -v with dpkg-buildpackage when next uploading to unstable. + + -- Drew Parsons Sun, 1 Oct 2006 21:03:11 +1000 + +xprint (1:1.1.99.3+git20060910-2) unstable; urgency=low + + * xfixes 4 is now in unstable, so bring the new xprint into unstable + * It really irritates me the way bugs fixed in experimental are not + fully closed when the upload to unstable is made. + Closes: #377659, #384775, #383166, #375125, #369834. + + -- Drew Parsons Wed, 20 Sep 2006 10:21:50 +1000 + +xprint (1:1.1.99.3+git20060910-1) experimental; urgency=low + + * Latest git. + Patches applied upstream: + 80_no_composite + 91_Xprint_README + 91_enforce_bash + 91_install_config + 91_install_etc + 94_man_typoes + * Install manpages via * to avoid defining .1 or .1x. Closes: #383166. + + -- Drew Parsons Sun, 10 Sep 2006 19:21:27 +1000 + +xprint (1:1.1.99.2+git20060627-0.4) experimental; urgency=low + + * Swapped patch 80_check_windowpixmap for 80_no_composite. Composite has + no role in Xprint. + * LSB compliance: force-reload only operates conditionally when Xprt is + already running. Thanks Sven Mueller. Closes: #377659. + * Added Portuguese debconf translation, thanks Rui Branco. Closes: #384775. + * Adjust debian/xprint.manpages to allow for a shifting suffix. + Closes: #383166. + + -- Drew Parsons Sun, 27 Aug 2006 13:51:57 +1000 + +xprint (1:1.1.99.2+git20060627-0.3) experimental; urgency=low + + * Why doesn't dpkg -l damn well report versions correctly? + Build-Depends: libxfont-dev (>=1:1.1) not (>=1.1). + + -- Drew Parsons Tue, 27 Jun 2006 21:04:24 +1000 + +xprint (1:1.1.99.2+git20060627-0.2) experimental; urgency=low + + * Oops should add versioned build-depends on libxfont-dev too. + + -- Drew Parsons Tue, 27 Jun 2006 19:28:03 +1000 + +xprint (1:1.1.99.2+git20060627-0.1) experimental; urgency=low + + * Latest upstream git: Xprint subdirectory moved to hw. + Patches updated accordingly. + * Actually create the patch allowing build with new libxfont (freetype + 2.2) and avoiding a segfault (patch 80_check_windowpixmap). + * Versioned dependencies on x11proto-fixes-dev, libxfont1. Closes: #375125. + * Standards version 3.7.2. + + -- Drew Parsons Tue, 27 Jun 2006 13:31:08 +1000 + +xprint (1:1.1.99.2+git20060614-0.1) experimental; urgency=low + + * New upstream version (including lastest git). + * Russian debconf translation. СпаÑибо Юрию Козлову. Closes: #369834. + * Upload to experimental while we wait for dependencies (libxfont 1.1, + libxfixes 4) to reach unstable. + + -- Drew Parsons Thu, 22 Jun 2006 16:04:40 +1000 + +xprint (1:1.0.2-1) unstable; urgency=low + + * New upstream version (hey! slashdot is good for something after all! + (http://linux.slashdot.org/article.pl?sid=06/05/02/2216235) + * Only include the required ft.h, ftfuncs.h files in ./extras. + + -- Drew Parsons Thu, 4 May 2006 17:46:57 +1000 + +xprint (1:1.0.1-7) unstable; urgency=low + + * Build-Depends: libgl1-mesa-dev|libgl-dev. + + -- Drew Parsons Mon, 1 May 2006 22:58:28 +1000 + +xprint (1:1.0.1-6) unstable; urgency=low + + * I wonder if I should install pbuilder? + * Build-Depends: mesa-common-dev (only needed when compiling with + OpenGL support). Guess what, closes: #365386. + + -- Drew Parsons Mon, 1 May 2006 22:22:40 +1000 + +xprint (1:1.0.1-5) unstable; urgency=low + + * Build-Depends: pkg-config *sigh*. + + -- Drew Parsons Mon, 1 May 2006 17:55:46 +1000 + +xprint (1:1.0.1-4) unstable; urgency=low + + * Added Build-Depends: xutils-dev to get BUILD_LINUXDOC etc defined for + configure.ac. + * Looking more closely at "checking for XSERVERCFLAGS", need to add + Build-Depends: libxau-dev, libxdmcp-dev. + + -- Drew Parsons Mon, 1 May 2006 17:32:46 +1000 + +xprint (1:1.0.1-3) unstable; urgency=low + + * Build-Depends: libtool. Closes: #365386 (again). + + -- Drew Parsons Mon, 1 May 2006 09:31:33 +1000 + +xprint (1:1.0.1-2) unstable; urgency=low + + * Dutch debconf translation. Thanks Kurt De Bree. Closes: #363035. + * Restore dh_installdebconf in debian/rules to get debconf back again. + * Added xprint-common Depends: xfonts-encodings, since /etc/init.d.xprint + expects to be able to find encodings.dir. + * Since /etc/init.d/xprint no longer knows about /usr/X11R6/bin, let + xprint-common Depends on x11-common (>=1:7.0.12) to ensure Xprt is in + /usr/bin (even if it comes from an old package, where it would be + forced to use the /usr/X11R6/bin symlink). Closes: #363245. + * Make /etc/init.d/xprint exit quietly if the Xprt binary can't be found. + Closes: #270054. + * Added Build-Depends: automake1.9. Closes: #365386. + * Standards version 3.7.0. + * Restore xprint-common debconf files lost in X11R7 transition (where did + they disappear to?) + * Added lintian override to xprint-common to not trigger + "package-depends-on-an-x-font-package" on Depends: xfonts-encodings. + + -- Drew Parsons Mon, 1 May 2006 00:35:12 +1000 + +xprint (1:1.0.1-1) unstable; urgency=low + + * Xprint from X11R7! Closes: #360446, #356987, #362884. + * Xprt does not build in Xorg 7.0, hence need CVS (X11R7.1). However CVS + needs xfixes 4 which will not be available in Debian until the XSF + prepares 7.1. So backport patches (relating to build with FreeType + support). + * Please be advised that as a consequence of the above there will be a + degradation of output quality until Debian is able to upgrade to 7.1 + (due end of May). Please hold back from filing bug reports about font + quality until that upgrade has occurred. My apologies for the + inconvenience. + * Build-depends updated to follow modular X11R7. + * Xprint utilities removed (transferred to xprint-utils). + * Set debhelper compatibility version to 5. + * Updated xprint init file to expect encodings.dir in + /usr/share/fonts/X11/encodings. + + -- Drew Parsons Mon, 17 Apr 2006 14:03:06 +1000 + +xprint (1:0.1.0.alpha1-13) unstable; urgency=low + + * Got to actually install the overrides file for it to take effect, dammit. + * Swedish debconf translation. Thanks, Daniel Nylander. Closes: #330651. + * Patch 91_xsession_ifexec: only define XPSERVERLIST in + /etc/X11/Xsession.d/92xprint-xpserverlist if /etc/init.d/xprint is + present and executable. Some administrators may wish to disable xprint + by making the init script non-executable. Closes: #330812. + * Break a circular dependency by downgrading xprint-common's Depends: on + xprint to a Recommends:. Closes: #339928. + * Added a paragraph to README.printing-problems indicating that CUPS + settings may also need to be adjusted if the printer resolution is + mismatched. Closes: #342714. + + -- Drew Parsons Sun, 11 Dec 2005 21:10:52 +1100 + +xprint (1:0.1.0.alpha1-12) unstable; urgency=low + + * Patch 93_init_startstopdaemon has the side effect that some log messages + (errors and warnings) from Xprt are lost, including attempted connections. + Let me know if you want all such messages back again. + * Ditch the xprt and xprt-xprintorg dummy packages. Closes: #322078, #303123. + * Time to start stripping binaries. Closes: #164952. + * Vietnamese debconf translation. Thanks Clytie Siddall. Closes: #324267. + * Added xprint-overrides to ignore pesky lintian warnings. + * Removed 93_check_default_start, since the facility to control rc scripts + is provided elsewhere (see command update-rc.d, or packages rcconf, + sysv-rc-conf or file-rc). This means /etc/default/Xprint is no longer + used. Use the facilities mentioned above if you want Xprint installed + but not to start up by default. + However, it is true that the manner in which Debian handles packages is + only partially implemented. Packages start their daemons using + invoke-rc.d, whose operations may be controlled by /usr/sbin/policy-rc.d + it exists. But it does not exist. Therefore upon upgrade (or + dpkg-reconfigure), the Xprt daemon will be started, even if you have + correctly set the rc symlinks. You will need to stop it by hand + "/etc/init.d/xprint stop" (this only applies to upgrades, your rc + configuration will be honoured at boot). This is a general Debian + problem, for having daemons installed but not running. It is *not* an + Xprint problem. Sorry. See Bug#291766 for further discussion. + + -- Drew Parsons Sat, 10 Sep 2005 00:38:08 +1000 + +xprint (1:0.1.0.alpha1-11) unstable; urgency=low + + * Created patch 93_init_startstopdaemon to use start-stop-daemon to launch + and kill Xprt. It handles backgrounding of the Xprt process, so we + don't get rogue /etc/init.d/xprint processes running alongside Xprt. + Note during stop, we retain kill ${pid} to facilitate compatibility when + upgrading (otherwise the new init script won't have a + /var/run/Xprt_0.pid file to kill when upgrading from the old version). + Closes: #229252, #255240, #313315. + * Patch 94_man_typoes fixes spelling errors. Thanks A. Costa. + Fixed in *.sgml docbook files, propagated to man and html using + docbookconv.sh (also altered to adapt to Debian's current XSLT + structure, accounting for the fact that docbook2man cannot read the sgml + file at the moment). Note there are problems generating the derived doc + files using HasDocBookTools in config/cf/xprint_host.def, so html and + man are generated by hand and included in the patch. + Closes: #306701, #306702. + * New standards version: 3.6.2. + + -- Drew Parsons Sat, 2 Jul 2005 23:05:44 +1000 + +xprint (1:0.1.0.alpha1-10) unstable; urgency=high + + * Reduced the priority of the printer resolution debconf question to + "medium", since the default of 600 is fine for most printers today. + Closes: #298954. + * Reduced the amount of the text in the debconf question. + Closes: #298956, #298959. + * Added new binaries and man pages to xprint.install. + * New patch 92_lib_not_lib64_on_amd64ppc64: ppc64 and amb64 use + /usr/X11R6/lib not /usr/X11R6/lib64. Reported upstream, Xprint bug #2803. + Closes: #301028. + * New patch 91_no_ExecCommand: ExecCommand does not belong in + attributes.{c|h}, and gcc4 complains about it. See Debian bug #301028 and + upstream Xprint bug #2254. + * New patch 93_spooltodir_check_file_exists. Closes: #295139. + * 93_spooltodir_check_file_exists also checks size of file name is not too + long. Closes: #284620. + + -- Drew Parsons Fri, 25 Mar 2005 18:29:49 +1100 + +xprint (1:0.1.0.alpha1-9) unstable; urgency=medium + + * Taking over xprt, which has been expelled from XFree86. + * Take the opportunity the rationalise package naming: + - use "xprint" rather than "xprint-xprintorg". Since the Xprint + development version (known as xprint.xprintorg but hosted at + xprint.mozdev.org) has been accepted as the official X.org development + version, it is now unlikely that the separate domain xprint.org will be + registered. + - xprint contains Xprt and other architecture-dependent binaries + - xprint-common contains architecture-independent files (config files, + including /etc/init.d/xprint) + - xprt and xprt-xprintorg become dummy packages. Closes: #294324. + * Even without Super-Cow powers, this Xprint washes whiter than. + Closes: #275656. + * Add example of different resolutions for different printers to + README.printing-problems. Closes: #293539. + * In xprint-common.postinst, explicitly stop server before letting debhelper + (dh_installinit) start it. This avoids complaints in the situation where + Xprt was started by a simultaneous upgrade of the xprint package. + Closes: #292355. + * For simplicity of maintenance, removed debconf question about old + arrangement of config files. Since Xprint is not in woody, this will not + cause upgrade problems. + * Bump up the epoch to ensure a smooth upgrade of xprt (from + 4.3.0.dfsg.1-10). + + -- Drew Parsons Thu, 17 Feb 2005 21:02:18 +1100 + +xprint-xprintorg (0.1.0.alpha1-8) unstable; urgency=low + + * Updated debconf translations: + - Brazilian (thanks Andre Luis Lopes) + - German (thanks Erik Schanze) + - Czech (thanks Miroslav Kure) + + -- Drew Parsons Sun, 30 Jan 2005 13:16:30 +1100 + +xprint-xprintorg (0.1.0.alpha1-7) unstable; urgency=medium + + * Updated debconf translations: + - Danish, (thanks Morten Bo Johansen) + - Japanese (thanks Hideki Yamane) + - French (thanks Christian Perrier) + + Closes: #291425, #292363, #292459. + + -- Drew Parsons Thu, 27 Jan 2005 19:09:39 +1100 + +xprint-xprintorg (0.1.0.alpha1-6) unstable; urgency=medium + + * Added debconf question to set the default printer resolution. + Closes: #280159. + + -- Drew Parsons Wed, 19 Jan 2005 01:44:29 +1100 + +xprint-xprintorg (0.1.0.alpha1-5) unstable; urgency=high + + * Related to the dash problem again, just remove /bin/sh altogether from + 92xprint-xpserverlist; this should be simpler than changing it to + /bin/bash. Will close #288585 (but leave open pending upstream fix). + Closes: #288844. + + -- Drew Parsons Tue, 11 Jan 2005 19:59:08 +1100 + +xprint-xprintorg (0.1.0.alpha1-4) unstable; urgency=low + + * Force /etc/init.d/xprint to use bash, since there are conflicts with + dash when it is /bin/sh. Patch 91_enforce_bash. Closes: #288630. Also + closes #288585, but I will leave this open as a reminder to upstream to + fix the non-Posix code. + * On a related note, upstream simply no longer asks Linux systems to use ksh + at all, so 91_bash_before_ksh is deprecated. Hence, "test -a" is no + longer used. Closes: #285056, #256241. + * xset is still being used in /etc/init.d/xprint to build the fontlist, so + XPROJECTROOT (or /usr/X11R6/bin) still needs to be defined. + Closes: #282723. + * Removed square brackets around \n, used by tr in /etc/init.d/xprint. + Patch 93_init_tr_fix. Closes: #258419, #264983. + + -- Drew Parsons Wed, 5 Jan 2005 13:59:18 +1100 + +xprint-xprintorg (0.1.0.alpha1-3) unstable; urgency=medium + + * There have been enough positive reports about 1.0alpha1 in experimental + (contrasted with negative reports of the version in sarge), + that I think it is time to get it into unstable and sarge. + * I'll keep the "0.1.0" versioning for now. I'll almost certainly make the + final 1.0 version to be "1.0". + * Added Danish debconf translation. Thanks Morten Bo Johansen. + Closes: #285957. + + -- Drew Parsons Mon, 3 Jan 2005 14:43:04 +1100 + +xprint-xprintorg (0.1.0.alpha1-2) experimental; urgency=low + + * Build-Depends: flex, bison. Closes: #284920. + * amd64 support confirmed. Closes: #278510, #282655. + * I was joking about the cubes rotating on your paper. But the OpenGL + support is real. + + -- Drew Parsons Sun, 12 Dec 2004 00:29:23 +1100 + +xprint-xprintorg (0.1.0.alpha1-1) experimental; urgency=low + + * New upstream version: 1.0alpha1, preview of the forthcoming v1.0. + * Based on X.Org 6.8.2, with innumerable improvements: + - better handling of broken fonts + - OpenGL support (yes, rotating cubes on your printer paper) + - better greyscale support + - generally more stable + - supports amd64 + * Recommended by upstream to go into sarge. + + -- Drew Parsons Tue, 7 Dec 2004 17:47:27 +1100 + +xprint-xprintorg (0.0.9.final.001-9) unstable; urgency=medium + + * Added patch 92_close_std_files to get /etc/init.d/xprint to close the + standard file descriptors (stdin/out/err) when Xprt is invoked. This + solves a number of problems, such as hanging sessions of dpkg-reconfigure, + ssh, chroot. Thanks for the patch, Nicolas Boullis. + Closes: #233260, #265827, #234132. OK, #234132 also refers to the bash + shells, which are still there, but there are other bug reports dealing + with them. + + -- Drew Parsons Tue, 7 Dec 2004 10:03:30 +1100 + +xprint-xprintorg (0.0.9.final.001-8) unstable; urgency=medium + + * Added patch 93_check_default_start, which checks if START_XPRINT=0 in + /etc/default/xprint before starting Xprt. Thanks Anthony DeRobertis. + Closes: #281973. + * Created debian/default to be installed as /etc/default/xprint. + * Suggests: xbase-clients, since xset is used by /etc/init.d/xprint. + Closes: #282723. + + -- Drew Parsons Thu, 2 Dec 2004 19:00:42 +1100 + +xprint-xprintorg (0.0.9.final.001-7) unstable; urgency=medium + + * Added Czech translation for debconf templates. Thanks Miroslav Kure. + Closes: #274073. + * Added Eugeniy Meshcheryakov's patch (93_xprint_fonts_fix) to improve + TrueType font handling. Closes: #272368. + * Added new workaround to README.printing-problems for printing problem + with Debian home page: delete "font.name.serif.x-western" entry from + pref.js. + * Removed Recommends: xprt from xprt-common, since it Depends: on it. + + -- Drew Parsons Fri, 12 Nov 2004 14:37:23 +1100 + +xprint-xprintorg (0.0.9.final.001-6) unstable; urgency=high + + * Added another question to README.printing-problems to address the + problem when the image is printed too large or too small (default + printer resolution in /etc/Xprint/C/print/attributes/document + needs to be adjusted for your printer). Closes: #262958, #267964. + * Removed man page for xpxmhelloworld: binary is not provided. + + -- Drew Parsons Sun, 12 Sep 2004 22:31:15 +1000 + +xprint-xprintorg (0.0.9.final.001-5) unstable; urgency=high + + * README.printing-problems needs to be added to debian/xprt-common.docs. + + -- Drew Parsons Sun, 22 Aug 2004 14:12:13 +1000 + +xprint-xprintorg (0.0.9.final.001-4) unstable; urgency=high + + * Added README.printing-problems, describing the printing problem of + words being run together without spaces. The file suggests two + workarounds (remove Xprint's fonts directories, or add a + firefox/mozilla stylesheet). Thanks to Jan Willem Stumpel for the + CSS workaround and to Yaacov Akiba Slama for the fonts directory + workaround. + * Set urgency to high to get this workaround description into sarge. + + -- Drew Parsons Sun, 22 Aug 2004 12:30:57 +1000 + +xprint-xprintorg (0.0.9.final.001-3) unstable; urgency=low + + * Created patch (91_no_sh_suffix_in_Xsession.d) to not provide .sh + suffix to Xsession.d script. Closes: #264978. + * Added Erik Schanze's German debconf translation. Closes: #264611. + * Added a note to README.Debian concerning the "could not open + default font 'fixed'" problem preventing Xprt from starting, which + has been reported by some users. The bug has not yet been + reproduced on a system which does not already experience it, + making it difficult to fix it properly. A work-around ("sort -u -r" + instead of "sort -u" in /etc/init.d/xprint) is suggested. This + concerns bugs such as #259281, #257731, #259281. Apparently the + 009.001 release did not help. Maybe v010 will get it at last? + + -- Drew Parsons Sun, 15 Aug 2004 18:20:13 +1000 + +xprint-xprintorg (0.0.9.final.001-2) unstable; urgency=low + + * Added Brazilian Portuguese (pt_BR) debconf translation. + Thanks Andre Luis Lopes. Closes: #262554. + * Uses Dwayne C. Litzenberger's patch (92_xprint-security-holes-fix.patch) + to print to file into the user's $HOME directory instead of /tmp. + In subdirectory ../Xprintjobs. Security patch. Closes: #262871. + * xprt-xprintorg includes binaries and manpages for other auxiliary + programs: xprehashprinterlist, xpsimplehelloworld, xpxthelloworld. + The manpage for xpxmhelloworld is omitted since the binary is not built. + The general man page for Xprint is also included. + + -- Drew Parsons Sun, 8 Aug 2004 18:59:52 +1000 + +xprint-xprintorg (0.0.9.final.001-1) unstable; urgency=low + + * Upstream maintenance release v009.001. + - only use basic optimisation on PPC. Closes: #252362, #258844. + - default printer resolution in /usr/share/Xprint/xserver/C/print/attributes/document + is now 600dpi not 300dpi. Closes: #254704, #256175. + - should no longer hang when using CUPS. Closes: #256850. + - /etc/init.d/xprint now has a simpler copyright statement, without + "all rights reserved". Closes: #250887. + - incorporates lpr/CUPS patch (10-lpr-cups). + * Will hopefully deal with a number of TrueType-related font + problems (e.g. #259281, #257731, #259281). Bugs will be closed in + the next upload, pending positive reports from bug reporters. + * Treat /usr/share/Xprint/xserver/C/print/Xprinters as a config file + (place in /etc/). Closes: #258413. + * Patch applied to use bash in preference to ksh. Bug #256241 will + be closed once the '-a' posix issue is appropriately settled. + * Patch 92_lsprinter_path checks command is executable, and adds + test for /usr/bin/xplsprinters. Closes: #257750. + + -- Drew Parsons Mon, 19 Jul 2004 19:29:22 +1000 + +xprint-xprintorg (0.0.9.final-3) unstable; urgency=low + + * Applied patch (92_make_amd64) to enable building on AMD 64. + Closes: #254752. + * Added handling for DEB_BUILD_OPTIONS' noopt (i.e. -O0) in + debian/rules, using the code sample in Policy 10.1. turned on -g + by default (the debug keyword is deprecated, it should always be + on). See bug #252659 (but I think it's not yet passed to Xprint's + imake system). + + -- Drew Parsons Fri, 18 Jun 2004 19:13:09 +1000 + +xprint-xprintorg (0.0.9.final-2) unstable; urgency=low + + * Applied upstream patch to fix some lpr/CUPS problems + (see http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=608) + - BugZilla #608 ("Can not print on Debian/CUPS due to error |Xprt_64: + lpr: unable to print file: server-error-not-accepting-jobs|"): + Xprt did setup the list of supplementary group ids, causing print + failure when the the calling user must be a member in a specific + group to be allowed to print. + (patch placed in debian/patches/10-lpr-cups) + + -- Drew Parsons Sun, 9 May 2004 17:41:54 +1000 + +xprint-xprintorg (0.0.9.final-1) unstable; urgency=low + + * v0.9 official release (cvs20040322, released 28 March 2004). + * Rearranged debian/rules to build binary-indep and binary-arch + separately. Closes: #241066. + + -- Drew Parsons Fri, 2 Apr 2004 20:45:33 +1000 + +xprint-xprintorg (0.0.9.cvs20040301-1) unstable; urgency=low + + * New upstream version: v009 release candidate 2. + * Partially addresses the complaints about extra processes alongside the + Xprt daemon: tee no longer invoked for logging. Closes: #224189. + * Users finally convinced me there's no point only having xprt-common + Recommends: xprt-xprintorg. xprt-common is not required for client-only + setups (they only need XPSERVERLIST to be defined, which can be done + without /etc/init.d/xprint. Remember to switch off "-nolisten tcp" in the + Xprt server configuration if you want to do this). So having xprt-common + installed without xprt-xprintorg is not in fact particularly useful, + unless you really want the config files stored on a different host to the + Xprt server, which seems somehow pointless. + So, xprt-common now Depends: xprt-xprintorg ( | xprt). + Closes: #195070, #211002, #238559. + * xprt-common only contains config files, so it should really be + Architecture: all. Why wasn't this noticed before? + + -- Drew Parsons Sat, 20 Mar 2004 17:06:20 +1100 + +xprint-xprintorg (0.0.9.cvs20040216-2) unstable; urgency=low + + * Updated the Japanese debconf translation. Closes: #234254. + * Replaced Build-Depends: xlibs-dev in favour of the new separated + X libraries. + + -- Drew Parsons Wed, 25 Feb 2004 19:54:26 +1100 + +xprint-xprintorg (0.0.9.cvs20040216-1) unstable; urgency=low + + * New upstream version: v009 release candidate 1. + + -- Drew Parsons Sat, 21 Feb 2004 12:02:12 +1100 + +xprint-xprintorg (0.0.9.cvs20040114-3) unstable; urgency=low + + * The "Now He Tells Me" release. + * Build-depends: xutils. This provides mkfontdir, whose absence was the + real cause of the bug I tried to fix in -2. + + -- Drew Parsons Thu, 15 Jan 2004 17:18:09 +1030 + +xprint-xprintorg (0.0.9.cvs20040114-2) unstable; urgency=low + + * Build-depends: lesstif2-dev. In order to compile xpxmhelloworld and allow + the build to proceed. Not that I package xpxmhelloworld, ho-hum. + + -- Drew Parsons Thu, 15 Jan 2004 10:43:56 +1030 + +xprint-xprintorg (0.0.9.cvs20040114-1) unstable; urgency=low + + * New upstream version (0.0.9 gamma) + - fixes handling of missing xft servers (closes: #224952,#226642,#226703). + * Added Japanese template translation. Thanks Hideki Yamane! + Closes: #224180. + + -- Drew Parsons Wed, 14 Jan 2004 17:56:59 +1030 + +xprint-xprintorg (0.0.9.cvs20031220-1) unstable; urgency=low + + * New upstream version (0.0.9 beta). + - new improved font download engine. + - supports OpenType fonts. Closes: #211798, #216813. + - XFree86 config file is used to extract font paths (as well as standard + paths and the defoma directory). + - supports PDF output (find it in /tmp/Xprintjobs). + - improved CUPS support. cupsys-bsd is no longer mandatory (but still + works fine). Closes: #206657. + - uses lockfiles for Xprint servers started via /etc/init.d/xprint. + Closes: #198745. + * xprt-common Recommends: xfonts-base, in order to find encodings.dir. + It is not a strict dependency since the location of the file can be set + as a configuration option in /etc/init.d/xprint. Closes: #217524. + * xprt-xprintorg Provides: xprt. Strictly speaking this is only valid if + we create a virtual package called xprt, but what the hell. + "Future proofing"... ;) Closes: #206655. + + -- Drew Parsons Fri, 5 Dec 2003 23:08:13 +1100 + +xprint-xprintorg (0.0.8.cvs20030508-6) unstable; urgency=low + + * Added defoma directory to font directory in /etc/init.d/xprint. + Closes: #206557. + * Applied upstream patch to improve printer spool (CUPS) handling. + * New standards version 3.6.1. + + -- Drew Parsons Fri, 26 Sep 2003 09:33:31 +1000 + +xprint-xprintorg (0.0.8.cvs20030508-5) unstable; urgency=low + + * Something went awry with the changes in -4, so try again: + - French debconf translation. Closes: #199347. + + -- Drew Parsons Wed, 30 Jul 2003 20:25:03 +1000 + +xprint-xprintorg (0.0.8.cvs20030508-4) unstable; urgency=low + + * Updated upstream patch for /etc/init.d/xprint regarding LSB. + * French debconf translation provided by Christian Perrier. Closes: #199347. + + -- Drew Parsons Mon, 30 Jun 2003 18:49:09 +1000 + +xprint-xprintorg (0.0.8.cvs20030508-3) unstable; urgency=low + + * Applied upstream patch to make /etc/init.d/xprint compliant with LSB. + * Updated debconf template to new po format using debconf-gettextize. + Added Build-Depends: debhelper (>= 4.1.16). Tidied up some spaces and + formatting in template and Description in control. Closes: #198287. + + -- Drew Parsons Sun, 22 Jun 2003 00:45:13 +1000 + +xprint-xprintorg (0.0.8.cvs20030508-2) unstable; urgency=low + + * Identify that Xprt is the server in question during stop/start + messages from /etc/init.d/xprint. Closes: #194694, #196487. + + -- Drew Parsons Sat, 14 Jun 2003 13:37:50 +1000 + +xprint-xprintorg (0.0.8.cvs20030508-1) unstable; urgency=low + + * Final 0.0.8 release. + No significant changes from previous release candidate (mainly fixes for + Solaris). + * Description identifies that TrueType fonts are now supported in 0.0.8. + Closes: #190736. + * New standards version: 3.5.10. + + -- Drew Parsons Sun, 25 May 2003 12:47:06 +1000 + +xprint-xprintorg (0.0.8.cvs20030416-1) unstable; urgency=low + + * New upstream version: v0.0.8 release candidate #2. + * I forgot to mention last time, man pages were recompiled with docbook2man, + gives better results than docbook-to-man. + + -- Drew Parsons Wed, 23 Apr 2003 13:12:31 +1000 + +xprint-xprintorg (0.0.8.cvs20030403-1) unstable; urgency=low + + * New upstream version. + + -- Drew Parsons Sat, 12 Apr 2003 23:49:35 +1000 + +xprint-xprintorg (0.0.8.cvs20030328-2) unstable; urgency=low + + * Added libxaw7-dev to Build-Depends in debian/control. + Closes: #186782, #186785. + + -- Drew Parsons Sun, 30 Mar 2003 09:56:21 +1000 + +xprint-xprintorg (0.0.8.cvs20030328-1) unstable; urgency=low + + * Upstream CVS. "Beta" version for release 0.0.8. + * Upstream changes include: + - Xsession.d script defines XPSERVERLIST for all X sessions, + removing the need to set it in profile files. + Closes: #171174, #177104. + - "-nolisten tcp" is now implemented, allowing for improved network + security when using Xprt. + Note that you may need to reset XPSERVERLIST (possibly by restarting X), + since this improvement requires the Xprt "display" to be given as ":64" + rather than "localhost:64". + Closes: #162023. + - the use of TrueType fonts is now supported. + - man pages are now available for the Xprt and other support binaries. + - size of source tarball now reduced to about 10 MB. + * The Xprint FAQ is always updated fresh from each new upstream tarball. + Closes: #170903. + * The upstream source tarball is now handled using dbs, one of Debian's patch + handling tools. This should facilitate the incorporation of one-off + patches in the future, such as the "-nolisten tcp" patch. + I decided in this context to use the pristine upstream tarball without + modification, rather than removing the www directory from it. The size + of www is not significant. + * Identify use of debhelper v4 via debian/compat. + * Standards version 3.5.9. + + -- Drew Parsons Sat, 29 Mar 2003 02:53:12 +1100 + +xprint-xprintorg (0.0.7.cvs20021203-1) unstable; urgency=low + + * New upstream version (final release for v007). + + -- Drew Parsons Mon, 9 Dec 2002 18:13:38 +1100 + +xprint-xprintorg (0.0.7.cvs20021125-1) unstable; urgency=low + + * New upstream version (final release candidate for v007). + * Standards version 3.5.8. + * Upstream tarball created by make_xprint_tarball (invoked in + debian/rules) for Debian systems now recognises it is building for + Debian and places config files in /usr/share/Xprint, not + /usr/X11R6/lib/X11. debian/xprt-common.install changed accordingly. + * Added link from usr/share/Xprint/xserver/README to + usr/share/doc/xprt-common/README in debian/xprt-common.links. + * xserver/SecurityPolicy no longer exists, remove from + debian/xprt-common.links and debian/rules. + * Added attributes directory for en_US to config files in /etc/Xprint + (allows default paper for en_US to be letter, for everyone else A4). + Altered directory structure in /etc/Xprint to accomodate both C and en_US + locales. Changes made in rules, xprt-common.dirs, xprt-common.links. + Debconf invoked to remove old config files, if user permits it. + * Removed xprt-common.conffiles, since dh_installdeb (v3 and higher) + automatically lists everything in /etc as a conffile. + + -- Drew Parsons Mon, 2 Dec 2002 18:11:04 +1100 + +xprint-xprintorg (0.0.7.cvs20021101-1) unstable; urgency=low + + * New upstream version. + * Debian patches incorporated upstream (thanks Roland!). + * /etc/init.d/xprint now provided in upstream source. + Note that upstream has set the Xprint "display" to :64, not :12. + You may have to refresh shell variable XPSERVERLIST by restarting client + programs such as mozilla or by relogging in again. + * Binary stripping switched off (dh_strip commented out in debian/rules) + by upstream's request, see Debian bug #164952. Only temporary. + + -- Drew Parsons Tue, 5 Nov 2002 08:20:15 +1100 + +xprint-xprintorg (0.0.7.cvs20021004-1) unstable; urgency=low + + * New upstream version. + * Should facilitate build on sparc and mips. + + -- Drew Parsons Tue, 8 Oct 2002 15:24:44 +1000 + +xprint-xprintorg (0.0.7.cvs20020903-3) unstable; urgency=low + + * Change reference in README.Debian from /etc/environment to /etc/profile + for setting variable XPSERVERLIST. + + -- Drew Parsons Mon, 23 Sep 2002 22:38:35 +1000 + +xprint-xprintorg (0.0.7.cvs20020903-2) unstable; urgency=low + + * Moved check for Xprt binary to point where it is invoked in + debian/xprt-common.xprint (i.e. /etc/init.d/xprint). + Depends: on xprt[-xprintorg] should not be required, /etc/init.d/xprint may + complain, but this ought not to affect installation. + Closes: #161824. + + -- Drew Parsons Sun, 22 Sep 2002 11:09:43 +1000 + +xprint-xprintorg (0.0.7.cvs20020903-1) unstable; urgency=low + + * New package. Closes: #149658. + * 0.0.7 release branch from CVS tarball, 3 September 2002. + * Includes modified /etc/init.d/xprint script (v0.2) from + http://mozdev.org/bugs/show_bug.cgi?id=2037 + * Standards Version 3.5.7. + + -- Drew Parsons Sun, 15 Sep 2002 12:33:27 +1000 + --- xorg-server-1.4.1~git20080131.orig/debian/local/xvfb-run.1 +++ xorg-server-1.4.1~git20080131/debian/local/xvfb-run.1 @@ -0,0 +1,282 @@ +.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ +.\" +.\" Copyright 1998-2004 Branden Robinson . +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This is distributed in the hope that it will be useful, but +.\" WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License with +.\" the Debian operating system, in /usr/share/common-licenses/GPL; if +.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, +.\" Suite 330, Boston, MA 02111-1307 USA +.\" +.\" We need the URL macro from groff's www macro package, but also want +.\" things to work all right for people who don't have it. So we define +.\" our own URL macro and let the www macro package override it if it's +.\" available. +.de URL +\\$2 \(laURL: \\$1 \(ra\\$3 +.. +.if \n[.g] .mso www.tmac +.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" +.SH NAME +xvfb\-run \- run specified X client or command in a virtual X server environment +.SH SYNOPSIS +.B xvfb\-run +[ +.I options +] +.I command +.SH DESCRIPTION +.B xvfb\-run +is a wrapper for the +.BR Xvfb (1x) +command which simplifies the task of running commands (typically an X +client, or a script containing a list of clients to be run) within a virtual +X server environment. +.PP +.B xvfb\-run +sets up an X authority file (or uses an existing user\-specified one), +writes a cookie to it (see +.BR xauth (1x)) +and then starts the +.B Xvfb +X server as a background process. +The process ID of +.B Xvfb +is stored for later use. +The specified +.I command +is then run using the X display corresponding to the +.B Xvfb +server +just started and the X authority file created earlier. +.PP +When the +.I command +exits, its status is saved, the +.B Xvfb +server is killed (using the process ID stored earlier), the X authority +cookie removed, and the authority file deleted (if the user did not specify +one to use). +.B xvfb\-run +then exits with the exit status of +.IR command . +.PP +.B xvfb\-run +requires the +.B xauth +command to function. +.SH OPTIONS +.TP +.B \-a\fR,\fB \-\-auto\-servernum +Try to get a free server number, starting at 99, or the argument to +.BR \-\-server\-num . +.TP +.BI \-e\ file \fR,\fB\ \-\-error\-file= file +Store output from +.B xauth +and +.B Xvfb +in +.IR file . +The default is +.IR /dev/null . +.TP +.BI \-f\ file \fR,\fB\ \-\-auth\-file= file +Store X authentication data in +.IR file . +By default, a temporary directory called +.IR xvfb\-run. PID +(where PID is the process ID of +.B xvfb\-run +itself) is created in the directory specified by the environment variable +.B TMPDIR +(or +.I /tmp +if that variable is null or unset), and the +.BR tempfile (1) +command is used to create a file in that temporary directory called +.IR Xauthority . +.TP +.B \-h\fR,\fB \-\-help +Display a usage message and exit. +.TP +.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber +Use +.I servernumber +as the server number (but see the +.B \-a\fR,\fB \-\-auto\-servernum +option above). +The default is 99. +.TP +.B \-l\fR,\fB \-\-listen\-tcp +Enable TCP port listening in the X server. +For security reasons (to avoid denial\-of\-service attacks or exploits), +TCP port listening is disabled by default. +.TP +.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname +Use +.I protocolname +as the X authority protocol to use. +The default is \(oq.\(cq, which +.B xauth +interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. +.TP +.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments +Pass +.I arguments +to the +.B Xvfb +server. +Be careful to quote any whitespace characters that may occur within +.I arguments +to prevent them from regarded as separators for +.BR xvfb\-run 's +own arguments. +Also, note that specification of \(oq\-nolisten tcp\(cq in +.I arguments +may override the function of +.BR xvfb\-run 's +own +.B \-l\fR,\fB \-\-listen\-tcp +option, and that specification of the server number (e.g., \(oq:1\(cq) may +be ignored because of the way the X server parses its argument list. +Use the +.B xvfb\-run +option +.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber +to achieve the latter function. +The default is \(oq\-screen 0 640x480x8\(cq. +.TP +.BI \-w\ delay \fR,\fB\ \-\-wait= delay +Wait +.I delay +seconds after launching +.B Xvfb +before attempting to start the specified command. +The default is 3. +.SH ENVIRONMENT +.TP +.B COLUMNS +indicates the width of the terminal device in character cells. +This value is used for formatting diagnostic messages. +If not set, the terminal is queried using +.BR stty (1) +to determine its width. +If that fails, a value of \(oq80\(cq is assumed. +.TP +.B TMPDIR +specifies the directory in which to place +.BR xvfb\-run 's +temporary directory for storage of the X authority file; only used if the +.B \-f +or +.B \-\-auth\-file +options are not specified. +.SH "OUTPUT FILES" +.PP +Unless the +.B \-f +or +.B \-\-auth\-file +options are specified, a temporary +directory and file within it are created (and deleted) to store the X +authority cookies used by the +.B Xvfb +server and client(s) run under it. +See +.BR tempfile (1). +If \-f or \-\-auth\-file are used, then the specified X authority file is +only written to, not created or deleted (though +.B xauth +creates an authority file itself if told to use use that does not already +exist). +.PP +An error file with a user\-specified name is also created if the +.B \-e +or +.B \-\-error\-file +options are specifed; see above. +.SH "EXIT STATUS" +.B xvfb\-run +uses its exit status as well as output to standard error to communicate +diagnostics. +The exit status of \(oq1\(cq is not used, and should be interpreted as failure +of the specified command. +.TP +0 +.B xvfb\-run +only uses this exit status if the +.B \-h\fR,\fB \-\-help +option is given. +In all other situations, this may be interpreted as success of the specified +command. +.TP +2 +No command to run was specified. +.TP +3 +The +.B xauth +command is not available. +.TP +4 +The temporary directory that was going to be used already exists; since +.B xvfb\-run +produces a uniquely named directory, this may indicate an attempt by another +process on the system to exploit a temporary file race condition. +.TP +5 +A problem was encountered while cleaning up the temporary directory. +.TP +6 +A problem was encountered while using +.BR getopt (1) +to parse the command\-line arguments. +.SH EXAMPLES +.TP +.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo +runs the +.BR xlogo (1x) +demonstration client inside the +.B Xvfb +X server on the first available server number greater than or equal to 1. +.TP +.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces +runs the +.BR ico (1x) +demonstration client (and passes it the +.B \-faces +argument) inside the +.B Xvfb +X server, configured with a root window of 1024 by 768 pixels and a color +depth of 24 bits. +.PP +Note that the demo X clients used in the above examples will not exit on +their own, so they will have to be killed before +.B xvfb\-run +will exit. +.SH BUGS +See +.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . +If you wish to report a bug in +.BR xvfb\-run , +please use the +.BR reportbug (1) +command. +.SH AUTHOR +.B xfvb\-run +was written by Branden Robinson and Jeff Licquia with sponsorship from +Progeny Linux Systems. +.SH "SEE ALSO" +.BR Xvfb (1x), +.BR xauth (1x) +.\" vim:set et tw=80: --- xorg-server-1.4.1~git20080131.orig/debian/local/xvfb-run +++ xorg-server-1.4.1~git20080131/debian/local/xvfb-run @@ -0,0 +1,183 @@ +#!/bin/sh + +# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ + +# This script starts an instance of Xvfb, the "fake" X server, runs a command +# with that server available, and kills the X server when done. The return +# value of the command becomes the return value of this script. +# +# If anyone is using this to build a Debian package, make sure the package +# Build-Depends on xvfb, xbase-clients, and xfonts-base. + +set -e + +PROGNAME=xvfb-run +SERVERNUM=99 +AUTHFILE= +ERRORFILE=/dev/null +STARTWAIT=3 +XVFBARGS="-screen 0 640x480x8" +LISTENTCP="-nolisten tcp" +XAUTHPROTO=. + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the event +# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the +# script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +# Display a message, wrapping lines at the terminal width. +message () { + echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} +} + +# Display an error message. +error () { + message "error: $*" >&2 +} + +# Display a usage message. +usage () { + if [ -n "$*" ]; then + message "usage error: $*" + fi + cat <"$ERRORFILE" 2>&1 + fi + if [ -n "$XVFB_RUN_TMPDIR" ]; then + if ! rm -r "$XVFB_RUN_TMPDIR"; then + error "problem while cleaning up temporary directory" + exit 5 + fi + fi +} + +# Parse the command line. +ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ + --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ + --name "$PROGNAME" -- "$@") +GETOPT_STATUS=$? + +if [ $GETOPT_STATUS -ne 0 ]; then + error "internal error; getopt exited with status $GETOPT_STATUS" + exit 6 +fi + +eval set -- "$ARGS" + +while :; do + case "$1" in + -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; + -e|--error-file) ERRORFILE="$2"; shift ;; + -f|--auth-file) AUTHFILE="$2"; shift ;; + -h|--help) SHOWHELP="yes" ;; + -n|--server-num) SERVERNUM="$2"; shift ;; + -l|--listen-tcp) LISTENTCP="" ;; + -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; + -s|--server-args) XVFBARGS="$2"; shift ;; + -w|--wait) STARTWAIT="$2"; shift ;; + --) shift; break ;; + *) error "internal error; getopt permitted \"$1\" unexpectedly" + exit 6 + ;; + esac + shift +done + +if [ "$SHOWHELP" ]; then + usage + exit 0 +fi + +if [ -z "$*" ]; then + usage "need a command to run" >&2 + exit 2 +fi + +if ! which xauth >/dev/null; then + error "xauth command not found" + exit 3 +fi + +# tidy up after ourselves +trap clean_up EXIT + +# If the user did not specify an X authorization file to use, set up a temporary +# directory to house one. +if [ -z "$AUTHFILE" ]; then + XVFB_RUN_TMPDIR="${TMPDIR:-/tmp}/$PROGNAME.$$" + if ! mkdir -p -m 700 "$XVFB_RUN_TMPDIR"; then + error "temporary directory $XVFB_RUN_TMPDIR already exists" + exit 4 + fi + AUTHFILE=$(tempfile -n "$XVFB_RUN_TMPDIR/Xauthority") +fi + +# Start Xvfb. +MCOOKIE=$(mcookie) +XAUTHORITY=$AUTHFILE xauth add ":$SERVERNUM" "$XAUTHPROTO" "$MCOOKIE" \ + >"$ERRORFILE" 2>&1 +XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >"$ERRORFILE" \ + 2>&1 & +XVFBPID=$! +sleep "$STARTWAIT" +if ! kill -0 $XVFBPID 2>/dev/null; then + echo "Xvfb failed to start" >&2 + exit 1 +fi + +# Start the command and save its exit status. +set +e +DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 +RETVAL=$? +set -e + +# Kill Xvfb now that the command has exited. +kill $XVFBPID + +# Return the executed command's exit status. +exit $RETVAL + +# vim:set ai et sts=4 sw=4 tw=80: --- xorg-server-1.4.1~git20080131.orig/debian/xserver-xorg-core.NEWS +++ xorg-server-1.4.1~git20080131/debian/xserver-xorg-core.NEWS @@ -0,0 +1,62 @@ +xorg-server (2:1.3.0.0.dfsg-3) unstable; urgency=low + + * The server now includes a patch to always include the font paths + defined at compile-time by default. This will help prevent errors with + finding fonts when a xorg.conf has alternate font paths specified. + + As a result of this, many of the font paths shipped in our default + xorg.conf are obsolete, and may be deleted. If you have no customized + your xorg.conf, a future update to the xserver-xorg package will + re-create the file from your stored preferences. + + If for some reason you do not want the server to look in the default + font paths, you can set the boolean variable "UseDefaultFontPath" to + "False" in the ServerFlags section of your xorg.conf. + + -- David Nusinow Tue, 24 Apr 2007 00:18:04 -0400 + +xorg-server (2:1.2.99.905-3) experimental; urgency=low + + * This server update includes a patch to enable proper module defaults in + the server. A default set of modules will be loaded unless you + specifically specify that they don't load. You may do this in the module + section of your xorg.conf using the "Disable" instruction. Note that + this will only override the default, not an explicit "Load". + + This change will not affect most users, however if you have a customized + xorg.conf in which you comment out "Load" lines to disable modules, you + will want to change those lines so that they are uncommented and say + "Disable" instead of "Load". The most notable example of this is the dri + module, which is now loaded by default. Those who experience crashes + when dri is enabled will want to make this change to ensure that their + system does not begin to crash again. + + -- David Nusinow Sat, 14 Apr 2007 12:41:37 -0400 + +xserver-xorg-core (1:1.0.2-5) unstable; urgency=low + + * Several users have reported an error on load like the following: + + "(EE) Failed to load module "GLcore" (loader failed, 7)" + + To resolve this error and the related ones in the logfile above it, + remove the line to load the glcore module in your /etc/X11/xorg.conf. + Other similar errors about module loading can be resolved the same way. + If you have not customized your config file by hand, you can run the + command "dpkg-reconfigure xserver-xorg" as root to do this for you. + + -- David Nusinow Wed, 12 Apr 2006 19:38:51 -0400 + +xserver-xorg-core (1:1.0.2-3) unstable; urgency=low + + * With the latest updates of Xorg, we have transitioned from X11R6 to + X11R7. Part of this transition involves changing the paths to the + xfonts and the xkb data files, as well as the modules loaded by the X + server. One way to automatically update the paths is to run + "dpkg-reconfigure xserver-xorg" as root and it will automatically + generate a new config file for you. Note that this will currently not + work for people who have customized config files due to a bug, so + you'll have to manually edit your config if you have customized it + previously. + + -- David Nusinow Wed, 12 Apr 2006 19:38:51 -0400 --- xorg-server-1.4.1~git20080131.orig/debian/xvfb.install +++ xorg-server-1.4.1~git20080131/debian/xvfb.install @@ -0,0 +1,4 @@ +usr/bin/Xvfb +usr/bin/xvfb-run +usr/share/man/man1/xvfb-run.1 +usr/share/man/man1/Xvfb.1 --- xorg-server-1.4.1~git20080131.orig/debian/xserver-xephyr.docs +++ xorg-server-1.4.1~git20080131/debian/xserver-xephyr.docs @@ -0,0 +1 @@ +hw/kdrive/ephyr/README --- xorg-server-1.4.1~git20080131.orig/debian/po/bg.po +++ xorg-server-1.4.1~git20080131/debian/po/bg.po @@ -0,0 +1,50 @@ +# translation of bg.po to Bulgarian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Damyan Ivanov , 2007. +msgid "" +msgstr "" +"Project-Id-Version: xorg-server\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 07:46+0200\n" +"PO-Revision-Date: 2007-09-19 22:08+0300\n" +"Last-Translator: Damyan Ivanov \n" +"Language-Team: Bulgarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Подразбирана разделителна ÑпоÑобноÑÑ‚ на принтера:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Xprint използва по подразбиране разделителна ÑпоÑобноÑÑ‚ от 600 dpi. Тази " +"ÑтойноÑÑ‚ би Ñ‚Ñ€Ñбвало да е подгодÑща за повечето принтери." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"При нÑкои принтери Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¸Ñ‚ÐµÐ»Ð½Ð° ÑпоÑобноÑÑ‚ от 1200 dpi изображението може " +"да е Ñвито в ъгъла на Ñтраницата, а при други, използващи 300 dpi - да е " +"твърде разтегнато. Ðко имате подобни проблеми при печатането, може да Ñе " +"наложи да промените подразбираната разделителна ÑпоÑобноÑÑ‚ на принтера Ñ Ð¿Ð¾-" +"подходÑща ÑтойноÑÑ‚. Вижте /usr/share/doc/xprint-commin/README.printing-" +"problems.gz за повече информациÑ." --- xorg-server-1.4.1~git20080131.orig/debian/po/eu.po +++ xorg-server-1.4.1~git20080131/debian/po/eu.po @@ -0,0 +1,50 @@ +# translation of xorg-server-templates.po to Euskara +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Piarres Beobide , 2007. +msgid "" +msgstr "" +"Project-Id-Version: xorg-server-templates\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 07:46+0200\n" +"PO-Revision-Date: 2007-09-18 09:59+0200\n" +"Last-Translator: Piarres Beobide \n" +"Language-Team: Euskara \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Lehenetsiko inprimagailu erresoluzioa:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Lehenespenez, Xprint-ek inprimagailu erresoluzioa 600 dpi-koa dela " +"pentsatuko du. Balio hau egokia izan beharko litzateke inprimagailu " +"gehienentzat." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"1200 dpi-ko zenbait inprimagailuetan hala ere irudia orriaren ertzean agertu " +"daiteke edo handiegia izan liteke 300 dpi-ko inprimagailuentzat. Horrelako " +"arazoak jasaten badituzu eta inprimagailu erresoluzioa beste balio " +"erabilgarriago batetara aldatu nahi izanez gero irakurri /usr/share/doc/" +"xprint-common/README.printing-problems.gz xehetasun gehiagorako." --- xorg-server-1.4.1~git20080131.orig/debian/po/he.po +++ xorg-server-1.4.1~git20080131/debian/po/he.po @@ -0,0 +1,48 @@ +# translation of templates.po to Hebrew +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Lior Kaplan , 2007. +msgid "" +msgstr "" +"Project-Id-Version: templates\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 07:46+0200\n" +"PO-Revision-Date: 2007-09-19 18:35+0200\n" +"Last-Translator: Lior Kaplan \n" +"Language-Team: Hebrew \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "רזולוציה ברית מחדל של המדפסת:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"כברירת מחדל, Xprint מניחה על רזולוציית המדפסת ×”×™× 600 dpi. ערך ×–×” צריך " +"להת××™× ×”×™×˜×‘ לרוב המדפסות." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"עבור מספר מדפסות 1200 dpi, התמונה עלולה להופיע מעוכה בפינת הדף, ×ו ×©×”×™× " +"תופיע בהגדלה רבה מידי במדפסות 300 dpi. ×× ×™×©× ×Ÿ ×›×לה בעיות, כד××™ לקבוע ×ת ערך " +"רזולוציית ברירת המחדל לערך מת××™× ×™×•×ª×¨. ×¤×¨×˜×™× × ×•×¡×¤×™× ×™×©× × ×‘×§×•×‘×¥ /usr/share/" +"doc/xprint-common/README.printing-problems.gz" --- xorg-server-1.4.1~git20080131.orig/debian/po/POTFILES.in +++ xorg-server-1.4.1~git20080131/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] xprint-common.templates --- xorg-server-1.4.1~git20080131.orig/debian/po/ru.po +++ xorg-server-1.4.1~git20080131/debian/po/ru.po @@ -0,0 +1,60 @@ +# translation of ru.po to Russian +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Yuri Kozlov , 2006, 2007. +msgid "" +msgstr "" +"Project-Id-Version: 2:1.3.0.0.dfsg-13\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 20:35+0200\n" +"PO-Revision-Date: 2007-09-24 20:33+0400\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Разрешение печати Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð° по умолчанию:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"По умолчанию, Xprint предполагает, что принтер имеет разрешение печати 600 " +"dpi. Это значение приемлемо Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½Ñтва принтеров." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"Однако, на принтерах Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸ÐµÐ¼ печати 1200 dpi изображение может " +"оказатьÑÑ Ñжатым в углу Ñтраницы или может Ñтать Ñлишком большим на " +"принтерах Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸ÐµÐ¼ печати 300 dpi. ЕÑли у Ð²Ð°Ñ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð¸ подобные " +"проблемы Ñ Ð¿ÐµÑ‡Ð°Ñ‚ÑŒÑŽ, уÑтановите более подходÑщее значение Ð´Ð»Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ " +"печати принтера по умолчанию. Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ñ€ÐµÐ´Ñтавлена в " +"файле /usr/share/doc/xprint-common/README.printing-problems.gz." --- xorg-server-1.4.1~git20080131.orig/debian/po/pt_BR.po +++ xorg-server-1.4.1~git20080131/debian/po/pt_BR.po @@ -0,0 +1,85 @@ +# portmap Brazilian Portuguese translation +# Copyright (C) 2007 THE portmap'S COPYRIGHT HOLDER +# This file is distributed under the same license as the portmap package. +# Felipe Augusto van de Wiel (faw) , 2007. +# Eder L. Marques (frolic) , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: portmap 6.0-2\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 20:35+0200\n" +"PO-Revision-Date: 2007-10-03 17:17-0300\n" +"Last-Translator: Eder L. Marques (frolic) \n" +"Language-Team: l10n Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"pt_BR utf-8\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" + +#~ msgid "Should portmap be bound to the loopback address?" +#~ msgstr "O portmap deveria escutar somente no endereço de loopback?" + +#~| msgid "" +#~| "Portmap by default listens to all IP addresses. However, if you are not " +#~| "providing network RPC services to remote clients (you are if you are " +#~| "setting up a NFS or NIS server) you can safely bind it to the loopback " +#~| "IP address (127.0.0.1)" +#~ msgid "" +#~ "By default, portmap listens to all IP addresses. However, if this machine " +#~ "does not provide network RPC services (such as NIS or NFS) to remote " +#~ "clients, you can safely bind it to the loopback IP address (127.0.0.1)." +#~ msgstr "" +#~ "Por padrão, o portmap escuta em todos os endereços IP. Entretanto, se " +#~ "esta máquina não provê serviços de rede RPC (como NIS ou NFS) para " +#~ "clientes remotos, você pode, com segurança, restringí-lo somente ao " +#~ "endereço IP de loopback (127.0.0.1)." + +#~| msgid "" +#~| "This will allow RPC local services (like FAM) to work properly, while " +#~| "preventing remote systems from accessing your RPC services." +#~ msgid "" +#~ "This will allow RPC local services (like FAM) to work properly, while " +#~ "preventing remote systems from accessing the RPC services." +#~ msgstr "" +#~ "Isto permitirá que serviços RPC locais (como o FAM) funcionem " +#~ "corretamente, enquanto previne que sistemas remotos acessem os serviços " +#~ "RPC." + +#~| msgid "" +#~| "You can also change this configuration by editing the OPTIONS line in " +#~| "the /etc/default/portmap file. If you just don't specify the -i option " +#~| "it will bind to all interfaces." +#~ msgid "" +#~ "This configuration can be changed by editing the OPTIONS line in the /etc/" +#~ "default/portmap file and adapting the use of the -i option to your needs." +#~ msgstr "" +#~ "Esta configuração pode ser alterada editando a linha OPTIONS no arquivo /" +#~ "etc/default/portmap e adaptando o uso da opção -i para as suas " +#~ "necessidades." --- xorg-server-1.4.1~git20080131.orig/debian/po/th.po +++ xorg-server-1.4.1~git20080131/debian/po/th.po @@ -0,0 +1,47 @@ +# Thai translation for xorg-server +# Copyright (C) 2007 Software in the Public Interest, Inc. +# This file is distributed under the same license as the xorg-server package. +# Theppitak Karoonboonyanan , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg-server\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 07:46+0200\n" +"PO-Revision-Date: 2007-09-18 13:54+0700\n" +"Last-Translator: Theppitak Karoonboonyanan \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "ความละเอียดปริยายของเครื่องพิมพ์:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"โดยปà¸à¸•à¸´ Xprint จะใช้ความละเอียด 600 dpi สำหรับเครื่องพิมพ์ ซึ่งน่าจะใช้ได้à¸à¸±à¸šà¹€à¸„รื่องพิมพ์ส่วนใหà¸à¹ˆ" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"à¹à¸•à¹ˆà¸ªà¸³à¸«à¸£à¸±à¸šà¹€à¸„รื่องพิมพ์ 1200 dpi บางรุ่นà¹à¸¥à¹‰à¸§ ค่านี้อาจทำให้ภาพที่พิมพ์ออà¸à¸¡à¸²à¹€à¸¥à¸­à¸°à¸—ี่มุมหน้าà¸à¸£à¸°à¸”าษ " +"หรือถ้าเป็นเครื่องพิมพ์ 300 dpi à¸à¹‡à¸ˆà¸°à¹„ด้ภาพที่ใหà¸à¹ˆà¹€à¸à¸´à¸™à¹„ป ถ้าคุณพบปัà¸à¸«à¸²à¸à¸²à¸£à¸žà¸´à¸¡à¸žà¹Œà¸”ังà¸à¸¥à¹ˆà¸²à¸§ " +"คุณà¸à¹‡à¸­à¸²à¸ˆà¸à¸³à¸«à¸™à¸”ความละเอียดปริยายของเครื่องพิมพ์ให้เป็นค่าที่เหมาะสมได้ " +"à¸à¸£à¸¸à¸“าอ่านรายละเอียดเพิ่มเติมได้จาภ/usr/share/doc/xprint-common/README.printing-" +"problems.gz" --- xorg-server-1.4.1~git20080131.orig/debian/po/gl.po +++ xorg-server-1.4.1~git20080131/debian/po/gl.po @@ -0,0 +1,47 @@ +# Galician translation of xorg-server's debconf templates +# This file is distributed under the same license as the xorg-server package. +# Jacobo Tarrio , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg-server\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 07:46+0200\n" +"PO-Revision-Date: 2007-09-30 18:53+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Resolución de impresión por defecto:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Por defecto, Xprint supón unha resolución de impresión de 600 ppp. Este " +"valor é axeitado para a maioría das impresoras." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"Nembargantes, nalgunhas impresoras de 1200 ppp a imaxe pode aparecer " +"aplastada nunha esquina da páxina, ou pode aparecer grande de máis en " +"impresoras de 300 ppp. Se ten este tipo de problemas pode cambiar a " +"resolución de impresión a un valor máis axeitado. Consulte /usr/share/doc/" +"xprint-common/README.printing-problems.gz para ter máis detalles." --- xorg-server-1.4.1~git20080131.orig/debian/po/de.po +++ xorg-server-1.4.1~git20080131/debian/po/de.po @@ -0,0 +1,58 @@ +# translation of xorg-server_2:1.3.0.0.dfsg-13_de.po to German +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Erik Schanze , 2004-2007. +msgid "" +msgstr "" +"Project-Id-Version: xorg-server_2:1.3.0.0.dfsg-13_de\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 20:35+0200\n" +"PO-Revision-Date: 2007-10-01 21:52+0200\n" +"Last-Translator: Erik Schanze \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Standard-Druckerauflösung:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Standardmäßig verwendet Xprint eine Druckerauflösung von 600 dpi. Das " +"funktioniert gut mit den meisten Druckern." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"Trotzdem erscheint der Ausdruck bei bestimmten 1200-dpi-Druckern in die Ecke " +"der Seite gequetscht oder er wird auf 300-dpi-Druckern zu groß dargestellt. " +"Falls bei Ihnen diese Druckprobleme auftreten, sollten Sie die Standard-" +"Druckerauflösung auf einen besser passenden Wert setzen. Einzelheiten finden " +"Sie in der Datei /usr/share/doc/xprint-common/README.printing-problems.gz." --- xorg-server-1.4.1~git20080131.orig/debian/po/hu.po +++ xorg-server-1.4.1~git20080131/debian/po/hu.po @@ -0,0 +1,44 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 20:35+0200\n" +"PO-Revision-Date: 2007-09-18 08:21+0100\n" +"Last-Translator: SZERVÃC Attila \n" +"Language-Team: Hungarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Hungarian\n" +"X-Poedit-Country: HUNGARY\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Alapértelmezett nyomtató felbontás:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Alapban az Xprint 600dpi-s nyomtató felbontást feltételez. Ez jó a legtöbb " +"nyomtatóhoz." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"Egyes 1200dpi-s nyomtatókon viszont a kép a sarokba kerülhet vagy kilóghat " +"egyes 300dpi-s eszközökön. Hasonló hibáknál állítsd az alap nyomtató " +"felbontást megfelelÅ‘ értékre. Lásd a /usr/share/doc/xprint-common/README." +"printing-problems.gz fájlt a részletekért." --- xorg-server-1.4.1~git20080131.orig/debian/po/ja.po +++ xorg-server-1.4.1~git20080131/debian/po/ja.po @@ -0,0 +1,58 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# +msgid "" +msgstr "" +"Project-Id-Version: xorg-server 2:1.4.1~git20080118-1\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 20:35+0200\n" +"PO-Revision-Date: 2008-01-27 19:52+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "デフォルトã®ãƒ—リンタ解åƒåº¦:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"デフォルトã§ã¯ã€Xprint ã¯ãƒ—リンタã®è§£åƒåº¦ã‚’ 600dpi ã¨ã—ã¦ã„ã¾ã™ã€‚ã»ã¨ã‚“ã©ã®ãƒ—リン" +"ã‚¿ã§ã¯ã€ã»ã¨ã‚“ã©ã“ã®å€¤ã§è‰¯ã„ã§ã—ょã†ã€‚" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"ã—ã‹ã—ã€1200dpi 固定ã®ãƒ—リンタã§ã¯å°åˆ·ã•ã‚ŒãŸç”»åƒã¯ãƒšãƒ¼ã‚¸ã®éš…ã«è©°ã‚ã¦å°åˆ·ã•ã‚Œ" +"ã¦ã—ã¾ã„ã¾ã™ã—ã€300dpi ã®ãƒ—リンタã§ã¯å¤§ãããªã‚Šã™ãŽã¦ã—ã¾ã„ã¾ã™ã€‚ã“ã®æ§˜ãªå°åˆ·" +"時ã®å•é¡Œã«é­é‡ã—ãŸå ´åˆã€ãƒ—リンタã®è§£åƒåº¦ã‚’よりé©åˆ‡ãªå€¤ã«å¤‰æ›´ã—ãŸããªã‚‹ã§ã—ょã†ã€‚" +"詳細ã«ã¤ã„ã¦ã¯ã€/usr/share/doc/xprint-common/README.printing-problems.gz " +"ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + --- xorg-server-1.4.1~git20080131.orig/debian/po/ta.po +++ xorg-server-1.4.1~git20080131/debian/po/ta.po @@ -0,0 +1,49 @@ +# translation of xorg-server.po to TAMIL +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Dr.T.Vasudevan , 2007. +msgid "" +msgstr "" +"Project-Id-Version: xorg-server\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 07:46+0200\n" +"PO-Revision-Date: 2007-09-18 13:59+0530\n" +"Last-Translator: Dr.T.Vasudevan \n" +"Language-Team: TAMIL \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ அசà¯à®šà¯ இயநà¯à®¤à®¿à®° தௌதவà¯à®¤à¯à®¤à®¿à®±à®©à¯:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà®¾à®• எகà¯à®¸à¯ பà¯à®°à®¿à®©à¯à®Ÿà¯ அசà¯à®šà¯ இயநà¯à®¤à®¿à®° தௌதவà¯à®¤à¯à®¤à®¿à®±à®©à¯ ஆக 600 டிபி஠஠பà¯à®£à¯ˆà®¨à¯à®¤à¯ கொளà¯à®³à¯à®®à¯. " +"பெரà¯à®®à¯à®ªà®¾à®²à®¾à®© à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ அசà¯à®šà¯ இயநà¯à®¤à®¿à®°à®™à¯à®•à®³à¯à®•à¯à®•à¯ இத௠சரியாகவே இரà¯à®•à¯à®•à¯à®®à¯." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"சில 1200 dpi அசà¯à®šà¯ இயநà¯à®¤à®¿à®°à®™à¯à®•à®³à®¿à®²à¯ பிமà¯à®ªà®®à¯ பகà¯à®•à®¤à¯à®¤à®¿à®©à¯ மூலைகளில௠நெரà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà¯ காணà¯à®®à¯. " +"அலà¯à®²à®¤à¯ 300 dpi இயநà¯à®¤à®¿à®°à®™à¯à®•à®³à®¿à®²à¯ மிகபà¯à®ªà¯†à®°à®¿à®¤à®¾à®• தெரியà¯à®®à¯. இபà¯à®ªà®Ÿà®¿à®ªà¯à®ªà®Ÿà¯à®Ÿ பிரசà¯à®šà®¿à®©à¯ˆà®•à®³à¯ வநà¯à®¤à®¾à®²à¯ " +"நீஙà¯à®•à®³à¯ சரியான à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ அசà¯à®šà¯ இயநà¯à®¤à®¿à®° தௌதவà¯à®¤à¯à®¤à®¿à®±à®©à¯ ஠அமைகà¯à®• வேணà¯à®Ÿà¯à®®à¯. மேலà¯à®®à¯ " +"தகவலà¯à®•à®³à¯à®•à¯à®•à¯ /usr/share/doc/xprint-common/README.printing-problems.gz à® " +"பாரà¯à®•à¯à®•à®µà¯à®®à¯." --- xorg-server-1.4.1~git20080131.orig/debian/po/vi.po +++ xorg-server-1.4.1~git20080131/debian/po/vi.po @@ -0,0 +1,49 @@ +# Vietnamese translation for XOrg Server. +# Copyright © 2007 Free Software Foundation, Inc. +# Clytie Siddall , 2005-2007. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg-server 2:1.3.0.0.dfsg-13\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 20:35+0200\n" +"PO-Revision-Date: 2007-09-19 21:50+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.7b1\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Äá»™ phân giải máy in mặc định:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Mặc định là trình Xprint giả sá»­ Ä‘á»™ phân giải của máy in là 600 chấm/insÆ¡. " +"Äây nên hữu ích cho phần lá»›n máy in." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"Tuy nhiên, trên má»™t số máy in 1200 chấm/insÆ¡ nào đó, ảnh có thể hình nhÆ° bị " +"nén vào góc trang, hoặc nó có thể bị phóng to quá nhiá»u trên máy in 300 chấm/" +"insÆ¡. Gặp khó khăn in nhÆ° vậy thì bạn có thể muốn đặt Ä‘á»™ phân giải máy in " +"mặc định thành giá trị thích hợp hÆ¡n. Xem tập tin Äá»c Äi « /usr/share/doc/" +"xprint-common/README.printing-problems.gz » để tìm chi tiết." --- xorg-server-1.4.1~git20080131.orig/debian/po/sk.po +++ xorg-server-1.4.1~git20080131/debian/po/sk.po @@ -0,0 +1,43 @@ +msgid "" +msgstr "" +"Project-Id-Version: xorg-server 2:1.3.0.0.dfsg-12\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 20:35+0200\n" +"PO-Revision-Date: 2007-10-27 10:29+0100\n" +"Last-Translator: Ivan Masár \n" +"Language-Team: Slovak \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Å tandardné rozlíšenie tlaÄiarne:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Xprint Å¡tandardne predpokladá rozlíšenie tlaÄiarne 600 dpi. To by malo byÅ¥ v " +"poriadku pre väÄÅ¡inu dneÅ¡ných tlaÄiarní." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"Na istých tlaÄiarňach s 1200 dpi vÅ¡ak môže obraz vyzeraÅ¥ stlaÄený do rohu " +"stránky alebo na tlaÄiarňach s 300 dpi môže byÅ¥ natiahnutý. Ak máte takýto " +"problém, možno budete chcieÅ¥ zmeniÅ¥ Å¡tandardné rozlíšenie tlaÄiarne na " +"vhodnejÅ¡iu hodnotu. Viac informácií v /usr/share/doc/xprint-common/README." +"printing-problems.gz." --- xorg-server-1.4.1~git20080131.orig/debian/po/es.po +++ xorg-server-1.4.1~git20080131/debian/po/es.po @@ -0,0 +1,61 @@ +# +# +# +msgid "" +msgstr "" +"Project-Id-Version: xprint-es\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 20:35+0200\n" +"PO-Revision-Date: 2006-12-13 23:22+0100\n" +"Last-Translator: Fernando Cerezal López \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +#, fuzzy +#| msgid "Default printer resolution" +msgid "Default printer resolution:" +msgstr "Resolución predeterminada de la impresora" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +#, fuzzy +#| msgid "" +#| "By default Xprint assumes a printer resolution of 600dpi. This should be " +#| "fine for the majority of printers today." +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Por omisión, Xprint asume una resolución de impresión de 600 ppp. Esto " +"debería estar bien para la mayoría de las impresoras actuales." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +#, fuzzy +#| msgid "" +#| "On certain 1200dpi printers, however, the image might appear squashed in " +#| "the corner of the page, or it might be blown up too large on 300dpi " +#| "printers. If you are experiencing these kinds of printing problems, you " +#| "may want to set the default printer resolution to a more appropriate " +#| "value. See /usr/share/doc/xprint-common/README.printing-problems.gz for " +#| "more details." +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"Sin embargo, en ciertas impresoras de 1200 ppp, la imagen puede parecer " +"aplastada en la esquina de la página, o puede parecer demasiado hinchada en " +"impresoras de 300 ppp. Si experimenta este tipo de problemas de impresión, " +"puede que quiera establecer la resolución predeterminada de la impresora a " +"un valor más apropiado. Véase «/usr/share/doc/xprint-common/README.printing-" +"problems.gz» para obtener más detalles." --- xorg-server-1.4.1~git20080131.orig/debian/po/nl.po +++ xorg-server-1.4.1~git20080131/debian/po/nl.po @@ -0,0 +1,72 @@ +# Translation of xprint_1:0.1.0.alpha1-13_templates.po to dutch +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: xprint_1:0.1.0.alpha1-13_nl\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 20:35+0200\n" +"PO-Revision-Date: 2006-04-13 18:20\n" +"Last-Translator: Kurt De Bree \n" +"Language-Team: Nederlands \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +#, fuzzy +#| msgid "Default printer resolution" +msgid "Default printer resolution:" +msgstr "Standaard printerresolutie:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +#, fuzzy +#| msgid "" +#| "By default Xprint assumes a printer resolution of 600dpi. This should be " +#| "fine for the majority of printers today." +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Standaard veronderstelt Xprint een printerresolutie van 600dpi. Dit zou voor " +"het merendeel van de hedendaagse printers goed moeten zijn." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +#, fuzzy +#| msgid "" +#| "On certain 1200dpi printers, however, the image might appear squashed in " +#| "the corner of the page, or it might be blown up too large on 300dpi " +#| "printers. If you are experiencing these kinds of printing problems, you " +#| "may want to set the default printer resolution to a more appropriate " +#| "value. See /usr/share/doc/xprint-common/README.printing-problems.gz for " +#| "more details." +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"Op bepaalde 1200dpi-printers zou het beeld echter samengedrukt kunnen lijken " +"in de hoek van de pagina, terwijl het op 300dpi-printers te groot zou kunnen " +"worden opgeblazen. Als u dergelijke afdrukproblemen ervaart, kunt u de " +"standaard printerresolutie naar een meer passende waarde veranderen. Zie /" +"usr/share/doc/xprint-common/README.printing-problems.gz voor meer " +"gedetailleerde informatie." --- xorg-server-1.4.1~git20080131.orig/debian/po/da.po +++ xorg-server-1.4.1~git20080131/debian/po/da.po @@ -0,0 +1,60 @@ +# Danish translation of the Debconf po-template for xprint-xprintorg. +# Morten Bo Johansen , 2004, 2005. +msgid "" +msgstr "" +"Project-Id-Version: xprint-xprintorg_0.1.0.alpha1-8_da.po\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 20:35+0200\n" +"PO-Revision-Date: 2005-03-17 01:15+0100\n" +"Last-Translator: Morten Bo Johansen \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +#, fuzzy +#| msgid "Default printer resolution" +msgid "Default printer resolution:" +msgstr "Printerens standardopløsning" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +#, fuzzy +#| msgid "" +#| "By default Xprint assumes a printer resolution of 600dpi. This should be " +#| "fine for the majority of printers today." +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Xprint bruger en opløsning på 600dpi som standard. Dette skulle være " +"passende for de fleste nyere printere." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +#, fuzzy +#| msgid "" +#| "On certain 1200dpi printers, however, the image might appear squashed in " +#| "the corner of the page, or it might be blown up too large on 300dpi " +#| "printers. If you are experiencing these kinds of printing problems, you " +#| "may want to set the default printer resolution to a more appropriate " +#| "value. See /usr/share/doc/xprint-common/README.printing-problems.gz for " +#| "more details." +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"På visse printere med en opløsning på 1200dpi kan billedet forekomme " +"sammenpresset i hjørnerne, eller det kan virke overforstørret på printere " +"med en opløsning på 300dpi. Hvis du oplever sådanne udskrivningsproblemer, " +"vil det være en god ide at sætte printerens opløsning til en mere passende " +"værdi. Se /usr/share/doc/xprint-common/README.printing-problems.gz for flere " +"detaljer." --- xorg-server-1.4.1~git20080131.orig/debian/po/templates.pot +++ xorg-server-1.4.1~git20080131/debian/po/templates.pot @@ -0,0 +1,42 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 20:35+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" --- xorg-server-1.4.1~git20080131.orig/debian/po/it.po +++ xorg-server-1.4.1~git20080131/debian/po/it.po @@ -0,0 +1,49 @@ +# Italian (it) translation of debconf templates for xorg-server +# Copyright (C) 2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the xorg-server package. +# Luca Monducci , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg-server debconf templates\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 07:46+0200\n" +"PO-Revision-Date: 2007-09-21 21:26+0200\n" +"Last-Translator: Luca Monducci \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Risoluzione predefinita della stampante:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Xprint assume che la risoluzione della stampante sia di 600 dpi. Questo " +"valore dovrebbe essere adatto alla maggior parte delle stampanti." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"Purtroppo su alcune stampanti a 1200 dpi l'immagine potrebbe apparire come " +"schiacciata in un angolo della pagina oppure potrebbe essere troppo " +"ingrandita su stampanti a 300 dpi. Nel caso si verificassero questi " +"problemi, si può impostare la risoluzione di stampa predefinita a un valore " +"più adatto. Si veda /usr/share/doc/xprint-common/README.printing-problems.gz " +"per maggiori dettagli." --- xorg-server-1.4.1~git20080131.orig/debian/po/fr.po +++ xorg-server-1.4.1~git20080131/debian/po/fr.po @@ -0,0 +1,61 @@ +# translation of fr.po to French +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Christian Perrier , 2007. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 07:46+0200\n" +"PO-Revision-Date: 2007-09-18 07:47+0200\n" +"Last-Translator: Christian Perrier \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Résolution par défaut de l'imprimante :" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Par défaut, XPrint utilise une résolution d'impression de 600 ppp (points " +"par pouce ou « dpi »). Cette valeur convient pour la majorité des " +"imprimantes actuelles." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"Cependant, un document préparé en 600 ppp apparaîtra trop gros sur une " +"imprimante dont la résolution est de 300 ppp ou trop petit (un quart de page " +"occupée) sur une imprimante à 1200 ppp. Si vous rencontrez ce type de " +"problèmes, vous devriez choisir une valeur plus adaptée comme résolution " +"d'impression. Veuillez consulter le fichier /usr/share/doc/xprint-common/" +"README.printing-problems.gz pour plus d'informations." --- xorg-server-1.4.1~git20080131.orig/debian/po/fi.po +++ xorg-server-1.4.1~git20080131/debian/po/fi.po @@ -0,0 +1,46 @@ +msgid "" +msgstr "" +"Project-Id-Version: debconf: xorg-server\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 20:35+0200\n" +"PO-Revision-Date: 2007-09-22 22:59+0200\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Finnish\n" +"X-Poedit-Country: FINLAND\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Tulostimen oletusresoluutio:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Xprint olettaa tulostimen resoluution olevan 600 dpi. Suurimmalle osalle " +"tulostimista tämä oletus sopii hyvin." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"Joillain 1200 dpi:n tulostimilla kuva saattaa tulostua hyvin pienenä paperin " +"kulmaan ja joillain 300 dpi:n tulostimilla tulostua liian suurena. " +"Tällaisten ongelmien ilmetessä saatat haluta asettaa oletusresoluutioksi " +"jonkin sopivamman arvon. Lisätietoja löytyy dokumentista /usr/share/doc/" +"xprint-common/README.printing-problems.gz." --- xorg-server-1.4.1~git20080131.orig/debian/po/sv.po +++ xorg-server-1.4.1~git20080131/debian/po/sv.po @@ -0,0 +1,55 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: xorg-server\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 07:46+0200\n" +"PO-Revision-Date: 2007-09-18 11:08+0100\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Standardupplösning för skrivare:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Som standard antar Xprint att skrivarupplösningen är 600 dpi. Detta borde " +"passa fint för de flesta av dagens skrivare." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"På vissa skrivare med 1200 dpi kan dock bilden verka hoptryckt i ett hörn av " +"sidan eller att den blir mycket förstorad på skrivare med 300 dpi. Om du " +"upplever sådana problem kan du ställa in standardskrivarens upplösning till " +"ett mer lämpligt värde. Se /usr/share/doc/xprint-common/README.printing-" +"problems.gz för mer information." --- xorg-server-1.4.1~git20080131.orig/debian/po/cs.po +++ xorg-server-1.4.1~git20080131/debian/po/cs.po @@ -0,0 +1,56 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: xprint-xprintorg\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 20:35+0200\n" +"PO-Revision-Date: 2007-09-18 19:23+0200\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Výchozí rozliÅ¡ení tiskárny:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Xprint implicitnÄ› pÅ™edpokládá rozliÅ¡ení tiskárny 600 dpi. To by mÄ›lo " +"vyhovovat vÄ›tÅ¡inÄ› dneÅ¡ních tiskáren." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"Na nÄ›kterých 1200 dpi tiskárnách může obraz vypadat příliÅ¡ malý, zatímco na " +"300 dpi tiskárnách se může obraz vytisknout příliÅ¡ velký. Pokud zaznamenáte " +"popsané problémy, mÄ›li byste nastavit výchozí rozliÅ¡ení tiskárny na " +"vhodnÄ›jší hodnotu. Podrobnosti naleznete v souboru /usr/share/doc/xprint-" +"common/README.printing-problems.gz." --- xorg-server-1.4.1~git20080131.orig/debian/po/pt.po +++ xorg-server-1.4.1~git20080131/debian/po/pt.po @@ -0,0 +1,48 @@ +# Portuguese translation for xorg-server's debconf messages +# Copyright (C) 2007 Miguel Figueiredo +# This file is distributed under the same license as the xorg-server package. +# Miguel Figueiredo , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg-server\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: 2007-09-18 07:46+0200\n" +"PO-Revision-Date: 2007-10-02 21:27+0000\n" +"Last-Translator: Miguel Figueiredo \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "Default printer resolution:" +msgstr "Resolução de impressão pré-definida:" + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"By default, Xprint assumes a printer resolution of 600 dpi. This should be " +"well suited for the majority of printers." +msgstr "" +"Como pré-definição o Xprint assume que a resolução da sua impressora é de " +"600 dpi. Isto deve ser adequado para a maioria das impressoras." + +#. Type: string +#. Description +#: ../xprint-common.templates:2001 +msgid "" +"On certain 1200 dpi printers, however, the image might appear squashed in " +"the corner of the page, or it might be blown up too large on 300 dpi " +"printers. If you are experiencing such printing problems, you may want to " +"set the default printer resolution to a more appropriate value. See /usr/" +"share/doc/xprint-common/README.printing-problems.gz for more details." +msgstr "" +"No entanto, nalgumas impressoras de 1200 dpi a imagem pode parecer encolhida " +"no canto da página, ou pode aparecer demasiado grande em impressoras de 300 " +"dpi. Se estiver a ter estes problemas de impressão, você pode querer definir " +"a resolução de impressão pré-definida para um valor mais apropriado. Para " +"mais detalhes veja /usr/share/doc/xprint-common/README.printing-problems.gz." --- xorg-server-1.4.1~git20080131.orig/debian/xprint-common.templates +++ xorg-server-1.4.1~git20080131/debian/xprint-common.templates @@ -0,0 +1,21 @@ +# These templates have been reviewed by the debian-l10n-english +# team +# +# If modifications/additions/rewording are needed, please ask +# debian-l10n-english@lists.debian.org for advice. +# +# Even minor modifications require translation updates and such +# changes should be coordinated with translators and reviewers. + +Template: xprint-common/default_printer_resolution +Type: string +Default: 600 +_Description: Default printer resolution: + By default, Xprint assumes a printer resolution of 600 dpi. This should be + well suited for the majority of printers. + . + On certain 1200 dpi printers, however, the image might appear squashed in the + corner of the page, or it might be blown up too large on 300 dpi printers. If + you are experiencing such printing problems, you may want to set + the default printer resolution to a more appropriate value. See + /usr/share/doc/xprint-common/README.printing-problems.gz for more details. --- xorg-server-1.4.1~git20080131.orig/debian/xdmx-tools.install +++ xorg-server-1.4.1~git20080131/debian/xdmx-tools.install @@ -0,0 +1,7 @@ +usr/bin/dmx* +usr/bin/vdltodmx +usr/bin/xdmx +usr/bin/xdmxconfig +usr/share/man/man1/vdltodmx.1 +usr/share/man/man1/dmxtodmx.1 +usr/share/man/man1/xdmxconfig.1 --- xorg-server-1.4.1~git20080131.orig/debian/xprint-common.dirs +++ xorg-server-1.4.1~git20080131/debian/xprint-common.dirs @@ -0,0 +1,4 @@ +etc/Xprint/C/print +etc/Xprint/en_US/print +etc/default +usr/share/lintian/overrides --- xorg-server-1.4.1~git20080131.orig/debian/xprint-common.xprint.init +++ xorg-server-1.4.1~git20080131/debian/xprint-common.xprint.init @@ -0,0 +1,1246 @@ +#!/bin/bash +# +# Copyright 2002-2004 by Roland Mainz . +# +# This script manages the Xprint server side + +# Basic support for IRIX-style "chkconfig" +# chkconfig: 2345 61 61 +# description: Startup/shutdown script for Xprint server(s) + +# Basic support for the Linux Standard Base Specification 1.0.0 +# (Note: The Should-Start/Stop lines are there so that this works in the +# future, when the LSB adopts these. The X-UnitedLinux lines are there +# so that it works right now.) +### BEGIN INIT INFO +# Provides: xprint +# Required-Start: $local_fs $remote_fs $syslog $network +# Required-Stop: $local_fs $remote_fs $syslog +# Should-Start: cups lpd xfs +# Should-Stop: cups lpd xfs +# X-UnitedLinux-Should-Start: cups lpd xfs +# X-UnitedLinux-Should-Stop: cups lpd xfs +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Description: Startup/shutdown script for Xprint server(s) +### END INIT INFO + + + + +############################################################################ +# +# This script has three main tasks: +# 1. Start Xprint servers ("Xprt") at boot time. +# 2. Shutdown Xprint servers when the machine is being shut down. +# 3. Query the list of available printers. +# +# Additional tasks are: +# 4. Restart ('restart') and conditional restart +# ('condrestart'/'try-restart'|'force-reload') for Linux support +# 5. Wrapping of application call with setting XPSERVERLIST ('wrapper') +# +# Usage: +# - Start Xprint server(s) manually: +# % /etc/init.d/xprint start +# +# - Stop Xprint server(s) manually: +# % /etc/init.d/xprint stop +# +# - Populate $XPSERVERLIST env var (for example as part of a global +# login script like /etc/profile or per-user login scripts like +# $HOME/.profile (sh/ksh/bash)) +# % XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`" +# % export XPSERVERLIST +# +# Installation: +# Copy this script to /etc/init.d/xprint and make sure that it is +# executable. If your installation is LSB-compliant, then run +# % /usr/lib/lsb/install_initd /etc/init.d/xprint +# to start the service on startup. Otherwise, manually create links +# to the matching run levels. +# Examples: +# - Solaris 2.7/2.8/2.9: +# % cp xprint /etc/init.d/xprint +# % chmod a+rx /etc/init.d/xprint +# % ln /etc/init.d/xprint /etc/rc0.d/K38xprint +# % ln /etc/init.d/xprint /etc/rc1.d/K38xprint +# % ln /etc/init.d/xprint /etc/rc2.d/S81xprint +# % ln /etc/init.d/xprint /etc/rcS.d/K38xprint +# +# - SuSE Linux 7.3 +# % cp xprint /etc/init.d/xprint +# % chmod a+rx /etc/init.d/xprint +# % ln -s ../xprint /etc/init.d/rc3.d/K13xprint +# % ln -s ../xprint /etc/init.d/rc3.d/S12xprint +# % ln -s ../xprint /etc/init.d/rc5.d/K13xprint +# % ln -s ../xprint /etc/init.d/rc5.d/S12xprint +# % ln -s ../xprint /etc/init.d/rc2.d/K13xprint +# % ln -s ../xprint /etc/init.d/rc2.d/S12xprint +# +# - SuSE Linux 6.4: +# % cp xprint /sbin/init.d/xprint +# % chmod a+rx /sbin/init.d/xprint +# % ln -s ../xprint /sbin/init.d/rc2.d/K20xprint +# % ln -s ../xprint /sbin/init.d/rc2.d/S20xprint +# % ln -s ../xprint /sbin/init.d/rc3.d/K20xprint +# % ln -s ../xprint /sbin/init.d/rc3.d/S20xprint +# +# Notes: +# - The Xprint servers must be started _after_ the print +# spooler or the server(s) may refuse to start +# - The script should be readable by all users to ensure that they +# can use the "get_xpserverlist"-option +# +# Custom configuration: +# - Edit the function setup_config() in this script to match your needs +# +# Known bugs/ToDo/Notes: +# - The shell script assumes that a Xserver can be reached via +# "hostname:displaynum" where "hostname" is obtained from +# "/usr/bin/hostname". It may happen that a kernel firewall +# blocks an X connection on the same host (e.g. client && Xserver +# are running on the same host). +# Suggested fix: Fix the firewall config. +# Suggested workaround: Edit this script and replace the use of +# /usr/bin/hostname with "echo 'localhost'". +# +############################################################################ +# + + +############################################################################ + +fatal_error() +{ + echo "${0}: ## FATAL ERROR: ${1}" 1>&2 + exit 1 +} + +error_echo() +{ + echo "${0}: ## ERROR: ${1}" 1>&2 +} + +warning_echo() +{ + echo "${0}: ## WARNING: ${1}" 1>&2 +} + +verbose_echo() +{ + echo "${0}: ${1}" +} + +msg() +{ + echo "${1}" +} + +############################################################################ + + +##debug +# set -x + +# Change current dir to a location which is writeable by everyone +cd /tmp + +# Clear some environment variables +unset TEMP TMPDIR SCREENDIR + +# Set search path for commands +export PATH=/usr/bin:/bin:/usr/sbin:/sbin + + + + +## Try to figure-out where X11 was installed + + + + + + +[ -d /usr/X11/bin ] && XPROJECTROOT=/usr/X11 +[ -d /usr/X11R6/bin ] && XPROJECTROOT=/usr/X11R6 + +# X11R7 now follows FHS, doesn't use it's own separate directory +XPROJECTROOT=/usr + +XPCUSTOMGLUE=DebianGlue # This is used for customizing this script +export XPROJECTROOT XPCUSTOMGLUE + +if [ -z "${XPROJECTROOT}" ] ; then + fatal_error "Unknown XProjectRoot." +fi + +# Set the location of the Xprt binary we want to use. +XPRT_BIN="${XPROJECTROOT}/bin/Xprt" + +# Set the location of the global file where we store the locations +# of the system-wide servers +if [ -d /var/run ] ; then + XP_GLOBAL_SERVERS=/var/run/Xprint_servers +else + XP_GLOBAL_SERVERS=/tmp/.Xprint_servers +fi + +# ${LOGNAME} will not work if user su'ed into another account +export CURRLOGNAME="$(id -u -n)" + +# Set location where we want to store the list of Xprint servers managed +# by this user +# - If we start as "root" use the global file +# - If we start as normal user use a per-user file + +if [ "${CURRLOGNAME}" != "root" -a "${CURRLOGNAME}" != "" ] ; then + XP_PER_USER_SERVERS="/tmp/.Xprint_servers_${CURRLOGNAME}" + XP_SERVERS="${XP_PER_USER_SERVERS}" +else + XP_SERVERS="${XP_GLOBAL_SERVERS}" +fi + +# Set umask that owner can r/w all files and everyone else can read them +umask 022 + +# Bump limit for per-process open files to ensure that Xprt can open many many fonts +ulimit -n 1024 + +############################################################################ + +# Get list of fonts for a given display +get_fontlist_from_display() +{ + ${XPROJECTROOT}/bin/xset -display "${1}" q | + awk "/Font Path:/ { i=1 ; next } i==1 { print \$0 ; i=0 }" | + fontpath2fontlist +} + +# Get list from a fontserver config +get_fontlist_from_xfs_config() +{ + if [ ! -r "${1}" ] ; then + return 0 + fi + + ( + cat "${1}" | + while read -r i ; do + for val in $i; do + case $val in + \#*) break ;; + ?*=*) key="${val%%=*}" ;; + =*) key="${tok}" ;; + *) [ "${key}" = "catalogue" -a "${tok}" != "" ] && echo "${tok}" ;; + esac + tok="${val#*=}" + done + done + ) | tr "," "\n" | fontpath2fontlist +} + +get_fontlist_from_all_xfs_configs() +{ + get_fontlist_from_xfs_config "/etc/openwin/fs/fontserver.cfg" + get_fontlist_from_xfs_config "/usr/openwin/lib/X11/fontserver.cfg" + get_fontlist_from_xfs_config "/etc/X11/fs-xtt/config" + get_fontlist_from_xfs_config "/etc/X11/fs/config" + get_fontlist_from_xfs_config "/etc/X11/xfs/config" + get_fontlist_from_xfs_config "${XPROJECTROOT}/lib/X11/fs/config" +} + +get_fontlist_from_xf86config() +{ + srcxconf="" + + # see xorg.conf(5x) manual page for the list of locations used here + [ "${srcxconf}" = "" -a -f "/etc/X11/xorg.conf" ] && srcxconf="/etc/X11/xorg.conf" + [ "${srcxconf}" = "" -a -f "/usr/X11R6/etc/X11/xorg.conf" ] && srcxconf="/usr/X11R6/etc/X11/xorg.conf" + [ "${srcxconf}" = "" -a -f "/etc/X11/xorg.conf-4" ] && srcxconf="/etc/X11/xorg.conf-4" + [ "${srcxconf}" = "" -a -f "/etc/X11/xorg.conf" ] && srcxconf="/etc/X11/xorg.conf" + [ "${srcxconf}" = "" -a -f "/etc/xorg.conf" ] && srcxconf="/etc/xorg.conf" + [ "${srcxconf}" = "" -a -f "/usr/X11R6/etc/X11/xorg.conf.${hostname}" ] && srcxconf="/usr/X11R6/etc/X11/xorg.conf.${hostname}" + [ "${srcxconf}" = "" -a -f "/usr/X11R6/etc/X11/xorg.conf-4" ] && srcxconf="/usr/X11R6/etc/X11/xorg.conf-4" + [ "${srcxconf}" = "" -a -f "/usr/X11R6/etc/X11/xorg.conf" ] && srcxconf="/usr/X11R6/etc/X11/xorg.conf" + [ "${srcxconf}" = "" -a -f "/usr/X11R6/lib/X11/xorg.conf.${hostname}" ] && srcxconf="/usr/X11R6/lib/X11/xorg.conf.${hostname}" + [ "${srcxconf}" = "" -a -f "/usr/X11R6/lib/X11/xorg.conf-4" ] && srcxconf="/usr/X11R6/lib/X11/xorg.conf-4" + [ "${srcxconf}" = "" -a -f "/usr/X11R6/lib/X11/xorg.conf" ] && srcxconf="/usr/X11R6/lib/X11/xorg.conf" + + # Xfree86 locations + [ "${srcxconf}" = "" -a -f "/etc/X11/XF86Config-4" ] && srcxconf="/etc/X11/XF86Config-4" + [ "${srcxconf}" = "" -a -f "/etc/X11/XF86Config" ] && srcxconf="/etc/X11/XF86Config" + + + if [ "${srcxconf}" = "" ] ; then + return 0 + fi + + currsection="" + cat "${srcxconf}" | + while read i1 i2 i3 i4 ; do + # Strip "\"" from I2 + i2="${i2#\"}" ; i2="${i2%\"}" + + case "${i1}" in + \#*) + continue + ;; + 'Section') + currsection="${i2}" + ;; + 'EndSection') + currsection="" + ;; + 'FontPath') + [ "$currsection" = "Files" ] && echo "${i2%:unscaled}" + ;; + esac + done | egrep -v -i "tcp/|tcp4/|tcp6/|unix/" + + return 0 +} + +get_fontlist_from_defoma() +{ + # Include Debian defoma font directory where relevant + if [ -d "/var/lib/defoma/x-ttcidfont-conf.d/dirs" ] ; then + find "/var/lib/defoma/x-ttcidfont-conf.d/dirs" -name fonts.dir | + while read i ; do echo "${i%/fonts.dir}" ; done + fi +} + +# Get list of system fonts +get_system_fontlist() +{ + ( + get_fontlist_from_defoma + + get_fontlist_from_xf86config + + # Getting font paths from XFS is mainly required for compatibilty to RedHat + get_fontlist_from_all_xfs_configs + + ## List all fonts in all locales installed on this machine + ( + [ -d "/usr/share/fonts" ] && find /usr/share/fonts -name fonts.dir + [ -d "${XPROJECTROOT}/lib/X11/fonts" ] && find "${XPROJECTROOT}/lib/X11/fonts" -name fonts.dir + ) | + while read i ; do echo "${i%/fonts.dir}" ; done + ) | sort -u +} + +# Filter fonts per given extended regular expressions +# (and make sure we filter any model-config fonts - they are managed by Xprt internally) +filter_fontlist() +{ + egrep -- "${1}" | fgrep -v "/models/" | egrep -v -- "${2}" +} + +# Filter font paths with unsupported font types +# (such as CID fonts) +filter_unsupported_fonts() +{ + egrep -v -i "/cid(/$|$)|/csl(/$|$)" +} + +# Validate fontpath +# Only return valid font path entries (note that these entries may +# include non-file stuff like font server references) +validate_fontlist() +{ + while read i ; do + case "${i}" in + # Check if font path entry is a font server... + tcp/''*|tcp4/''*|tcp6/''*|unix/''*) + echo "${i}" + ;; + # ... if not check if the path is accessible + # and has a valid "fonts.dir" index + *) + [ -f "${i}/fonts.dir" ] && echo "${i}" + ;; + esac + done +} + +# Build a comma-seperated list of fonts (font path) from a list of fonts +fontlist2fontpath() +{ + fp="" + read fp; + while read i ; do + fp="${fp},${i}" + done + + echo "$fp" +} + +# Build a list (one item per line) of fonts from a font path +fontpath2fontlist() +{ + while read i ; do + echo "${i}" | tr "," "\n" + done +} + +# Sort scaleable fonts (PS Type1 and TrueType) first in a font list +sort_scaleable_fonts_first() +{ + i="$(fontlist2fontpath)" + # First list PS Type1 fonts... + echo "${i}" | fontpath2fontlist | fgrep "/Type1" + # ... then TrueType fonts ... + echo "${i}" | fontpath2fontlist | egrep -i "/TrueType|/TT(/$|$)|/TTF(/$|$)" + # ... then all others + echo "${i}" | fontpath2fontlist | egrep -v -i "/Type1|/TrueType|/TT(/$|$)|/TTF(/$|$)" +} + +# Check if a X display is used by a Xserver or not +# Known bugs: +# - there is no way in plain bourne shell or bash (see comment about ksh93 +# below) to test if a Xserver sits only on a socket and not on a pipe +# - some Xserver's don't cleanup their stuff in /tmp on exit which may end +# in the problem that we don't detect possible free display numbers +# (one problem is that only ksh93 can do stuff like +# "cat "${lastdisplaynumreturned_store}" + return 0 + fi + done + + # Using "magic" value of 189 here due lack of a better solution + echo "189" + echo "189" >"${lastdisplaynumreturned_store}" + return 0 +} + +# Check if a process exists or not +pexists() +{ + [ "$1" = "" ] && return 1; + + # Use of /proc would be better but not all platforms (like AIX) have procfs + [ "$(ps -p $1 | fgrep $1)" != "" ] && return 0; + return 1 +} + +# Check if there is a spooler running... +is_spooler_running() +{ + # This covers Linux lpd, CUPS, Solaris and AIX 4.x - but what about + # AIX 5.x, HP-UX and IRIX ? + + [ "$(ps -A | egrep 'lpd|lpsched|cupsd|qdaemon' | fgrep -v 'grep')" != "" ] && return 0; + return 1 +} + +# Wait until the spooler system has been started (but not more than 30secs) +wait_for_print_spooler() +{ + for i in 1 2 3 4 5 6 7 8 9 10 ; do + is_spooler_running && return 0; + sleep 3 + done + + return 0 +} + +lock_server_registry() +{ + lock_counter=0 # counts in 1/100s + waiting_for_lock_msg_send="false" + while ! mkdir "${XP_SERVERS}.lock" 2>/dev/null ; do + # print notice after 2 seconds + if [ ${lock_counter} -gt 200 -a "${waiting_for_lock_msg_send}" != "true" ] ; then + echo "${0}: waiting for lock(=${XP_SERVERS}.lock)..." + waiting_for_lock_msg_send="true" + fi + + # tread the lock as "broken" after 20 seconds + if [ ${lock_counter} -gt 2000 ] ; then + echo "${0}: WARNING: lock timeout for lock(=${XP_SERVERS}.lock)." + return 0 + fi + + if [ -x /bin/usleep ] ; then + /bin/usleep 200000 + lock_counter=$((${lock_counter} + 20)) # 20/100s + else + sleep 1 + lock_counter=$((${lock_counter} + 100)) # 100/100s + fi + done +} + +unlock_server_registry() +{ + rmdir "${XP_SERVERS}.lock" +} + +# Kill dead registry locks (silently!) +kill_dead_registry_locks() +{ + rm -Rf "${XP_SERVERS}.lock" +} + +# Start Xprint servers +start_servers() +{ + # Write registry "intro" ... + lock_server_registry + echo "# Xprint server list" >>"${XP_SERVERS}" + echo "# File is for private use for ${0}." >>"${XP_SERVERS}" + echo "# Do not edit, rely on the content or file format." >>"${XP_SERVERS}" + unlock_server_registry + + hostname="$(hostname)" + + default_fontpath="$(get_system_fontlist | fontlist2fontpath)" + default_fontpath_acceptpattern=".*"; + default_fontpath_rejectpattern="_No_Match_"; # Match nothing + + curr=0 + while [ $curr -lt $num_xpstart ] ; do + if [ "${xpstart_remote_server[$curr]}" != "" ] ; then + # Remote Xprt, just put the entry into the registry + lock_server_registry + echo "display=${xpstart_remote_server[$curr]}" >>"${XP_SERVERS}" + unlock_server_registry + else + # Run block in seperate process to avoid that changes to the + # xpstart_* variables affect the next cycle + ( + # Use defaults if there are no special options + [ "${xpstart_fontpath[$curr]}" = "" ] && xpstart_fontpath[$curr]="${default_fontpath}"; + [ "${xpstart_fontpath_acceptpattern[$curr]}" = "" ] && xpstart_fontpath_acceptpattern[$curr]="$default_fontpath_acceptpattern"; + [ "${xpstart_fontpath_rejectpattern[$curr]}" = "" ] && xpstart_fontpath_rejectpattern[$curr]="$default_fontpath_rejectpattern"; + [ "${xpstart_displayid[$curr]}" = "" ] && xpstart_displayid[$curr]="$(FindFreeXDisplayNum)" + [ "${xpstart_logger[$curr]}" = "" ] && xpstart_logger[$curr]="logger -p lpr.notice -t Xprt_${xpstart_displayid[$curr]}"; + [ "${xpstart_logfile[$curr]}" = "" ] && xpstart_logfile[$curr]="/dev/null"; + [ "${xpstart_xprt_binary[$curr]}" = "" ] && xpstart_xprt_binary[$curr]="${XPRT_BIN}"; + if [ "${xpstart_xprt_binary[$curr]}" = "/usr/openwin/bin/Xprt" -o "$(uname -s)" = "SunOS" ] ; then + # Solaris /usr/openwin/bin/Xprt does not support "-nolisten tcp" + # yet nor is it possible to run a Xserver on a unix socket only + # in Solaris since access to the unix domain sockets in + # /tmp/.X11-pipe and /tmp/.X11-unix is restricted to applications + # with group-id "root" (e.g. the Xprt server would need to be + # setgid "root" that plain users can start it listening on a unix + # socket only) + [ "${xpstart_options[$curr]}" = "" ] && xpstart_options[$curr]="-ac -pn" + else + [ "${xpstart_options[$curr]}" = "" ] && xpstart_options[$curr]="-ac -pn -nolisten tcp" + fi + + # Check if the Xprt binary is available + if [ ! -x "${xpstart_xprt_binary[$curr]}" ] ; then + # Debian policy 9.3.2 says just stop quietly here + exit 0 + + error_echo "Can't find \"${xpstart_xprt_binary[$curr]}\"." + exit 1 # exit block + fi + + # Verify and set location of font encodings directory file + if [ "${xpstart_font_encodings_dir[$curr]}" = "" ] ; then + if [ -f "${XPROJECTROOT}/lib/X11/fonts/xf86encodings/encodings.dir" ] ; then + xpstart_font_encodings_dir[$curr]="${XPROJECTROOT}/lib/X11/fonts/xf86encodings/encodings.dir" + elif [ -f "${XPROJECTROOT}/lib/X11/fonts/encodings/encodings.dir" ]; then + xpstart_font_encodings_dir[$curr]="${XPROJECTROOT}/lib/X11/fonts/encodings/encodings.dir" + else + xpstart_font_encodings_dir[$curr]="${XPROJECTROOT}/share/fonts/X11/encodings/encodings.dir"; + fi + fi + + unset FONT_ENCODINGS_DIRECTORY + if [ ! -f "${xpstart_font_encodings_dir[$curr]}" ] ; then + warning_echo "Can't find \"${xpstart_font_encodings_dir[$curr]}\", TrueType font support may not work." + fi + + export FONT_ENCODINGS_DIRECTORY="${xpstart_font_encodings_dir[$curr]}" + + # Generate font path (containing only valid font path elements) + # from input font path and filter expressions + curr_fp=$(echo "${xpstart_fontpath[$curr]}" | + fontpath2fontlist | + filter_fontlist "${xpstart_fontpath_acceptpattern[$curr]}" "${xpstart_fontpath_rejectpattern[$curr]}" | + filter_unsupported_fonts | + sort_scaleable_fonts_first | + validate_fontlist | + fontlist2fontpath) + + # Set Xserver auditing level option + unset curr_audit + if [ "${xpstart_auditlevel[$curr]}" != "" ] ; then + curr_audit="-audit ${xpstart_auditlevel[$curr]}" + fi + + # Set Xprt -XpFile option + unset curr_xpfile + if [ "${xpstart_xpfile[$curr]}" != "" ] ; then + curr_xpfile="-XpFile ${xpstart_xpfile[$curr]}" + fi + + # Set custom XPCONFIGDIR (if there is one) + unset XPCONFIGDIR + if [ "${xpstart_xpconfigdir[$curr]}" != "" ] ; then + export XPCONFIGDIR="${xpstart_xpconfigdir[$curr]}" + fi + + # If someone uses "-nolisten tcp" make sure we do not add a hostname to force local transport + if [ "$(echo "${xpstart_options[$curr]}" | egrep "nolisten.*tcp")" != "" ] ; then + xp_display=":${xpstart_displayid[$curr]}" + else + xp_display="${hostname}:${xpstart_displayid[$curr]}" + fi + + ( + ( + DAEMON_OPTS="${xpstart_options[$curr]} ${curr_xpfile} ${curr_audit} -fp ${curr_fp} :${xpstart_displayid[$curr]}" + + + + PIDFILE=/var/run/Xprt_${curr}.pid + start-stop-daemon --start --background --oknodo --quiet --pidfile ${PIDFILE} --make-pidfile --exec ${xpstart_xprt_binary[$curr]} -- $DAEMON_OPTS + + + server_pid="$(cat ${PIDFILE})" + + # Append the new server to the registry + lock_server_registry + echo "display=${xp_display} display_id=${xpstart_displayid[$curr]} pid=${server_pid}" >>"${XP_SERVERS}" + unlock_server_registry + + ) 2>&1 | while read i ; do echo "$i" | tee -a "${xpstart_logfile[$curr]}" | ${xpstart_logger[$curr]} ; done + ) <&- >&- 2>&- & + ) + fi + + curr=$(($curr + 1)) + done + + # Remove tmp. file created by |FindFreeXDisplayNum()| + rm -f "${lastdisplaynumreturned_store}" + + # Done. + lock_server_registry + echo "# EOF." >>"${XP_SERVERS}" + unlock_server_registry + return 0 +} + + +# Convenience function to check setup and start Xprt server(s) +do_start() +{ + if [ -f "${XP_SERVERS}" ] ; then + numservers="$(do_get_xpserverlist | wc -l)" + if [ ${numservers} -gt 0 ] ; then + verbose_echo "Xprint servers are already running." + return 0 + else + verbose_echo "Old server registry found, cleaning-up..." + do_stop + fi + fi + + # Check if we can write the registry file + touch "${XP_SERVERS}" 2>/dev/null + if [ ! -f "${XP_SERVERS}" ] ; then + error_echo "Cannot create \"${XP_SERVERS}\"." + # exit code 4 = user had insufficient privilege (LSB) + exit 4 + fi + + if ! setup_config ; then + error_echo "setup_config failed." + exit 1 + fi + + # Provide two paths here - one which simply starts the Xprt servers, + # assuming that there is a print spooler already running (or that + # ${XPCONFIG}/C/print/Xprinters provides static print queue entries + # (like for the PSspooldir print model)) and a 2nd path which + # explicitly checks if the print queue daemons are running + if true ; then + msg "Starting Xprint servers: Xprt." + start_servers + else + # Continue in the background if there is no spooler running yet (that + # we don't hold off the boot process nor run in a possible race-condition + # when /etc/init.d/lpd was not called yet but the runlevel script waits + # for us to finish first ... + if is_spooler_running ; then + msg "Starting Xprint servers: Xprt." + start_servers + else + msg "Starting Xprint servers (in the background): Xprt." + (wait_for_print_spooler ; start_servers) & + sleep 5 + fi + fi + + if [ "${CURRLOGNAME}" = "root" -a -d /var/lock/subsys/ ] ; then + touch /var/lock/subsys/xprint + fi +} + +# Convenience function to stop Xprt server(s) +do_stop() +{ + msg "Stopping Xprint servers: Xprt." + + # need to run setup_config to grab values of xpstart_xprt_binary, etc. + if ! setup_config ; then + error_echo "setup_config failed." + exit 1 + fi + + curr=0 + while [ $curr -lt $num_xpstart ] ; do + [ "${xpstart_xprt_binary[$curr]}" = "" ] && xpstart_xprt_binary[$curr]="${XPRT_BIN}"; + PIDFILE=/var/run/Xprt_${curr}.pid + if [ -f ${PIDFILE} ] ; then + start-stop-daemon --stop --oknodo --quiet --pidfile ${PIDFILE} --exec ${xpstart_xprt_binary[$curr]} + + + rm -f ${PIDFILE} + fi + curr=$(($curr + 1)) + done + + lock_server_registry + if [ -f "${XP_SERVERS}" ] ; then + reglist="$(cat "${XP_SERVERS}")" + rm -f "${XP_SERVERS}" + fi + unlock_server_registry + + if [ "${reglist}" != "" ] ; then + echo "${reglist}" | + grep "^display=.*:.* pid=[0-9]*$" | + while read i ; do + ( + eval ${i} + if pexists ${pid} ; then + kill ${pid} + fi + + # Remove the X sockets/pipes which are not in use anymore + # (It would be better if the Xservers would cleanup this + # automatically, but most Xservers do not do that... ;-( + # Note that this will not work on Solaris where applications + # must run with groupid="root" if they want to write into + # /tmp/.X11-unix/ and/or /tmp/.X11-pipe/) + if [ "${display_id}" != "" ] ; then + rm -f "/tmp/.X${display_id}-lock" 2>/dev/null + rm -f "/tmp/.X11-unix/X${display_id}" 2>/dev/null + rm -f "/tmp/.X11-pipe/X${display_id}" 2>/dev/null + fi + ) + done + fi + + if [ "${CURRLOGNAME}" = "root" -a -d /var/lock/subsys/ ] ; then + rm -f /var/lock/subsys/xprint + fi + + # Remove any outstanding (dead) locks and cleanup + rm -f "${XP_SERVERS}" + kill_dead_registry_locks +} + +# Convenience function to obtain a list of available Xprint servers +do_get_xpserverlist() +{ + if [ -f "${XP_PER_USER_SERVERS}" -o -f "${XP_GLOBAL_SERVERS}" ] ; then + xpserverlist=$( + # Enumerate both per-user and global servers (in that order) + ( + [ -f "${XP_PER_USER_SERVERS}" ] && cat "${XP_PER_USER_SERVERS}" + [ -f "${XP_GLOBAL_SERVERS}" ] && cat "${XP_GLOBAL_SERVERS}" + ) | + egrep "^display=.*:.* pid=[0-9]*$|^display=.*:[0-9]*$" | + while read i ; do + ( + pid="none" + eval ${i} + # Check if the Xprt process exists (if possible) + if [ "$pid" != "none" ] ; then + if pexists ${pid} ; then + echo ${display} + fi + else + echo ${display} + fi + ) + done | tr "[\n]" " " + ) + # Only produce output if we have some entries... + [ "${xpserverlist}" != "" ] && echo "${xpserverlist}" + fi +} + +do_restart() +{ + msg "Restarting Xprint server(s): Xprt." + do_stop + sleep 1 + do_start +} + +do_diag() +{ + echo "##### Diag start $(date)." + + # General info + echo "## General info start." + ( + echo "PATH=\"${PATH}\"" + echo "TZ=\"${TZ}\"" + echo "LANG=\"${LANG}\"" + echo "uname -a=\"$(uname -a)\"" + echo "uname -s=\"$(uname -s)\"" + echo "uname -p=\"$(uname -p)\"" + echo "uname -i=\"$(uname -i)\"" + echo "uname -m=\"$(uname -m)\"" + echo "has /etc/SuSE-release ... $([ -f "/etc/SuSE-release" ] && echo "yes" || echo "no")" + echo "has /etc/redhat-release ... $([ -f "/etc/redhat-release" ] && echo "yes" || echo "no")" + echo "has /etc/debian_version ... $([ -f "/etc/debian_version" ] && echo "yes" || echo "no")" + echo "how many Xprt servers are running ...$(ps -ef | fgrep Xprt | fgrep -v "grep" | wc -l)" + ) 2>&1 | while read i ; do echo " $i" ; done + echo "## General info end." + + # Testing font paths + echo "## Testing font paths start." + ( + get_system_fontlist | + filter_unsupported_fonts | + sort_scaleable_fonts_first | + validate_fontlist | while read d ; do + echo "#### Testing \"${d}\" ..." + if [ ! -d "$d" ] ; then + echo "# Error: $d does not exists." + continue + fi + if [ ! -r "$d" ] ; then + echo "# Error: $d not readable." + continue + fi + if [ ! -f "${d}/fonts.dir" ] ; then + echo "# Error: ${d}/fonts.dir not found." + continue + else + if [ ! -r "${d}/fonts.dir" ] ; then + echo "# Error: ${d}/fonts.dir not readable." + continue + fi + fi + if [ -f "${d}/fonts.alias" ] ; then + if [ ! -r "${d}/fonts.alias" ] ; then + echo "# Error: ${d}/fonts.alias not readable." + fi + fi + + if [ "$(cat "${d}/fonts.dir" | fgrep 'cursor')" != "" ] ; then + echo "${d}/fonts.dir has cursor font." + fi + if [ "$(cat "${d}/fonts.dir" | fgrep 'fixed')" != "" ] ; then + echo "${d}/fonts.dir has fixed font." + fi + + if [ -r "${d}/fonts.alias" ] ; then + if [ "$(cat "${d}/fonts.alias" | fgrep 'cursor')" != "" ] ; then + echo "${d}/fonts.alias has cursor font." + fi + if [ "$(cat "${d}/fonts.alias" | fgrep 'fixed')" != "" ] ; then + echo "${d}/fonts.alias has fixed font." + fi + fi + + linenum=0 + cat "${d}/fonts.dir" | while read i1 i2 i3 i4 ; do + linenum=$((${linenum} + 1)) + [ ${linenum} -eq 1 ] && continue + + if [ ! -f "${d}/${i1}" ] ; then + echo "ERROR: ${d}/fonts.dir line ${linenum} has non-exististant font \"${i1}\" (=\"${i1} ${i2} ${i3} ${i4}\")" + fi + done + done + ) 2>&1 | while read i ; do echo " $i" ; done + echo "## Testing font paths end." + + echo "##### Diag End $(date)." +} + +# Set platform-defaults for setup_config() +setup_config_defaults() +{ + curr_num_xpstart="${1}" + + #### Defaults for Linux/Solaris + # Start Xprt using builtin XPCONFIGDIR at a free display numer + # (Solaris(=SunOS5.x)'s /usr/openwin/bin/Xprt supports TrueType fonts, + # therefore we don't need to filter them) + xpstart_fontpath[${curr_num_xpstart}]=""; + xpstart_fontpath_acceptpattern[${curr_num_xpstart}]=".*"; + xpstart_fontpath_rejectpattern[${curr_num_xpstart}]="/Speedo|/F3bitmaps|/F3"; + xpstart_displayid[${curr_num_xpstart}]=""; + xpstart_xpconfigdir[${curr_num_xpstart}]=""; + xpstart_xpfile[${curr_num_xpstart}]=""; + xpstart_auditlevel[${curr_num_xpstart}]="4"; + xpstart_options[${curr_num_xpstart}]=""; + xpstart_logger[${curr_num_xpstart}]=""; + # Check whether we have /dev/stderr (needed for old AIX + old Debian) + if [ -w "/dev/stderr" ] ; then + xpstart_logfile[${curr_num_xpstart}]="/dev/stderr"; + else + xpstart_logfile[${curr_num_xpstart}]="/dev/tty"; + fi + xpstart_xprt_binary[${curr_num_xpstart}]=""; + + # Custom rules for the GISWxprintglue package on Solaris + # (which uses Solaris's /usr/openwin/bin/Xprt but a custom config) + if [ "${XPCUSTOMGLUE}" = "GISWxprintglue" ] ; then + xpstart_xpconfigdir[${curr_num_xpstart}]="/opt/GISWxprintglue/server/etc/XpConfig" + xpstart_xprt_binary[${curr_num_xpstart}]="/usr/openwin/bin/Xprt" + fi + # Custom rules for the GISWxprint package on Solaris + # (which uses both it's own Xprt and a custom config) + if [ "${XPCUSTOMGLUE}" = "GISWxprint" ] ; then + xpstart_xpconfigdir[${curr_num_xpstart}]="/opt/GISWxprint/server/etc/XpConfig" + xpstart_xprt_binary[${curr_num_xpstart}]="/opt/GISWxprint/bin/Xprt" + xpstart_font_encodings_dir[${curr_num_xpstart}]="/opt/GISWxprint/lib/X11/fonts/encodings/encodings.dir" + fi + + ####################################################### + ### + ### Debian Xprint package default configuration + ### + if [ "${XPCUSTOMGLUE}" = "DebianGlue" ] ; then + # Set XPCONFIGDIR=/usr/share/Xprint/xserver + xpstart_xpconfigdir[${curr_num_xpstart}]="/usr/share/Xprint/xserver"; + + # Use fixed display ID (":64"), or else all client programs will have to be + # restarted simply to update XPSERVERLIST to the latest ID when upgrading, + # which would be a nightmare. + xpstart_displayid[${curr_num_xpstart}]=64; + + # Do not send any messages to console + xpstart_logfile[${curr_num_xpstart}]="/dev/null"; + + # By default use binary provided by Debian's "xprt-xprintorg" package + # (=/usr/bin/Xprt), otherwise leave blank (e.g. use script's default + # (=/usr/X11R6/bin/Xprt)) + if [ -x "/usr/bin/Xprt" ] ; then + xpstart_xprt_binary[${curr_num_xpstart}]="/usr/bin/Xprt"; + fi + fi + ### + ### End Debian default configuration + ### + ####################################################### +} + +fetch_etc_initd_xprint_envvars() +{ + curr_num_xpstart="${1}" + + ## Process some $ETC_INITD_XPRINT_* vars after all which may be used by + # a user to override the hardcoded values here when starting Xprt per-user + # (a more flexible way is to provide an own setup config script in + # "~./Xprint_per_user_startup" - see above) + if [ "${ETC_INITD_XPRINT_XPRT_PATH}" != "" ] ; then + xpstart_xprt_binary[${curr_num_xpstart}]="${ETC_INITD_XPRINT_XPRT_PATH}" + fi + if [ "${ETC_INITD_XPRINT_XPCONFIGDIR}" != "" ] ; then + xpstart_xpconfigdir[${curr_num_xpstart}]="${ETC_INITD_XPRINT_XPCONFIGDIR}" + fi + if [ "${ETC_INITD_XPRINT_XPFILE}" != "" ] ; then + xpstart_xpfile[${curr_num_xpstart}]="${ETC_INITD_XPRINT_XPFILE}" + fi + if [ "${ETC_INITD_XPRINT_LOGFILE}" != "" ] ; then + xpstart_logfile[${curr_num_xpstart}]="${ETC_INITD_XPRINT_LOGFILE}" + fi + if [ "${ETC_INITD_XPRINT_DISPLAYID}" != "" ] ; then + xpstart_displayid[${curr_num_xpstart}]="${ETC_INITD_XPRINT_DISPLAYID}" + fi + if [ "${ETC_INITD_XPRINT_FONTPATH}" != "" ] ; then + xpstart_fontpath[${curr_num_xpstart}]="${ETC_INITD_XPRINT_FONTPATH}" + fi + if [ "${ETC_INITD_XPRINT_XPRT_OPTIONS}" != "" ] ; then + xpstart_options[${curr_num_xpstart}]="${ETC_INITD_XPRINT_XPRT_OPTIONS}" + fi + if [ "${ETC_INITD_XPRINT_AUDITLEVEL}" != "" ] ; then + xpstart_auditlevel[${curr_num_xpstart}]="${ETC_INITD_XPRINT_AUDITLEVEL}" + fi + if [ "${ETC_INITD_XPRINT_XF86ENCODINGSDIR}" != "" ] ; then + xpstart_font_encodings_dir[${curr_num_xpstart}]="${ETC_INITD_XPRINT_XF86ENCODINGSDIR}" + fi +} + +############################################################################ +# setup_config() sets the configuration parameters used to start one +# or more Xprint servers ("Xprt"). +# The following variables are used: +# - "num_xpstart" - number of servers to start +# - "xpstart_fontpath[index]" - custom font path. Leave blank if you want +# the platform-specific default +# - "xpstart_fontpath_acceptpattern[index]" - extended regular expression +# (see egrep(1)) used to filter the font path - items only pass this +# filter if they match the pattern (leave blank if you want to filter +# nothing) +# - "xpstart_fontpath_rejectpattern[index]" - extended regular expression +# (see egrep(1)) used to filter the font path - items only pass this +# filter if they do not match the pattern (leave blank if you want to +# filter nothing) +# - "xpstart_font_encodings_dir[index]" - location of "encodings.dir". +# Leave blank to use the default. +# - "xpstart_displayid[index]" - display id to use for the Xprint server +# (leave blank to choose the next available free display id) +# - "xpstart_xpconfigdir[index]" - value for custom XPCONFIGDIR (leave blank +# if you don not want that that XPCONFIGDIR is set at Xprt startup) +# - "xpstart_xpfile[index]" - value used for Xprt's "-XpFile" option (leave +# blank if you do not want to set this option) +# - "xpstart_auditlevel[index]" - set Xserver auditing level (leave blank to +# use no auditing) +# - "xpstart_options[index]" - set further Xprt options (leave blank to set +# no further options) +# - "xpstart_logger[index]" - utility which gets stderr/stdout messages from +# Xprt and sends them to a logging daemon. Leave blank to use /usr/bin/logger +# to send such messages to the lpr.notice syslog) +# - "xpstart_logfile[index]" - log file to append stderr/stdout messages from +# Xprt to. Leave blank to send messages to /dev/null +# - "xpstart_xprt_binary[index]" - set custom Xprt binary (leave blank to use +# the platform-specifc default) +setup_config() +{ + num_xpstart=0; + + if [ "${ETC_INITD_XPRINT_CUSTOM_SETUP_CONFIG}" != "" ] ; then + user_cfg="${ETC_INITD_XPRINT_CUSTOM_SETUP_CONFIG}" + else + user_cfg="${HOME}/.Xprint_per_user_startup" + fi + + # Source per-user ~/.Xprint_per_user_startup file if there is one + # (and do not use the script's defaults below) + if [ -r "${user_cfg}" ] ; then + # Define API version which should be checked by ${HOME}/.Xprint_per_user_startup + # ${HOME}/.Xprint_per_user_startup should bail-out if the version differ + etc_initd_xprint_api_version=2 + + # Source per-user settings script + . "${user_cfg}" + + # done with setting the config for per-user Xprt instances + return 0; + else + # Use /etc/init.d/xprint's builtin config + # Each entry should start with |setup_config_defaults| to pull the + # platform defaults and finish with |num_xpstart=$(($num_xpstart + 1))| + # to end the entry + + # Set platform-defaults + setup_config_defaults "${num_xpstart}" + + ## -- snip -- + + # Admins can put their stuff "in" here... + + ## -- snip -- + + # Override script's builtin values with those a user may set via the + # $ETC_INIITD_XPRINT_* env vars + fetch_etc_initd_xprint_envvars "${num_xpstart}" + + num_xpstart=$((${num_xpstart} + 1)) + + return 0; + fi + + #### Sample 1: + # # Start Xprt on a free display ID with custom XPCONFIGDIR and without + # # Speedo and TrueType fonts + # xpstart_fontpath_rejectpattern[$num_xpstart]="/Speedo|/TrueType|/TT(/$|$)|/TTF(/$|$)"; + # xpstart_xpconfigdir[$num_xpstart]="/home/gisburn/cwork/Xprint/Xprt_config/XpConfig"; + # xpstart_auditlevel[$num_xpstart]="4"; + # xpstart_options[$num_xpstart]="-ac -pn"; + #num_xpstart=$(($num_xpstart + 1)) + + + #### Sample 2: + # # Start Xprt without TrueType fonts on a display 55 with custom + # # XPCONFIGDIR + # xpstart_fontpath_rejectpattern[$num_xpstart]="/TrueType|/TT(/$|$)|/TTF(/$|$)"; + # xpstart_displayid[$num_xpstart]=55; + # xpstart_xpconfigdir[$num_xpstart]="/home/gisburn/cwork/Xprint/Xprt_config/XpConfig"; + # xpstart_auditlevel[$num_xpstart]=4; + # xpstart_options[$num_xpstart]="-ac -pn"; + #num_xpstart=$(($num_xpstart + 1)) + + #### Sample 3: + # # Start Xprt without TrueType fonts on a display 56 with custom + # # XPCONFIGDIR and alternate "Xprinters" file + # xpstart_fontpath_rejectpattern[$num_xpstart]="/TrueType|/TT(/$|$)|/TTF(/$|$)"; + # xpstart_displayid[$num_xpstart]=56; + # xpstart_xpconfigdir[$num_xpstart]="/etc/XpConfig/default"; + # xpstart_xpfile[$num_xpstart]="/etc/XpConfig/default/Xprinters_test2" + # xpstart_auditlevel[$num_xpstart]="4"; + # xpstart_options[$num_xpstart]="-ac -pn"; + # xpstart_xprt_binary[$num_xpstart]=""; + #num_xpstart=$(($num_xpstart + 1)) + + #### Sample 4: + # # Start Xprt with Solaris ISO-8859-7 (greek(="el") locale) fonts on + # # display 57 + # xpstart_fontpath[$num_xpstart]="/usr/openwin/lib/locale/iso_8859_7/X11/fonts/75dpi,/usr/openwin/lib/locale/iso_8859_7/X11/fonts/Type1,/usr/openwin/lib/X11/fonts/misc/"; + # xpstart_fontpath_acceptpattern[$num_xpstart]=""; + # xpstart_fontpath_rejectpattern[$num_xpstart]="_No_Match_"; + # xpstart_displayid[$num_xpstart]="57"; + # xpstart_auditlevel[$num_xpstart]="4"; + # xpstart_options[$num_xpstart]="-ac -pn"; + #num_xpstart=$(($num_xpstart + 1)) + + #### Sample 5: + # # Start Xprt with the font list of an existing Xserver (excluding Speedo fonts) on + # # display 58 + # # Note that this only works within a X session. At system boot time + # # there will be no $DISPLAY to fetch the information from!! + # xpstart_fontpath[$num_xpstart]="$(get_fontlist_from_display ${DISPLAY} | fontlist2fontpath)"; + # xpstart_fontpath_acceptpattern[$num_xpstart]=""; + # xpstart_fontpath_rejectpattern[$num_xpstart]=""; + # xpstart_displayid[$num_xpstart]="58"; + # xpstart_xpconfigdir[$num_xpstart]=""; + # xpstart_auditlevel[$num_xpstart]="4"; + # xpstart_options[$num_xpstart]="-ac -pn"; + # xpstart_xprt_binary[$num_xpstart]=""; + #num_xpstart=$(($num_xpstart + 1)) + + #### Sample 6: + # # List remote Xprt's here + # # (note that there is no test to check whether these DISPLAYs are valid!) + # xpstart_remote_server[$num_xpstart]="sera:12" ; num_xpstart=$(($num_xpstart + 1)) + # xpstart_remote_server[$num_xpstart]="gandalf:19" ; num_xpstart=$(($num_xpstart + 1)) +} + +############################################################################ + +# Main +case "$1" in + ## Start Xprint servers + 'start') + do_start + ;; + + ## Stop Xprint servers + # Note that this does _not_ kill Xprt instances started using this script + # by non-root users + 'stop') + do_stop + ;; + + ## Restart Xprint servers + 'restart') + do_restart + ;; + + ## Reload configuration without stopping and restarting + 'reload') + # not supported + msg "reload not supported, use 'restart' or 'force-reload'" + exit 3 + ;; + + ## Restart Xprint only if it is already running + 'condrestart'|'try-restart'|'force-reload') + # only restart if it is already running + [ -f /var/lock/subsys/xprint ] && do_restart || : + ;; + + ## Get list of all Xprint servers for this user + # (incl. per-user and system-wide instances) + 'get_xpserverlist') + do_get_xpserverlist + ;; + + ## Get status of Xprint servers, RedHat-style + 'status') + x="$(do_get_xpserverlist)" + if [ "${x}" != "" ] ; then + msg "Xprint (${x}) is running..." + exit 0 + else + msg "Xprint is stopped" + exit 3 + fi + ;; + + ## Wrapper + 'wrapper') + cmd="${2}" + [ "${cmd}" = "" ] && fatal_error "No command given." + shift ; shift + export XPSERVERLIST="$(do_get_xpserverlist)" + [ "${XPSERVERLIST}" = "" ] && fatal_error "No Xprint servers found." + exec "${cmd}" "$@" + ;; + + ## Wrapper for "xplsprinters" + 'lsprinters') + [ "${ETC_INITD_XPRINT_XPLSPRINTERS_PATH}" != "" ] && cmd="${ETC_INITD_XPRINT_XPLSPRINTERS_PATH}" + [ ! -x "${cmd}" -a "${XPCUSTOMGLUE}" = "GISWxprintglue" ] && cmd="/opt/GISWxprintglue/bin/xplsprinters" + [ ! -x "${cmd}" -a "${XPCUSTOMGLUE}" = "GISWxprint" ] && cmd="/opt/GISWxprint/bin/xplsprinters" + [ ! -x "${cmd}" -a "${XPROJECTROOT}" != "" ] && cmd="${XPROJECTROOT}/bin/xplsprinters" + [ ! -x "${cmd}" ] && cmd="/usr/bin/xplsprinters" + [ ! -x "${cmd}" ] && cmd="xplsprinters" + + shift + export XPSERVERLIST="$(do_get_xpserverlist)" + [ "${XPSERVERLIST}" = "" ] && fatal_error "No Xprint servers found." + exec "${cmd}" "$@" + ;; + + ## Diagnostics + 'diag') + do_diag + ;; + + ## Print usage + *) + msg "Usage: $0 { start | stop | restart | force-reload | status | condrestart | try-restart | wrapper | lsprinters | get_xpserverlist | diag }" + exit 2 +esac +exit 0 + +# EOF. --- xorg-server-1.4.1~git20080131.orig/debian/xprint.manpages +++ xorg-server-1.4.1~git20080131/debian/xprint.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/Xprt* --- xorg-server-1.4.1~git20080131.orig/debian/copyright +++ xorg-server-1.4.1~git20080131/debian/copyright @@ -0,0 +1,1108 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/xserver/ +The upstream tarball has been modified to remove the files listed in +debian/prune/non-free. + + Licenses + + The X.Org Foundation + + March 2004 + +1. Introduction + +The X.org Foundation X Window System distribution is a compilation of code +and documentation from many sources. This document is intended primarily as +a guide to the licenses used in the distribution: you must check each file +and/or package for precise redistribution terms. None-the-less, this summary +may be useful to many users. No software incorporating the XFree86 1.1 +license has been incorporated. + +This document is based on the compilation from XFree86. + +2. XFree86 License + +XFree86 code without an explicit copyright is covered by the following copy- +right/license: + +Copyright (C) 1994-2003 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 fur- +nished 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, FIT- +NESS 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 CON- +NECTION 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 deal- +ings in this Software without prior written authorization from the XFree86 +Project. + +3. Other Licenses + +Portions of code are covered by the following licenses/copyrights. See indi- +vidual files for the copyright dates. + +3.1 X/MIT Copyrights + +3.1.1 X Consortium + +Copyright (C) X Consortium + +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 fur- +nished 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, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X +CONSORTIUM 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 X Consortium 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 X Consortium. + +X Window System is a trademark of X Consortium, Inc. + +3.1.2 The Open Group + +Copyright The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that 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, FIT- +NESS 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. + +3.2 Berkeley-based copyrights: + +o + +3.2.1 General + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- +CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- +CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- +ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + +3.2.2 UCB/LBL + +Copyright (c) 1993 The Regents of the University of California. All rights +reserved. + +This software was developed by the Computer Systems Engineering group at +Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to +Berkeley. + +All advertising materials mentioning features or use of this software must +display the following acknowledgement: This product includes software devel- +oped by the University of California, Lawrence Berkeley Laboratory. + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: This product includes soft- + ware developed by the University of California, Berkeley and its con- + tributors. + + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DIS- +CLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +3.2.3 The NetBSD Foundation, Inc. + +Copyright (c) 2003 The NetBSD Foundation, Inc. All rights reserved. + +This code is derived from software contributed to The NetBSD Foundation by +Ben Collver + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: This product includes soft- + ware developed by the NetBSD Foundation, Inc. and its contributors. + + 4. Neither the name of The NetBSD Foundation nor the names of its con- + tributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSE- +QUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAM- +AGE. + +3.2.4 Theodore Ts'o. + +Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All rights +reserved. + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + and the entire permission notice in its entirety, including the dis- + claimer of warranties. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. he name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO +EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- +CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- +ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF NOT +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +3.2.5 Theo de Raadt and Damien Miller + +Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. Copyright (c) +2001-2002 Damien Miller. All rights reserved. + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- +CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- +CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- +ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + +3.2.6 Todd C. Miller + +Copyright (c) 1998 Todd C. Miller + +Permission to use, copy, modify, and distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright +notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MER- +CHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE FOR ANY +SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CON- +TRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +3.2.7 Thomas Winischhofer + +Copyright (C) 2001-2004 Thomas Winischhofer + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- +CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- +ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + +3.3 NVIDIA Corp + +Copyright (c) 1996 NVIDIA, Corp. All rights reserved. + +NOTICE TO USER: The source code is copyrighted under U.S. and international +laws. NVIDIA, Corp. of Sunnyvale, California owns the copyright and as +design patents pending on the design and interface of the NV chips. Users +and possessors of this source code are hereby granted a nonexclusive, roy- +alty-free copyright and design patent license to use this code in individual +and commercial software. + +Any use of this source code must include, in the user documentation and +internal comments to the code, notices to the end user as follows: + +Copyright (c) 1996 NVIDIA, Corp. NVIDIA design patents pending in the U.S. +and foreign countries. + +NVIDIA, CORP. MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE +CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WAR- +RANTY OF ANY KIND. NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA, CORP. BE LIABLE +FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAM- +AGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. + +3.4 GLX Public License + +GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License") + +Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby +grants permission to Recipient (defined below), under Recipient's copyrights +in the Original Software (defined below), to use, copy, modify, merge, pub- +lish, distribute, sublicense and/or sell copies of Subject Software (defined +below), and to permit persons to whom the Subject Software is furnished in +accordance with this License to do the same, subject to all of the following +terms and conditions, which Recipient accepts by engaging in any such use, +copying, modifying, merging, publishing, distributing, sublicensing or sell- +ing: + +1. Definitions. + + (a) "Original Software" means source code of computer software code + which is described in Exhibit A as Original Software. + + (b) "Modifications" means any addition to or deletion from the sub- + stance or structure of either the Original Software or any previous + Modifications. When Subject Software is released as a series of + files, a Modification means (i) any addition to or deletion from + the contents of a file containing Original Software or previous + Modifications and (ii) any new file that contains any part of the + Original Code or previous Modifications. + + (c) "Subject Software" means the Original Software or Modifications + or the combination of the Original Software and Modifications, or + portions of any of the foregoing. + + (d) "Recipient" means an individual or a legal entity exercising + rights under, and complying with all of the terms of, this License. + For legal entities, "Recipient" includes any entity which controls, + is controlled by, or is under common control with Recipient. For + purposes of this definition, "control" of an entity means (a) the + power, direct or indirect, to direct or manage such entity, or (b) + ownership of fifty percent (50%) or more of the outstanding shares + or beneficial ownership of such entity. + +2. Redistribution of Source Code Subject to These Terms. Redistributions of +Subject Software in source code form must retain the notice set forth in +Exhibit A, below, in every file. A copy of this License must be included in +any documentation for such Subject Software where the recipients' rights +relating to Subject Software are described. Recipient may distribute the +source code version of Subject Software under a license of Recipient's +choice, which may contain terms different from this License, provided that +(i) Recipient is in compliance with the terms of this License, and (ii) the +license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13 +of this License, which terms may not be modified or superseded by any other +terms of such license. If Recipient distributes the source code version under +a different license Recipient must make it absolutely clear that any terms +which differ from this License are offered by Recipient alone, not by SGI. +Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as +a result of any such terms Recipient offers. + +3. Redistribution in Executable Form. The notice set forth in Exhibit A must +be conspicuously included in any notice in an executable version of Subject +Software, related documentation or collateral in which Recipient describes +the user's rights relating to the Subject Software. Recipient may distribute +the executable version of Subject Software under a license of Recipient's +choice, which may contain terms different from this License, provided that +(i) Recipient is in compliance with the terms of this License, and (ii) the +license terms include this Section 3 and Sections 4, 7, 8, 10, 12 and 13 of +this License, which terms may not be modified or superseded by any other +terms of such license. If Recipient distributes the executable version under +a different license Recipient must make it absolutely clear that any terms +which differ from this License are offered by Recipient alone, not by SGI. +Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as +a result of any such terms Recipient offers. + +4. Termination. This License and the rights granted hereunder will terminate +automatically if Recipient fails to comply with terms herein and fails to +cure such breach within 30 days of the breach. Any sublicense to the Subject +Software which is properly granted shall survive any termination of this +License absent termination by the terms of such sublicense. Provisions which, +by their nature, must remain in effect beyond the termination of this License +shall survive. + +5. No Trademark Rights. This License does not grant any rights to use any +trade name, trademark or service mark whatsoever. No trade name, trademark or +service mark of SGI may be used to endorse or promote products derived from +the Subject Software without prior written permission of SGI. + +6. No Other Rights. This License does not grant any rights with respect to +the OpenGL API or to any software or hardware implementation thereof or to +any other software whatsoever, nor shall any other rights or licenses not +expressly granted hereunder arise by implication, estoppel or otherwise with +respect to the Subject Software. Title to and ownership of the Original Soft- +ware at all times remains with SGI. All rights in the Original Software not +expressly granted under this License are reserved. + +7. Compliance with Laws; Non-Infringement. Recipient shall comply with all +applicable laws and regulations in connection with use and distribution of +the Subject Software, including but not limited to, all export and import +control laws and regulations of the U.S. government and other countries. +Recipient may not distribute Subject Software that (i) in any way infringes +(directly or contributorily) the rights (including patent, copyright, trade +secret, trademark or other intellectual property rights of any kind) of any +other person or entity or (ii) breaches any representation or warranty, +express, implied or statutory, which under any applicable law it might be +deemed to have been distributed. + +8. Claims of Infringement. If Recipient at any time has knowledge of any one +or more third party claims that reproduction, modification, use, distribu- +tion, import or sale of Subject Software (including particular functionality +or code incorporated in Subject Software) infringes the third party's intel- +lectual property rights, Recipient must place in a well-identified web page +bearing the title "LEGAL" a description of each such claim and a description +of the party making each such claim in sufficient detail that a user of the +Subject Software will know whom to contact regarding the claim. Also, upon +gaining such knowledge of any such claim, Recipient must conspicuously +include the URL for such web page in the Exhibit A notice required under Sec- +tions 2 and 3, above, and in the text of any related documentation, license +agreement or collateral in which Recipient describes end user's rights relat- +ing to the Subject Software. If Recipient obtains such knowledge after it +makes Subject Software available to any other person or entity, Recipient +shall take other steps (such as notifying appropriate mailing lists or news- +groups) reasonably calculated to inform those who received the Subject Soft- +ware that new knowledge has been obtained. + +9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, +WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT +LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER- +CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- INFRINGING. SGI ASSUMES NO +RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE +PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER- +VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN +ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED +HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THE- +ORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIA- +BILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR +ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY +CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK +STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER +COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF +THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY +TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO +THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO +NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, +SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT. + +11. Indemnity. Recipient shall be solely responsible for damages arising, +directly or indirectly, out of its utilization of rights under this License. +Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc. +from and against any loss, liability, damages, costs or expenses (including +the payment of reasonable attorneys fees) arising out of Recipient's use, +modification, reproduction and distribution of the Subject Software or out of +any representation or warranty made by Recipient. + +12. U.S. Government End Users. The Subject Software is a "commercial item" +consisting of "commercial computer software" as such terms are defined in +title 48 of the Code of Federal Regulations and all U.S. Government End +Users acquire only the rights set forth in this License and are subject to +the terms of this License. + +13. Miscellaneous. This License represents the complete agreement concerning +subject matter hereof. If any provision of this License is held to be unen- +forceable, such provision shall be reformed so as to achieve as nearly as +possible the same economic effect as the original provision and the remainder +of this License will remain in effect. This License shall be governed by and +construed in accordance with the laws of the United States and the State of +California as applied to agreements entered into and to be performed entirely +within California between California residents. Any litigation relating to +this License shall be subject to the exclusive jurisdiction of the Federal +Courts of the Northern District of California (or, absent subject matter +jurisdiction in such courts, the courts of the State of California), with +venue lying exclusively in Santa Clara County, California, with the losing +party responsible for costs, including without limitation, court costs and +reasonable attorneys fees and expenses. The application of the United Nations +Convention on Contracts for the International Sale of Goods is expressly +excluded. Any law or regulation which provides that the language of a con- +tract shall be construed against the drafter shall not apply to this License. + +Exhibit A + +The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 and +13 of the GLX Public License Version 1.0 (the "License"). You may not use +this file except in compliance with those sections of the License. You may +obtain a copy of the License at Silicon Graphics, Inc., attn: Legal Services, +2011 N. Shoreline Blvd., Mountain View, CA 94043 or at +http://www.sgi.com/software/opensource/glx/license.html. + +Software distributed under the License is distributed on an "AS IS" basis. +ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED +WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON- +INFRINGEMENT. See the License for the specific language governing rights and +limitations under the License. + +The Original Software is GLX version 1.2 source code, released February, +1999. The developer of the Original Software is Silicon Graphics, Inc. Those +portions of the Subject Software created by Silicon Graphics, Inc. are Copy- +right (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. + +3.5 CID Font Code Public License + +CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License") + +Subject to any applicable third party claims, Silicon Graphics, Inc. ("SGI") +hereby grants permission to Recipient (defined below), under SGI's copyrights +in the Original Software (defined below), to use, copy, modify, merge, pub- +lish, distribute, sublicense and/or sell copies of Subject Software (defined +below) in both source code and executable form, and to permit persons to whom +the Subject Software is furnished in accordance with this License to do the +same, subject to all of the following terms and conditions, which Recipient +accepts by engaging in any such use, copying, modifying, merging, publica- +tion, distributing, sublicensing or selling: + +1. Definitions. + + a. "Original Software" means source code of computer software code + that is described in Exhibit A as Original Software. + + b. "Modifications" means any addition to or deletion from the sub- + stance or structure of either the Original Software or any previous + Modifications. When Subject Software is released as a series of + files, a Modification means (i) any addition to or deletion from + the contents of a file containing Original Software or previous + Modifications and (ii) any new file that contains any part of the + Original Code or previous Modifications. + + c. "Subject Software" means the Original Software or Modifications + or the combination of the Original Software and Modifications, or + portions of any of the foregoing. + + d. "Recipient" means an individual or a legal entity exercising + rights under the terms of this License. For legal entities, "Recip- + ient" includes any entity that controls, is controlled by, or is + under common control with Recipient. For purposes of this defini- + tion, "control" of an entity means (i) the power, direct or indi- + rect, to direct or manage such entity, or (ii) ownership of fifty + percent (50%) or more of the outstanding shares or beneficial own- + ership of such entity. + + e. "Required Notice" means the notice set forth in Exhibit A to + this License. + + f. "Accompanying Technology" means any software or other technology + that is not a Modification and that is distributed or made publicly + available by Recipient with the Subject Software. Separate soft- + ware files that do not contain any Original Software or any previ- + ous Modification shall not be deemed a Modification, even if such + software files are aggregated as part of a product, or in any + medium of storage, with any file that does contain Original Soft- + ware or any previous Modification. + +2. License Terms. All distribution of the Subject Software must be made sub- +ject to the terms of this License. A copy of this License and the Required +Notice must be included in any documentation for Subject Software where +Recipient's rights relating to Subject Software and/or any Accompanying Tech- +nology are described. Distributions of Subject Software in source code form +must also include the Required Notice in every file distributed. In addition, +a ReadMe file entitled "Important Legal Notice" must be distributed with each +distribution of one or more files that incorporate Subject Software. That +file must be included with distributions made in both source code and exe- +cutable form. A copy of the License and the Required Notice must be included +in that file. Recipient may distribute Accompanying Technology under a +license of Recipient's choice, which may contain terms different from this +License, provided that (i) Recipient is in compliance with the terms of this +License, (ii) such other license terms do not modify or supersede the terms +of this License as applicable to the Subject Software, (iii) Recipient hereby +indemnifies SGI for any liability incurred by SGI as a result of the distri- +bution of Accompanying Technology or the use of other license terms. + +3. Termination. This License and the rights granted hereunder will terminate +automatically if Recipient fails to comply with terms herein and fails to +cure such breach within 30 days of the breach. Any sublicense to the Subject +Software that is properly granted shall survive any termination of this +License absent termination by the terms of such sublicense. Provisions which, +by their nature, must remain in effect beyond the termination of this License +shall survive. + +4. Trademark Rights. This License does not grant any rights to use any trade +name, trademark or service mark whatsoever. No trade name, trademark or ser- +vice mark of SGI may be used to endorse or promote products derived from or +incorporating any Subject Software without prior written permission of SGI. + +5. No Other Rights. No rights or licenses not expressly granted hereunder +shall arise by implication, estoppel or otherwise. Title to and ownership of +the Original Software at all times remains with SGI. All rights in the Origi- +nal Software not expressly granted under this License are reserved. + +6. Compliance with Laws; Non-Infringement. Recipient shall comply with all +applicable laws and regulations in connection with use and distribution of +the Subject Software, including but not limited to, all export and import +control laws and regulations of the U.S. government and other countries. +Recipient may not distribute Subject Software that (i) in any way infringes +(directly or contributorily) the rights (including patent, copyright, trade +secret, trademark or other intellectual property rights of any kind) of any +other person or entity, or (ii) breaches any representation or warranty, +express, implied or statutory, which under any applicable law it might be +deemed to have been distributed. + +7. Claims of Infringement. If Recipient at any time has knowledge of any one +or more third party claims that reproduction, modification, use, distribu- +tion, import or sale of Subject Software (including particular functionality +or code incorporated in Subject Software) infringes the third party's intel- +lectual property rights, Recipient must place in a well-identified web page +bearing the title "LEGAL" a description of each such claim and a description +of the party making each such claim in sufficient detail that a user of the +Subject Software will know whom to contact regarding the claim. Also, upon +gaining such knowledge of any such claim, Recipient must conspicuously +include the URL for such web page in the Required Notice, and in the text of +any related documentation, license agreement or collateral in which Recipient +describes end user's rights relating to the Subject Software. If Recipient +obtains such knowledge after it makes Subject Software available to any other +person or entity, Recipient shall take other steps (such as notifying appro- +priate mailing lists or newsgroups) reasonably calculated to provide such +knowledge to those who received the Subject Software. + +8. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, +WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT +LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER- +CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. SGI ASSUMES NO +RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE +PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER- +VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN +ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED +HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, +WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY), +CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR 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 SUBJECT SOFTWARE OR +THE USE OR OTHER DEALINGS IN THE SUBJECT SOFTWARE. SOME JURISDICTIONS DO NOT +ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO THIS EXCLUSION AND +LIMITATION MAY NOT APPLY TO RECIPIENT TO THE EXTENT SO DISALLOWED. + +10. Indemnity. Recipient shall be solely responsible for damages arising, +directly or indirectly, out of its utilization of rights under this License. +Recipient will defend, indemnify and hold SGI and its successors and assigns +harmless from and against any loss, liability, damages, costs or expenses +(including the payment of reasonable attorneys fees) arising out of (Recipi- +ent's use, modification, reproduction and distribution of the Subject Soft- +ware or out of any representation or warranty made by Recipient. + +11. U.S. Government End Users. The Subject Software is a "commercial item" +consisting of "commercial computer software" as such terms are defined in +title 48 of the Code of Federal Regulations and all U.S. Government End Users +acquire only the rights set forth in this License and are subject to the +terms of this License. + +12. Miscellaneous. This License represents the complete agreement concerning +subject matter hereof. If any provision of this License is held to be unen- +forceable by any judicial or administrative authority having proper jurisdic- +tion with respect thereto, such provision shall be reformed so as to achieve +as nearly as possible the same economic effect as the original provision and +the remainder of this License will remain in effect. This License shall be +governed by and construed in accordance with the laws of the United States +and the State of California as applied to agreements entered into and to be +performed entirely within California between California residents. Any liti- +gation relating to this License shall be subject to the exclusive jurisdic- +tion of the Federal Courts of the Northern District of California (or, absent +subject matter jurisdiction in such courts, the courts of the State of Cali- +fornia), with venue lying exclusively in Santa Clara County, California, with +the losing party responsible for costs, including without limitation, court +costs and reasonable attorneys fees and expenses. The application of the +United Nations Convention on Contracts for the International Sale of Goods is +expressly excluded. Any law or regulation that provides that the language of +a contract shall be construed against the drafter shall not apply to this +License. + +Exhibit A + +Copyright (c) 1994-1999 Silicon Graphics, Inc. + +The contents of this file are subject to the CID Font Code Public License +Version 1.0 (the "License"). You may not use this file except in compliance +with the License. You may obtain a copy of the License at Silicon Graphics, +Inc., attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 +or at http://www.sgi.com/software/opensource/cid/license.html + +Software distributed under the License is distributed on an "AS IS" basis. +ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED +WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON- +INFRINGEMENT. See the License for the specific language governing rights and +limitations under the License. + +The Original Software (as defined in the License) is CID font code that was +developed by Silicon Graphics, Inc. Those portions of the Subject Software +(as defined in the License) that were created by Silicon Graphics, Inc. are +Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved. + +[NOTE: When using this text in connection with Subject Software delivered +solely in object code form, Recipient may replace the words "this file" with +"this software" in both the first and second sentences.] + +3.6 Bitstream Vera Fonts Copyright + +The fonts have a generous copyright, allowing derivative works (as long as +"Bitstream" or "Vera" are not in the names), and full redistribution (so long +as they are not *sold* by themselves). They can be be bundled, redistributed +and sold with any software. + +The fonts are distributed under the following copyright: + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated documentation +files (the "Font Software"), to reproduce and distribute the Font Software, +including without limitation the rights to use, copy, merge, publish, dis- +tribute, and/or sell copies of the Font Software, and to permit persons to +whom the Font Software is furnished to do so, subject to the following condi- +tions: + +The above copyright and trademark notices and this permission notice shall be +included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and addi- +tional glyphs or characters may be added to the Fonts, only if the fonts are +renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream Vera" +names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDA- +TION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN- +ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR +INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT- +WARE. + +Except as contained in this notice, the names of Gnome, the Gnome Foundation, +and Bitstream Inc., shall not be used in advertising or otherwise to promote +the sale, use or other dealings in this Font Software without prior written +authorization from the Gnome Foundation or Bitstream Inc., respectively. For +further information, contact: fonts at gnome dot org. + +3.7 Bigelow & Holmes Inc and URW++ GmbH Luxi font license + +Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction +code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a regis- +tered trademark of Bigelow & Holmes Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of these Fonts and associated documentation files (the "Font Software"), to +deal in the Font Software, including without limitation the rights to use, +copy, merge, publish, distribute, sublicense, and/or sell copies of the Font +Software, and to permit persons to whom the Font Software is furnished to do +so, subject to the following conditions: + +The above copyright and trademark notices and this permission notice shall be +included in all copies of one or more of the Font Software. + +The Font Software may not be modified, altered, or added to, and in particu- +lar the designs of glyphs or characters in the Fonts may not be modified nor +may additional glyphs or characters be added to the Fonts. This License +becomes null and void when the Fonts or Font Software have been modified. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BIGELOW & HOLMES INC. OR URW++ +GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN- +ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR +INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT- +WARE. + +Except as contained in this notice, the names of Bigelow & Holmes Inc. and +URW++ GmbH. shall not be used in advertising or otherwise to promote the +sale, use or other dealings in this Font Software without prior written +authorization from Bigelow & Holmes Inc. and URW++ GmbH. + +For further information, contact: + +info@urwpp.de or design@bigelowandholmes.com + + $Id: LICENSE,v 1.3 2004/09/03 23:41:21 kem Exp $ + + +======================================================================== +Certain files in this package (e.g. GL/glx/g_*) are covered by the SGI +Free Software License B, Version 1.1, http://oss.sgi.com/projects/FreeB + +SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000]) +1. Definitions. +1.1. "Additional Notice Provisions" means such additional provisions as appear in the +Notice in Original Code under the heading "Additional Notice Provisions." +1.2. "Covered Code" means the Original Code or Modifications, or any combination thereof. +1.3. "Hardware" means any physical device that accepts input, processes input, stores the +results of processing, and/or provides output. +1.4. "Larger Work" means a work that combines Covered Code or portions thereof with +code not governed by the terms of this License. +1.5. "Licensable" means having the right to grant, to the maximum extent possible, whether +at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. +1.6. "License" means this document. +1.7. "Licensed Patents" means patent claims Licensable by SGI that are infringed by the use +or sale of Original Code or any Modifications provided by SGI, or any combination thereof. +1.8. "Modifications" means any addition to or deletion from the substance or structure of the +Original Code or any previous Modifications. When Covered Code is released as a series of files, +a Modification is: +A. Any addition to the contents of a file containing Original Code and/or addition to or +deletion from the contents of a file containing previous Modifications. +B. Any new file that contains any part of the Original Code or previous Modifications. +1.9. "Notice" means any notice in Original Code or Covered Code, as required by and in +compliance with this License. +1.10. "Original Code" means source code of computer software code that is described in the +source code Notice required by Exhibit A as Original Code, and updates and error corrections +specifically thereto. +1.11. "Recipient" means an individual or a legal entity exercising rights under, and complying +with all of the terms of, this License or a future version of this License issued under Section 8. +For legal entities, "Recipient" includes any entity that controls, is controlled by, or is under +common control with Recipient. For purposes of this definition, "control" of an entity means (a) +the power, direct or indirect, to direct or manage such entity, or (b) ownership of fifty percent +(50%) or more of the outstanding shares or beneficial ownership of such entity. +1.12. "Recipient Patents" means patent claims Licensable by a Recipient that are infringed by +the use or sale of Original Code or any Modifications provided by SGI, or any combination +thereof. +1.13. "SGI" means Silicon Graphics, Inc. +1.14. "SGI Patents" means patent claims Licensable by SGI other than the Licensed Patents. +2. License Grant and Restrictions. +2.1. SGI License Grant. Subject to the terms of this License and any third party intellectual +property claims, for the duration of intellectual property protections inherent in the Original +Code, SGI hereby grants Recipient a worldwide, royalty-free, non-exclusive license, to do the +following: (i) under copyrights Licensable by SGI, to reproduce, distribute, create derivative +works from, and, to the extent applicable, display and perform the Original Code and/or any +Modifications provided by SGI alone and/or as part of a Larger Work; and (ii) under any +Licensable Patents, to make, have made, use, sell, offer for sale, import and/or otherwise transfer +the Original Code and/or any Modifications provided by SGI. Recipient accepts the terms and +conditions of this License by undertaking any of the aforementioned actions. The patent license +shall apply to the Covered Code if, at the time any related Modification is added, such addition +of the Modification causes such combination to be covered by the Licensed Patents. The patent +license in Section 2.1(ii) shall not apply to any other combinations that include the Modification. +No patent license is provided under SGI Patents for infringements of SGI Patents by +Modifications not provided by SGI or combinations of Original Code and Modifications not +provided by SGI. +2.2. Recipient License Grant. Subject to the terms of this License and any third party +intellectual property claims, Recipient hereby grants SGI and any other Recipients a worldwide, +royalty-free, non-exclusive license, under any Recipient Patents, to make, have made, use, sell, +offer for sale, import and/or otherwise transfer the Original Code and/or any Modifications +provided by SGI. +2.3. No License For Hardware Implementations. The licenses granted in Section 2.1 and +2.2 are not applicable to implementation in Hardware of the algorithms embodied in the Original +Code or any Modifications provided by SGI . +3. Redistributions. +3.1. Retention of Notice/Copy of License. The Notice set forth in Exhibit A, below, must be +conspicuously retained or included in any and all redistributions of Covered Code. For +distributions of the Covered Code in source code form, the Notice must appear in every file that +can include a text comments field; in executable form, the Notice and a copy of this License +must appear in related documentation or collateral where the Recipient's rights relating to +Covered Code are described. Any Additional Notice Provisions which actually appears in the +Original Code must also be retained or included in any and all redistributions of Covered Code. +3.2. Alternative License. Provided that Recipient is in compliance with the terms of this +License, Recipient may, so long as without derogation of any of SGI's rights in and to the +Original Code, distribute the source code and/or executable version(s) of Covered Code under +(1) this License; (2) a license identical to this License but for only such changes as are necessary +in order to clarify Recipient's role as licensor of Modifications; and/or (3) a license of +Recipient's choosing, containing terms different from this License, provided that the license +terms include this Section 3 and Sections 4, 6, 7, 10, 12, and 13, which terms may not be +modified or superseded by any other terms of such license. If Recipient elects to use any license +other than this License, Recipient must make it absolutely clear that any of its terms which differ +from this License are offered by Recipient alone, and not by SGI. It is emphasized that this +License is a limited license, and, regardless of the license form employed by Recipient in +accordance with this Section 3.2, Recipient may relicense only such rights, in Original Code and +Modifications by SGI, as it has actually been granted by SGI in this License. +3.3. Indemnity. Recipient hereby agrees to indemnify SGI for any liability incurred by SGI +as a result of any such alternative license terms Recipient offers. +4. Termination. This License and the rights granted hereunder will terminate automatically +if Recipient breaches any term herein and fails to cure such breach within 30 days thereof. Any +sublicense to the Covered Code that is properly granted shall survive any termination of this +License, absent termination by the terms of such sublicense. Provisions that, by their nature, +must remain in effect beyond the termination of this License, shall survive. +5. No Trademark Or Other Rights. This License does not grant any rights to: (i) any +software apart from the Covered Code, nor shall any other rights or licenses not expressly +granted hereunder arise by implication, estoppel or otherwise with respect to the Covered Code; +(ii) any trade name, trademark or service mark whatsoever, including without limitation any +related right for purposes of endorsement or promotion of products derived from the Covered +Code, without prior written permission of SGI; or (iii) any title to or ownership of the Original +Code, which shall at all times remains with SGI. All rights in the Original Code not expressly +granted under this License are reserved. +6. Compliance with Laws; Non-Infringement. There are various worldwide laws, +regulations, and executive orders applicable to dispositions of Covered Code, including without +limitation export, re-export, and import control laws, regulations, and executive orders, of the +U.S. government and other countries, and Recipient is reminded it is obliged to obey such laws, +regulations, and executive orders. Recipient may not distribute Covered Code that (i) in any way +infringes (directly or contributorily) any intellectual property rights of any kind of any other +person or entity or (ii) breaches any representation or warranty, express, implied or statutory, to +which, under any applicable law, it might be deemed to have been subject. +7. Claims of Infringement. If Recipient learns of any third party claim that any disposition +of Covered Code and/or functionality wholly or partially infringes the third party's intellectual +property rights, Recipient will promptly notify SGI of such claim. +8. Versions of the License. SGI may publish revised and/or new versions of the License +from time to time, each with a distinguishing version number. Once Covered Code has been +published under a particular version of the License, Recipient may, for the duration of the +license, continue to use it under the terms of that version, or choose to use such Covered Code +under the terms of any subsequent version published by SGI. Subject to the provisions of +Sections 3 and 4 of this License, only SGI may modify the terms applicable to Covered Code +created under this License. +9. DISCLAIMER OF WARRANTY. COVERED CODE IS PROVIDED "AS IS." ALL +EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS ARE DISCLAIMED, +INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND +CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A +PARTICULAR PURPOSE, AND NON-INFRINGEMENT. SGI ASSUMES NO RISK AS TO +THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD THE SOFTWARE +PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR +SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY IS AN +ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS +AUTHORIZED HEREUNDER EXCEPT SUBJECT TO THIS DISCLAIMER. +10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES NOR LEGAL +THEORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR +STRICT LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI +LICENSOR BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR +CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT +LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF +DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER +COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN +INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY +RESULTING FROM SGI's NEGLIGENCE TO THE EXTENT APPLICABLE LAW +PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE +EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO +THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT. +11. Indemnity. Recipient shall be solely responsible for damages arising, directly or +indirectly, out of its utilization of rights under this License. Recipient will defend, indemnify and +hold harmless Silicon Graphics, Inc. from and against any loss, liability, damages, costs or +expenses (including the payment of reasonable attorneys fees) arising out of Recipient's use, +modification, reproduction and distribution of the Covered Code or out of any representation or +warranty made by Recipient. +12. U.S. Government End Users. The Covered Code is a "commercial item" consisting of +"commercial computer software" as such terms are defined in title 48 of the Code of Federal +Regulations and all U.S. Government End Users acquire only the rights set forth in this License +and are subject to the terms of this License. +13. Miscellaneous. This License represents the complete agreement concerning the its +subject matter. If any provision of this License is held to be unenforceable, such provision shall +be reformed so as to achieve as nearly as possible the same legal and economic effect as the +original provision and the remainder of this License will remain in effect. This License shall be +governed by and construed in accordance with the laws of the United States and the State of +California as applied to agreements entered into and to be performed entirely within California +between California residents. Any litigation relating to this License shall be subject to the +exclusive jurisdiction of the Federal Courts of the Northern District of California (or, absent +subject matter jurisdiction in such courts, the courts of the State of California), with venue lying +exclusively in Santa Clara County, California, with the losing party responsible for costs, +including without limitation, court costs and reasonable attorneys fees and expenses. The +application of the United Nations Convention on Contracts for the International Sale of Goods is +expressly excluded. Any law or regulation that provides that the language of a contract shall be +construed against the drafter shall not apply to this License. +Exhibit A +License Applicability. Except to the extent portions of this file are made subject to an +alternative license as permitted in the SGI Free Software License B, Version 1.1 (the "License"), +the contents of this file are subject only to the provisions of the License. You may not use this +file except in compliance with the License. You may obtain a copy of the License at Silicon +Graphics, Inc., attn: Legal Services, 1600 Amphitheatre Parkway, Mountain View, CA 94043- +1351, or at: +http://oss.sgi.com/projects/FreeB +Note that, as provided in the License, the Software is distributed on an "AS IS" basis, with ALL +EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS DISCLAIMED, +INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND +CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A +PARTICULAR PURPOSE, AND NON-INFRINGEMENT. +Original Code. The Original Code is: [name of software, version number, and release date], +developed by Silicon Graphics, Inc. The Original Code is Copyright (c) [dates of first +publication, as appearing in the Notice in the Original Code] Silicon Graphics, Inc. Copyright in +any portions created by third parties is as indicated elsewhere herein. All Rights Reserved. +Additional Notice Provisions: [such additional provisions, if any, as appear in the Notice in the +Original Code under the heading "Additional Notice Provisions"] + + +============================================================================= +Xprint uses ttf2pt1 for Freetype support. + + -- ttf2pt1 licence -- + +The following copyright notice applies to all the files provided +in this distribution unless explicitly noted otherwise +(the most notable exception being t1asm.c). + + Copyright (c) 1997-2002 by the AUTHORS: + Andrew Weeks + Frank M. Siegert + Mark Heath + Thomas Henlich + Sergey Babkin , + Turgut Uyar + Rihardas Hepas + Szalay Tamas + Johan Vromans + Petr Titera + Lei Wang + Chen Xiangyang + Zvezdan Petkovic + Rigel + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the TTF2PT1 Project + and its contributors. + + THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +For the approximate list of the AUTHORS' responsibilities see the +project history. + +Other contributions to the project are: + +Turgut Uyar + The Unicode translation table for the Turkish language. + +Rihardas Hepas + The Unicode translation table for the Baltic languages. + +Szalay Tamas + The Unicode translation table for the Central European languages. + +Johan Vromans + The RPM file. + +Petr Titera + The Unicode map format with names, the forced Unicode option. + +Frank M. Siegert + Port to Windows + +Lei Wang +Chen Xiangyang + Translation maps for Chinese fonts. + +Zvezdan Petkovic + The Unicode translation tables for the Cyrillic alphabet. + +Rigel + Generation of the dvips encoding files, modification to the Chinese maps. + +I. Lee Hetherington + The Type1 assembler (from the package 't1utils'), its full copyright + notice: + Copyright (c) 1992 by I. Lee Hetherington, all rights reserved. + Permission is hereby granted to use, modify, and distribute this program + for any purpose provided this copyright notice and the one below remain + intact. --- xorg-server-1.4.1~git20080131.orig/debian/xnest.install +++ xorg-server-1.4.1~git20080131/debian/xnest.install @@ -0,0 +1,2 @@ +usr/bin/Xnest +usr/share/man/man1/Xnest.1 --- xorg-server-1.4.1~git20080131.orig/depcomp +++ xorg-server-1.4.1~git20080131/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2007-03-29.01 +scriptversion=2006-10-15.18 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -215,39 +215,34 @@ # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` + tmpdepfile="$stripped.u" if test "$libtool" = yes; then - tmpdepfile1=$dir$base.u - tmpdepfile2=$base.u - tmpdepfile3=$dir.libs/$base.u "$@" -Wc,-M else - tmpdepfile1=$dir$base.u - tmpdepfile2=$dir$base.u - tmpdepfile3=$dir$base.u "$@" -M fi stat=$? + if test -f "$tmpdepfile"; then : + else + stripped=`echo "$stripped" | sed 's,^.*/,,'` + tmpdepfile="$stripped.u" + fi + if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + rm -f "$tmpdepfile" exit $stat fi - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done if test -f "$tmpdepfile"; then + outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" + sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile --- xorg-server-1.4.1~git20080131.orig/include/Makefile.in +++ xorg-server-1.4.1~git20080131/include/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -144,6 +144,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -561,8 +562,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -574,8 +575,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -585,12 +586,13 @@ CTAGS: $(HEADERS) $(SOURCES) do-not-use-config.h.in xorg-server.h.in dix-config.h.in xgl-config.h.in xorg-config.h.in xkb-config.h.in xwin-config.h.in kdrive-config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) do-not-use-config.h.in xorg-server.h.in dix-config.h.in xgl-config.h.in xorg-config.h.in xkb-config.h.in xwin-config.h.in kdrive-config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/record/Makefile.in +++ xorg-server-1.4.1~git20080131/record/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,7 +53,7 @@ librecord_la_LIBADD = am_librecord_la_OBJECTS = record.lo set.lo librecord_la_OBJECTS = $(am_librecord_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -141,6 +141,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -446,8 +447,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -459,8 +460,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -470,12 +471,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/xkb/Makefile.in +++ xorg-server-1.4.1~git20080131/xkb/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,7 +67,7 @@ libxkbstubs_la_LIBADD = am_libxkbstubs_la_OBJECTS = ddxVT.lo ddxPrivate.lo ddxKillSrv.lo libxkbstubs_la_OBJECTS = $(am_libxkbstubs_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -164,6 +164,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -567,8 +568,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -580,8 +581,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -591,12 +592,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/xkb/xkbLEDs.c +++ xorg-server-1.4.1~git20080131/xkb/xkbLEDs.c @@ -63,6 +63,9 @@ sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0); + if (!sli) + return update; + if (state_changes&(XkbModifierStateMask|XkbGroupStateMask)) update|= sli->usesEffective; if (state_changes&(XkbModifierBaseMask|XkbGroupBaseMask)) --- xorg-server-1.4.1~git20080131.orig/os/Makefile.in +++ xorg-server-1.4.1~git20080131/os/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,7 +85,7 @@ os_O_SOURCES = os.c os_O_OBJECTS = os.$(OBJEXT) os_O_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -174,6 +174,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -538,8 +539,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -551,8 +552,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -562,12 +563,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/XTrap/Makefile.in +++ xorg-server-1.4.1~git20080131/XTrap/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,7 +54,7 @@ am_libxtrap_la_OBJECTS = xtrapddmi.lo xtrapdi.lo xtrapdiswp.lo \ xtrapditbl.lo libxtrap_la_OBJECTS = $(am_libxtrap_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -142,6 +142,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -448,8 +449,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -461,8 +462,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -472,12 +473,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/aclocal.m4 +++ xorg-server-1.4.1~git20080131/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,13 +11,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- @@ -7371,7 +7368,7 @@ ]) # XTRANS_SECURE_RPC_FLAGS -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -7386,7 +7383,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.10], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -7402,10 +7399,8 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10])dnl +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) # Figure out how to run the assembler. -*- Autoconf -*- @@ -7699,7 +7694,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -7747,13 +7742,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 13 +# serial 12 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -7858,17 +7853,16 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. -_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $_am_arg | $_am_arg:* ) + $1 | $1:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -8169,7 +8163,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) --- xorg-server-1.4.1~git20080131.orig/ChangeLog +++ xorg-server-1.4.1~git20080131/ChangeLog @@ -0,0 +1,28776 @@ +commit b6d4cdf64f43ae805beada6122c8be2ed138742c +Author: Adam Jackson +Date: Fri Jan 18 14:41:20 2008 -0500 + + CVE-2007-6429: Don't spuriously reject <8bpp shm pixmaps. + + Move size validation after depth validation, and only validate size if + the bpp of the pixmap format is > 8. If bpp < 8 then we're already + protected from overflow by the width and height checks. + (cherry picked from commit e9fa7c1c88a8130a48f772c92b186b8b777986b5) + +commit 19b95cdd1d14a1e7d1abba1880ab023c96f19bf5 +Author: Matthieu Herrb +Date: Thu Jan 17 17:03:39 2008 +0100 + + Fix for CVE-2007-5958 - File existence disclosure. + +commit f09b8007e7f6e60e0b9c9665ec632b578ae08b6f +Author: Matthieu Herrb +Date: Thu Jan 17 15:29:06 2008 +0100 + + Fix for CVE-2008-0006 - PCF Font parser buffer overflow. + +commit 8b14f7b74284900b95a319ec80c4333e63af2296 +Author: Matthieu Herrb +Date: Thu Jan 17 15:28:42 2008 +0100 + + Fix for CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows. + +commit d244c8272e0ac47c41a9416e37293903b842a78b +Author: Matthieu Herrb +Date: Thu Jan 17 15:27:34 2008 +0100 + + Fix for CVE-2007-6427 - Xinput extension memory corruption. + +commit 4848d49d05a318559afe7a17a19ba055947ee1f5 +Author: Matthieu Herrb +Date: Thu Jan 17 15:28:03 2008 +0100 + + Fix for CVE-2007-6428 - TOG-cup extension memory corruption. + +commit 59a3b83922c810316a374a19484b24901c7437ae +Author: Matthieu Herrb +Date: Thu Jan 17 15:26:41 2008 +0100 + + Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index + +commit 636aa9e7be2822a0148067a11499ad48fe682cd9 +Author: Daniel Stone +Date: Sat Jan 5 10:47:39 2008 +0200 + + Xephyr: One-time keyboard leak fix + + Don't leak the originally-allocated keysym map. + (cherry picked from commit e85130c85f727466fc27be1cfa46c88b257499fb) + +commit 8a3acd3ec41b887b4aeaa0b2932265522c1e2836 +Author: Daniel Stone +Date: Sat Jan 5 10:43:53 2008 +0200 + + XKB: XkbCopyKeymap: Don't leak all the sections + + Previously, we'd just keep num_sections at 0, which would break the + geometry and lead us to leak sections. Don't do that. + (cherry picked from commit 0137b0394a248f694448a7d97c9a1a3efcf24e81) + +commit 02e805f0ff4b6af551372ba5fc5fb369c8834d1d +Author: Daniel Stone +Date: Sat Jan 5 10:38:16 2008 +0200 + + OS: IO: Zero out client buffers + + For alignment reasons, we can write out uninitialised bytes, so allocate + the whole thing with xcalloc. + (cherry picked from commit b99a43dfe97c1813e1c61f298b1c83c5d5ca88a2) + +commit 60144ac814ee26e151186f7c93cb1a273468d497 +Author: Peter Hutterer +Date: Wed Dec 19 16:20:36 2007 +1030 + + include: never overwrite realInputProc with enqueueInputProc. Bug #13511 + + In some cases (triggered by a key repeat during a sync grab) XKB unwrapping + can overwrite the device's realInputProc with the enqueueInputProc. When the + grab is released and the events are replayed, we end up in an infinite loop. + Each event is replayed and in replaying pushed to the end of the queue again. + + This fix is a hack only. It ensures that the realInputProc is never + overwritten with the enqueueInputProc. + + This fixes Bug #13511 (https://bugs.freedesktop.org/show_bug.cgi?id=13511) + (cherry picked from commit eace88989c3b65d5c20e9f37ea9b23c7c8e19335) + (cherry picked from commit 50e80c39870adfdc84fdbc00dddf1362117ad443) + +commit 102c012c206cbb3bbf0fa5b0c8f0ce2ce9bba72a +Author: Daniel Stone +Date: Fri Dec 28 15:49:50 2007 +0200 + + Input: Don't reinit devices + + If a device is already initialised (i.e. the virtual core devices) during + IASD, don't init them again. This fixes a leak. + (cherry picked from commit 1f6015c8fe62c28cfaa82cc855b5b9c28fd34607) + +commit a304fc1d4a7062f65161ef8748fd358639ec73de +Author: Daniel Stone +Date: Fri Dec 28 15:48:57 2007 +0200 + + KDrive: Xephyr: Don't leak screen damage structure + (cherry picked from commit 0b03d97a244540824c922c300adbc3d3ae4855d5) + +commit 38d8cfaaff0ae6273d9e921aae08b2706355f0d2 +Author: Daniel Stone +Date: Fri Dec 28 15:48:25 2007 +0200 + + OS: Don't leak connection translation table on regeneration + (cherry picked from commit e868e0bc0d2318e62707d3ae68532b0029959154) + +commit 30fc8053a5e734c3b70156bdae94fd7d5d7865a5 +Author: Daniel Stone +Date: Fri Dec 28 15:47:57 2007 +0200 + + Config: HAL: Don't leak options on failure to add device + + This showed up in Xephyr in particular, which denies new device requests. + (cherry picked from commit 2bb199056edf6c63cf978d1a8ad49a57ce1938f3) + +commit 81c5950d0af8d5859f850b98c98a532784e9a757 +Author: Daniel Stone +Date: Fri Dec 28 15:47:21 2007 +0200 + + Config: D-Bus: Don't leak timers + + TimerCancel doesn't free the timer: you need TimerFree for that. + (cherry picked from commit 25deaa7e6b29b3913b35efa39b9c8b25de5e6d95) + +commit d988da6eee8422774dff364050bf431b843a714a +Author: Arkadiusz Miskiewicz +Date: Thu Dec 13 00:09:08 2007 +0200 + + Xprint: Clean up generated files + + Remember to clean generated wrapper files. + (cherry picked from commit 977fcdea8198906936a64b8117e6a6d027c617e3) + +commit 41f735fbe02f59bc7bcca335c6e743c72c2fc44c +Author: Hong Liu +Date: Tue Sep 4 08:46:46 2007 +0100 + + bgPixel (unsigned long) is 64-bit on x86_64, so -1 != 0xffffffff + + This patch should fix bug 8080. + (cherry picked from commit 9adea807038b64292403ede982075fe1dcfd4c9a) + +commit f4bcb53e86bb103b6bcf8a3a170a36137c34d272 +Author: Hong Liu +Date: Wed Dec 5 17:48:28 2007 +0100 + + Bug 13308: Verify and reject obviously broken modes. + (cherry picked from commit c6cfcd408df3e44d0094946c0a7d2fa944b4d2d1) + +commit d63efecc9471ac53535932b80a85b7f408f06fb9 +Author: Daniel Stone +Date: Wed Dec 12 21:57:59 2007 +0200 + + Bump to 1.4.0.90 + +commit 446efcc554195970cb3ddcd992f7aac617d45b1d +Author: Bartosz Fabianowski +Date: Fri Dec 7 02:38:14 2007 +0000 + + Input: Fix proximity events with valuators + + Initialise num_events to 1, so we always send a proximity event, and then + optionally valuator events. Also make sure mieq can deal with valuator + events sent after proximity events. + (cherry picked from commit 2dcfab37d38c0c72e9be7cc724047405c8029e88) + +commit 9f4689173ef9db080592497dc2212ae79b8d6e02 +Author: Daniel Stone +Date: Thu Dec 6 00:46:32 2007 +0000 + + KDrive: Xephyr: Fix non-GLX builds + + Only set noGlxExtension if we're actually building GLX. + +commit d37351308b255d5f9bff3438b6767c62974902da +Author: Daniel Stone +Date: Wed Dec 5 19:37:48 2007 +0000 + + XKB: Actions: Don't run certain actions on the core keyboard + + Don't run VT switches, terminations, or anything, on the core keyboard: only + run actions which affect the keyboard state. If we get an action such as VT + switch, just swallow the event. + (cherry picked from commit 320abd7d1d906807448fa01ad3377daf707f46cc) + +commit 27da1367c9ea143946b8b8d3dbd0f9d44c4a9039 +Author: Daniel Stone +Date: Wed Dec 5 19:36:59 2007 +0000 + + WaitForSomething: Ignore EAGAIN + + If select ever returns EAGAIN, don't bother complaining. + (cherry picked from commit 85dd8efac1bc0715f03c99d261b1c5d0980623e1) + +commit 259f86b13b453f3503afd3d523de32b43996d334 +Author: Rich Coe +Date: Wed Dec 5 19:36:37 2007 +0000 + + OS: Connection: Keep trying select while it gets interrupted (bug #9240) + + If we got interrupted (EINTR or EAGAIN) during select, just try again, rather + than shutting clients down on either of these errors. + (cherry picked from commit b7f3618f3933a810778093fd47564a1e3bf3fde6) + +commit 90649e6a39dc6caad8313b25ef869a089f81aba7 +Author: Rich Coe +Date: Wed Dec 5 19:31:07 2007 +0000 + + OS: Connection: Don't shut down disappeared clients (bug #7876) + + If a client disappears in the middle of CheckConnections (presumably + because its appgroup leader disappears), then don't attempt to shut it down + a second time, when it's already vanished. + (cherry picked from commit d8b2cad3771a09860e7be1726f67e684cf7caeec) + +commit 25d26b55e74b50a2fd0632329cb0bdca017fe8e6 +Author: Kanru Chen +Date: Mon Dec 3 12:46:45 2007 +0000 + + Config: HAL: Fix XKB option parsing + + Actually combine the XKB options into a string, rather than just repeatedly + writing a comma. + (cherry picked from commit da893908feb2dcf7c22420b3426ab3ac65c7ca99) + +commit b037e4a5abb878ad89e7f27c2b6c23004625f6c3 +Author: Peter Harris +Date: Mon Oct 29 18:05:19 2007 -0400 + + Add missing swaps in panoramiXSwap.c + (cherry picked from commit cb67a10b7f6f564e0345de19316934361ea28720) + +commit 3e0993fcf38e47dd42c27a2dcb5dde7d23222ca8 +Author: Daniel Stone +Date: Fri Nov 30 20:35:26 2007 +0200 + + ProcessOtherEvent: Don't do double translation of button events + + We already deal with the button mapping in GetPointerEvents, so don't + do the remapping again in ProcessOtherEvent. + (cherry picked from commit 7ff002fe3e229330216d7f2ff16cdabe63014bcd) + +commit cbf775cde7bb737ddf71fa3aa5b08c859d516084 +Author: Peter Hutterer +Date: Sat Nov 17 22:50:07 2007 +0100 + + XKB: Generate correct key repeat events (bug #13114) + + Make sure we send the correct event for the type of device when we're + sending key repeat events, which stops repeats being sent to incorrect + windows. + +commit 3e987ea670aadefeb3a6ad05d9a39dd7902985f9 +Author: Michel Dänzer +Date: Thu Oct 18 17:44:14 2007 +0200 + + EXA: Don't attempt to move in pixmaps that can't be accelerated. + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=12815 . + + (Related to commit 5d74416740de883b7ef0994afea4bbd4d3901be0 on master.) + +commit 75b9dc907b332d64d074083cae0c6b099960f09b +Author: Michel Dänzer +Date: Thu Sep 27 13:08:41 2007 +0200 + + EXA: Make sure tile offsets passed to drivers are never negative. + + Thanks to Björn Steinbrink for pointing out the problem on IRC. + + (cherry picked from commit 006f6525057970a74382132237b2131286ad147c with + modifications.) + +commit 732d586b0919e57ed836999f4117db3e776e2934 +Author: Michel Dänzer +Date: Thu Sep 27 13:08:40 2007 +0200 + + EXA: Punt on fallback case not handled correctly in exaFillRegionTiled. + + Fixes http://bugs.freedesktop.org/show_bug.cgi?id=12520 . + + (From master commit c7d6d1f5, modified to suit.) + +commit a3aed33244914b64d08630e19100c71ab81e1a81 +Author: Daniel Stone +Date: Sat Nov 17 22:34:47 2007 +0100 + + XKB: Don't ring the bell when we don't have a BellProc (bug #13246) + (cherry picked from commit 55888552769ce6361174285b09dfb78ee22c170d) + +commit f3a5d67688a0f691ef23cb44b1fdda190b5b8bef +Author: Daniel Stone +Date: Sun Sep 23 12:43:31 2007 +0300 + + GetKeyboardEvents: Reject out-of-range keycodes (bug #12528) + + We can only deal with keycodes between 8 and 255, so make sure that we never + accept anything out of this range. + (cherry picked from commit 0e800ca4651a947ccef239e6fe7bf64aab92257c) + +commit 35bf7c738a8286a382aeef38c0f035773b3ab96a +Author: Naoki Hamada +Date: Thu Oct 25 18:45:50 2007 +0300 + + Input: Fix key down test (bug #12858) + + Fix the botched previous key_is_down test, which would give false positives. + Also move key_autorepeats to a separate inline function. + (cherry picked from commit 242f56f722243938e908d1957781ee53c2999783) + +commit b3de1b9d375c98b72c88991ac2011e492254c61f +Author: Daniel Stone +Date: Fri Oct 26 09:12:15 2007 +0300 + + XFree86 Misc/VidMode: Remove ridiculous debug ErrorFs + + When we're building with --enable-debug, don't emit an ErrorF every time a + function gets called. + (cherry picked from commit 6d59bb5709a99ab60b482bbf3393ebffda7f9407) + +commit 007e2239cf65535c4df3486e7b2cc42a4e86eb56 +Author: Dodji Seketeli +Date: Mon Nov 12 20:29:12 2007 +0100 + + Xephyr: don't initialise the GLX extension + +commit 7f231de5e05a8755d76e18595c57baf2e239a4be +Author: Daniel Stone +Date: Tue Nov 6 15:05:06 2007 +0000 + + .gitignore: Ignore build directories + + Ignore directories people might use for building. + (cherry picked from commit 36df34cffd0cfcfb250fb42596781b3d4e9871eb) + +commit 4c20d6104691b370f14216035b5ff07ad5633098 +Author: Alan Coopersmith +Date: Fri Aug 17 15:29:16 2007 -0700 + + Actually build Secure RPC authentication support (missed in modularization) + (cherry picked from commit 23fbd5292d356067e85e1eec4eb4f743532b0503) + +commit f350c81a912cf5eab8d88a7800a828141945a2f0 +Author: Matthias Hopf +Date: Wed Oct 24 20:31:51 2007 +0200 + + Prefer configured DisplaySize to probed DDC data, if available. + + Based on patch by Hong Liu . + (cherry picked from commit 48ca5961caee62f2980017a6bdc96a1b4c747727) + +commit c5501865703d5d4ee49e081b6075ab89a583deb6 +Author: Keith Packard +Date: Sun Aug 19 20:29:37 2007 -0700 + + Screen size changing should leave FB alone when X is inactive. + + xf86RandR12ScreenSetSize must protect calls to EnableDisableFBAccess with + suitable vtSema checks to avoid invoking driver code while the X server is + inactive. + (cherry picked from commit 265a633cf1fcbf497d6916d9e22403dffdde2e07) + +commit 9244b8e4a2274946b56d9cf6d43487e11c29f7d7 +Author: Elvis Pranskevichus +Date: Tue Nov 6 09:40:14 2007 +0000 + + Config: D-Bus: Fix dbus_bus_request_name failure check + + The code in connect_hook incorrectly checks for dbus_bus_request_name failure. + The dbus_bus_request_name error indicator is -1, not 0. This leads + to subsequent assertion failure in libdbus. + (cherry picked from commit ddce48ede036f3996f8e584b0012c396c5df42fb) + +commit 0050d7e78d990fa945bd808554b0a86721262786 +Author: Daniel Stone +Date: Tue Nov 6 14:52:03 2007 +0000 + + DIX: XKB: Set xkbInfo to NULL as well as freeing it (bug #10639) + + XkbRemoveResourceClient wants to access xkbInfo if it exists, so make + sure we NULL it after freeing it. It doesn't make much sense to move + the RemoveResourceClient call first, as there's not much point in + notifying clients while we're shutting the server down anyway. + (cherry picked from commit 23023af1c5a33546a2027cad23a946a2882e9893) + +commit 846745c58108856e5fc1b6d94c91a245cbc4f16f +Author: Markku Vire +Date: Thu Nov 1 22:43:04 2007 +0200 + + Config: HAL: Touchpads are pointers too + + Treat touchpads -- not just mice -- as pointer devices. + (cherry picked from commit 3f1b6765aadf665ede8253464da19a5878f16e56) + +commit ab80b27250bb583e3a40bf92cfe5edc117e4bd58 +Author: Mark Vytlacil +Date: Thu Nov 1 21:05:43 2007 +0200 + + XFree86: Input: Save/restore errno around SIGIO (bug #10683) + + Make sure errno is saved and restored from the SIGIO handler, so errors + from system calls in input handlers don't break the interrupted code. + (cherry picked from commit 41c3069f7cf28155f8e6cfe0c10a12a1f5f76c7d) + +commit ad05d5d035b32b05d304b2fc598f6fadeb077516 +Author: Daniel Stone +Date: Sun Sep 23 17:17:03 2007 +0300 + + Input: Generate XKB mapping changes for all core-sending devices (bug #12523) + + When we change the mapping on a core device, make sure we propagate this + through to XKB for all extended devices as well. + (cherry picked from commit 27ad5d74c20f01516a1bff73be283f8982fcf0fe) + +commit 84040b655e3ea9188a6c9d6dafea429ffc4690de +Author: Peter Hutterer +Date: Thu Sep 6 18:57:00 2007 +0930 + + xfree86: wrap keyboard devices for XKB. + + Call ProcessOtherEvents first, then for all keyboard devices let them be + wrapped by XKB. This way all XI events will go through XKB. + + Note that the VCK is still not wrapped, so core events will bypass XKB. + + (cherry picked from commit d627061b48ae06d27b37be209d67a3f4f2388dd3) + (cherry picked from commit 8ead41388e36e21eea6fa0408c847f174911eab0) + +commit e26e93c54e54ab4010dfdede47c3e56e4418bcbd +Author: Daniel Stone +Date: Sat Oct 27 21:32:47 2007 +0300 + + XKB: Cope with all events in XkbProcessKeyboardEvent + + Cope with Xi and pointer events in the (now increasingly misnamed) + XkbProcessKeyboardEvent. If it's the wrong type, call through the wrapping + chain to get out; else, process it. + (cherry picked from commit e717cf08e99746761d74289c426bbd84176f4435) + +commit 37c690cfa4e9055209732ab5431fffb8886c7d67 +Author: Daniel Stone +Date: Sat Oct 27 21:31:39 2007 +0300 + + XKB: Don't update indicators on all devices, add missing include file + + Don't get XkbUpdateIndicators to update the indicators on all our devices: we + already deal with that ourselves. + Add exevents.h include to get more (proto)types. + (cherry picked from commit 9db8846fa53d91193bbfe541b244e2326440011d) + +commit 1dce9c20283279eac4d6e5cafc4f73a333548c07 +Author: Peter Hutterer +Date: Wed Sep 26 18:04:59 2007 +0930 + + xkb: Unwrap properly in ProcessPointerEvent. + + Instead of hardcoding CoreProcessPointerEvent, actually try to unwrap properly + and then call the unwrapped processInputProc. Seems to be a better idea, + especially since it makes stuff actually work... + (cherry picked from commit 8f9bf927e1beecf9b9ec8877131ec12c765e4d84) + (cherry picked from commit ee3aa948eb8ed181d037294ed87df6ceec81684e) + +commit 940cce1f4856a3ffc6fdba9c807c8238ed1acf8b +Author: Peter Hutterer +Date: Thu Sep 27 11:44:03 2007 +0930 + + xkb: xkbHandleActions: let wrapping take care of event delivery. + + This is hopefully better than hardcodey calling CoreProcessPointerEvent. + (cherry picked from commit 32d0440c7f6e604807cb14dd32349df6f22c903b) + (cherry picked from commit d3588a0aee33fbd233082f881c0d37152c6d4d8b) + +commit 5909fb3c406356505440af8d53785d9ee06ab9be +Author: Peter Hutterer +Date: Wed Sep 12 17:40:11 2007 +0930 + + dix: don't compress motion events from different devices (EventEnqueue) + + (cherry picked from commit 8840829ab93c4eb62eb58753c015da5307133fe5) + (cherry picked from commit 352c5a311200bf491153fe9ef16126c5877a57bb) + +commit 600752bece350592f374470dd54b9e1cd2900d0b +Author: Peter Hutterer +Date: Thu Sep 6 18:52:02 2007 +0930 + + dix: add XI event support to FixKeyState. + + FixKeyState needs to be able to handle XI events, otherwise we get "impossible + keyboard events" on server zaps and other special key combos. + (cherry picked from commit 5ee409794ee604fcf84886f70429fc2d6b1ff4f1) + (cherry picked from commit 8d3d027062c105b50863dce43b8070ec560bc12e) + +commit 15117d47bf883f3eefc57404f1dfc0c933ab054a +Author: Peter Hutterer +Date: Thu Sep 6 18:49:57 2007 +0930 + + xkb: enable XI event processing for xkb. + + XI events can now take the same processing paths as core events, and should do + the correct state changes etc. + + There's some cases where XKB will use KeyPress as type for an event to be + delivered to the client. Stuck warnings in, not sure what the correct solution + is yet. + + (cherry picked from commit 6334d4e7be18de5f237c12a6dc20f75aa23477d0 with some + additional compile fixes and non-MPX adaptations) + (cherry picked from commit 99e826e867c1c5520153c539ba07a884aec88d0c) + +commit 83e76fb3f7a89a237893c2b7df450d4f90eab52d +Author: Peter Hutterer +Date: Thu Jun 21 18:24:30 2007 +0930 + + Save processInputProc before wrapping it and restore it later, instead of + using a hardcoded ProcessKeyboardEvent. Otherwise we lose the ability to + process DeviceKeyEvents after the first key press. + + This should be the correct fix now. + (cherry picked from commit 4d5df14f2c4a3108a8c8adfcf4766c0d1a9daad2) + (cherry picked from commit 91077bfc50d54be37c217e377c55b6bf886a2fab) + +commit a53172827c69a88155a088843c9a3e8a7a7a0463 +Author: Peter Hutterer +Date: Tue Sep 4 17:44:51 2007 +0930 + + xkb: Store the action filters per device in the XkbSrvInfoRec. + + Using a global array for action filters is bad. If two keyboard hit a modifier + at the same time, releaseing the first one will deactivate the filter and + thus the second keyboard can never release the modifier again. + (cherry picked from commit bfe6b4d2d9952a80f8dbc63eec974ef894e5c226) + (cherry picked from commit 8b9481a113b56078191e2298bf590905978f6289) + +commit b76b1d51fe3053fa2a60b64de9ac93f50ef252f5 +Author: Daniel Stone +Date: Sat Oct 27 21:33:52 2007 +0300 + + XFree86: Remove ridiculous SIGIO debugging + + YOU PRESSED A KEY + AND AGAIN + YOU RELEASED A KEY + AND AGAIN + YOU PRESSED A KEY + AND AGAIN + + ... not so much. + (cherry picked from commit 493b83bd097372ae0023da9919da83af39e3fc1c) + +commit b600e7c123ce637359a75c43bf67b3462eadb37e +Author: Daniel Stone +Date: Sat Oct 27 21:35:31 2007 +0300 + + XKB: Add more bits to xkbsrv.h + + Add the device private index, given we use that in a macro here, and also the + prototype for xkbUnwrapProc, since that's also useful. + (cherry picked from commit a3d48de5f2b7eacf3193c60f0fb461912201210b) + +commit 63c6d9d622a10303f594a07bd86dda8e5f894ca7 +Author: Daniel Stone +Date: Sat Oct 27 21:34:22 2007 +0300 + + Xi: Include XI protocol header in exevents.h + + Make sure we have all the types we need to use this header. + (cherry picked from commit e29e69960d67aa4b7a4d1551af509dbac193f438) + +commit bd779f8cde1c71a0db8470b8c993504da7c1104e +Author: Daniel Stone +Date: Sun Oct 28 15:46:26 2007 +0200 + + configure.ac/XFree86: Only build XF86Misc and XF86VidMode when appropriate + + Don't build XF86Misc or XF86Vidmode in hw/xfree86/dixmod when it's been + explicitly disabled in configure, or we don't have the proto modules + installed. + + (cherry picked from commit df57ae1639ba4f1719883c5bf868394e4748a022) + +commit 881e4fb518c7ed4c95882368356901c1ec4b6abf +Author: Aaron Plattner +Date: Thu Sep 20 14:00:33 2007 -0700 + + Set noCompositeExtension to TRUE when failing to initialize the extension (e.g. when Xinerama is enabled). + (cherry picked from commit 50fa8722d35c12e5f0322cebe25faf99c39d4f50) + +commit ce55565ecd0411065878fa7c9983606d53663b7c +Author: Aaron Plattner +Date: Thu Sep 20 16:22:24 2007 -0700 + + Don't segfault on shutdown if we never managed to connect to dbus. + (cherry picked from commit 3a965fdadccea7beff09a28c9c0ef4b4975eae38) + +commit eba45539af33f7d312bcfee954786fe38ab8f391 +Author: Peter Hutterer +Date: Thu Aug 30 18:22:12 2007 +0930 + + config: Use [config/dbus] consistently for error messages. + (cherry picked from commit 3f42af8c0ef1e5379bc836f589e0cbee43c02ac5) + +commit c0da35bda136ed423f2963bd5c75ad0301ac7845 +Author: Peter Hutterer +Date: Thu Aug 30 18:20:20 2007 +0930 + + config: return BadValue to caller if add/remove doesn't have parameters. + + If message iterator cannot be created, the caller didn't supply any + parameters. Return BadValue, instead of dying a horrible death while being + stuck in an endless loop. + (cherry picked from commit 0fcde83d94507eadd9f99d4e6a63584b221c989c) + +commit 99dd8b9414d1eb7aabc682be0b9cfd7a27eb2a6b +Author: Eric Anholt +Date: Thu Sep 6 01:42:43 2007 -0700 + + Bump version to 1.4.0. + +commit f73fd98a8636c0df3133a8b9428f3f23ecc788b4 +Author: Daniel Stone +Date: Wed Sep 5 17:46:23 2007 -0700 + + Fix key repeats during VT switch. + + Add keyc->postdown, which represents the key state as of the last mieqEnqueue + call, and use it when we need to know the posted state, instead of the + processed state (keyc->down). Add small functions to getevents.c to query and + modify key state in postdown and use them all through, eliminating previously + broken uses. + (cherry picked from commit 81c28ffd2b13a83770eadcfd7829d35d319d637f) + +commit 3c5fe1ec377688ab2edc6137b74a7c04b3bc2e7e +Author: Keith Packard +Date: Wed Sep 5 14:19:19 2007 -0700 + + Deliver correct event when releasing keys on VT switch. + + In commit 41bb9fce47f6366cc3f7d45790f7883f74289b5a, the event delivery loop + for Xinput enabled keyboards was changed and accidentally used the wrong + index variable, causing random events to be delivered when returning from VT + switch. + + In addition, in commit aeba855b07832354f59678e20cc29a085e42bd99, + SIGIO was blocked during delivery of these events, but not for the entire + period the xf86Events array was being used. Block SIGIO for the whole loop + to avoid other event delivery from trashing the key release events. + (cherry picked from commit aa7ed1f5f35cd043bc38d985500aa0a32e857e84) + (cherry picked from commit accd71bda6f958ea6892ad3a10879232d345774c) + +commit 70ed110538413e96cefbf0a1c276b52dc62c5aae +Author: Eric Anholt +Date: Wed Sep 5 13:30:02 2007 -0700 + + Fix server version reporting to be the server package version. + + Previously, the server version reported by xdpyinfo and Xorg -version would + bear some vague resemblance to a X.Org katamari version, but in the presence + of modularization (and client-server relationships with different katamari + versions on each side) those numbers don't really make sense. Instead, just + report the package version. + + When branching a stable branch, master's version should be immediately updated + to the endpoint of the stable branch plus a snapshot of 1 (for example, + 1.4.0.1 after server-1.4-branch). The stable branch should then be changed to + RC0 at that time (1.3.99.0, for example). + + This scheme was partially attempted for server 1.3, but lacked the appropriate + master updates, thus why it had to be revisited now. While here, we can also + remove a lot of versioning complexity since everything is based on the package + version. + + (cherry picked from commit 47300ed2be59d0ba7ea9345b954bf3104877c095) + +commit b328d553723ecf8f893783e91ec00ee6054acb74 +Author: Alan Hourihane +Date: Thu Aug 30 21:57:41 2007 +0100 + + Allow yres_virtual to be greater for some kernel fbdev drivers. + + (temporary fix for older fbdev drivers) + (cherry picked from commit 87495fc7064d5e0a7575a0713b6895a4172df0fa) + +commit b69e6165136ff76ba4649bb9d11906fef27b78bc +Author: Keith Packard +Date: Sat Sep 1 21:14:22 2007 -0700 + + [COMPOSITE] Composite used for pixmap population on redirect. (Bug #7447) + + compNewPixmap copies bits from the parent window to the redirected child + pixmap to populate the pixmap with reasonable data. It cannot always use + CopyArea as that only works across matching depths. Use Composite when + the depths do not match. + (cherry picked from commit f98dfec79dadb70fa7bba84e7335f92b3a73dc02) + +commit 87f98178417718d8720566a2df04857a682a2d15 +Author: Adam Jackson +Date: Fri Aug 31 22:11:13 2007 -0700 + + [RANDR] Don't mark Xinerama as active if no crtcs are enabled. (bug #11504). + + Clients expect any Xinerama-enabled screen to report at least one + monitor, but with RandR, there may not be any enabled crtcs. In this case, + tell the client that Xinerama is not active. + (cherry picked from commit 1afdf8b0a92437dffe84fa98b6083b3d8fd55e27) + +commit 61460cf095a655d8711b79225080a8c2808dbbc4 +Author: Marius Gedminas +Date: Fri Aug 31 21:36:37 2007 -0700 + + [RANDR] Compare only milliseconds of config time. (Bug #6502) + + The timestamp transferred in the X protocol is a 32-bit number of + milliseconds. + + The timestamp stored in the server is a structure that contains two fields: + months (!) and milliseconds. + + When the server passes the config timestamp to the client, it discards the + months part and sends only the milliseconds part. + + When the server receives the config timestamp from the client, it tries to + guess the "months" part by looking at the current time and then maybe adding + or + subtracting one. The guess is wrong after the server has been running long + enough (several hours). + + I have added two ErrorF calls around the 'if' statement that returns + RRSetConfigInvalidConfigTimestamp in randr/randr.c and my Xorg.0.log has + this: + + randr request got good config time: 0:-2103495671 + + for the first few successful xrandr calls, and + + randr request failed with RRSetConfigInvalidConfigTime: client passed + 1:-2103495671, server has 0:-2103495671 + + when it fails. The server has been running for 8 and a half hours. + + The obvious fix would be to ignore the months field and only compare the + milliseconds. + (cherry picked from commit 0dc2bb6101704d0fd25f36e2c3df79687f119f5b) + +commit ec56c5e958248ea0161dda885fa59752b20f5d7c +Author: Eric Anholt +Date: Fri Aug 31 20:02:52 2007 -0700 + + Bump version to 1.3.99.2. + +commit 5efc4bd7d0e2020242127d8ed83efb8d2d76a151 +Author: Eric Anholt +Date: Fri Aug 31 18:27:41 2007 -0700 + + Remove backend.[ch] from neomagic to fix distcheck. + (cherry picked from commit 917e3bb83a48da7618fce463cf6283be36cd9084) + +commit 1a125b521434da7ba3a41b6398c7f094867908e0 +Author: Eric Anholt +Date: Fri Aug 31 15:16:01 2007 -0700 + + Bug #7364: Require renderproto 0.9.3 on 64-bit, and fix build with it. + + (cherry picked from commit 07630d897ef37cad8b79d073d9edc891d5a7bddd) + +commit f499c2ea0a90a69713daef8f9497463229384964 +Author: Eric Anholt +Date: Fri Aug 31 13:00:23 2007 -0700 + + Bug #7186: Fix an excessive request size limitation that broke big-requests. + + MAXBUFSIZE appears to be a leftover of some previous time. Instead, just + use maxBigRequestSize when bigreqs are available (limiting buffers to ~16MB). + When bigreqs are not available, needed won't be larger than the maximum + size of a non-bigreqs request (256kB). + (cherry picked from commit ca82d4bddf235c9b68d51d68636bab40eafb9889) + +commit 3e9ecdcb132bb223febc396626211aa2681e4c79 +Author: Matthieu Herrb +Date: Thu Aug 23 22:11:56 2007 +0200 + + Remove an extra cast. + + Thou should not apply patches manually without testing. + (cherry picked from commit a66c0f1dca2958835ff65a5b50579e3304ed316a) + +commit a964d541283e93b1096150275ba2d95594bf77ea +Author: Otto Moerbeek +Date: Thu Aug 23 21:59:25 2007 +0200 + + A high resolution device that's moving fast can potentially generate + an int overflow, making dx*dx+dy*dy negative. Now pow(negative, + non-integer) yields NaN, so you loose. Use fp math to avoid that. + (cherry picked from commit 12d27cf33c6d963eae77795c0d247175907162a5) + +commit bcd6708895e5c2fda423bb13fe42b078ef293b13 +Author: Egbert Eich +Date: Thu Aug 30 12:50:21 2007 +0200 + + Fixing a misleading comment which could suggest a GPL violation. + + The author of the int10 code looked at the VBIOS POSTing code + in DOSEMU to get some initial idea on how to POST a VBIOS. + To give credit to the DOSEMU Team for this inspiration a comment + was added to the code which could suggest that code from the + GPLed DOSEMU was directly incorporated into this code. + This patch should clearify the situation. + (cherry picked from commit 1d11e4bc4ccb169fb23fc18583f0b648f0a6a4e0) + +commit ed001ed363d11aff3df9a7de2f72075e0b2cfb7b +Author: Eric Anholt +Date: Wed Aug 29 15:54:32 2007 -0700 + + Bug #9629: Remove badly-licensed neomagic kdrive files. + + Licensing issues of these files include: + - They claim to be licensed under the GPL, yet we haven't allowed that in the + xserver repository in the past. + - They refer the user to the top of the tree for GPL license text, yet it isn't + there. + - They claim to be derived from the (MIT-licensed) ati kdrive code, yet don't + follow the licensing terms of those files. + (cherry picked from commit 87295b66a972a2bd194a79af6aa4f715018fcded) + +commit 5182fbf302beae93ea5b71a40a23528ee83fa1cc +Author: Alex Deucher +Date: Wed Aug 22 19:26:34 2007 -0400 + + Add _X_EXPORT to exported functions in hw/xfree86/modes/* + + Also add missing exports to hw/xfree86/loader/xf86sym.c + (cherry picked from commit 81f8b652d99ee0f7116c1e34aed0e585d23a91fb) + +commit 37954c019afd92edbe4aaa9d6deb6efaad7bf088 +Author: Brian Paul +Date: Thu Aug 23 19:38:53 2007 +0200 + + glx: fix crash when freeing visuals + + Don't set screen->num_vis to a value greater than the actual number of visuals. + + X.Org Bug #10809 + (cherry picked from commit ff089e6cae634ac3eb509abd448a250bcbb17275) + +commit d34b66402c9205aae38316c5855f3b492a7612c2 +Author: Dave Airlie +Date: Thu Aug 23 16:22:03 2007 +1000 + + randr: fixup crtc and output destroy + + if you are moving pointers, you want to move the pointers not just a byte + (cherry picked from commit 76bf3cd7b8c6189b6b08518cde00c8bd991bdfb7) + +commit efac9c9c2e7cfa974fb0e7737832f0e34d156f65 +Author: Keith Packard +Date: Sun Aug 19 20:28:05 2007 -0700 + + Ref count cursors used in hw/xfree86/modes code. + + The multi-crtc cursor code in hw/xfree86/modes holds a reference to the + current cursor. This reference must be correctly ref counted so the cursor + is not freed out from underneath this code. + (cherry picked from commit 7dc8531548cc9573e28bb04363dcbb3af5864c9a) + +commit 248b220b3e2bf8d999241543b69be3022a728b3a +Author: Alex Deucher +Date: Tue Aug 21 00:37:33 2007 -0400 + + add xf86_crtc_clip_video_helper to xf86sym.c + (cherry picked from commit 1f6ddae003ec65d6bc567831bf32bf75dfefdd6c) + +commit 242c05e326646cbe1ab6ced54504456fee327bce +Author: Alex Deucher +Date: Mon Aug 20 19:46:38 2007 -0400 + + move intel crtc xv clipping helper to the xserver + + The code is generic and can be used by any overlay-based card when + adding randr 1.2 support. Tested on radeon. + (cherry picked from commit 53c04351c462d2ae307684e50d5960debe1ee557) + +commit dd33e936b39d1c5229353d3f25c47e3b87de8498 +Author: Fredrik Höglund +Date: Sat Aug 18 19:02:18 2007 +0200 + + EXA: Fix a couple of logic errors in exaGetPixmapFirstPixel. + + The fb pointer would be left uninitialized when exaPixmapIsOffscreen + returned false. When it returned true and the pixmap was damaged, + fb would be initialized from the pixmap's devPrivate.ptr before the + exaDoMigration and exaPrepareAccess calls, at which point + devPrivate.ptr would still be pointing at offscreen memory. + (cherry picked from commit 3c448b0eb67337b56641e09a6d168aad6745e3ef) + +commit ec126e29e4a270577bba6337ed6f4ec8dbce46f9 +Author: Søren Sandmann Pedersen +Date: Tue Aug 21 14:26:14 2007 -0400 + + Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix + bug 11620 (reported by Jens Stroebel. + (cherry picked from commit 53941c8e68014619d3ded7f8bc0f07d9a38bb9b1) + +commit 71ddf917d7449b721582c910c5026faa457597fe +Author: Aaron Plattner +Date: Thu Aug 16 17:43:29 2007 -0700 + + stride is in FbBits-sized chunks, but xoff is not. + + Fixes corruption problems with composite rendering to redirected windows in + depth 16. + (cherry picked from commit 6a32a96d8df184c3ace4847beb48fdcb846d2286) + +commit 7cc53ae10adb7f8bb59f904b1362b7391b327f83 +Author: Aaron Plattner +Date: Thu Aug 16 14:57:18 2007 -0700 + + Bug #12015: Use the right offsets in the dst arguments of pixman_blt. + (cherry picked from commit 32666d77227fcd2c066de16bf3c07366f92b0457) + +commit 2bf6cb3074d9c0dcd706e8e083747c6d84b70e30 +Author: Julien Cristau +Date: Tue Aug 21 18:17:35 2007 +0200 + + config: fix default xkb model (pc105, not keyboard) + (cherry picked from commit 6ef4ecd82670c37a354243166750d76a97959c8b) + +commit fd4dc5a98e600b267ee22a3fb47c093c3e1b26d6 +Author: Julien Cristau +Date: Mon Aug 20 12:57:06 2007 +0200 + + xfree86: Fix build on Linux/alpha. + + A bunch of CFLAGS had gone missing, so the build failed with errors like: + ../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:7:19: error: input.h: No such file or directory + ../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:8:24: error: scrnintstr.h: No such file or directory + (cherry picked from commit a1fe36b772f7edc162ea97368f86588c0fb77148) + +commit 9a747b0b81d0bd9eea7d02601703df266d6c5eca +Author: Fredrik Höglund +Date: Wed Aug 15 19:19:11 2007 +0200 + + EXA: Wrap Trapezoids to prevent excessive migration of the alpha pixmap. + + miTrapezoids creates an alpha pixmap and initializes the contents + using PolyFillRect, which causes the pixmap to be moved in for + acceleration. The subsequent call to RasterizeTrapezoid won't be + accelerated by EXA, which causing the pixmap to be moved back out + again. + + By wrapping Trapezoids and using ExaCheckPolyFillRect instead of + PolyFillRect to initialize the pixmap, we avoid this roundtrip. + (cherry picked from commit daee59b1703ac07c2def9e9fecc479e59b93f761) + +commit d37edeff997219b1944a15cc0c9d7db64868ea70 +Author: Dave Jones +Date: Thu Aug 16 09:46:27 2007 +0200 + + Kdrive: fix nasty thinko in TslibEnable() + +commit 026534f945ae5652592a090a9d41375ca37ab618 +Author: Alan Coopersmith +Date: Wed Aug 15 16:47:53 2007 -0700 + + Update pci.ids to 2007-08-15 snapshot + + Remove nvidia ids in extrapci.ids that are now in pci.ids + +commit 6cef7b9611297cb1d93cefe3890b26b69c87bce2 +Author: Alan Coopersmith +Date: Wed Aug 15 16:44:49 2007 -0700 + + Correct XErrorDB path and make it configurable (used by DTrace support) + +commit 0f9e89b4e309e570d7d366489d250ca2143f0ad7 +Author: Fredrik Höglund +Date: Tue Aug 14 22:47:49 2007 +0200 + + Fix the value comparisons in the IDLETIME wakeup handler. + + LessThan/GreaterThan comparisons were used in the wakeup handler, + and LessOrEqual/GreaterOrEqual in the block handler. + + Change it to use LessOrEqual/GreaterOrEqual in both functions, + since this is what XSyncNegativeComparison and + XSyncPositiveComparison imply. + +commit 6a195e816b9d60f728d77cc1c23538e7af00a879 +Author: Kristian Høgsberg +Date: Mon Aug 13 10:43:48 2007 -0400 + + Revert "Implement damage tracking for AIGLX." + + This reverts commit 2243b30e54df07892f75e3d65b687abe5b183cf3. The existing + DRI interface doesn't let us get from a __DRIdrawable to the corresponding + X drawable, and thus, we can't implement AIGLX damage tracking with the + current interface. + +commit 03f9da672466b9ab9a9814d784b8c44f1030587e +Author: Samuel Thibault +Date: Sun Aug 12 03:07:04 2007 +0200 + + xfree86: Improve default mouse handling on the Hurd + + Make /dev/mouse the default device. This makes Xorg works with empty + or missing InputDevice sections. + +commit c5741438a3a171f493e9da32a6b39f73403f6993 +Author: Alan Coopersmith +Date: Fri Aug 10 16:13:55 2007 -0700 + + Only use evdev drivers in Xephyr #ifdef linux + +commit 59961e47df4ea621a6713a8c7d060555f8746c3a +Author: Alan Coopersmith +Date: Fri Aug 10 16:08:41 2007 -0700 + + xorgcfg needs PIXMAN_CFLAGS in order to build libc_wrapper.c + +commit 2243b30e54df07892f75e3d65b687abe5b183cf3 +Author: Kristian Høgsberg +Date: Fri Aug 10 15:53:05 2007 -0400 + + Implement damage tracking for AIGLX. + +commit ff4bd3addb48df3eacc4b121cc249a7f38eb981a +Author: Eric Anholt +Date: Wed Aug 8 14:24:42 2007 -0700 + + Fix the swapped decode of the EDID DTD h/v sync polarity fields. + + As a result, we can remove the quirks that existed to flip the bits back around + for us. This is not confirmed in all cases due to lack of bugs containing EDID + blocks associated with the quirks, but is likely true. + +commit 2926cf1da7e4ed63573bfaecdd7e19beb3057d9b +Author: Gustavo Pichorim Boiko +Date: Thu Aug 2 18:09:52 2007 -0300 + + [PATCH] Allocate the right number of entries for saving crtcs + +commit b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4 +Author: Keith Packard +Date: Wed Aug 8 12:16:12 2007 -0700 + + RRScanOldConfig cannot use RRFirstOutput before output is configured. + + RRFirstOutput returns the first active output, which won't be set until + after RRScanOldConfig is finished running. Instead, just use the first + output (which is the only output present with an old driver, after all). + +commit ab3f601149e15789edfb7c9a0c33387070279582 +Author: Tiago Vignatti +Date: Tue Aug 7 23:17:32 2007 -0300 + + Updates some piece of the dead mouse evdev code under the new hotplug scheme. + I exported the evdev driver to Xephyr server. I'm running it using something + like: + $ ./hw/kdrive/ephyr/Xephyr :1 -mouse evdev,,device=/dev/input/event4 -keybd \ + evdev,,device=/dev/input/event1,xkbmodel=abnt2,xkblayout=br + + It also closes /#5668. + +commit 7d1a749b210ba5b9f8d0e5a1feb9a9ef9fa4d992 +Author: Tiago Vignatti +Date: Tue Aug 7 22:59:12 2007 -0300 + + Export device path key options to be called by the command line of server. + +commit aee3588a4a6829326770c84b860061f47f2cbcae +Author: Tiago Vignatti +Date: Tue Aug 7 22:49:07 2007 -0300 + + Update KdUseMsg() for completeness. + +commit 30259d5a4e95ff20b30807e5e207ab5995a3fdaf +Author: Daniel Stone +Date: Tue Aug 7 20:58:49 2007 +0300 + + Hotplug: HAL: Fix error handling + + Don't use our DBusError for property getting, because we simply don't care: + this fixes D-Bus error spew to stderr. Thanks Michel Dänzer for debugging + and testing. + +commit aef255425a3521d66c3405d34f7787628a22703e +Author: Daniel Stone +Date: Tue Aug 7 16:37:42 2007 +0300 + + Config: HAL: Use input.xkb namespace + + Use an explicit input.xkb.foo namespace, not input.xkb_foo. + +commit 838e59c02ec06446fc180fb9d86fa8793c7b9903 +Author: Daniel Stone +Date: Mon Aug 6 16:07:20 2007 +0300 + + configure.ac: Add $CONFIG_LIB to server libraries + + Make sure all DDXes get $CONFIG_LIB. Build-tested with Xvfb and Xdmx. + +commit b4193a2eee80895c5641e77488df0e72a73a3d99 +Author: Keith Packard +Date: Tue Aug 7 12:45:53 2007 -0700 + + RRScanOldConfig wasn't getting crtcs set correctly + + The output crtc is set by RRCrtcNotify, which is called at the end of + RRScanOldConfig. Several uses of output->crtc in this function were wrong. + +commit 2b93cbb5f8bac9b1b75f723baaa728430b5fefff +Author: Keith Packard +Date: Tue Aug 7 12:44:19 2007 -0700 + + Decrement mode count when removing RandR output mode. + + Removing an output mode without decrementing the mode count scrambles the + output mode array badly. + +commit fef4c7a6f1a1ef34233b36137bb66d9a657307fb +Author: Eric Anholt +Date: Tue Aug 7 09:01:14 2007 -0700 + + Fix driver build after pixman changes. + +commit 1339e57485db5a285cfbecbe0bba7154458680ad +Author: Tiago Vignatti +Date: Tue Aug 7 04:24:34 2007 -0300 + + Fix typo. + +commit d9ee5f3e3a3a814ebcd257736c305b41139cc354 +Author: Tiago Vignatti +Date: Tue Aug 7 04:22:26 2007 -0300 + + Clean a little bit the code. + +commit 7a5eb3e96b74daaaeb6babf46b13d698280aa3f6 +Author: Tiago Vignatti +Date: Tue Aug 7 02:16:44 2007 -0300 + + Let xkb options be passed through command line in kdrive servers. I start my + Xephyr using something like: + + ./hw/kdrive/ephyr/Xephyr :1 -fp /usr/share/fonts/X11/misc/ -mouse ephyr -keybd ephyr,,xkblayout=br,xkbmodel=abnt2 + +commit 955d5f6c0d14fae63bfe7c4ab39ee0a708919479 +Author: Tiago Vignatti +Date: Tue Aug 7 01:39:29 2007 -0300 + + When we call Xephyr with '-pointer' a new pointer is added inside the server + and the Xephyr virtual mouse keeps alive. With this patch the semantic changes + turning '-pointer' && 'Xephyr virtual mouse' always false. + + Now we can open a device pointer and pass its options in Xephyr's command line + without having other pointer unused. + +commit aa3c6aaaab213200591d29ddb2921adfb87ee5b4 +Author: Søren Sandmann Pedersen +Date: Mon Aug 6 19:00:59 2007 -0400 + + Require pixman-1 0.9.4, update pixman includes to new scheme + +commit 74feba4d77d74979a0ea478d666439ffc55001e5 +Author: Aaron Plattner +Date: Wed Aug 1 14:30:03 2007 -0700 + + Don't unwrap too early in libwfb for Composite. + + Don't call fbFinishWrap until the pixman_image_t that stores the pointer is + actually freed. This prevents corruption or crashes caused by accessing a + wrapped pointer after the wrapping is torn down. + +commit f6aa2200f2fb4f4d4bb51e67d68e86aabcac0c4b +Author: Roland "Test-tools" Bär +Date: Mon Aug 6 12:37:52 2007 -0700 + + Probable off by one buffer overflow in .../xorgconfig/xorgconfig.c + + X.Org Bug #11858 + Patch #11005 + +commit e717eb82dc2e55f852919312d04f5cfc8ee55bc8 +Author: Dave Airlie +Date: Thu Aug 2 10:50:01 2007 +1000 + + xserver: stop bcopy from going really slow + + The outport is most likely unnecessary on any currently used hardware, + the byte copy is necessary from what I know on IA64 and friends so leave it. + + Add a new API entry point which lets a driver select the old behaviour if + such a needs is ever found. + + This gives me ~20% speed up on startup on 945 hardware. + +commit 600ef07113caa7a901c7d486bc8ebd1ae47f885c +Author: Tiago Vignatti +Date: Fri Aug 3 15:33:41 2007 -0300 + + Fix kdrive command line parser. + +commit f3955c0a020b39021050cd33c20a17f14fc4b579 +Author: Arkadiusz Miskiewicz +Date: Wed Aug 1 21:04:22 2007 +0300 + + XFree86: xf1bpp: distclean generated files as well + + Make sure we clean up after ourselves: not sure why distcheck didn't flag + this one. + +commit a04c95f4446e5c169dea71019321d790ab4fa139 +Author: Julien Cristau +Date: Wed Aug 1 20:37:05 2007 +0300 + + configure.ac: Fix argument quoting for argv[] + + m4 quoting. Yar boo sux. + +commit 99a88826e5e8cfa25c5f8a88c12799d33114729c +Author: Daniel Stone +Date: Wed Aug 1 20:34:58 2007 +0300 + + configure.ac: Actually use -lrt in monotonic clock test + + If we need -lrt to use clock_gettime, then make sure we link with it. + +commit 1c80e04f876e9254b93ef87eadfcff71234340c6 +Author: Daniel Stone +Date: Wed Aug 1 20:08:31 2007 +0300 + + configure.ac: Disable D-Bus config API support by default + + This is problematic, so don't even bother with it unless someone wants it. + respeclaration is dead, long live HAL. + +commit c46663367329615bd2c9b63e93c9534036e5a2ae +Author: Michel Dänzer +Date: Wed Aug 1 18:32:09 2007 +0200 + + GLX/DRI: Remove some unused variables. + +commit 17cb4f64e3c39725e83b1e311c09422d7e1c0e52 +Author: Michel Dänzer +Date: Wed Aug 1 18:13:18 2007 +0200 + + GLX_EXT_texture_from_pixmap: Use client provided texture target when available. + + This prevents situations where the server doesn't use the target the + client thinks it does, usually resulting in the texture being sampled as all + white. + +commit a4197db9504adae6af005b2218eee36b8af0d98b +Author: Daniel Stone +Date: Wed Aug 1 14:04:51 2007 +0300 + + GL: GLX: Make sure glxbyteorder.h is distributed + +commit ad7421fc764e2b82e20d90f12225a03a1d636f18 +Author: Daniel Stone +Date: Wed Aug 1 08:30:00 2007 +0300 + + Bump version to 1.3.99.1 for development + + This is not actually .1, just bumping for a different devel version. + +commit 43e71a54502d9ab28ece7f6296d1416d60948dad +Author: Daniel Stone +Date: Wed Aug 1 08:16:35 2007 +0300 + + XFree86: xf1bpp: Fix previous build system commit + + Amateur error. + +commit 6d6bc93b0a13c5356544561e326d4aedf33e61c2 +Author: Daniel Stone +Date: Wed Aug 1 08:11:22 2007 +0300 + + Build system: Add missing files + + A couple of headers weren't added to the build. + +commit 505ec436af3a173e0ba32c6f14b4cf9837a553eb +Author: Daniel Stone +Date: Wed Aug 1 08:11:08 2007 +0300 + + XFree86: Properly clean up after ourselves + + CLEAN is not a useful variable. CLEANFILES/DISTCLEANFILES, on the other hand, + are useful variables. + +commit 1ace9770fed4a2ba354ff06a96189428beb36088 +Author: Daniel Stone +Date: Wed Aug 1 08:10:38 2007 +0300 + + Build system: Non-dtrace distcheck hacks + + automake 1.10 really wants foo.c for foo.O, so give it some dummy files to + deal with if it really needs them. + +commit cacbdf18ee771d43228c2e96e8ef9a32251ceb55 +Author: Daniel Drake +Date: Wed Aug 1 08:08:37 2007 +0300 + + Remove duplicated licenses + + Some files had two copies of the same license. + +commit bd49332e4772bd57ffb76c829f0e4770ab876057 +Author: Daniel Drake +Date: Wed Aug 1 08:07:08 2007 +0300 + + Add proper COPYING file + + I went through the entire xorg-server distribution and aggregated all + the licenses I could find (except the questionable GPL files, see my + last mail). + + There are many many permutations on essentially the same license terms, + but I have been pedantic and treated slight differences as separate + licenses. + + Here is a description of the process I used: + + tar xvjf /usr/portage/distfiles/xorg-server-1.1.1.tar.bz2 + + cd xorg-server-1.1.1 + find -name '*.c' -o -name '*.h' | xargs gvim + + egrep -Rli "permission|copyright" * | grep -v "\.[ch]" \ + | grep -v "\.in$" | xargs gvim + + cd .. + tar xvjf /usr/portage/distfiles/xorg-server-1.3.0.0.tar.bz2 + diff -urNp xorg-server-1.1.1 xorg-server-1.3.0.0 + + git clone git://anongit.freedesktop.org/git/xorg/xserver + cd xserver + git diff xorg-server-1.3.0.0.. + + For each file, licenses have been aggregated as follows: + + If 2 files have identical license text but different copyright notices, + the copyright notices are aggregated and the license text + is included only once. + + Note that by identical I mean really identical, i.e.: + 'AUTHOR(S)' is not the same as 'AUTHORS' + 'KEITH PACKARD DISCLAIMS' is not the same as 'KEITH PACKARD AND COMPAQ + DISCLAIM' + + Otherwise, licenses and accompanying copyright notices have been + stacked. + + When going through the changes from 1.1.1 to 1.3.0.0 then HEAD, licenses + have been added and removed (so I have reflected this since the original + version of my COPYING file). It's slightly concerning to see that even + between 1.3.0.0 and HEAD, new license permutations are being added. I'd + suggest that a primary license be chosen and this would be indicated at + the top of this COPYING file. + +commit 51b735394f0aa9f953f9c320617c7a56028ec458 +Author: Daniel Drake +Date: Mon Apr 30 11:37:46 2007 -0400 + + [PATCH] xserver: Add COPYING terms + + I went through the entire xorg-server distribution and aggregated all + the licenses I could find (except the questionable GPL files, see my + last mail). + + There are many many permutations on essentially the same license terms, + but I have been pedantic and treated slight differences as separate + licenses. + + Here is a description of the process I used: + + tar xvjf /usr/portage/distfiles/xorg-server-1.1.1.tar.bz2 + + cd xorg-server-1.1.1 + find -name '*.c' -o -name '*.h' | xargs gvim + + egrep -Rli "permission|copyright" * | grep -v "\.[ch]" \ + | grep -v "\.in$" | xargs gvim + + cd .. + tar xvjf /usr/portage/distfiles/xorg-server-1.3.0.0.tar.bz2 + +commit 7fa58385724fa7f441107a1793b601ba3dcb1f4c +Author: Arkadiusz Miskiewicz +Date: Wed Aug 1 08:01:28 2007 +0300 + + XFree86: xf1bpp: Fix parallel build + + One of the constructs wasn't parallel-build safe: fix that. + +commit 18ab4d559409d4b682aab99fb75f8d861122eab6 +Author: Daniel Stone +Date: Wed Aug 1 07:27:53 2007 +0300 + + Darwin: Remove missing file + + Xserver.m is missing and still hasn't been added, so just remove it for now. + +commit 0bd6fe7401b2524cf34793c0b0c642e3d32fae00 +Author: Daniel Stone +Date: Wed Aug 1 07:27:30 2007 +0300 + + Config: Add missing include + +commit 48b3034d13bbbb69072eb11f4579389cc32b0850 +Author: Daniel Stone +Date: Wed Aug 1 07:01:51 2007 +0300 + + Config: Add current FDI file + + Add the FDI file we're using at the moment, until it gets into upstream HAL. + +commit 82b720cf3e09d8a6adcd40b25c4d48b34ba1ae80 +Author: Daniel Stone +Date: Wed Aug 1 06:57:11 2007 +0300 + + Config: Fix merge detritus + +commit 6b055e5d9751e3679ff98065e43225ec8a960053 +Author: Daniel Stone +Date: Wed Aug 1 06:55:36 2007 +0300 + + Input: Fix stuck modifiers (bug #11683) + + Disclaimer: It's 6:51am. I'm trying to be as understandable as possible. + + What was happening previously was this: + * Press Alt + * Extended event generated and processed: state is now Alt down once + * Core event generated + - keyboard switched: inherited state is Alt down once + - event processed: Alt down twice + * Release Alt + * Extended event generated and processed: state is now null + * Core event generated and processed: Alt down once + + If we switch the order: + * Press Alt + * Core event generated: + - keyboard switched: inherited state is null + - event processed: Alt down once + * Extended event generated and processed: state is now Alt down once + * Release Alt + * Core event generated and processed: state is now null + * Extended event generated and processed: state is now null + + When we carry over the previous state, it needs to be the _previous_ state + (state and modifiersPerKey), assuming that we're going to catch now-core + events for any of these. For example, if Ctrl is held down as we pivot, we + need to carry Ctrl over with a count of one, for which an extended + core + release will then clear. Carrying over the union of the previous state _and + the state resulting from the immediate action_ was what broke things. + +commit 0e0174d45ecbeb7b6dddc4af53da9d6211038e0e +Author: Daniel Stone +Date: Wed Aug 1 03:30:07 2007 +0300 + + XFree86: Allow disabling of HAL + + If NoAutoAddDevices is given as a server flag, then no devices will be added + from HAL events at all. If NoAutoEnableDevices is given, then the devices will + be added (and the DevicePresenceNotify sent), but not enabled, thus leaving + policy up to the client. + +commit cd8e99e56ec5d02026e401cc15e0f8d75f2a4727 +Author: Daniel Stone +Date: Wed Aug 1 03:29:12 2007 +0300 + + Input: Don't enable devices when we open them + + Thanks to Xi's braindead design, it's otherwise impossible to query input + devices without enabling them. Hurrah. + +commit 0a31db14b7c7c21ef550dbcc73a9f649f3613cbe +Author: Daniel Stone +Date: Wed Aug 1 02:54:14 2007 +0300 + + Config: D-Bus core: Fix hook removal + + Make sure we properly initialise the entire hook when adding it, and + bust out when we're done removing. + +commit 89f628394f7d831f2ba1e45c5884c3983bef6031 +Author: Daniel Stone +Date: Wed Aug 1 02:08:02 2007 +0300 + + XFree86: Input: Fix whitespace + +commit aec0d06469a2fa7440fdd5ee03dc256a68704e77 +Author: Aaron Plattner +Date: Tue Jul 31 16:33:37 2007 -0700 + + Fix a crash when rotating the screen. + + Remember output->crtc before setting a NULL mode because RRCrtcNotify now sets + output->crtc to NULL. Use the saved crtc to set the new mode. + +commit a93033b0bc14ed0bb95c680ded26b63cfe5fd1d3 +Author: Daniel Stone +Date: Wed Aug 1 01:53:08 2007 +0300 + + XFree86: Module: Bump input version + + config_info changes the size (and ordering) of DeviceIntRec, so bump the + input major. + +commit 1150969b826e2bd6d8345fa245ed499f2e4cf101 +Author: Daniel Stone +Date: Wed Aug 1 01:52:20 2007 +0300 + + Convert all my license statements to the standard form + + Convert all my license statements to the standard, accepted form: + cf. <20070717142307.GD13478@fooishbar.org> + http://lists.freedesktop.org/archives/xorg/2007-July/026451.html + + keithp's license on configure.ac changed with his verbal permission. + +commit 8658f5d923a69fb55b4cd9e1e84c2d271679f6e2 +Author: Daniel Stone +Date: Wed Aug 1 01:10:50 2007 +0300 + + Hotplug: Add HAL support + + Add support for HAL-based hotplugging, in which we just get the list of + input devices and properties from HAL. Requires an FDI which is not yet + in mainline HAL. + +commit aa75b3481724834da2f855d8dd2ff36074bd5706 +Author: Daniel Stone +Date: Wed Aug 1 01:09:07 2007 +0300 + + Hotplug: D-Bus: Dispatch harder + + Dispatch until we've got nothing left to dispatch, since apparently + dispatching will only ever fire a single message ... + +commit 4d238c5c67461ed747aa6c021d1532734f4c63fe +Author: Daniel Stone +Date: Wed Aug 1 01:08:26 2007 +0300 + + Input: GetPointerEvents: Deny events from devices without valuators + + For some reason, my keyboard has 25 mouse buttons, but zero valuators. This + causes GPE to blow up spectacularly, trying to get (and set) co-ordinates from + devices without valuators. For now, just prevent this from ever happening, + and whack a dirty great FIXME in. + +commit 7c9e8fd56e1830f7a971187d14877ebbdf35c4b0 +Author: Daniel Stone +Date: Wed Aug 1 00:19:14 2007 +0300 + + Input: Allow enabling and disabling of devices + + Add DEVICE_ENABLE to KDrive and XFree86 to allow us to enable and disable + devices on the fly. + +commit 0afeb0241a83796575da827bd81375c99ff10af5 +Author: Daniel Stone +Date: Sun Jul 8 20:48:57 2007 +0300 + + DIX: Clean up null root cursor handling + + Move the null root cursor handling out of main() and into CreateRootCursor. + +commit 62ec6d09b3adaea82ff52c8672e6f611c15ec56d +Author: Daniel Stone +Date: Sun Jul 8 20:47:28 2007 +0300 + + dix.h: Remove duplicate ffs() prototype. + +commit 4d3379d418a781938358e511fd41deb4115a032c +Author: Daniel Stone +Date: Sun Jul 8 14:31:35 2007 +0300 + + Fonts: Fix builtin fonts + + Make sure the font path is always 'built-ins' when we use built-in fonts, + rather than having it as a fixed path for a while, then clobbering it + halfway through startup. + +commit 9ac7e8a559fe6008cafc95e8264680c50e72ba19 +Author: Daniel Stone +Date: Sun Jul 8 14:30:53 2007 +0300 + + Hotplug: D-Bus: API version 2 + + Use uint32s instead of int32s where practical, and add an API version + request. Also, try to return all devices added, not just the first, + and box device arguments. + +commit 1cdadc2f43d9069572814510d04b1a560c488fcb +Author: Daniel Stone +Date: Sun Jul 8 14:28:58 2007 +0300 + + Hotplug: Separate D-Bus into core and hotplug API components + + Break up D-Bus into two components: a D-Bus core that can be used by any + part of the server (for the moment, just the D-Bus hotplug API, and the + forthcoming HAL hotplug API), and the old D-Bus hotplug API. + +commit 8bfa41e1bf3f588780d7e9f6f900b1fde0570a7e +Author: Daniel Stone +Date: Sun Jul 8 04:29:43 2007 +0300 + + gitignore: Add automake lex/yacc wrapper + +commit 06dd2748da8b7af343f6cab409b9f351567de5f3 +Author: Daniel Stone +Date: Sun Jul 8 00:27:40 2007 +0300 + + configure.ac: Properly check XFree86 proto modules + + Not sure why these are conditionals, anyway. This one really needs + revisiting, but at least causes configure, rather than the compilation, + to bomb out. + +commit fd10312b4224197b937d9e696b53dc2a16c8912f +Author: Daniel Stone +Date: Sun Jul 8 00:26:26 2007 +0300 + + configure.ac: Fix KDrive VESA/fbdev conditionals + + Make sure we actually respect anything explicitly given on the configure + line, instead of just stomping it with what we detect. + +commit f37612c6f2375ca904411e6caa0be19fa24f032c +Author: Nicolas Trangez +Date: Sun Jul 8 00:23:57 2007 +0300 + + Hotplug: Remove unused function definition from hotplug.h + + configDispatch hasn't been used in a long time. + +commit 951c058e7800308f7c472e77178c14400f45c1b3 +Author: Aaron Plattner +Date: Tue Jul 31 14:23:58 2007 -0700 + + Don't fail compScreenInit if the driver added its own alternate visuals. + +commit 722d73a0ef54c2ebd8ef38c4a6afa0e7c5aa3e30 +Author: Dave Airlie +Date: Tue Jul 31 10:34:56 2007 +1000 + + Revert "Fix RandR 1.2 conversion of two colour to ARGB cursor on MSB first platforms." + + This reverts commit 0f057ebb272f0ee0b51b9ab37d4b07da0924fec4. + + This screws my cursor up just starting a bare X server on Intel, + I get the X more like <> than ><.. + +commit 57b5b97a0710fc043b8a1c01d756cdb73dfe4567 +Author: Adam Jackson +Date: Sun Jul 29 11:02:47 2007 -0400 + + ReduceCompositeOp returns a Render op, not a boolean. + +commit f62beb6f3609e8b6e61325ac89017590811bbd07 +Author: Adam Jackson +Date: Fri Jul 27 13:23:15 2007 -0400 + + Remove all trace of Option "BiosLocation". + + This code was deeply dangerous. If anyone actually had a use for this code, + we should find a better way of doing it. + +commit 486fd4145aed93093d1f1655de40c0a8582bb8b1 +Author: Adam Jackson +Date: Fri Jul 27 13:10:39 2007 -0400 + + exaGetPixmapFirstPixel: avoid framebuffer readbacks if possible. + + If the pixel in framebuffer memory isn't modified since we uploaded it, we + can just read from the system memory copy, wihch avoids both a readback and + an accelerator stall. + + In principle this function is still wrong, and all the framebuffer pixel + access should be going through (w)fb so we can get pixel layout corrections. + +commit 50cb6c7e4419e067c1f080d1de940811d21fc725 +Author: Kristian Høgsberg +Date: Fri Jun 15 15:29:00 2007 -0400 + + Don't map the front buffer in libdri if the ddx driver doesn't set the size. + + This lets drivers map the front buffer themselves + by setting dontMapFramebuffer. + +commit cec793ef7a6dac9fa2a6538683e363a72672cde9 +Author: Aaron Plattner +Date: Thu Jul 26 11:49:46 2007 -0700 + + Include picturestr.h in xf86Crtc.h to pick up definition of PictTransform. + +commit 27845fe197b74bf453d99f352e83513e201fdaae +Author: Adam Jackson +Date: Thu Jul 26 09:32:16 2007 -0400 + + libconfig shouldn't be an installed library. + +commit 276f8e2ca42eec982d16b86d67217d68ff98f81d +Author: Alan Coopersmith +Date: Wed Jul 25 17:42:23 2007 -0700 + + Include comment/copyright/license for AC_DEFINE_DIR in acinclude.m4 + +commit eba2be448bdd298ff2f7b8603bd9e976da1fdf72 +Author: Brice Goglin +Date: Wed Jul 25 20:53:45 2007 +0200 + + Minor fixes in cvt and gtf manpages + + Reported by "A. Costa" in + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432065 + +commit 8d230319040f0a7f72231da2bf5ec97dc3612e21 +Author: Gustavo Pichorim Boiko +Date: Tue Jul 24 16:19:19 2007 -0300 + + Fix the output->crtc initialization in the old randr setup + +commit 0f057ebb272f0ee0b51b9ab37d4b07da0924fec4 +Author: Michel Dänzer +Date: Wed Jul 25 17:04:04 2007 +0200 + + Fix RandR 1.2 conversion of two colour to ARGB cursor on MSB first platforms. + + Doesn't seem necessary to do anything here... + +commit 5b424b562eee863b11571de4cd0019cd9bc5b379 +Author: Gustavo Pichorim Boiko +Date: Mon Jul 23 18:27:41 2007 -0300 + + Set the crtc before the output change is notified + + Set the new randr crtc of the output before the output change notification is + delivered to the clients. + Remove RROutputSetCrtc as it is not really necessary. All we have to do is set + the output's crtc on RRCrtcNotify + +commit 7da38bb6a15247948c90e00a59230453fcf13cbd +Author: Adam Jackson +Date: Sat Jul 21 15:27:40 2007 -0400 + + Partial redundancy elimination in PropertyNotify generation. + +commit 0f91abd5c68eb044d09733d18ef0f6b8ed128200 +Author: Julien Cristau +Date: Thu Jul 19 20:37:26 2007 -0400 + + Fix alpha build failures + + Don't include in os-support/linux/lnx_axp.c, use "lnx.h" and + instead + +commit dc9c5196282ba61bd542e198dfe0d53d93181591 +Author: Keith Packard +Date: Thu Jul 19 13:28:00 2007 -0700 + + Make PreferredMode option in config file override EDID mode preferences. + + When the PreferredMode option is selected in the config file, remove the + M_T_PREFERRED bit from all other preferred modes to force the config file + mode to be selected. + +commit 73a93c5a6b68f7ba21f9e75f50b1032603a3b39e +Author: Keith Packard +Date: Thu Jul 19 13:26:36 2007 -0700 + + Query modes on disabled (but not ignored) outputs. + + Code that disabled mode detection on disabled outputs would confuse + applications by listing said outputs as connected but without any modes. + This makes the disabled state in the config file affect only the initial + configuration and not subsequent modifications by RandR. + +commit 9fc36a391c11170cde1a28f548a2cae5f6f20d5b +Author: Keith Packard +Date: Sat Jul 14 12:36:15 2007 -0700 + + Make pending property changes trigger mode setting. + + The DDX code was ignoring pending properties for computing when mode setting + was required. This meant that configurations differing only in property + values would not cause the mode to be set. + +commit aed6569309223ecc7e26fa84e4d430e422455607 +Author: Adam Jackson +Date: Sat Jul 14 15:21:46 2007 -0400 + + Refactor how Composite adds visuals to the screen. + + Besides being slightly simpler to read, it's now trivial to add a depth-16 + visual to a depth-24 screen just by adding a line for it in the alternate + visual list. Visuals for indexed depths are slightly tricky still. + +commit 21bbd7d64b5f74915afd7a312e589654442f3461 +Author: Adam Jackson +Date: Tue Feb 6 21:42:50 2007 -0500 + + Delete some pre-dlloader debugging scaffolding. + + If your loader is as bad as elfloader, then it makes sense for the + server to have some stubs for you to assign to / break on. However it + is no longer 1996. + +commit 1f71f0c0574bafb36da20fec669f9a1138c69a47 +Author: Adam Jackson +Date: Tue Feb 6 21:28:03 2007 -0500 + + Remove (long-)deprecated xf86EnablePciBusMaster. + +commit 0a63d874e9c2f4fe4b38839a744461f9d41040b2 +Author: Adam Jackson +Date: Tue Feb 6 21:22:49 2007 -0500 + + Always normalize the module name. + +commit 9a1c6afd12caf0143483f72bfbba0c4c3daaa6ff +Author: Adam Jackson +Date: Tue Feb 6 21:19:50 2007 -0500 + + Remove dead code for screen crossing. + +commit 8ca2fe8914af1a67bf597f99025e5cbe9b08da57 +Author: Adam Jackson +Date: Tue Feb 6 21:11:13 2007 -0500 + + Delete dead module test code. + +commit e2413cc7cae4e578b8e9b408ea85bef596b03ea3 +Author: Adam Jackson +Date: Tue Feb 6 21:07:37 2007 -0500 + + Remove MEMDEBUG + + This existed (but may not have worked) in the monolith, but is gone now. + +commit d1d65a84150dfbc3a4dbe108f237a85ab6e09bbb +Author: Adam Jackson +Date: Tue Feb 6 21:01:08 2007 -0500 + + Dead ifdefs for BITMAP_SCANLINE_UNIT == 64 + + This appears to be a legacy of cfb24 not being smart enough to deal with this + case. But since cfb24 unexists, die die die. + +commit cbe74394a5ed21ed80c0aab6eefd2716122cce11 +Author: Adam Jackson +Date: Tue Feb 6 20:44:34 2007 -0500 + + Nuke dead X -configure code. + +commit 5657fb065cc79ba3ca5a836f45637ba9894f9abf +Author: Dodji Seketeli +Date: Tue Jul 17 12:12:02 2007 +0200 + + exaDriverInit: Fail if pScreenInfo or a member of it is invalid. + + EXA may attempt to use the invalid value and crash otherwise. + +commit bbe7ce10fa93017374d7a4611427b70a22d7507a +Author: Alan Coopersmith +Date: Mon Jul 16 17:25:59 2007 -0700 + + Update pci.ids to 2007-07-16 snapshot + + Remove nvidia ids in extrapci.ids that are now in pci.ids + Add nvidia ids to extrapci.ids that are in xf86-video-nv but not pci.ids + +commit ac979c165128704116cd40086320b6edc79018e2 +Author: Keith Packard +Date: Sat Jul 14 12:13:17 2007 -0700 + + MakeAtom needs length without trailing NUL. sizeof("string") includes NUL. + + I made a mistake in some new code using MakeAtom, passing the size of the + string instead of the length of the string. Figuring there might be other + such mistakes, I reviewed the server code and found four bugs of the same + form. + +commit 393171034c15d8a1b82232b8f9455a358035e932 +Author: Keith Packard +Date: Sat Jul 14 09:03:40 2007 -0700 + + Add RandR reflection support. + + Replace the ad-hoc transformation mechanisms with matrices. + Prepares for more general transformation as well. + +commit 8773ad023eb28950eb0f802d2ca31a67f84adddc +Author: Keith Packard +Date: Sat Jul 14 08:47:50 2007 -0700 + + Screen size bounds check in ProcRRSetCrtcConfig not masking out reflections. + + When checking how to validate the selected mode and position against the + current screen size, the test against 90/270 rotation did not mask out + reflection, so that when reflection was specified, the 90/270 test would + never succeed. This caused incorrect bounds checking and would return + an error to the user instead of rotating the screen. + +commit 881a620b4d6ea7a54af14c8f8fbe6924c9aa9291 +Author: Keith Packard +Date: Sat Jul 14 08:45:10 2007 -0700 + + When sync'ing logfile, also flush it. + + When the logfile is set to sync, the actual sync occurs whenever the log + file is flushed. If the log file is not also set to flush, no syncing + occurs. + +commit 031b009ea678809bf1ddca883c2082b304c408c9 +Author: Alan Coopersmith +Date: Fri Jul 13 14:54:45 2007 -0700 + + Use %S instead of %s for strftime seconds when printing build time + +commit c0e91777a9874fe2cd9a7e9180263f512c1e8f8d +Author: Alan Coopersmith +Date: Thu Jul 12 16:37:11 2007 -0700 + + Add __SOL8__ to xorg-server.h.in since xf86-input-kbd needs it to build + +commit 6b4231e3b5b49b731c9a00930ae465fff8539831 +Author: Alan Coopersmith +Date: Thu Jul 12 16:36:27 2007 -0700 + + Use kbd driver when xorg.conf specifies "keyboard" or "Keyboard" (bug #11301) + + X.Org Bug #11301 + Sun Bug #6560332 + +commit 9fcb30ebf7b7b2137955f759e95c1d58c4f27a11 +Author: Alan Coopersmith +Date: Thu Jul 12 13:00:32 2007 -0700 + + Make SOLARIS_INOUT_ARCH substitutions work better with automake-1.10 + +commit 7c0ca27f6dd0a800dc27429a33dbc8e133f9a9c1 +Author: Alan Coopersmith +Date: Wed Jul 11 17:15:29 2007 -0700 + + "fbpict.c", line 215: void function cannot return value + +commit 0a4e9311158ed3ecda0722640f860ace2f87a97e +Author: Hanno Boeck +Date: Thu Jul 12 10:17:07 2007 +1000 + + xnest: fix linking since dbus + + Fixes bug 8955 + +commit b2f9ca6ac400d426d7a1ef0162f7e7ce28288dd1 +Author: Keith Packard +Date: Tue Jul 10 21:33:34 2007 -0700 + + Redirect fix: Manual + Automatic - Manual = Automatic + + A window with redirect manual *and* redirect automatic which loses the + manual redirecting client becomes redirect automatic. + +commit 561989f2f0fc31e3d3bf8df978a9cb3d4c85af59 +Author: Keith Packard +Date: Tue Jul 10 21:06:51 2007 -0700 + + Generate ChangeLog file for make dist. + + Copy Makefile.am snippet which generates a complete git change history to + the ChangeLog file during the distribution generation process. + +commit e316fa59fea8b7b18cdf3a227890351a9567ec65 +Author: Adam Jackson +Date: Tue Jul 10 14:20:55 2007 -0400 + + Add per-monitor config file option for maximum pixel clock. + +commit 161624a5a45808fd56141dc2c64be729944f03ed +Author: Michel Dänzer +Date: Tue Jul 10 09:02:40 2007 +0200 + + GLX: Only build code dealing with GLXPixmap damage field when DRI is enabled. + +commit 4abd00dab7e648dab8172f6009371e4e63d0c521 +Author: Michel Dänzer +Date: Tue Jul 10 09:02:08 2007 +0200 + + Make sure DRI drawables are cleaned up when client dies. + + The previous scheme didn't work when the client didn't create the core drawable, + e.g. the root or composite overlay window. Use refcounting via special client + resources to fix that. + +commit 5957aa6fdc580ccad4557eeefa0636ffad823f33 +Author: Michel Dänzer +Date: Mon Jul 9 08:47:05 2007 +0200 + + Fix regression from recent composite changes. + + One pWin->redirectDraw test was converted incorrectly, causing incorrect + rendering in some cases. + +commit bcb23527421578bd4c9397d4c2c19cbefa22fc59 +Author: Adam Jackson +Date: Thu Jul 5 15:56:25 2007 -0400 + + Clean up unused #ifdefs from fb. + +commit 9ff7ff2fda30f334515b16ef0867c1500c41bc0f +Author: Keith Packard +Date: Wed Jul 4 23:38:27 2007 -0700 + + Fix MEMORY SMASH in XkbCopyKeymap. + + XkbCopyKeymap reallocates the destination keymap when it is not large enough + to hold the source data. When reallocating the map->types data, it needs to + zero out the new entries. The computation for where to start bzero'ing was + accounting for the size of the data type twice, once implicitly in the + pointer arithmetic, and once explicitly with '* sizeof (XkbKeyTypeRec)'. + This would often lead to random memory corruption when the destination + keymap had existing map->types data. + +commit 9131d560a0d42067cc4e726e445e060216c9acdc +Author: Tiago Vignatti +Date: Thu Jul 5 02:47:34 2007 -0300 + + Postpone options variable assignment to fix segfault when we got a device but + its driver is incorrect. Also if (!ki && !pi) can never be true. + + This one also adds the device option field. + +commit 41b485d5507821e41c3281c3c565647ae7582101 +Author: Tiago Vignatti +Date: Thu Jul 5 02:40:07 2007 -0300 + + kdrive must to know that devices are unplugged. + +commit a92dc6b5295e4f352115fed2856169929819863f +Author: Tiago Vignatti +Date: Thu Jul 5 02:28:14 2007 -0300 + + Remove redundant linking in kdrive. Fix configure.ac variable name and clean + it up a little. + +commit 41b5155c8be75c4e171c0f64616cc09598b8ec54 +Author: Tiago Vignatti +Date: Thu Jul 5 01:57:41 2007 -0300 + + For each kdrive server put a dependencie on its own libraries. + +commit 16e429bcbf2f62cfc58162ab2857afb7376dda41 +Author: Jonathan Lim +Date: Wed Jul 4 20:08:49 2007 +0200 + + Bug 5000: Fix domain support for SGI Altix + +commit f106c04b627d9f57b38627971dc79c75129e66d6 +Author: Keith Packard +Date: Tue Jul 3 14:47:19 2007 -0700 + + Have Composite always report server version. + + It was reporting the lessor of the server and client versions, which doesn't + make sense with the 0.4 semantic change in clipping. + +commit 4f88d68bdb90cc7d12170355105b4fd020acd306 +Author: Keith Packard +Date: Tue Jul 3 14:43:17 2007 -0700 + + Force advertised Composite version to 0.4 instead of using header version. + + Installed protocol header version may be newer than the server code base. + Use internal version number for Composite extension to make sure the server + doesn't advertise capabilities it doesn't support. + +commit 866f092ca0160a366add01b48ad03438926c4d16 +Author: Keith Packard +Date: Tue Jul 3 14:29:11 2007 -0700 + + Make Composite manual redirect windows not clip their parent. + + This patch changes the semantics of manual redirect windows so that they no + longer affect the clip list of their parent. Doing this means the parent can + draw to the area covered by the child without using IncludeInferiors. More + importantly, this also means that the parent receives expose events when + that region is damaged by other actions. + +commit 2a75c774975b50dd4e71b7dbea7bd65ca2984a43 +Author: Dodji Seketeli +Date: Tue Jul 3 11:00:29 2007 +0200 + + ExaOffscreenMarkUsed: Don't crash when there's no offscreen memory. + +commit 0ede39a25cf5b0b6c2c89677f810c21ce42b95df +Author: Michel Dänzer +Date: Tue Jul 3 10:55:13 2007 +0200 + + Fix build when int10 doesn't use x86emu. + +commit 028a00bc518dc6908839e8ce7c50ab1837100945 +Author: Adam Jackson +Date: Mon Jul 2 18:41:55 2007 -0400 + + Make x86emu's I/O cycle tracing more useful. + + Print debug messages only when the appropriate debug bit is set in the + 8086 state vector, so you can focus in on the call you're actually + interested in. + +commit 00e8295b7e0c7c0ba97707903004272818e3d87d +Author: Gero Mudersbach +Date: Mon Jul 2 11:40:11 2007 -0700 + + Bug #10814: Add needed quirk for Samsung 225BW like the 226BW. + +commit 667e95f2e8389d9f23c50446d6d664eddd16d260 +Author: Eric Anholt +Date: Mon Jul 2 11:36:11 2007 -0700 + + Correct the xf86EdidModes.c file description. + +commit 3de1f0d03b329b01856f664651db23ffefb58646 +Author: Eric Anholt +Date: Tue May 29 10:08:58 2007 -0700 + + Fix documentation of association of outputs to monitor sections in xorg.conf(5) + +commit 4d76075dbb618a47ff9fc15c4be2e2d34210fa8d +Author: Adam Jackson +Date: Fri Jun 29 14:06:52 2007 -0400 + + Death to RCS tags. + +commit 2691c05fd647d9fa10f791ac397ecb9c423a076f +Author: Peter Hutterer +Date: Fri Jun 29 11:56:18 2007 +0930 + + Make sure window->optional is allocated before assigning it. + + DeletePassiveGrabFromList() may remove the window optional, so we need to + re-alloc it if it isn't there anymore. + + Thanks to Colin Harrison for spotting the bug. + +commit f7f3fe7fe7233a2ffc43106c48f44cbbd82b7c19 +Author: Adam Jackson +Date: Thu Jun 28 18:59:05 2007 -0400 + + Remove the remnants of OS/2 support. + + This has never worked in any modular server release, and as far as I know + was never tested in 6.7 through 6.9. + +commit 8a06ff9ffa4816d192e58e43e7fe569b97b4dd7c +Author: Adam Jackson +Date: Thu Jun 28 16:41:28 2007 -0400 + + Fix another usage of MAX_PCI_DEVICES. + + Fixes cases where the VGA device is above the 128th device on the system. + +commit 928836a5abd85466e920eb487fab9ccb295e0c5b +Author: Adam Jackson +Date: Thu Jun 28 16:29:28 2007 -0400 + + Bug #10770: "Inputdevs" isn't a valid config file keyword. + +commit 62f43d8b33f67d8f3d0bd65787ffae9e6b634d65 +Author: Tiago Vignatti +Date: Wed Jun 27 16:24:42 2007 -0300 + + Relink properly all kdrive servers when changes happen. + +commit 3860996d5666b76600b1537e2cbd58e36b086308 +Author: Tiago Vignatti +Date: Wed Jun 27 16:06:12 2007 -0300 + + Remove double-defined. + +commit 1e189ed1daab58c1de67d387306fde0a9e7984a4 +Author: Aaron Plattner +Date: Wed Jun 27 10:16:40 2007 -0700 + + Handle tileStride > 1 in fbEvenTile. + + Patch courtesy of James Jones. + +commit bf1ad1aa4270dccf1540943d97e80b317c0adb56 +Author: Adam Jackson +Date: Wed Jun 27 09:19:28 2007 -0400 + + Add VBE PanelID support. + + Originally found only in the i810 driver. + +commit d73835efda4995a310188537233a984f4b73628d +Author: Tiago Vignatti +Date: Wed Jun 27 03:34:13 2007 -0300 + + More janitor work. Remove 'defined but not used' warnings from kdrive and some minor cosmetic. + +commit 38f8e536684193c3f70b23be22d818053c676072 +Author: Tiago Vignatti +Date: Wed Jun 27 03:19:37 2007 -0300 + + Janitor work. Remove 'defined but not used' warnings from xorg and other cosmetic. + +commit 1340f34ec98c41781164018d43bd7bb858d8132b +Author: Tiago Vignatti +Date: Wed Jun 27 03:04:55 2007 -0300 + + Fix kdrive XKB. + +commit 9725516b4274ceaf9d6caf372c5439b4c9db2316 +Author: Alan Coopersmith +Date: Fri Jun 22 17:05:21 2007 -0700 + + Split checks for dtrace & getpeerucred() + +commit edb9ccf3ecb4e35a840aa13815979c5fbd73f32d +Author: Michel Dänzer +Date: Mon Jun 25 10:51:38 2007 +0200 + + Make sure DRIScreenPrivIndex is -1 when no DRI screen private is allocated. + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=11340 . + +commit 4c601b904ee6fb01da3343ff9ef00d36f1341fcb +Author: Peter Hutterer +Date: Mon Jun 25 10:53:05 2007 +0930 + + configFiles(): don't return anything when declared as void. + +commit bec4e47d128ec40b58a2c9aae475f6a6fc4323c3 +Author: Peter Hutterer +Date: Mon Jun 25 10:51:42 2007 +0930 + + NULL-terminate device list when synthesizing core devices. + + This fix is required for 93ca526892c0d22afa05cce6496198c652043a19 to work. + +commit 8e5102b9f01821048e72e7f068193a0b3e1816f9 +Author: Peter Hutterer +Date: Thu Jun 21 15:47:48 2007 +0930 + + Set the detail field for DeviceKeyEvents to the keycode. + + (cherry picked from commit 0c33dc152e372cdc8ae59d9a5696b0774bcd03b7) + +commit 87564543d92c1ee1f8cb6fb9716a15d693e08cf5 +Author: Peter Hutterer +Date: Tue Jun 19 18:20:05 2007 +0930 + + Only decrement buttonsDown when the button count is greater than 0. + + Device drivers flush their buttons on device init and cause a button down + event to be generated. If we unconditionally decrease the buttons, we won't be + able to ever get a passive device grab. + + Format documentation for CheckDeviceGrabs to make it readable. + (cherry picked from commit 3e894974cdd6a75683d4601f71622d1da7ec4395) + + Conflicts: + + Xi/exevents.c + +commit 24ee89fd60f489f2d3af0399e0d667057df74d02 +Author: Peter Hutterer +Date: Tue Jun 19 15:31:56 2007 +0930 + + Add a few comments to devices.c + +commit 93ca526892c0d22afa05cce6496198c652043a19 +Author: Peter Hutterer +Date: Wed Jun 13 15:28:15 2007 +0930 + + Split up memory for devices configured in the config file. + + If we're using a continuous block here, we segfault when a device removal + triggers an xfree call. + +commit b141b85c254afff3ce2221d899787fab3dc295bd +Author: Peter Hutterer +Date: Wed Jun 13 15:26:03 2007 +0930 + + Check for identical grabs when adding a new passive grab. If an identical grab + + exists, remove the old one and prepend the new one. + + X.org Bug 2738 + +commit 19cde59c41cf167cc609debfee75bfc015beac12 +Author: Søren Sandmann Pedersen +Date: Fri Jun 22 00:38:50 2007 -0400 + + In fbFill() make sure the drawable is validated when pixman_fill() succeeds. + + In fbSolidBoxClipped() don't return when pixman_fill() succeeds. + +commit d2177c80915f2fe2e8a5c948d4ba2fa51dbfbea2 +Author: Keith Packard +Date: Fri Jun 22 02:08:21 2007 +0100 + + Skip driver mode detection/configuration when !vtSema. + + When the server is not active, make sure the driver functions related to + mode setting are not called. + +commit e523859a952d49b20f3d10152cc0ef695d2c12a1 +Author: Alan Coopersmith +Date: Wed Jun 20 17:54:38 2007 -0700 + + Include module name in "already built-in" message + +commit 5138f710a1574fef6f553f3fe2fccac0620d2584 +Author: Arcady Goldmints-Orlov +Date: Wed Jun 20 16:31:55 2007 -0700 + + Fixed fbSolidBoxClipped() to fill the right place. + + Changed an X2 to a Y1. + + Signed-off-by: Aaron Plattner + +commit c9b79a355845c895aca8303a39798264d80b6212 +Author: Michel Dänzer +Date: Wed Jun 20 18:56:06 2007 +0200 + + exaPolyFillRect: Don't track damage explicitly. + + All callers should already do it. + + Also don't leak pReg. + +commit 87966c5d2889873cea6cbc16b7e4399490dfaec1 +Author: Michel Dänzer +Date: Wed Jun 20 18:42:00 2007 +0200 + + exaGetImage: Don't migrate or try to accelerate for 1x1. + + This is mainly to avoid wasting effort for XSync(), but just reading a single + pixel directly is probably faster than DownloadFromScreen anyway. Though in + light of the latter, even larger thresholds might be useful. + + Also move the swappedOut check before the migration checks because migration + can't actually occur when swapped out. + +commit 40f27a2df4906d9ceb1c78f6163a62c497321535 +Author: Michel Dänzer +Date: Tue Jun 19 09:11:16 2007 +0200 + + mieqEnqueue: Make local queue tail variables unsigned. + + So the modulo arithmetic actually works as intended... thanks to Peter Hutterer + for pointing out the problem. + +commit 2e7fef7d0837939e822c40b6ac77e7f0e66d57bd +Author: Adam Jackson +Date: Mon Jun 18 12:08:39 2007 -0400 + + Make xf86{En,Dis}ableInterrupts no-ops on Linux. + +commit 831d3b7f8d053aba649c8d04af3bef96376bdc3a +Author: Lennart Buytenhek +Date: Mon Jun 18 12:05:55 2007 -0400 + + Compile fixes for Linux ARM platforms. + +commit 562ca3f2f9005e7c5ed0a24b0759051ded2173e9 +Author: Zephaniah E. Hull +Date: Mon Jun 18 12:00:49 2007 -0400 + + In NewInputDeviceRequest, only call EnableDevice if xf86Screens[0]->vtSema is + true, preventing unwanted behavior in the case where a device is added while + the user is in a different VT. + +commit 42c2e14b254f6f882b3e79444360ab855db43e27 +Author: Matthieu Herrb +Date: Fri Jun 15 00:14:02 2007 +0200 + + swap xOrigin and yOrigin in SProcRenderSetPictureClipRectangles. + + Fixes Xrender clipping rectangles when X server and client are of + different endianness, shown by xterm 225 among others. + +commit 78179ae827bb5d19abb1340084362bc51ad5c1e5 +Author: Søren Sandmann Pedersen +Date: Mon Jun 11 22:46:42 2007 -0400 + + Remove fbmmx.[ch] files + +commit eb2d7fe02f9cbca57b462bba05498e2d59316fbc +Author: Søren Sandmann Pedersen +Date: Mon Jun 11 22:43:01 2007 -0400 + + Replace fbFillmmx() with pixman_fill() and remove fbmmx.[ch] + +commit f52ae237d3eec79ccd64cdd77271aeacc37af70c +Author: Søren Sandmann Pedersen +Date: Mon Jun 11 22:02:39 2007 -0400 + + Require pixman 0.9.2 + +commit d1d85c04e248f46b1cf1b1d25fdd56aa69b8f0ee +Author: Søren Sandmann Pedersen +Date: Mon Jun 11 21:25:42 2007 -0400 + + Delete fbBltmmx(). + +commit 3f9adb18f127318d054f30a57e3a77176e14c692 +Author: Søren Sandmann Pedersen +Date: Mon Jun 11 15:19:27 2007 -0400 + + Port a few forgotten fbSolidFillmmx()'es to fbFillmmx(). Use pixman_blt() instead of fbBltmmx() + in fbCopyNToN(). + +commit d06099b38e8445e6e31f5178ffefcc31a71080ef +Author: Søren Sandmann Pedersen +Date: Mon Jun 11 13:28:24 2007 -0400 + + Remove fbCopyAreammx() and fbSolidFillmmx() + +commit d4a034370c8ae71b2cc4fe824ceee58b19624f35 +Author: Søren Sandmann Pedersen +Date: Mon Jun 11 13:26:24 2007 -0400 + + Split fbSolidFillmmx() into a new FbFillmmx() function. Call that from fbFill(). + +commit 3210902a7334f3d8d6c18a34a3cb3f55803b0043 +Author: Søren Sandmann Pedersen +Date: Mon Jun 11 13:14:50 2007 -0400 + + Split fbCopyAreammx() into a new fbBltmmx() function; call this + + function from fbCopyNToN(). + +commit 8d5f4368eac1b259db3e61f877a4cc10f04efa2f +Author: Clark Rawlins +Date: Mon Jun 11 16:53:38 2007 +0200 + + Really make sure BUILD_TIME doesn't have a leading zero. + + date +'%k%M%S' still gives a leading zero in the hour after midnight... + + Add a leading 1 and remove it in xf86PrintBanner(). + +commit 54e023cec07aa7e392da36e11d0a4667b8341370 +Author: Søren Sandmann Pedersen +Date: Mon Jun 11 09:16:46 2007 -0400 + + Don't pass regions to pixman_image_composite() anymore. + +commit 5cbec267b6426960c90f6bcff1d051af5084538c +Author: Michel Dänzer +Date: Mon Jun 11 12:38:41 2007 +0200 + + Make sure BUILD_TIME doesn't have a leading zero. + + It causes the compiler to treat it as an octal constant instead of decimal as + intended, which could even cause a build failure in the cases of 08 and 09. + + Thanks to Clark Rawlins for pointing out the problem. + +commit 1aceec61ff203848576c47a1eab13f90a67d7176 +Author: Michel Dänzer +Date: Mon Jun 11 09:23:19 2007 +0200 + + DRI: Clip cliprects obtained from DRIGetDrawableInfo to screen dimensions. + + This is to avoid issues with redirected windows which are located partly or + fully outside of a screen edge, resulting in unusual cliprects which the 3D + drivers generally can't handle. The symptoms in such cases would be incorrect + rendering or even crashes or hangs. + +commit 5d896e43fd056d935935b4eb66562791edc247a1 +Author: Michel Dänzer +Date: Mon Jun 11 09:23:19 2007 +0200 + + DRITreeTraversal: Stop walking tree when we've seen all DRI windows. + +commit 0fb44c6f9a0415184818ba8357a21ff920e907dc +Author: Michel Dänzer +Date: Mon Jun 11 09:23:19 2007 +0200 + + DRI: Fix build warning. + +commit 644f7ddc0cb029e2ebca43742fd8a46a1a3f4c9f +Author: Michel Dänzer +Date: Mon Jun 11 09:23:18 2007 +0200 + + dixLookupClient: Use access parameter. + +commit 30a3297fed9af3a594aba0875a8f58a0a38b33fc +Author: Michel Dänzer +Date: Mon Jun 11 09:23:18 2007 +0200 + + mieq queue handling cleanups. + + In particular, fix handling of wraparounds in mieqEnqueue. + +commit c1a49a9269f14b6975a1a2c751bb179757373f11 +Author: Adam Jackson +Date: Sun Jun 10 22:14:57 2007 -0400 + + GNU is wrong and ` is not left-quote. + +commit 67a0a4da1a225ee3bd6bbd1846f8141fe333c884 +Author: Dave Airlie +Date: Mon Jun 11 11:55:11 2007 +1000 + + update xproto dependency to at least 7.0.9 + +commit c079cce9d884ab03f305b3fba4a4e1247c023480 +Author: Daniel Ciocea +Date: Fri Jun 8 18:12:21 2007 -0700 + + Fix sync polarity on Samsung SyncMaster 205BW monitor. + + need to use standard VESA sync polarity instead of the + EDID provided -hsync -vsync values. + +commit 9c47b86bd9a4633fda5fd305a09ac8623187efa0 +Author: Aaron Plattner +Date: Thu Jun 7 13:57:12 2007 -0700 + + Add new fb symbols to wfbrename.h. + + Avoids crashes when wfbComposite calls the wrong image_from_pict. + +commit 567b5bf765254a4ae9cc7711bb6acfa89a9fd61c +Author: Søren Sandmann Pedersen +Date: Tue Jun 5 20:26:49 2007 -0400 + + Delete fbCompositeCopyAreammx() + +commit 49ed31c0b323dd8c5887a803c199875e6f2330d8 +Author: Søren Sandmann Pedersen +Date: Tue Jun 5 17:44:21 2007 -0400 + + Remove most of the fast-path MMX operations from fbmmx. fbCopyAreammx + + and fbSolidFillmmx are still needed by other code. + +commit dfbe32b5b828cc4e3da36a0e2e6ad641164eaa5e +Author: Adam Jackson +Date: Mon Jun 4 18:07:00 2007 -0400 + + Remove the old Kerberos 5 authentication code. + + Before you complain, this code hasn't seen material change since at least + X11R6. It certainly does not build with any modern version of Kerberos. + Anybody wanting krb5 auth to their X server should probably be using + GSSAPI instead of internal krb5 API anyway. + +commit 75dece08fb72803d5116e6776e9f1534ff20e37b +Author: Zephaniah E. Hull +Date: Mon Jun 4 09:09:20 2007 -0400 + + xf86PostMotionEvents[P] calls xf86SendDragEvents, xf86SendDragEvents + unconditionally checks device->button->buttonsDown. + + Let's make it possible to have a device with motion, but no buttons. + + Without segfaulting. + +commit fbb9b203950e9d0e82574cde5b3e006b0e6b404f +Author: Zephaniah E. Hull +Date: Mon Jun 4 06:59:42 2007 -0400 + + Let's not do a calloc and a free on every call to xf86PostMotionEvents. + +commit 3f4295e643ca56c40f33af7966e8efd367ef8749 +Author: Zephaniah E. Hull +Date: Mon Jun 4 06:48:06 2007 -0400 + + Add xf86PostMotionEventP, takes a pointer instead of a variable number of + arguments. + + Bump input ABI to 1.1 since we export this. + +commit a4f3473c88370b8411e016ebab619cffd33e58f9 +Author: Zephaniah E. Hull +Date: Mon Jun 4 06:39:02 2007 -0400 + + Fully init the AbsoluteClassRec in InitAbsoluteClassDeviceStruct. + (Specificly, we were missing the screen field.) + +commit 0cbc3a4da2ddb6e4f30f60d2bc7f405d31aa554a +Author: Zephaniah E. Hull +Date: Mon Jun 4 02:03:44 2007 -0400 + + Print the build time as well as the date if we can. + +commit 9a7aaeb3f6ff79af60fde91cd0575a54ba0b9587 +Author: Daniel Stone +Date: Mon May 28 13:54:16 2007 +0300 + + XFree86: Input: Assume core events per default + + Assume that a device will be sending core events, unless explicitly + specified otherwise. + +commit 94361cbba7f866144691f6f5e9251a550e0e0cb8 +Author: Daniel Stone +Date: Mon May 28 13:54:47 2007 +0300 + + XFree86: Input: Perform case-insensitive comparisons on option names + +commit e5ce982381c4092252d6b55fcefcc9a3cd21e656 +Author: Benjamin Herrenschmidt +Date: Sun Jun 3 09:40:37 2007 +1000 + + Include pixman.h from fb.h or compile of some files will fail + + Signed-off-by: Benjamin Herrenschmidt + +commit 90eb22656c34d2d08a8dccaf05e6d081c56bd7f3 +Author: Adam Jackson +Date: Sat Jun 2 16:49:26 2007 -0400 + + Minor cleanup/robustification to config parsing. + +commit f6a983533bdc84752562ef0be25b320678bf08a1 +Author: Adam Jackson +Date: Sat Jun 2 16:37:39 2007 -0400 + + Don't warn about default behaviour when autoconfigging. + +commit 21e8f4eb02842f877336db08c332d8ee4a381ee0 +Author: Adam Jackson +Date: Sat Jun 2 16:13:01 2007 -0400 + + Don't print lack of DRI support as an error in AIGLX init. + +commit 0e1384d8318637f75d04d3d1b7600f7cad40117e +Author: Adam Jackson +Date: Sat Jun 2 16:07:20 2007 -0400 + + Delete VDIF support; it was never used anyway. + +commit 66702f3c1c6c884e83744c72da173cc32f22b2f4 +Author: Henry Zhao +Date: Fri Jun 1 23:55:40 2007 -0700 + + Need to use minPitch in miScanLineWidth() to get the shrinked + linePitch. + +commit fa877d7ff25c4ec45288e1fea70d4f5e1baf3ef3 +Author: Alan Hourihane +Date: Wed May 30 13:06:45 2007 +0100 + + Fix mode validation against the maximum X/Y values configured + at server startup, and not against the virtual X/Y parameters + as they can change. + + This fixes an issue when canGrow is TRUE and modes get dropped + when using the virtual X/Y parameters. + +commit 99eae8bea6724a24477375ad5b2d31cc4883cf6b +Author: Samuel Thibault +Date: Tue May 29 22:04:36 2007 -0400 + + I/O enable/disable update for the Hurd + +commit 3c6f1428489c1f71acd41066ea73ef4ae7c60f17 +Author: Julien Cristau +Date: Tue May 29 22:01:30 2007 -0400 + + Make sure that the ramdac symbols are present in the server + + The former ramdac module is now built into the server, so its symbols need to + be explicitly exported to drivers (Debian #423129). + +commit ee20c481eede0954f4a8bef5113979b101863c32 +Author: Matthieu Herrb +Date: Tue May 29 14:54:27 2007 -0600 + + Remove wscons keyboard handling stuff that doesn't belong there anymore. + +commit 60de6c7ef9bdcee043f63e8e0d493e6feba6a9d0 +Merge: 3a6549a... 2f13b7c... +Author: Matthieu Herrb +Date: Tue May 29 12:14:49 2007 -0600 + + Merge branch 'master' of ssh://herrb@git.freedesktop.org/git/xorg/xserver + +commit 3a6549a163aba26bf4ac58b050c493fba0df14c6 +Author: Matthieu Herrb +Date: Tue May 29 12:14:23 2007 -0600 + + Make this build on OpenBSD + +commit 2f13b7c113c17239e382dd3640e9c29201d8ab1f +Author: Drew Parsons +Date: Wed May 30 02:13:36 2007 +1000 + + Update Xprint build for pixman. + + Xprt links libfb, which now uses pixman. Update configure.ac to + require module $PIXMAN for XPRINT. + Also, use $(top_builddir) to reference libfb.la and other local + libraries, rather than using the relative reference ../.. + +commit ba0b7d47ab0c24d5a29228f8af583044060464bd +Author: David Nusinow +Date: Mon May 28 21:57:04 2007 -0400 + + Fix for GNU/kFreeBSD + +commit 2267bf48b385c93243e26c3bb84ebb04c7fdb39f +Author: Bastian Blank +Date: Mon May 28 21:55:05 2007 -0400 + + Fixes for s390 + +commit 857ddbb660a21cad1c16f4fb2dc8a904d6655304 +Author: Eugene Konev +Date: Mon May 28 21:53:02 2007 -0400 + + Allow configurable serverconfigdir for security policy location + Allow the location of the SERVERCONFIGdir variable to be defined at + compile-time. This allows us to specify where the security policy will be + located (Debian uses this to put it in /etc). The default is to the + previous location. + +commit 78d01d1008973899d931ef44b47d5f0b5f220b0d +Author: Gerhard Tonn +Date: Mon May 28 21:48:58 2007 -0400 + + Miscellaneous fixes for S/390. + +commit d98bd4bf908c2c51fcfd3a4c3230de17f2567244 +Author: Branden Robinson +Date: Mon May 28 21:44:59 2007 -0400 + + Overhaul xorg.conf manpage + + Major stylistic cleanups, greatly expanded cross-reference ("SEE ALSO") + section and some typo fixes. + + This patch by Branden Robinson. Forward-ported by Fabio M. Di Nitto. + +commit 6bf8d5019313ee2251a44dfb7ad3435a3c6db7eb +Author: David Nusinow +Date: Mon May 28 21:42:10 2007 -0400 + + Read ROM in chunks + This patch speeds up reads of the ROM by reading in large chunks rather + than one byte at a time. This patch was by Dann Frazier. + +commit 6fdd134a0c3e6fdde9b089100e8783705c9cc6ac +Author: David Nusinow +Date: Mon May 28 21:39:12 2007 -0400 + + Fix up xnest manpage + I believe this patch was originally by Branden Robinson + +commit 6a870992d81a6bacfa9d313c15784fdb281d474f +Author: Keith Packard +Date: Fri May 25 20:33:08 2007 -0700 + + xf86XVFillKeyHelper assumed root clip never changed. + + When the root window changed size, xf86XVFillKeyHelper would not revalidate + the GC, leaving the clip at the old size causing lossage (and possibly + memory corruption if the screen and frame buffer shrank). + + Fixed by just using a scratch GC; saving memory, eliminating bugs and + shrinking the code. + +commit 3c982bc1a49509dda7bc469b0eced44df02755b3 +Author: Luo Jie +Date: Thu May 24 11:13:03 2007 -0700 + + Reinstate an apparently mis-deleted ';' from a for loop with no body. + + Fixes an error returning "No core keyboard" with multiple keyboards. + +commit 4d7469f75fadfc4a59664e88e18eb304203670f4 +Author: Luo Jie +Date: Thu May 24 11:04:06 2007 -0700 + + Fix a typo in using memcpy in xwin. + +commit 0b988450462ddb005311e68502357baf272e6371 +Author: Luo Jie +Date: Thu May 24 11:02:28 2007 -0700 + + Fix os/utils.c compile with mingw. + +commit 1f48995d66c0072caa7e5ce2845be642221dd56d +Author: Luo Jie +Date: Thu May 24 11:01:15 2007 -0700 + + Fix build of composite, dix, and randr when Xinerama is disabled. + +commit 8f98be7db303bc3db650054efb86843c70114451 +Author: Eric Anholt +Date: Thu May 24 11:00:04 2007 -0700 + + Fix bswap detection on BSD (mis-added '_' in function names). + +commit 9616a042855399f0ee9c6489ea824621ea5fee18 +Author: Matthias Drochner +Date: Tue Apr 10 16:15:40 2007 -0700 + + Fix build on NetBSD/amd64. + +commit 649e7f82d8d4333443493056b81eb20d6cf022bc +Author: Michel Dänzer +Date: Thu May 24 12:10:05 2007 +0200 + + Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow. + + This avoids a crash in xf86XVReputVideo and also cleans up the code slightly. + +commit 047bf3349bb697c73c95729a8bbf15f72605901f +Author: Soren Sandmann Pedersen +Date: Wed May 23 16:56:05 2007 -0400 + + Delete trapezoid rendering code; replace with pixman calls + +commit 9d87ef4e0dff40ea39f1b209c67b90079fc79065 +Author: Soren Sandmann Pedersen +Date: Wed May 23 15:50:25 2007 -0400 + + - Make image_from_pict() non-static + - Delete fbedge.c and fbedgeimp.h + - Use pixman_rasterize_edges() in fbtrap.c + +commit 2a960c442bd7560630f52b55d82ec0517542ee5a +Author: Soren Sandmann Pedersen +Date: Wed May 23 13:08:26 2007 -0400 + + Port renderedge.c to pixman + +commit 3ba3ede9bbdfc6376b6f6e0b6ce8280a05e6584d +Author: Soren Sandmann Pedersen +Date: Wed May 23 12:56:04 2007 -0400 + + Add missing offsets for window coordinates - reported by Colin Harrison + +commit cc648e609d472472bac4a2e568eb3598b3690ba3 +Author: Michel Dänzer +Date: Tue May 22 10:51:56 2007 +0200 + + EXA: Export ExaOffscreenMarkUsed. + + Can be used to inform EXA that an offscreen area is used outside of EXA. + +commit e6a7198e7cd96f1fe0654cc6811a977821579258 +Author: Adam Jackson +Date: Tue May 22 10:51:55 2007 +0200 + + Bug #8991: Add glXGetDrawableAttributes dispatch; fix texture format therein. + + Adapted to master branch by Michel Dänzer . + +commit 6324bfc468f7a645d2fee59f1c921a4328a4639f +Author: Michel Dänzer +Date: Tue May 22 10:51:53 2007 +0200 + + AIGLX: Zero-copy texture-from-pixmap. + + When available, use the 2D driver texOffsetStart hook and the 3D driver + setTexOffset hook to save the overhead of passing the pixmap data to + glTex(Sub)Image. + + The basic idea is to update the driver specific 'offset' for bound pixmaps + before dispatching a GLX render request and to flush immediately afterwards + if there are any pixmaps bound. This should ensure that the 3D driver can + use pixmaps for texturing directly regardless of the X server moving them + around. + +commit 5006d08d7fc56d3d380cc6b75297f94e8594eb54 +Author: Michel Dänzer +Date: Tue May 22 10:51:52 2007 +0200 + + DRI: Add TexOffset driver hooks. + + To be used by AIGLX for GLX_EXT_texture_from_pixmap without several data copies. + + The texOffsetStart hook must make sure that the given pixmap is accessible by + the GPU for texturing and return an 'offset' that can be used by the 3D + driver for that purpose. + + The texOffsetFinish hook is called when the pixmap is no longer being used for + texturing. + +commit ff2eae86b6a8760befbbc5d605debebe7b024c05 +Author: David Nusinow +Date: Mon May 21 19:50:04 2007 -0400 + + Fix boolean thinko that prevented working without a server layout + +commit 56fd92715567cd32e4b725b3791de9ac4e3879aa +Author: Soren Sandmann Pedersen +Date: Mon May 21 20:00:25 2007 -0400 + + Remove fast path code from fbpict.c + + Remove the various fast path functions from fbpict, and instead use + pixman_image_composite(). + +commit 7e2c935920cafadbd87c351f1a3239932864fb90 +Author: Fredrik Höglund +Date: Fri May 18 20:06:14 2007 +0200 + + Add a new IDLETIME system sync counter. + + This counter exposes the time in milliseconds since the last + input event. Clients such as screen savers and power managers + can set an alarm on this counter to find out when the idle time + reaches a certain value, without having to poll the server. + +commit 756acea23a0cc56c470bcd77c6f5638d923ab3d1 +Author: Soren Sandmann Pedersen +Date: Fri May 18 13:39:12 2007 -0400 + + Use pixman_image_set_indexed() to make 8 bit work + +commit 7916419a0092b8bf9713c0840f9e969950d7aa85 +Author: Soren Sandmann Pedersen +Date: Fri May 18 11:58:24 2007 -0400 + + Comment out setup of general MMX code + +commit 998164bac648756e5b5254aa36e075ae360d3972 +Author: Soren Sandmann Pedersen +Date: Fri May 18 11:36:20 2007 -0400 + + Move fbCompositeGeneral() to fbpict.c and remove fbcompose.c + +commit a2e3614eb8f0fa198615df492b03ff36bc9c1121 +Author: Soren Sandmann Pedersen +Date: Fri May 18 11:33:11 2007 -0400 + + Break image_from_pict() into a few subfunctions. + +commit c5ef84c325440af5fbdf9f44c3781d99a0392df9 +Author: Soren Sandmann Pedersen +Date: Thu May 17 21:31:08 2007 -0400 + + Make the general compositing code create a pixman image and call + + pixman_image_composite(). Leave the general code commented out for now. + +commit 076d070e186afeb416976ae74fbfd50c86db10c5 +Author: Keith Packard +Date: Thu May 17 20:24:18 2007 -0700 + + Use Screen block handler for rotation to draw under DRI lock. + + DRI uses a non-screen block/wakeup handler which will be executed after the + screen block handler finishes. To ensure that the rotation block handler is + executed under the DRI lock, dynamically wrap the screen block handler for + rotation. + +commit 915563eba530c5e2fdc2456cf1c7c3cc09b3add0 +Author: Keith Packard +Date: Thu May 17 20:22:43 2007 -0700 + + Disable all outputs and crtcs at startup. + + Leaving devices enabled during server startup can cause problems during the + initial mode setting in the server, especially when they are used for + different purposes by the X server than by the BIOS. Disabling all of them + before any mode setting is attempted provides a stable base upon which the + remaining mode setting operations can be built. + +commit 0375009a97c2ab7f0e0f0265463d45c0580388c6 +Author: Soren Sandmann Pedersen +Date: Thu May 17 12:59:24 2007 -0400 + + Remove excessive unrolling in fbCompositeSrc_x888x8x8888() and fix bug where + the source alpha was used instead of 0xff. + +commit 546465ee6aa6584780aec6357f32d205c807ae71 +Author: Soren Sandmann Pedersen +Date: Wed May 16 17:42:04 2007 -0400 + + Make fbFetch_b8g8r8() actually write the read value to the buffer + +commit 0fcd17c9181901c419cc32bc24c07fe5a6934d81 +Author: Soren Sandmann Pedersen +Date: Tue May 15 17:59:13 2007 -0400 + + Use pixman short formats, revert the gradient_stop change + +commit f4c1d5fc28a5a7fe2592505350f9e2331f6049b7 +Author: Soren Sandmann Pedersen +Date: Tue May 15 17:12:22 2007 -0400 + + Use pixman types for transforms and vectors + +commit f2e30e7d0a1d075e7e83c5b5ceca9e4752951138 +Author: Soren Sandmann Pedersen +Date: Tue May 15 16:51:21 2007 -0400 + + Use the pixman fixed point types and macros + +commit 3da842bf930d7875599ca0c06cb4a09cfa987ac5 +Author: Soren Sandmann Pedersen +Date: Tue May 15 14:57:14 2007 -0400 + + Revert various fast path functions to their pre-pixman-merge state + since they fail rendercheck. Remove their associated macros. + + See bug 10903. + +commit 1568b6b6a0d7337f29c7b87cc46ae64b3b0f8fdf +Author: Soren Sandmann Pedersen +Date: Sat May 12 20:33:23 2007 -0400 + + Port large amounts of the region code to pixman + +commit dde0ceac4ea7639d0096bfd26f37c5851778854c +Author: Soren Sandmann Pedersen +Date: Sat May 12 17:41:47 2007 -0400 + + Add new InitRegions() function called from dix/main + +commit e037052ac522150786abf44d3a04c813cc490050 +Author: Soren Sandmann Pedersen +Date: Sat May 12 16:58:54 2007 -0400 + + Turn boxes and regions into typedefs for pixman types + +commit 8e56f5be4b70773c899f01b9ccd2e88d523327e4 +Author: Soren Sandmann Pedersen +Date: Fri May 11 11:45:37 2007 -0400 + + Add dependency on pixman 0.9.0 + +commit a277f04ab08514462b7f10b4dd92eb326af85501 +Author: Adam Jackson +Date: Wed May 9 22:03:12 2007 -0400 + + Remove mfb and cfb from include paths where they're not needed. + +commit 20c5250e487e032d392e2e4624021fccb1bfb72c +Author: Adam Jackson +Date: Wed May 9 21:49:44 2007 -0400 + + Use system copy of cbrt() if available. + + Also move the replacement inline into miarc.c, since that's the only user. + +commit 8dcc37520d5e8c8b52cee81faa67fd5205548377 +Author: Adam Jackson +Date: Wed May 9 18:57:05 2007 -0400 + + Use _X_INLINE instead of ad-hoc #defines. + +commit 6ff239cb4e67c0a2ea497a1714e5585c1d941af3 +Author: Adam Jackson +Date: Wed May 9 18:38:33 2007 -0400 + + Make the use of ICEIL slightly less ugly. + +commit 178d426311bb3c7160f72b5d95b0a137eda09ba9 +Author: Colin Harrison +Date: Fri May 11 10:08:42 2007 +0100 + + Missing piece from bug 9808 + +commit ebaa6c920c82401952a0ccc991b94574306449bd +Author: Matthias Hopf +Date: Thu May 10 15:25:31 2007 +0200 + + Disable Simba PCI bridge routing code (Bug #8020). + + The code in hw/xfree86/os-support/bus/sparcPci.c:simbaCheckBus() + is trying to mimmick VGA routing by disabling I/O space responses + behind the Simba PCI-PCI controller. + + Unfortunately, doing this also happens to disable access to the + IDE controller I/O space registers, thus crashing the system. The + granularity of the I/O disabling in the Simba controller is not + fine enough to disable VGA without also disabling the IDE controller + registers. + +commit 86c4941727f7c673ae6bb88c67443fa25935c7f5 +Author: Colin Harrison +Date: Wed May 9 16:55:27 2007 +0100 + + fix an occasional crash in GetWindowName() (bug: 9798) + +commit be44018a3c6172caf3e91c36ea321420d104e79f +Author: Colin Harrison +Date: Wed May 9 16:55:09 2007 +0100 + + Fix bad use of hwnd (bug: 9808) + +commit d3248b66a650c6c629cd66240e25004869217d2e +Author: Colin Harrison +Date: Wed May 9 16:54:46 2007 +0100 + + Migrate some code to the new mi apis + +commit 021e5df85d7c9373a2fed55512751d16e08128db +Author: David Nusinow +Date: Mon May 7 21:03:40 2007 -0400 + + Add more informative logging for module default loading + + When the modules section is parsed, if a module is set to be loaded by + default, this will be logged. If it is redundantly specified in xorg.conf, + this will also be noted. None of this logging will happen if the xorg.conf + lacks a modules section. + +commit 1b3a0508a7aee1c7b14cd62216b4727fcc9181d4 +Author: Jesse Barnes +Date: Sun May 6 01:30:59 2007 -0700 + + Fix documentation for Copy hook -- it can copy memory to the scanout + buffer too. + +commit 030a578391c634bc68add6ada3f251cf3f8c3069 +Author: David Nusinow +Date: Thu May 3 22:51:07 2007 -0400 + + Provide UseDefaultFontPath option + + This provides a new option, UseDefaultFontPath. This option is enabled by + default, and causes the X server to always append the default font path + (defined at compile time) to the font path for the server. This will allow + people to specify additional font paths if they want without breaking + their font path, thus hopefully avoiding ye olde "fixed front" problem. + + Because this option is a ServerFlag option, the ServerFlags need to be + processed before the files section of the config file, so swap the order + that they are processed. + +commit e91b9ddc7aa95abc2d4d314e8db204860771a099 +Author: David Nusinow +Date: Thu May 3 22:00:23 2007 -0400 + + Improve modules loading defaults + + Provide default modules that may be overrided easily. Previously the + server would load a set of default modules, but only if none were + specified in the xorg.conf, or if you didn't have a xorg.conf at all. This + patch provides a default set and you can add only the "Load" instructions + to xorg.conf that you want without losing the defaults. Similarly, if you + don't want to load a module that's loaded by default, you can add "Disable + modulename" to your xorg.conf (see man xorg.conf in this release for + details). This allows for a minimal "Modules" section, where the user only + need specify what they want to be different. See bug #10541 for more. + + The list of default modules is taken from the set loaded by default when + there was a xorg.conf containing no "Modules" section. + + A potential problem for some users is that some users disable a module, + most notably DRI, by commenting out the "Load" line in their xorg.conf. + This needs to be changed to an uncommented "Disable" line, as DRI is + loaded by default. + +commit d2f813f7db157fc83abc4b3726821c36ee7e40b1 +Author: Soren Sandmann Pedersen +Date: Wed May 2 19:10:22 2007 -0400 + + New fbWalkCompositeRegion() function + + This new function walks the composite region and calls a rectangle + compositing function on each compositing rectangle. Previously there + were buggy duplicates of this code in fbcompose.c and + miext/rootles/safealpha/safeAlphaPicture.c. + +commit e0959adcd8df2c61e98e76e708fceef9c7cd54eb +Author: Soren Sandmann Pedersen +Date: Tue May 1 13:41:48 2007 -0400 + + Add fbCompositeRect() as another special case in the switch of doom in fbpict.c + + This is phase one of getting the two region walkers in fbcompose.c and + fbpict.c merged together. + +commit c1e1d6b98a6708860e5b5f6e21d8d5b1d8ce9075 +Author: Brian +Date: Wed May 2 15:55:40 2007 -0600 + + In __glXCreateARGBConfig(), insert the new GL mode at the _end_ of the linked list. + + Previously, the new mode was added at the head of the list. This caused the + positional correspondence between modes and the XMesaVisuals array to be off + by one. The net result was GLX clients failing when they tried to use the + last GLX mode/visual. + + We still have the problem of DRI drivers not being able to use the extra + mode/visual introduced by __glXCreateARGBConfig(). glXCreateContext fails + with BadAlloc if it's attempted. This is also the source of the often- + seen warning "libGL warning: 3D driver claims to not support visual xxx" + Look into fixing that someday... + +commit bd0abb2844ef9faf28703e592cfebb886004234c +Author: Tilman Sauerbeck +Date: Wed May 2 17:20:48 2007 +0200 + + Bug #10823: Fixed default OSNAME value. + + We try to get OSNAME from uname by default now. + +commit 71fc5b3e9309182978ead676965d65ca93a4e3b9 +Author: Keith Packard +Date: Wed May 2 11:41:11 2007 +0200 + + Fix for a divide by zero that can be triggered by a malicious client. + + Problem reported by Derek Abdine of rapid7.com. Thanks. + +commit 873ef75b1e8c94d39670c981c4d830ab8bcc018b +Author: Colin Guthrie +Date: Mon Apr 30 10:33:12 2007 -0600 + + fix __glXErrorCallBack() proto + +commit 6b33459bf5aac23c3ecc7002d091c02f327d907a +Merge: 18252a5... 3c91a99... +Author: Brian +Date: Mon Apr 30 10:26:19 2007 -0600 + + Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/xorg/xserver + +commit 3c91a993e8c752002adf85c317216e1487c20780 +Author: Michel Dänzer +Date: Sun Apr 29 23:49:41 2007 +0200 + + EXA: Fix OffscreenValidate build with DEBUG_OFFSCREEN enabled. + +commit a261e1325057974d58440812b93c00c0caa4423a +Author: Michel Dänzer +Date: Sun Apr 29 23:49:35 2007 +0200 + + EXA: Remove DrawableDirty. + + Convert the remaining callers to PixmapDirty. + +commit b1b6674a919943a8ac37e54d02e8d0d23a642b1d +Author: Michel Dänzer +Date: Sun Apr 29 23:49:28 2007 +0200 + + EXA: FillSpans improvements. + + * Don't need to track damage. + * Always migrate for fallbacks. + +commit 584697a2231ac782f362a925e1489c15483a8791 +Author: Michel Dänzer +Date: Sun Apr 29 23:49:09 2007 +0200 + + EXA: SolidBoxClipped improvements. + + * Centralize handling of fallbacks and damage tracking. + * Always migrate for fallbacks. + +commit 982d7c2c0b948ba04c8eefa475d660981e6ed9f9 +Author: Michel Dänzer +Date: Sun Apr 29 23:48:59 2007 +0200 + + EXA: CopyNtoN improvements. + + * Centralize handling of fallbacks and damage tracking. + * Always migrate for fallbacks. + +commit d2245386eed200e77a8c84bdda36ab29e39fd593 +Author: Michel Dänzer +Date: Sun Apr 29 23:48:31 2007 +0200 + + EXA: GetImage improvements. + + Only migrate when appropriate. In particular, don't migrate to offscreen in the + no-fallback case as copying from system memory should usually be as fast if not + faster than DownloadFromScreen, in particular if the bits need to be uploaded + to offscreen first. + +commit 0880aaac9c83019fec2e3d32871f74c7a407f8b3 +Author: Michel Dänzer +Date: Sun Apr 29 23:48:19 2007 +0200 + + EXA: PutImage improvements. + + * Migrate for fallbacks when appropriate. + * Add damage tracking in ExaCheckPutImage. + +commit 7fca16901187ade48e83e6a2684ef464b1912357 +Author: Michel Dänzer +Date: Sun Apr 29 23:48:11 2007 +0200 + + EXA: ImageGlyphBlt improvements. + + * Don't waste effort on invisible glyphs. + * Only track damage for bounding box instead of each glyph separately. + * Always migrate for fallbacks. + +commit a8d6ebdf9338dc2f6ff9a532e6fec460a70d3b1e +Author: Michel Dänzer +Date: Sun Apr 29 23:47:53 2007 +0200 + + EXA: Defer to FillRegionTiled in Composite when possible. + + Committed separately as this case is hard to hit and has only been tested + lightly. + +commit 81b055605c34b5823f6c5f63cc0f92f43c6b7252 +Author: Michel Dänzer +Date: Sun Apr 29 23:47:43 2007 +0200 + + EXA: Composite improvements. + + * Defer to simpler hooks in more cases (inspired by XAA behaviour). + * Move damage tracking from lower to higher level functions. + * Always migrate for fallbacks. + +commit ce317a5b76c053f449122c46e1372bf8e067cb4c +Author: Michel Dänzer +Date: Sun Apr 29 23:47:16 2007 +0200 + + EXA: Glyphs improvements. + + * Don't waste effort on invisible glyphs. + * Add damage tracking where necessary. + * Always migrate for fallbacks. + +commit 0c8905ebc91cf654facef84ee52231a358deec5c +Author: Michel Dänzer +Date: Sun Apr 29 23:47:08 2007 +0200 + + EXA: PolyFillRect improvements. + + * Convert rects to region and use it for damage tracking. + * When possible, defer to exaFillRegion{Solid,Tiled} using converted region. + * Always migrate for fallbacks. + * Move damage tracking out of ExaCheckPolyFillRect. + +commit 567f18a09bfb05f448be40c7ebe0f210f955601c +Author: Michel Dänzer +Date: Sun Apr 29 23:46:49 2007 +0200 + + EXA: FillRegion{Solid,Tiled} improvements. + + * Support planemasks, different ALUs and arbitrary tile origin. + * Leave damage tracking and non-trivial fallbacks to callers. + * Always migrate for fallbacks. + + This is in preparation for using these from more other functions. + +commit e869573b52fac69fb88cea120daaeec59c7a3461 +Author: Michel Dänzer +Date: Sun Apr 29 23:45:48 2007 +0200 + + EXA: exaAssertNotDirty improvements. + + * Return early if the valid region is empty or the pixmap is pinned. + * Fix loop for several cliprects. + +commit d3f8667341bfe6dc7d0258c4ad69377f37d88d95 +Author: Michel Dänzer +Date: Sun Apr 29 23:44:27 2007 +0200 + + EXA: Fix exaEnableDisableFBAccess for nested disables and enables. + +commit 5e4b3232dafe3b0dec65bf639bebaba4774210b7 +Author: Michel Dänzer +Date: Sun Apr 29 23:38:22 2007 +0200 + + Fix fbCompositeTrans_0888xnx0888 build for wfb on big endian. + +commit 2866e0bac9b8dd3892c5e68abcfc6c97cebaf88a +Author: Michel Dänzer +Date: Sun Apr 29 23:38:13 2007 +0200 + + Fix a couple of picture repeat fields incorrectly compared to RepeatNormal. + +commit 78a20455356ccc310f73cfc65ad65a7677eee7e5 +Author: Soren Sandmann Pedersen +Date: Fri Apr 27 15:20:24 2007 -0400 + + Pixman merging + + More msvc++ porting + +commit 6c4f1826bf2c5f30f5fe6e489a02b6375478b380 +Author: Soren Sandmann Pedersen +Date: Fri Apr 27 08:13:08 2007 -0400 + + Bug fix in fbCompositeIn_nx8x8888 + + Make sure both halves of the dst word is set to zero when the masks + are both 0. + +commit ae04f2cb0a068cdc1e519627bf745de0c9e4a85a +Author: Adam Jackson +Date: Thu Apr 26 15:28:04 2007 -0400 + + Fix the 'relink' target for kdrive servers. + +commit 6c8152d6ee9eeb21a68a8bbfed1540939e5bcd1f +Author: Adam Jackson +Date: Thu Apr 26 14:59:04 2007 -0400 + + Remove old edid_modes.c, it lives in hw/xfree86/modes/ now. + +commit 2208c6087d6bffcb24a30891a56430e28735874c +Author: Soren Sandmann Pedersen +Date: Thu Apr 26 14:40:30 2007 -0400 + + Change expand_alpha_rev to expand_alpha in mmxSaturateU + +commit a300ef84cee26febfbe08c497d0d063588130bdd +Author: Soren Sandmann Pedersen +Date: Thu Apr 26 14:37:53 2007 -0400 + + Fix typo in previous commit + +commit 0ebe48be59368b55c618f60d4656300bd7f52ed9 +Author: Soren Sandmann Pedersen +Date: Thu Apr 26 14:36:32 2007 -0400 + + Pixman merge + + - Changes to support MS Visual C++ + + - use inline instead of __inline__ + + - Fix rounding errors (Billy Biggs, from xserver via pixman) + +commit 4fe918b38553133c27e5ae672e5c43984a9bbaea +Author: Soren Sandmann Pedersen +Date: Thu Apr 26 12:41:01 2007 -0400 + + Fix bug 8871 - scrolling corruption with a compositing manager + + Call miHandleExposures() in CopyArea/CopyPlane explicitly in cw to + generate GraphicsExposes correctly. + +commit 0ff7c94fcf6497ee8575f81cf97eeeb3a857739e +Author: Soren Sandmann Pedersen +Date: Thu Apr 26 10:56:02 2007 -0400 + + Pixman merge + + Make use of fbCompositeSrcAdd_8888x8x8mmx + +commit 701ccb4a22cfd646ccb7f19b7b3a476aeb5ce2da +Author: Soren Sandmann Pedersen +Date: Thu Apr 26 10:49:06 2007 -0400 + + Pixman merge + + - Remove stray default label + + - Integrate new MMX ops SolidMaskSrc_nx8x8888mmx, In_8x8mmx, and + In_nx8x8mmx + + - Formatting changes to reduce diff noise + +commit a54ef54db19dcd36ed86b33cff2bc369f9690a15 +Author: Soren Sandmann Pedersen +Date: Thu Apr 26 10:24:25 2007 -0400 + + Pixman merge + + Make sure fbCompositeSrc_x888x8x8888mmx and fbCompositeSrc_8888x8x8888mmx + are used when possible. + +commit 3571b8e65b0857322d12e291305cfe29ea497c3c +Author: Soren Sandmann Pedersen +Date: Thu Apr 26 09:45:11 2007 -0400 + + More pixman merging + + - Move some code around to minimize diff noise + + - Add mmx ops from pixman that never made it into X + + - Merge Jeff Muizelaar's bugfixes to fbCompositeSrc_8888x8x8888mmx and + fbCompositeSrc_x888x8x8888mmx. + +commit c0346e57e6d3857994f7af76060c502c2fdea294 +Author: Peter Hutterer +Date: Thu Apr 26 12:02:45 2007 +0930 + + Require inputproto 1.4.2. + + Requirement was introduced with c7e2ba0c9b9b1fc1aed8f91f86471c4c8e650b78. + +commit 67347739b0571b2978468e8088480b105f505ad2 +Author: Soren Sandmann Pedersen +Date: Wed Apr 25 14:19:39 2007 -0400 + + Don't treat convolution filters as transformations. + + Some rearrangement of code to get it closer to pixman. + +commit c056ce95d89ef1df57edf47149fc34cd3925496e +Author: Soren Sandmann Pedersen +Date: Wed Apr 25 13:21:47 2007 -0400 + + Port MSVC++ CPU detection code from pixman. (Vladimir Vukicevic). + +commit c19ece1d8c32dc81740a4036a642661f54064e75 +Author: Soren Sandmann Pedersen +Date: Wed Apr 25 12:34:19 2007 -0400 + + Integrate optimization from xserver from David Reveman where repeats + + get handled by fbFetchTransformed() rather than in the region walking + code. + +commit 48c73dfc369fdf8f6023436ebe82bb604f76bb80 +Author: Soren Sandmann Pedersen +Date: Wed Apr 25 12:09:22 2007 -0400 + + Add function fbCompositeSrcAdd_8888x8x8(), and fix a bug where + + srcRepeat = FALSE would be set in the wrong place. + +commit 66ba3d758a368bf83d75bab8b08bdb6b34925e40 +Author: Soren Sandmann Pedersen +Date: Wed Apr 25 10:31:38 2007 -0400 + + Various fixes from xserver via pixman (Billy Biggs) + +commit c09e68ce30dabd6b7068b163b9d2382d85d0d0bc +Author: Adam Jackson +Date: Wed Apr 25 16:46:26 2007 -0400 + + Paper over a crash at exit during GLX teardown. + +commit 9c80eda826448822328bb678a7d284cc43fffb17 +Author: Adam Jackson +Date: Wed Apr 25 16:35:04 2007 -0400 + + Disable RANDR's fake Xinerama protocol when there's more than one screen. + + ... in the protocol sense. Xinerama doesn't have any provision for more + than one protocol screen each with its own geometry. + + Red Hat bug #231257. + +commit d322608dc929d5f8cda07a53143a4f28423e0460 +Author: Adam Jackson +Date: Wed Apr 25 16:29:48 2007 -0400 + + Fix a buffer overrun on machines with excessively large PCI busses. + + Formerly we sized an array with a compile time constant, then initialized + its size to the same constant, but the Linux PCI init code would increase + that "constant". So if you happened to have more than 128 PCI devices, + you'd happily scribble into whatever variables happened to be in .bss + after that array. + + Only really fixed for Linux atm. Other OSes will simply (still) fail to + work on video devices above the 128th PCI device. + +commit 3ba1e8ab6d69566e1a3f8f0eb4605631aeffc8e5 +Author: Aaron Plattner +Date: Tue Apr 24 17:20:14 2007 -0700 + + Include xf86Rename.h in xf86RandR12.h. + +commit 0a2fe443d25b1ca25349aba3f748df986952e20f +Author: Soren Sandmann Pedersen +Date: Tue Apr 24 19:02:44 2007 -0400 + + Use READ/WRITE macros for new functions introduced in previous commits. + +commit 7e16da7b78c422f96387502b9cc29eaa1741543f +Author: Soren Sandmann Pedersen +Date: Tue Apr 24 18:15:34 2007 -0400 + + Remove #if 0'ed blocks + +commit 18252a515d4989b983a3b7389636045e06d0f246 +Author: Brian +Date: Tue Apr 24 14:10:09 2007 -0600 + + bump release date to reflect input code updates + +commit 2d9a7a768747ca39a800475f12c424c298018dc6 +Author: Soren Sandmann Pedersen +Date: Tue Apr 24 14:46:59 2007 -0400 + + From pixman (Jeff Muizelaar) + + Fix up the fast-path compositing operators; those are useful for + sources without alpha, but can't be used for sources with + alpha. Also, replaced fbCompositeSrcSrc_nxn with call to fbBlt as + this function must handle 1, 4, 8, 16, 24, 32 bpp objects. Would + be nice to optimize fbBlt for common cases involving 8, 16, 24 and + 32bpp. + + From Keith Packard. + +commit fde4a5adf02d3067a064ebf6bdd666aa5784cfe9 +Author: Soren Sandmann Pedersen +Date: Tue Apr 24 13:30:43 2007 -0400 + + From xserver via pixman (Jeff Muizelaar) + + Add some optimizations from jaymz. Also adds some compile + warnings that will hopefully go awa y as we continue merging. + +commit 13e1d5ea55b0a3b7729316c8e37d3d8fca2075b5 +Author: Soren Sandmann Pedersen +Date: Tue Apr 24 12:59:18 2007 -0400 + + Fix format vs formatCode in previous commit + +commit 077a5d4555676d5775e990468a697b6890c6d609 +Author: Soren Sandmann Pedersen +Date: Tue Apr 24 12:57:55 2007 -0400 + + Add functions fbCompositeSrcSrc_nxn() and fbCompositeTrans_0565xnx0565 + from xserver via pixman. Add READ/WRITE and fbFinishAccess as + appropriate. + +commit 09436fb7c38a9819bde770c4c21143591671c4d7 +Author: Peter Hutterer +Date: Tue Apr 24 22:52:33 2007 +0930 + + Disable devices before removing, remove unrecoverable devices. + +commit c7e2ba0c9b9b1fc1aed8f91f86471c4c8e650b78 +Author: Peter Hutterer +Date: Tue Apr 24 21:34:47 2007 +0930 + + Use DevicePresence events to tell the client about enabled/disabled devices. + + Include the device id in the event sent to the client. + +commit ce099a9b78195540ec251a6a3dbe26019c1a686d +Author: Brian +Date: Mon Apr 23 12:34:01 2007 -0600 + + fix bug in which maxKeysPerModifier wasn't getting set + +commit b5e1f7869b2f12a1c2baa7f699ae609fc9ad50aa +Author: Soren Sandmann Pedersen +Date: Mon Apr 23 14:16:30 2007 -0400 + + Remove #if 0'ed merge leftovers + +commit 84838268b34661d598f8e4856fab355f414930d9 +Author: Soren Sandmann Pedersen +Date: Mon Apr 23 13:19:54 2007 -0400 + + Gradient fixes + + * Port fix for bug 7685 from pixman. Patch by Carl Worth + + * Add projective version of radial gradient code. + + * Make sure that all Pict*Gradient types have PictGradient as prefix, + since code in various places relies on that. + +commit 38d14e858980a1b0c087344d24bf6aebf755663c +Author: Aaron Plattner +Date: Sun Apr 22 18:04:27 2007 -0700 + + Adjust the screen pixmap's dimensions in xf86RandR12ScreenSetSize. + +commit ca784df84e07227a4cc0a1add079884f557b7a00 +Author: Aaron Plattner +Date: Sun Apr 22 16:26:01 2007 -0700 + + Fix unbalanced fbGetDrawable added in commit 0a9239ec. + +commit 55bd8668e7d4100579bcd6c16a804d9f25267070 +Author: Soren Sandmann Pedersen +Date: Fri Apr 20 14:53:37 2007 -0400 + + Remove #if 0'ed leftovers from merge + +commit 41dd7ab067adde8f66cd9f74c5a6570c325518a5 +Author: Soren Sandmann Pedersen +Date: Fri Apr 20 14:51:40 2007 -0400 + + Fix gradient walker to not reset needlessly + + Previously the gradient walker was doing excessive resets, (such + as on every pixel in constant-colored regions or outside the + gradient with CAIRO_EXTEND_NONE). Don't do that. + + Carl Worth, from pixman + +commit c1b73f0f2acd56b423b91a04f1e1b3cdcad0069f +Author: Soren Sandmann Pedersen +Date: Fri Apr 20 14:34:13 2007 -0400 + + Fixing gradient repeat mode computations in previous patch. From David + + Turner. + +commit 38f718799c68995c2d9a1680355bd55fd925009e +Author: Soren Sandmann Pedersen +Date: Fri Apr 20 13:59:11 2007 -0400 + + Remove a few memory references in fbFetchTransformed + +commit 9c4b14d4f6a1fe018acd64789434216cd1560a4a +Author: Soren Sandmann Pedersen +Date: Fri Apr 20 13:23:58 2007 -0400 + + Integrate David Turner's gradient optimizations from pixman + +commit cd2c1714eb4946bf7b1fc194fe074f8024a2ec23 +Author: Brian +Date: Sat Apr 21 12:40:51 2007 -0600 + + add slang_mem.c + +commit 67545333ec0b08db783e94e9e3ec55873dea19a3 +Author: Brian +Date: Sat Apr 21 12:40:33 2007 -0600 + + replace occlude.c w/ queryobj.c + +commit 39bc8bb0fdc854dcf9bbc0857fec84d50fa4f3b2 +Author: Aaron Plattner +Date: Fri Apr 20 14:22:42 2007 -0700 + + Don't call xf86RandR12TellChanged if it doesn't exist. Add some exports to xf86Rename.h. + +commit 3daa5c1a991d659b1386a09e33b044470d489cb3 +Author: Soren Sandmann Pedersen +Date: Fri Apr 20 09:43:16 2007 -0400 + + Fix pixman bug 5777, patch by David Reveman + +commit 9c2e955f6792e80fb84f848ed9e6ebbfd79f7130 +Author: Brian +Date: Fri Apr 20 07:21:19 2007 -0600 + + regenerated to add GL_CLIENT_ATTRIB_STACK_DEPTH (bug 9823) + +commit 96ef0f78438b60436c3940817980a3ab4070c7e8 +Author: Keith Packard +Date: Thu Apr 19 17:39:51 2007 -0700 + + Disable SourceValidate in rotation to capture cursor. + + SourceValidate is used exclusively by the software cursor code to pull the + cursor off of the screen before using the screen as a source operand. This + eliminates the software cursor from the frame buffer while painting the + rotated image though. Disabling this function by temporarily setting the + screen function pointer to NULL causes the cursor image to be captured. + (cherry picked from commit 05e1c45ade9c558820685bfd2541617a2e8de816) + +commit 7ca4baffb5569ea12b578a4a3f69e93d272d6c6d +Author: Keith Packard +Date: Thu Apr 19 17:37:18 2007 -0700 + + Was accidentally disabling rotation updates in mode set. + + Setting a mode on an unrotated CRTC was causing all of the rotation updates + to be disabled; the loop looking for active rotation wasn't actually looking + at each crtc, it was looking at the modified crtc many times. + (cherry picked from commit 8b217dee3a6c46b13fc9571a4a9a95bc55686cdb) + +commit 806a537e644d8cc9e53f3ac52efb49453e5aa1fb +Author: Keith Packard +Date: Thu Apr 19 17:49:34 2007 -0700 + + Revert "Suppress software cursor removal during rotated shadow buffer drawing." + + This reverts commit 999b681cf3973af4191506e49cde06963b11a774. + Replacing this with simpler code that just disables SourceValidate + during rotation redisplay. + +commit 0a9239ec258828ec1da6c208634a55fc4053d7da +Author: Soren Sandmann Pedersen +Date: Thu Apr 19 18:19:34 2007 -0400 + + Merge David Reveman's gradient optimization patch from pixman + +commit d0e55774e0da641ba85c5173f27f68de27372747 +Author: Thomas Hellstrom +Date: Thu Apr 19 11:39:53 2007 +0200 + + libdri: Make sure the new DRIInfo keepFDOpen member is honoured. + +commit e1f0b3e70b696d7ea4cf9e6ed30d751e7fdbc577 +Author: Peter Hutterer +Date: Thu Apr 19 12:00:24 2007 +0930 + + config: Return errors as negative numbers, device ids as positive numbers. + Update dbus-api documentation. + +commit c6972c893359f8fa7631ae674330f3f4f7010ba0 +Author: Peter Hutterer +Date: Wed Apr 18 12:10:05 2007 +0930 + + Change dbus 'listDevices' call to not require an argument. + Update dbus-api documentation, plug memory leak on dbus reply error. + +commit 999b681cf3973af4191506e49cde06963b11a774 +Author: Eric Anholt +Date: Wed Apr 18 14:33:27 2007 -0700 + + Suppress software cursor removal during rotated shadow buffer drawing. + +commit 28bb34eec63bf3c98f38ba7fc044f6419aaa3307 +Author: Eric Anholt +Date: Wed Apr 18 13:48:28 2007 -0700 + + Belatedly bump XORG_VERSION for 7.2. + +commit 5d8e8a7f4b3226bffd9e4d6d9326688f475b0183 +Author: Eric Anholt +Date: Wed Apr 18 13:22:26 2007 -0700 + + Remove libminimi build. + + It appears to have been a leftover of a previous incarnation of the build + system that didn't handle miinitext.c well. + +commit 53fb42e65c2b2ff58a4a324b7f05cff8a587720a +Author: Erik Andrén +Date: Tue Apr 17 21:34:47 2007 -0700 + + Syncmaster 226 monitor needs 60Hz refresh (#10545). + + I've managed to solve my own bug (#10545) by applying the following + patch to the xserver. + + Please apply. + + + This monitor is "Vista Certified". I wonder if this is a pure coincidence... + + + With kind regards + Erik Andrén + (cherry picked from commit a63704f14a1d97b9a00fef6fa290e74e51b9732b) + +commit fc162c6cfa06f0b012743d6d79cef45cf0166229 +Author: Keith Packard +Date: Mon Apr 16 09:55:58 2007 -0700 + + Allow outputs to be explicitly enabled in config, overriding detect. + + Option "Enable" "True" will force the server to enable an output at startup + time, even if the output is not connected. This also causes the default + modes to be added for this output, allowing even sync ranges to be used to + pick out standard modes. + (cherry picked from commit a3d73ba2cb7e13a6d129cd88d6a7f7d756e2ced2) + +commit c41e3bd713206c0bbd8ab8cef4c83eb7ba7e1c3c +Author: Keith Packard +Date: Mon Apr 16 09:53:42 2007 -0700 + + Use default screen monitor for one of the outputs. + + By default, use the screen monitor section for output 0, however, a driver + can change which output gets the screen monitor by calling + xf86OutputUseScreenMonitor. + (cherry picked from commit f4a8e54caf6b9431711383a39f55a18e7fd654f4) + +commit 97a2c2579c56c304705c934f3b536473645747df +Author: Keith Packard +Date: Mon Apr 16 09:39:47 2007 -0700 + + Using wrong log level in extension to built-in message + + was: typo in built-in module log message + (cherry picked from commit 00cfd1f765895b4d1b2234f3203727a8871b64b0) + +commit deda7791dfa34d0563c8d7fa2a0660ac27e6858c +Author: Brian +Date: Mon Apr 16 11:35:22 2007 -0600 + + remove sources deleted in Mesa + +commit 02d42f344ce020c9b84723671cb9c68d5c064933 +Author: Thomas Hellstrom +Date: Mon Apr 16 17:24:53 2007 +0200 + + Changes for single-entity multi-screen DRI. + + The entity (device) has a locking SAREA and a master file descriptor + that optionally isn't closed between server generation. + + The locking SAREA contains the device hardware lock. + Each DRI screen creates an new SAREA containing the drawable lock, + drawable-and private info, the drawable SAREA. + + The first screen optionally shares its drawable SAREA with the + device SAREA. + + Default is to close the master descriptor between server generations, + and to share the drawable SAREA of the first screen with the device locking + SAREA. Thus we should (hopefully) have full backwards compatibility. + + Mesa changes to support single-device multiple screens are pending. + +commit b5823ea3e1ed5a0449d44da05165a46719dcf287 +Author: Keith Packard +Date: Sun Apr 15 22:59:19 2007 -0300 + + RandR 1.2 spec says CRTC info contains screen-relative geometry. + + Was reporting mode size instead of adjusting for rotation. + (cherry picked from commit e2e7c47a528447e90cff6cf10d2ce457742ef48d) + +commit cc4eb1c7ea1bace7ed69cfd80c99d22933282ae1 +Author: Keith Packard +Date: Fri Apr 13 15:04:29 2007 -0300 + + Add quirk for Acer AL1706 monitor to force 60hz refresh. + + This Acer monitor reports support for 75hz refresh via EDID, and yet when + that rate is delivered, the monitor does not sync and reports out of range. + Use the existing 60hz quirk for this monitor. + (cherry picked from commit 1328a288e9030a472a915077160f090d1afd4126) + +commit eba81a0a01f8a61151d8bf9f3d83bda85ca26e73 +Author: George Sapountzis +Date: Sat Apr 14 18:30:09 2007 +0300 + + glx: move __glXMesaProvider from GLcore module to glx module. + + This treats the GLcore provider similar to DRI provider, using a subset of + XMesa as the GLcore interface. + +commit 6b040b79f0e247b6f2da8f7d239443743e96de67 +Author: George Sapountzis +Date: Sat Apr 14 18:29:52 2007 +0300 + + glx: drop xmesaP.h include from xf86glx.c + + The declarations for the xfree86-specific XMesa functions were moved up to + xmesa.h, requires Mesa as of 2007-04-13. + +commit 2c833f60acb3dc358815a99cd295ef7fc695c45d +Author: George Sapountzis +Date: Sat Apr 14 18:29:25 2007 +0300 + + glx: drop stray CAPI define. + + SI imports/exports were dropped from Mesa. + +commit 7ccebc50b98ac175fdbdfaab081bcead62e60ee3 +Author: Peter Hutterer +Date: Fri Apr 13 13:08:44 2007 +0930 + + Documentation for events.c. + +commit 33a5d9605e3e282f6aa1921d7321a2a12ef02c42 +Author: Daniel Stone +Date: Wed Apr 11 18:28:57 2007 +0300 + + XFree86: DGA: Don't call ProcessInputEvents from CloseScreen + + By the time CloseScreen gets called, we can't call ProcessInputEvents, as + the event queue will get unhappy. So just unregister our hooks instantly, + and hope that they don't get called. + +commit 0910540e4322bba72a2fa0a907072eab2547a7b6 +Author: Remigiusz Marcinkiewicz +Date: Wed Apr 11 01:09:26 2007 +0300 + + Config: Extend D-BUS API + + Return device ID where available. + Add listDevices call, which does what it says on the box. + +commit aecbc712144dd1aaf462bd758821438b1d22d957 +Author: Remigiusz Marcinkiewicz +Date: Wed Apr 11 00:38:16 2007 +0300 + + Input: Allow a pointer to a device to be returned in NIDR + + Allow a pointer to the first device added to be returned, so we know which + device(s) were added by the NIDR call. + +commit 4f05f9591e5492c72f3856bd7a2ff13378f59f2b +Author: Magnus Vigerlöf +Date: Tue Apr 10 23:57:48 2007 +0300 + + Input: Always add devices with first available ID + + Scan the device list when adding a new device, and make sure we can use + the first available ID, instead of always incrementing. + +commit 20674dcbb2373a0af287883bc008fb6fb23d4466 +Author: Magnus Vigerlöf +Date: Tue Apr 10 23:55:36 2007 +0300 + + Config: Fix memory leaks + + Fix memory leaks that could occur along the error path. + +commit 82962bbae2b4fda274625d1712ef839ce1ab9dc8 +Author: Magnus Vigerlöf +Date: Tue Apr 10 23:54:32 2007 +0300 + + Input: Add DeleteInputDeviceRequest + + Add DIDR, which asks the DDX to remove a device, analogous to + NewInputDeviceRequest. Only implemented for XFree86 at the moment. + +commit 7b82a836c66ba88566255052caff63577e1a0384 +Author: Magnus Vigerlöf +Date: Tue Apr 10 23:52:08 2007 +0300 + + XFree86: Fix memory leaks, option parsing, in NewInputDeviceRequest + + Plugged some possible memory leaks, and added some more checks on the + options, particular for driver/identifier. Added an unwind. + +commit 4771fa8747791498e504d73afccfb5833499a38b +Author: Magnus Vigerlöf +Date: Tue Apr 10 23:48:00 2007 +0300 + + XFree86: Fix memory leak in option parsing + + Fix option parsing functions and callers thereof to not leak memory. + +commit 07c56abf84080c020a3e7b7703a447c7f996975c +Author: Magnus Vigerlöf +Date: Tue Apr 10 23:43:58 2007 +0300 + + Input: Plug memory leak in device free + + Remember to also free the motion history, if we're using the DIX-managed + history. + +commit e92743bc9839c36914a44f3e5bc8cd85773ac794 +Author: Daniel Stone +Date: Sun Apr 8 14:02:02 2007 +0300 + + getevents: Copy modifier state from extended to core devices + + Make core events carry the same modifier state as the extended events, so + that holding down Ctrl on keyboard A and pressing Q on keyboard B won't + cause your app to quit. + +commit e49f836d6fa2768cd6d2a6d0227b5dbf516013dc +Author: Daniel Stone +Date: Sun Apr 8 13:56:41 2007 +0300 + + mieq: Use larger default queue size + + Use a default queue size of 512 rather than 256, else Xephyr is too slow + without a host cursor, so events get stuck in the queue. + +commit 4aae2de74b9224bac2b2e2522637dac09abc3837 +Author: Jared D. McNeill +Date: Tue Apr 10 12:57:15 2007 -0700 + + Add a real xf86EnableIO/xf86DisableIO for NetBSD/PPC. + +commit f77a8ea849d171a8ca00b2b7334866ace1ffbf73 +Author: Keith Packard +Date: Mon Apr 9 14:29:46 2007 -0700 + + Rotate screen size as needed from RandR 1.1 change requests. + + Screen size must reflect rotated mode size when setting rotated mode using + RandR 1.1 SetScreenConfig request. + (cherry picked from commit efcec7dbd3c2736c7b421d29c4d37e231aa681d2) + +commit bcf17df69a232e5e84609abacdca36274316e170 +Author: Keith Packard +Date: Mon Apr 9 14:12:27 2007 -0700 + + Disable CRTC when SetSingleMode has no matching mode. Update RandR as well. + + xf86SetSingleMode tries to resize all crtcs to match the selected mode. When + a CRTC has no matching mode, it now disables the CRTC (instead of crashing). + + Also, poke the RandR extension when xf86SetSingleMode is done so that + appropriate events can be delivered, and so that future RandR queries return + correct information. + (cherry picked from commit dc6c4f6989f87149d8605604f4514f5cbf11de67) + +commit 67e1c98895a566f927e1ae2384d56cfca104f971 +Author: Adam Jackson +Date: Mon Apr 9 19:08:52 2007 -0400 + + Look for the PCI ROM file elsewhere in sysfs. + + /sys/devices reflects the bus topology, and we don't care that much. + Easier (and more reliable) to just look in /sys/bus/pci/devices, which + is a flat view. + +commit a08d5157f70567a0aa9583d4a15e62437340cf34 +Author: Adam Jackson +Date: Mon Apr 9 19:04:56 2007 -0400 + + VT activate or waitactive are fatal if they fail. + + Also, be sure to waitactive on the way down, to make sure we're off the VT + before exiting. + +commit 72b477f964c748a1ab668781643cc11877f19738 +Author: Adam Jackson +Date: Mon Apr 9 18:59:01 2007 -0400 + + Don't write out empty sections from the parser. + +commit 1f6741db19d4c91b1eacb497dff1814acb1bf0c3 +Author: Stefan Huehner +Date: Mon Apr 9 14:33:15 2007 -0700 + + Bug #10560: Code-Cleanup: function declarations () -> (void) + + X.Org Bugzilla #10560: + Patch #9511 + +commit f24391dbfd12a84253dfec794ee7884afd52e197 +Author: Keith Packard +Date: Mon Apr 9 12:30:31 2007 -0700 + + In AIGLX EnterVT processing, invoke driver EnterVT before resuming glx. + + As the driver EnterVT function generally re-enables the hardware and + prepares it for rendering, it must be called before any gl functions are + called which could touch the hardware. + +commit 4c2e28b0916b5f75cfefb6df9fa0a7a09675539a +Author: Keith Packard +Date: Mon Apr 9 12:28:53 2007 -0700 + + Add setrlimit call in -core option to make dumps occur. + + Default core size limit for most environments is 0, which disables core + dumps. Add code in the -core option processing path to set the core limit to + the maximum value. + +commit 4beeab8424774ea4c3142f29b90e33f1fc7cb154 +Author: Daniel Stone +Date: Sun Apr 8 13:39:06 2007 +0300 + + XFree86: Treat evdev and vmmouse as mouse drivers (bug #10512, #10559) + + When we see an evdev or vmmouse section, assume that it's a mouse, and + don't add a default mouse device. This will break users who have an + evdev keyboard section but no mouse, and want the mouse to get added + by default. + +commit 0a6ac992363343487dfe0a0fc985ea55bd448382 +Author: Brian +Date: Sat Apr 7 12:41:57 2007 -0600 + + regenerated to fix bug 10371 + +commit 7e385598613778de14c0feea0d32f17d7aa66a8e +Author: George Sapountzis +Date: Fri Apr 6 13:38:12 2007 +0300 + + GLcore: fix after moving xf86glx_util.[hc] to Mesa. + +commit 5a804f2e97ab59745482660a635b801ac2b9e769 +Author: George Sapountzis +Date: Thu Apr 5 19:14:31 2007 +0300 + + configure: minor cosmetic, move GLX extension options together. + +commit a4e2fc703484fffed8dd50c1b4b24c564be4d3cd +Author: George Sapountzis +Date: Thu Apr 5 19:13:47 2007 +0300 + + glx: Remove stray __GLinterface. + + __GLinterface was droped from glcore.h + +commit 38ca7d388c47c4800c74442172d6595a9b3dfcc7 +Author: George Sapountzis +Date: Thu Apr 5 19:13:14 2007 +0300 + + glx: fix symlink, glcontextmodes.c was moved to mesa/src/glx/ + +commit f8482967ae8080f49dd1bbb0b79cc65020df679f +Author: Thomas Hellstrom +Date: Wed Apr 4 12:28:48 2007 +0200 + + Add an EXA driver callback to determine whether a pixmap is + + "offscreen" in exa terms, which means accessible to the GPU. + Bump exa minor. The change is backwards-compatible. + +commit c10df5b967d4da4e11786520317e2917de5541fa +Author: Aaron Plattner +Date: Tue Apr 3 15:47:01 2007 -0700 + + Swap RRScreenChangeNotifyEvent dimensions when the screen has one crtc and it's rotated. + + RandR 1.1 clients expect the size fields in this event to be the unrotated + dimensions of the screen. This behavior is "weird", but that's the way the old + code worked so we need to be bug-compatible with it. + +commit e1dea151db6405e12d991feacba9446320739ee8 +Author: Brian +Date: Tue Apr 3 11:21:50 2007 -0600 + + Implement a minor hack in dmxCheckFunctionKeys() to detect special keys. + + Keep track of status of (left) alt/ctrl keys so that ctrl-alt-q to exit + can be detected. Not ideal, but works for now. + +commit 0ee40c935750e25a9e178cdd70f6b2c667e79344 +Author: Brian +Date: Tue Apr 3 09:31:00 2007 -0600 + + s/intead/instead/ + +commit 23974f20bf0e0c2786cc75af026af5484f6dc331 +Author: Brian +Date: Tue Apr 3 09:30:24 2007 -0600 + + add DDXRingBell() stub to solve link problem + +commit a240c039c47c0be22ea5e100692307b26d938747 +Author: Brian +Date: Tue Apr 3 09:27:57 2007 -0600 + + Split the xserver/fb/fbcmap.c file into two files. + + Now, fbcmap_mi.c contains the fb functions which just wrap mi functions. + Previously, these were in fbcmap.c and compiled when XFree86Server was defined. + Now, clients of fbcmap should either use fbcmap.c or fbcmap_mi.c and not worry + about setting the XFree86Server symbol. + +commit 1cc8db72816cd079f30255046e10043c350bf683 +Merge: 645d87c... a39f297... +Author: Matthieu Herrb +Date: Tue Apr 3 16:04:45 2007 +0200 + + Merge branch 'master' of ssh://herrb@git.freedesktop.org/git/xorg/xserver + +commit 645d87cf8ef724d4591614f9994cdc4d7549a7a8 +Author: Matthieu Herrb +Date: Tue Apr 3 15:47:18 2007 +0200 + + CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory Corruption + +commit a39f297ada4fa87c858395ae2aacefac5f8fba05 +Author: Keith Packard +Date: Mon Apr 2 14:15:36 2007 -0700 + + Don't erase current crtc for outputs on CloseScreen + + Erasing this variable causes some outputs (SDVO on intel) to fail + to be correctly reset at server reset time. + (cherry picked from commit 56262a4ee943f328d089a8eb4aa70b9a4bd5d135) + +commit 11797ffdcc22160317a5ebbc9291472570a51c6d +Author: Eric Anholt +Date: Mon Apr 2 18:21:58 2007 -0700 + + Move modes/ debugging output under Option "ModeDebug" in the Device section. + +commit e44f106ffc796c025abdfb66717c06db8b12b4e4 +Author: Brian +Date: Mon Apr 2 16:26:15 2007 -0600 + + clean-up, debug code + +commit 8d8bc8927760fad631bef83fa2841b455ff6d511 +Author: Brian +Date: Mon Apr 2 16:21:57 2007 -0600 + + fix formatting + +commit 3e482de7b145a5eed79b81c30c359fe43647824a +Author: Brian +Date: Mon Apr 2 15:38:15 2007 -0600 + + checkpoint: more clean-up + +commit 76a7a5ca1f068c27c9b5fbd49d5a1da80ed6f488 +Author: Brian +Date: Mon Apr 2 15:24:05 2007 -0600 + + formatting fixes + +commit 69baad321d35dae0bfa535be0c6ed2131fed1e60 +Author: Brian +Date: Mon Apr 2 15:21:22 2007 -0600 + + clean-up dmxCoreMotion() dmxCoreMotion2() + +commit 44eb15adeee3b299677070f39625daa53679bd13 +Author: Brian +Date: Mon Apr 2 15:12:04 2007 -0600 + + checkpoint clean-up + +commit 0f873a9d4f02b399c37b4058c6a9a2e21aa205e8 +Author: Brian +Date: Mon Apr 2 14:51:38 2007 -0600 + + remove some debug code + +commit 3a0ce1084a18e17a3c8a009d99c228652b8763a9 +Author: Brian +Date: Mon Apr 2 14:51:21 2007 -0600 + + for completeness, init dummy's min/maxval[1] values (vertical axis) + +commit 12016f20f7f5365f30cfbeb05568b3fb89759e5a +Author: Brian +Date: Mon Apr 2 14:50:48 2007 -0600 + + As for normal mouse device, init valuator maxval[] to real values, not zero. + +commit 0aaf28e5633a59563b89a2e42d19fabc84adc3ed +Author: Brian +Date: Mon Apr 2 12:41:30 2007 -0600 + + In dmxBackendMouGetInfo() initialize the info->minval[], maxval[] arrays to the size of the backend display. + + It seems that the changes to X input exposed a problem that wasn't detected + before. The axis clipping code in GetPointerEvents() uses those limits to + constrain the pointer's coordinate range. The max was zero so the pointer + couldn't move. + +commit 0013bf6ddb3867c9a504603434d8c2ec83f3f3bc +Author: Brian +Date: Mon Apr 2 12:39:04 2007 -0600 + + undo 1280 valuator hack + +commit 08a88d1803f672555141011e082fbc0edeedcf05 +Author: Brian +Date: Mon Apr 2 12:28:14 2007 -0600 + + Pass num_valuators=0 for ButtonPress/Release. This seems to fix the button coordinate problem + +commit 70683e338dacc48e3adf489d66ec33b29dfc3b77 +Author: Brian +Date: Mon Apr 2 12:26:27 2007 -0600 + + formatting fixes + +commit f2808005f4ee72c5fd7f5f3dcca181306485113e +Author: Alberto Mardegan +Date: Sat Mar 31 16:51:24 2007 +0200 + + Bug #6620: Fixed a missing 'else' in ATIPseudoDMAInit(). + + Before this, we'd write some registers twice on R200 hardware and also + possibly end up with a bad value in atis->cce_pri_size. + +commit 5257b32e492bd2082bef6a4cd0fea03ce093c0f8 +Author: Aaron Plattner +Date: Wed Mar 28 15:51:24 2007 -0700 + + Bump video driver ABI to 2.0 for cw change (commit 6ed08949af4f7ac09170d3d9581e4092b24a84ee). + +commit 73fdc16bc4f4e21ff604b3f9ded23b40398fb1b6 +Author: Brian +Date: Fri Mar 30 16:07:26 2007 -0600 + + formatting fixes + +commit ebdc8ce5c108dc3b6b0004e7c7939d1a5bef8676 +Author: Brian +Date: Fri Mar 30 16:05:46 2007 -0600 + + Checkpoint DMX updates: things are working much better now, but still not 100% right. + + Use new dmxCoreMotion2() function which enqueues motion events with + GetPointerEvents()/mieqEnqueue(). + The clipAxis() code in GetPointerEvents() is causing some grief. The + limits seem to have always been (0,0) according to the original calls + to InitValuatorAxisStruct() in dmxinputinit.c. + Terrible hack for now: Call InitValuatorAxisStruct() with hard-coded max + values of 1280 (my screen width). + +commit 3c7413e0c2f87e154aa8aa4a83bd585a6d1091e8 +Author: Brian +Date: Fri Mar 30 14:07:04 2007 -0600 + + Tweak some parameters, etc. Things seem a little better now, but still a ways to go. + +commit 7989dacdcb1449b10d7733dda11cd96e260e9fae +Author: Brian +Date: Fri Mar 30 13:44:24 2007 -0600 + + num_valuators=1 for GetPointerEvents(), hack ButtonPress/Release position + +commit 1ea842960fddbc6363cc6e7f914d70ba45525a6b +Author: Brian +Date: Fri Mar 30 13:43:15 2007 -0600 + + more debug + +commit 92e8cdbd32b0d86cabd4ad88e3240bf90c018b9a +Author: Brian +Date: Fri Mar 30 13:19:33 2007 -0600 + + Checkpoint fixes to DMX for X input changes. + + Xdmx builds and runs now. + Keyboard seems OK, and mouse pointer moves, but everything else is flakey. + Something is still seriously wrong. + +commit d92da3d5f309392ac398c0975ef17bb04312d5e2 +Author: Brian +Date: Fri Mar 30 12:56:34 2007 -0600 + + more formatting fixes + +commit 44acb2517d9fb07790d9d799aa9cc727d1b7d35c +Author: Brian +Date: Fri Mar 30 12:54:22 2007 -0600 + + Fix some bad formatting. + + Doing this: + if (something) stmt; + is evil if you're debugging and want to break on stmt! + +commit 9f24798af50896cc3262c1201f75c10a688f2a83 +Author: Brian +Date: Fri Mar 30 12:49:34 2007 -0600 + + ompile fbcmap.c w/ -DXFree86Server instead of linking libfbcmap.a. + + The former works, the later doesn't (DMX blows up on visuals/pixel formats). + This undos Daniel's patch, which undid my prev patch. Revisit someday. + +commit 76756f27561c6386cba0d338441e8ec7b98500ce +Author: George Sapountzis +Date: Thu Nov 30 04:20:32 2006 +0200 + + Make xf86glx.c unaware of Mesa internals + + Use newly added XMesaCopyContext() and drop the GlxSetRenderTables() call + for Xgl, as this is now done inside XMesaForceCurrent(). This leaves xmesaP.h + but only for the declarations of the three XMesa/XFree86 functions. Also, + GlxSetRenderTables() stays but is only used in hw/xgl/glxext/ . + + Also drop xf86glxint.h, no longer used. + + Depends on mesa commit 7439a36785b6a2783e80a40a96c09db8f56dc2bc of 2007-03-30. + +commit 307d2b57bbfcc281656011533627bea6ab98189e +Author: Peter Hutterer +Date: Thu Mar 29 15:23:41 2007 +0930 + + Xi: remove 'register' keywords. + +commit 82a8b99a6c46018885600011913267d8af9dfe13 +Author: Adam Jackson +Date: Wed Mar 28 15:17:02 2007 -0400 + + Move the XAA private indices to be static. + + Technically this is an ABI break, if you aren't smart enough to be using the + getter functions. Cope. + +commit 8c7f56d92d8471ee059c14d322af5f7f555dd5c6 +Author: Tomas Janousek +Date: Wed Mar 28 14:46:30 2007 -0400 + + Bug #10296: Fix timer rescheduling. + +commit 5ba4d9eedf1b4ce4795bf910cd184872e2d9b3fc +Author: Adam Jackson +Date: Wed Mar 28 12:03:19 2007 -0400 + + Refuse to create tiny modes from EDID detailed timing. + +commit 85220446359a75ea2c359b418b4051c04eea739c +Author: Daniel Stone +Date: Wed Mar 28 13:03:32 2007 +0300 + + GL: Update for Mesa changes + Added s_fragprog.c to fix the build. + +commit 1af2ef0b25fd8017a3271e624a5f1548f02b09f9 +Author: Eric Anholt +Date: Tue Mar 27 13:13:45 2007 -0700 + + Enable Composite by default now that it disables itself in the known bad cases. + +commit 0bfc3cc22db94ec6867596606fe93228e315c847 +Author: Eric Anholt +Date: Tue Mar 27 13:12:21 2007 -0700 + + Disable composite when Xinerama is active. + + It will likely take a decent bit of work to make that work right. + +commit 5e7936371c9e1ac48e19bf1e9e3f71f037fd9b5d +Author: Eric Anholt +Date: Mon Mar 26 20:18:18 2007 -0700 + + Disable Composite when the screen's visual is pseudocolor. + + Rendering fails badly in this case, and I don't care enough to fix it. + +commit 8afc7e2eb3ebec48d3879bf269143259c8bc18c8 +Author: Eric Anholt +Date: Mon Mar 26 15:55:38 2007 -0700 + + Refuse to initialize Composite if Render is not present. + + Composite relies on the presence of Render, in particular for the automatic + compositing. + +commit 6ed08949af4f7ac09170d3d9581e4092b24a84ee +Author: Eric Anholt +Date: Tue Mar 27 17:31:28 2007 -0700 + + Move libcw setup to the only renderer requiring it (XAA). + + Additionally, protect libcw setup behind checks for Render, to avoid + segfaulting if Render isn't available (xnest). + + The previous setup was an ABI-preserving dance, which is better nuked now. + Now, anything that needs libcw must explicitly initialize it, and + miDisableCompositeWrapper (previously only called by EXA and presumably binary + drivers) is gone. + +commit e76b6349516d5d1c8f7167d6f5419e0d06a546c3 +Author: Eric Anholt +Date: Mon Mar 26 16:04:50 2007 -0700 + + Fix indentation of fakexa help text. + +commit 6a0bed16e80a91891cee6c7033c90875bc2af193 +Author: Michel Dänzer +Date: Tue Mar 27 16:51:12 2007 +0200 + + Fix typo in GL/mesa/shader/slang/Makefile.am. + +commit b8f846a9dfc6697d59ad5482ba7c9d738875318e +Author: Dave Airlie +Date: Tue Mar 27 14:17:40 2007 +1000 + + gl: oops dodgy s appeared pointed out by jcristau on irc.. + +commit a63ee90bc2d490f6c5c1802c164391963cf6c1d9 +Author: Dave Airlie +Date: Tue Mar 27 11:05:52 2007 +1000 + + gl: update for latest mesa glsl-compiler merge + +commit d387a3ddf76716791e5e8b8f0954ca0df3c579d6 +Author: Dave Airlie +Date: Tue Mar 27 11:00:13 2007 +1000 + + fix loading of GLcore after recent loading changes + +commit 92ba435bd9aa7b6eca9aef8e5193576ef62fc9db +Author: Eric Anholt +Date: Mon Mar 26 12:44:58 2007 -0700 + + Update xorg.conf manpage for new RandR 1.2 monitor options. + +commit f7c5aa0dc0fa3569a2ee412c4f996960f936b6ed +Author: Eamon Walsh +Date: Mon Mar 26 10:21:44 2007 -0400 + + Remove dead NEED_DBE_BUF_BITS code. + +commit 2e3cc861f90415f200826bc71dab6298d759c42b +Author: Adam Jackson +Date: Sun Mar 25 22:01:34 2007 -0400 + + Since ddc, i2c, and ramdac are in core now, remove their ModuleData stubs. + +commit e88fa75c9b468b88bb7b87b1da235c6eb2fe8164 +Author: Adam Jackson +Date: Sun Mar 18 17:39:08 2007 -0400 + + Static cleanup on Xi/ + +commit 4b5802ddbd45271be3cadeae0a83a6742df2515b +Author: Adam Jackson +Date: Sun Mar 25 17:57:54 2007 -0400 + + General DIX static and dead code cleanup. + +commit 04b87d6dfae02e4ecdb5216d12c6cdafd1e8c2b4 +Author: Adam Jackson +Date: Sun Mar 25 17:57:22 2007 -0400 + + Static and dead code cleaup for Xext/ + +commit af769892a91c9af59de53ca3bcd77fc4967daffb +Author: Adam Jackson +Date: Sun Mar 25 17:56:32 2007 -0400 + + Static and dead code cleanup from mi/ + +commit 62224e39727fd6f1cf11a461983662f615a9fea1 +Author: Adam Jackson +Date: Sun Mar 25 17:55:15 2007 -0400 + + Static cleanup for xf86 ddx. + +commit e8bc1988d9ff10b65717574175f70df3c4d6334d +Author: Adam Jackson +Date: Sun Mar 25 15:13:05 2007 -0400 + + Un-staticise VTSwitchEnabled, since kbd wants it apparently. + +commit 70e493d223b1e943e652191150bd0b7e1a6ebcfb +Author: Adam Jackson +Date: Sun Mar 25 14:55:28 2007 -0400 + + Static and dead code cleanup over afb/ + +commit f36bf1a3e4ce9465ea4a6159c209924a3cafbe58 +Author: Adam Jackson +Date: Sun Mar 25 12:28:13 2007 -0400 + + Delete a dead file. + +commit 9a0f25de7ca3c68af867b38936103d17daa92ac6 +Author: Adam Jackson +Date: Sun Mar 25 12:27:01 2007 -0400 + + Static cleanups, dead code deletion. + +commit ac2356843e38b3400142bc54b65393c12976fc07 +Author: Peter Hutterer +Date: Sun Mar 25 09:41:33 2007 +0930 + + dix: Increase allocation size for core keyboard keymap to avoid buffer overrun when copying keymap from extension devices. + +commit 1072b88a8f352484e70bc749e300c936e5600480 +Author: Dave Airlie +Date: Sun Mar 25 10:06:00 2007 +1000 + + loader: fix already built-in message + +commit 804080a7096347d48c686f2c8fbfd06326bce400 +Author: Keith Packard +Date: Fri Mar 23 23:41:36 2007 -0700 + + Make pending properties force mode set. And, remove AttachScreen calls. + + Yes, two changes in one commit. Sorry 'bout that. + + The first change ensures that when pending property values have been + changed, a mode set to the current mode will actually do something, rather + than being identified as a no-op. In addition, the driver no longer needs to + manage the migration of pending to current values, that is handled both + within the xf86 mode setting code (to deal with non-RandR changes) as well + as within the RandR extension itself. + + The second change eliminates the two-call Create/AttachScreen stuff that was + done in a failed attempt to create RandR resources before the screen + structures were allocated. Merging these back into the Create function is + cleaner. + (cherry picked from commit 57e87e0d006cbf1f5b175fe02eeb981f741d92f0) + + Conflicts: + + randr/randrstr.h + randr/rrcrtc.c + + I think master and server-1.3-branch are more in sync now. + +commit 1f77120775dc05fc84a00dd55190af2fa50ae509 +Author: Keith Packard +Date: Fri Mar 23 14:39:10 2007 -0700 + + Ensure that crtc desired values track most recent mode. + + desiredX and desiredY were not recorded during xf86InitialConfiguration. + desiredX, desiredY and desiredRotation were not recorded during + xf86SetSingleMode. + (cherry picked from commit 36e5227215e0912ddf8a010db042467f00efe0fc) + +commit 476f2b5aefa518262b69e487555e6094818d857a +Author: Keith Packard +Date: Fri Mar 23 01:17:14 2007 -0700 + + Incorrect extra memory copy in RRChangeOutputProperty. + + Left over from previous version of the code, this memmove will break when + the mode is not Replace. + (cherry picked from commit 945aa0aa556429b50dea8e8ebc0008304b093eb7) + +commit 7093367c3976bef5b9d219d9f2a7dc7dd3eeb091 +Author: Keith Packard +Date: Fri Mar 23 01:05:55 2007 -0700 + + Fix Pending property API, adding RRPostPendingProperty. + + Pending Properties take effect when the driver says they do, so provide an + API to tell DIX when a property effect is made. Also, allow driver + to reject property values in RRChangeOutputProperty. + (cherry picked from commit 8eb288fbd69e2ffd02521d2c6a964c8180d08ec8) + +commit 86d76390eb182f271f5fa5dc19205e97a867f7e7 +Author: Keith Packard +Date: Fri Mar 23 01:03:40 2007 -0700 + + Make sure RandR events are delivered from RRCrtcSet. + + Some paths were skipping the event delivery stage. + (cherry picked from commit 9ca7ba5d6012295a77ed773c656e786440da973d) + +commit 510eaa346e68fd82c852c7b41fb0e2c5be12da78 +Author: Keith Packard +Date: Fri Mar 23 00:59:11 2007 -0700 + + Clean up xf86CrtcRec and xf86OutputRec objects at CloseScreen. + + Erase pointers to structures which are freed at server reset time. + (cherry picked from commit 492c768065f49306a2194a88edf96b85de0ff4ff) + +commit 479b2be4badab0a67b1f091feb83c1364e27d783 +Author: Keith Packard +Date: Fri Mar 23 00:57:18 2007 -0700 + + Clear allocated RandR screen private structure. + + Use xcalloc instead of xalloc when allocating this structure to ensure + consistent contents at startup. + (cherry picked from commit 16f4c0c1750824f2e5a001cef82a4122a7a2beb0) + +commit b63e0d2545bb75e14d9de019a88f31e20a2f7377 +Author: Keith Packard +Date: Tue Mar 20 07:17:27 2007 -0700 + + Clean up Rotate state on server reset. + + The rotation state is stored in the xf86_config structure which is not + re-initialized at server reset time. Clean it up at CloseScreen time. + (cherry picked from commit f8db7665dcd7af78ca4db2461e0bf787ec662cb1) + +commit 3e9f7a5504ab41d845e88f293d8498c963d8a7d8 +Author: Daniel Stone +Date: Wed Mar 21 02:35:31 2007 +0200 + + XFree86 DGA: Guard against NULL pointer dereferences. + Ass, u, me ... + +commit f292de2ef13dc994a38029cee9e2642576893332 +Author: Daniel Stone +Date: Wed Mar 21 02:04:12 2007 +0200 + + XKB: Fix size_syms calculation bug + + Apparently it needed to be nSyms*15/10, not *12/10; make it match the + other allocation code. + +commit f34b9a20b0181d3c2641c305e91180711afbd4b9 +Author: Daniel Stone +Date: Wed Mar 21 02:03:37 2007 +0200 + + XKB: Be a tiny bit more conservative with type allocation + + Make sure size_types will _always_ be 0 if we don't have any types. + +commit 021fc5cb2cb4a7972b4a6fcb570c1da92787d68d +Author: Adam Jackson +Date: Sun Mar 18 16:31:19 2007 -0400 + + Static markup and dead code cull over xkb/. + + The former has been pulled into the server now as + include/xkbsrv.h, and the world updated to look for it in the new place, + since it made no sense to define server API in an extension header. Any + further work along this line will need to do similar things with XKBgeom.h + and friends. + +commit 9398d62f27ee1b287e4458fd8b011c10f7b59efd +Author: Daniel Stone +Date: Wed Mar 21 00:18:24 2007 +0200 + + XFree86 input: Add backwards compatibility for motion history + Add the old motion history API back, as a shim around the new mi API. + +commit 0f75c47e0c5f4b2778930a6fabf894fc1dffd9d3 +Author: Daniel Stone +Date: Wed Mar 21 00:12:02 2007 +0200 + + xfree86 input: Re-enable DGA support + Re-enable DGA support for relative mouse motion. + +commit 80d29475b9a2ebbb303a8e324e09a15c528d5556 +Author: Daniel Stone +Date: Wed Mar 21 00:10:38 2007 +0200 + + mieq: Allow event handlers for arbitrary events to be set + Allow arbitrary events to use mieq by letting custom handlers be set. + +commit b8df961843a95b29258ae9c5d46ccfc620d8de1c +Author: Alan Coopersmith +Date: Mon Mar 19 18:03:26 2007 -0700 + + Define XF86PM on Solaris x86 builds now that we have sun_apm.c + +commit 720f302d241e88e6e9f2962207da1aa9a79728b7 +Author: Keith Packard +Date: Sat Mar 17 20:14:05 2007 -0700 + + Slow down DDC I2C bus using a RiseFallTime of 20us for old monitors. + + This time value makes the bus run slowly enough for even the least reliable + of monitors. Thanks to Pavel Troller for finding the necessary change. + +commit b5a8a71e64c76b8dd42962cbd7984215c6ce4aa8 +Author: Keith Packard +Date: Sat Mar 17 17:26:11 2007 -0700 + + Remove extra (and wrong) I2C ByteTimeout setting in DDC code. + + The DDC code sets the I2C timeouts to VESA standards, except that it had an + extra setting of the ByteTimeout value which was wrong (off by a factor of + 50). Removing this should help DDC work on many more monitors. Note that the + Intel driver duplicated these settings, along with the error. Yay for cult + and paste coding. + +commit 2489dae9f7def788910eee5733931392df83a0d6 +Author: Keith Packard +Date: Thu Mar 15 20:26:07 2007 -0700 + + Correct ref counting of RRMode structures + + RRModes are referenced by the resource db, RROutput and RRCrtc structures. + Ensure that the mode reference count is decremented each time a reference is + lost from one of these sources. The missing destroys were in + RRCrtcDestroyResource and RROutputDestroyResource, which only happen at + server reset time, so modes would be unavailable in subsequent server + generations. + +commit 9d0c3b52f25df89738fb1a62ccffda8c8cbb4689 +Author: Keith Packard +Date: Tue Feb 20 23:04:26 2007 -0800 + + Eliminate RRModeRec devPrivate field. + + The xf86 mode setting code was mis-using this field to try and store a + pointer to a DisplayModeRec, however, each output has its own copy of every + DisplayModeRec leaving the one in in the RRModeRec devPrivate field pointing + at a random DisplayModeRec. + + Instead of attempting to rectify this, eliminating the devPrivate entirely + turned out to be very easy; the DDX code now accepts an arbitrary RRModeRec + structure and set that to the hardware, converting it on the fly to a + DisplayModeRec as needed. + (cherry picked from commit 3506b9376c2b0db09bfff58d64e07af88a6e8195) + +commit 2c93083edd29a65e73bb2e8eff9d353e92845c9b +Author: Keith Packard +Date: Sun Feb 18 23:49:38 2007 -0800 + + Add support for user-defined modelines in RandR. + + The RandR protocol spec has several requests in support of user-defined + modes, but the implementation was stubbed out inside the X server. Fill out + the DIX portion and start on the xf86 DDX portion. It might be necessary to + add more code to the DDX to insert the user-defined modes into the output + mode list. + (cherry picked from commit 63cc2a51ef87130c632a874672a8c9167f14314e) + + Conflicts: + + randr/randrstr.h + + Updated code to work in master with recent security API changes. + +commit 3bffb281260476d2f74f0bf451d85d2f7cacd6c4 +Author: Keith Packard +Date: Thu Mar 15 16:16:16 2007 -0700 + + Don't wedge when rotating more than one CRTC. + + Rotation block handler was re-registering the rotation damage structure, + creating an infinite loop in the damage code. Track registration of the + damage structure to avoid this. + (cherry picked from commit b14f003b0ed1252766c9e3b1c086ea2809521047) + +commit 9562b6abe1da566cf73a08c4f4c4339fb67fbc71 +Author: Keith Packard +Date: Thu Mar 15 10:50:45 2007 -0700 + + Allow xf86_reload_cursors during server init. + + xf86_reload_cursors is supposed to be called from the crtc mode setting + commit hook; as that happens during server initialization, check for this + case. + (cherry picked from commit 5b77bf2d020b1ee56c1c5f2db089a8f7f64a76a6) + +commit 3b71b0f89f1db837da91650baa0ef4bb7ef2e98f +Author: Eric Anholt +Date: Thu Mar 15 13:21:00 2007 -0700 + + Set the RandR version returned, rather than just passing the proto's version. + +commit 2fe74ef339c3a4902ae8214f5a0454662895422c +Author: Matthias Hopf +Date: Thu Mar 15 16:56:01 2007 +0100 + + Fix calculations in x86 emulator for the long long case (Andreas Schwab). + +commit ae75019ccf1edac9e8be31b6a96293624f672ccb +Author: Keith Packard +Date: Wed Mar 14 23:59:29 2007 -0700 + + Create driver-independent CRTC-based cursor layer. + + This moves most of the cursor management code out of the intel driver and + into the general server code. Of course, the hope is that this code will be + useful for other driver writers as well. + + Check out xf86Crtc.h for the usage information, making sure you add the + needed hooks to the crtc funcs structure for your driver. + (cherry picked from commit 4d81c99a4660a0bf9014f789de55edabd185bd14) + +commit 4bf1b280f7cb676ec2b172f26dd2ad9bac2eb2ca +Author: Alan Hourihane +Date: Fri Mar 9 14:18:14 2007 +0000 + + Set pScreen on context + +commit c366b82bd50066019cf82b3464445d5bc27d6f9f +Author: Jay Estabrook +Date: Fri Mar 9 12:26:55 2007 +0000 + + Ensure domain is stripped from the bus ID. + +commit 405483496538f1c82cbd7fe1e76c5d94e1a90525 +Author: Peter Hutterer +Date: Fri Mar 9 14:16:23 2007 +1030 + + mi: remove 'register' keywords. + +commit 63169ce52d354b4345dcfc46b89f0ea88379718f +Author: Peter Hutterer +Date: Thu Mar 8 17:50:19 2007 +1030 + + dix: remove 'register' keyword for all variables. + +commit 40ae4f246d8818410490236ab183204a84765629 +Author: Keith Packard +Date: Wed Mar 7 20:52:31 2007 -0800 + + Remove stale monitor data when output becomes disconnected. + + Remove parsed EDID and EDID property from disconnected outputs. + (cherry picked from commit ae9d5aa479dd50cc81b755079fcf96a0d02f135a) + +commit b5fde366e2e21234ac0b81222fd5c42ca3e49cba +Author: Eamon Walsh +Date: Wed Mar 7 12:29:55 2007 -0500 + + Properly free device devPrivates - memory leak fix. + +commit a3d2c5d622d9ca36d6fa2966aff09524e3ea39ac +Author: Adam Jackson +Date: Wed Mar 7 11:02:47 2007 -0500 + + XORG_VERSION_CURRENT, not XF86_VERSION_CURRENT. + + If only this was the least wrong thing in this code. + +commit e9bfb2b3d7dfaafd90d2ad0fa3d0e1acced4380b +Author: Keith Packard +Date: Tue Mar 6 23:19:30 2007 -0800 + + Add hw/xfree86/docs/README.modes, documenting new mode setting APIs. + + This document covers both API and xorg.conf usage of the new mode setting + APIs. + (cherry picked from commit a59c31b0f7b94ed1f395c7586c37ef5fe7ba2a25) + +commit 72a23d88d73a8c72ed18847b004db05092d3e7be +Author: Keith Packard +Date: Tue Mar 6 23:15:34 2007 -0800 + + Add xf86CrtcScreenInit to share initialization across drivers. + + xf86CrtcScreenInit performs initialization that needs to happen at + ScreenInit time. + (cherry picked from commit 558a4f5588ad2ec11254e0b5d6ce9515b137369e) + +commit 81526232bc0119d2ec7b8590be4f78cf066ae359 +Author: Eamon Walsh +Date: Tue Mar 6 17:19:11 2007 -0500 + + remove PIXPRIV check as this flag is always set. + +commit a7cd53deb99957dec27a55ffd75e548b322ae0ce +Author: Eamon Walsh +Date: Tue Mar 6 15:32:13 2007 -0500 + + remove PIXPRIV checks as this flag is always set. + +commit 024bbc7cbb924daaf3e305ddfc8e74509acd1e15 +Author: Eric Anholt +Date: Tue Mar 6 16:18:59 2007 -0800 + + Bug #9931: Fix linear allocations with a non-1-byte granularity. + + This was introduced in 83080809f9a1c1d24b0318e54632f25f5940da25. Instead of + aligning the offset, it doubled it. Results were appropriately spectacular. + +commit 9d94c137596d3f9d9118ec70455b7a30b3582046 +Author: Ben Byer +Date: Tue Mar 6 11:09:30 2007 -0800 + + updated todo list + +commit 81d581e655fc989da3be4256b83849a63b8607b7 +Merge: a05ffca... d5aba03... +Author: Ben Byer +Date: Tue Mar 6 10:37:29 2007 -0800 + + Merge branch 'master' of git+ssh://bbyer@git.freedesktop.org/git/xorg/xserver + +commit a05ffca8dd0da9bdb5c1bf4c481028aeabf21e34 +Author: Ben Byer +Date: Tue Mar 6 10:36:51 2007 -0800 + + rewrote event handling, Xquartz now has working mouse and keyboard. use it\! + +commit d5aba03feff41722c72b4c6193f09d141cbf1678 +Author: Drew Parsons +Date: Tue Mar 6 23:53:23 2007 +1100 + + Xprint: shorten font filename to fit in tar length limit + + The length of the Xprint font file NewCenturySchlbk-BoldItalic.pmf + pushes the full path over the traditional 100 character limit for + tarballs (when module version number is included). Shorten it to + NewCentSchlbk-BoldItal.pmf to get back below the limit and rename + other font files in that family to match. + +commit 3206e9225897989638ad553e1f392b918ac4d21f +Author: Ben Byer +Date: Tue Mar 6 02:31:59 2007 -0800 + + moved new event-handling code from X11Application.m to darwinEvents.c in preparation for making all Darwin servers use it + +commit 0ccd1443fd6db397b42e5b99ce733ce1316c785e +Merge: ec1ef8a... 9b6bb06... +Author: Ben Byer +Date: Tue Mar 6 01:04:50 2007 -0800 + + Merge branch 'master' of git+ssh://bbyer@git.freedesktop.org/git/xorg/xserver + +commit ec1ef8a56d6217ca2b04899043874ce0bcad9784 +Author: Ben Byer +Date: Tue Mar 6 00:57:23 2007 -0800 + + Fixed Darwin's Makefile.am to fix a problem building X11.app + +commit 9b6bb06f13a71f6078f762b4a78fa516faccb638 +Author: Keith Packard +Date: Mon Mar 5 23:49:35 2007 -0800 + + Allow relative positions to use output names or monitor identifiers. + + Previous version used monitor identifiers if present, otherwise output + names. That caused existing working configurations to break when additional + information was added to the configuration file. + (cherry picked from commit 3f5cedf00a82f08a433c95ffbb7f8ac69dcf6a50) + +commit bed76caa6caaea6a6598755b82a54425a9d9f73e +Author: Keith Packard +Date: Mon Mar 5 23:36:00 2007 -0800 + + Use EDID data to set screen physical size at server startup. + + Screen physical size is set to a random value before the RandR code gets + control, override that and reset it to a value based on the compat_output + physical size (if available). If that output has no physical size, just use + 96dpi as the default resolution and set the physical size as appropriate. + (cherry picked from commit 843077f23a1b49bd712d931421753e3a09d4008c) + +commit 47f8361c3a64834587e54507653d8d5b258c2530 +Author: Keith Packard +Date: Mon Mar 5 22:07:01 2007 -0800 + + Add xf86SetDesiredModes to apply desired modes to crtcs. + + xf86SetDesiredModes applies the desired modes to each crtc (as selected by + xf86InitialConfiguration initially and modified by successful mode settings + afterwards). For crtcs without a desired mode, pScrn->currentMode is used to + select something workable. + (cherry picked from commit bcade98ccaa18298d844a606cb44271f0254c185) + +commit 33d2cf93fb50464941e74efe246b10aee212223a +Author: Keith Packard +Date: Sat Mar 3 23:10:31 2007 -0800 + + Move xf86SetSingleMode into X server from intel driver. + + This function applies a single mode to the screen (as from RandR 1.1, + XFree86-VidModeExtension or XFree86-DGA) using a policy that selects one + output to reconfigure to the requested mode and then makes all other outputs + fit within that size. + (cherry picked from commit 5a595c1f767a8d666348b845d18934aee0cfe38f) + +commit 689d52b6242434507a64a8fff27b01607628c393 +Author: Jens Granseuer +Date: Mon Mar 5 15:31:44 2007 -0800 + + Bugzilla #7145: fix build with gcc 2.95 + + Bugzilla #7145: + Patch #8987: + +commit fe7b8f4237874e3e45fe25a6bf06faddfa1ab8e1 +Author: Ben Byer +Date: Mon Mar 5 03:48:27 2007 -0800 + + began to factor out code to move to darwinEvents.c + +commit 537dc5ecde46d0525c503d1d2b39b6eb89a1298e +Author: Ben Byer +Date: Mon Mar 5 02:30:56 2007 -0800 + + started moving new input code into darwinEvents.c so that it may be shared by the three servers + +commit 8ba5e8d82014b774a52f3e050ddbbb8bde4e0933 +Author: Dave Airlie +Date: Mon Mar 5 13:46:41 2007 +1100 + + add a standard connector type and name for us as an output property + +commit 2e31872e05c2408d53ba0182bcddc5dabb3615fe +Author: Dave Airlie +Date: Mon Feb 26 09:40:00 2007 +1100 + + modes: add commit/prepare hooks + +commit 06b01186f6ae17aafdd1f628c306466ddea9e065 +Author: Keith Packard +Date: Sun Mar 4 17:15:24 2007 -0800 + + Remove debugging ErrorF from rotation code. + (cherry picked from commit e6af7569f201842b4754aec6e72b30dc2daefdfb) + +commit c14507b6837387d867792a24778786311b2b38d5 +Author: Keith Packard +Date: Sun Mar 4 17:06:37 2007 -0800 + + Handle non-zero origin rotated crtc. Damage crtc area on re-rotate. + + Box transformation from source to dest area was broken, leaving the wrong + areas painted when the crtc origin was non-zero. + + When rotating from left to right, the pixmap doesn't get reallocated, and so + no damage was left in the pixmap from xf86RotatePrepare. Separately damage + the whole crtc area when this occurs to repaint the area. + (cherry picked from commit 2a50ca2160bc05af1c24421ec079e902ff730277) + +commit 97978b515b7af5fbaaa32b1729e835f3bfb9f5c6 +Author: Drew Parsons +Date: Sun Mar 4 16:28:54 2007 +1100 + + Xprint: fix font symlinks + + Change symlinks to Xprint base fonts in model/PSdefault using local + relative links. This facilitates moving the Xprint config files, for + instance for FHS compliance placing data files in /usr/share rather + than /usr/lib. Also ensures NewCenturySchlbk-BoldItalic.pmf is + installed. + +commit 215e3691b76a63e6af19865790193b20b105ec5a +Author: Ben Byer +Date: Sat Mar 3 21:52:56 2007 -0800 + + stopped using XTrans internals in X11.app because they're apparently no longer public + +commit ea8dcc458ea8870126cf8d3e21cab9d63d094c5e +Author: Ben Byer +Date: Sat Mar 3 21:51:20 2007 -0800 + + Makefile fix for X11.app + +commit 18508212599bf0964c450c69b9790208e5d428be +Author: Ben Byer +Date: Sat Mar 3 21:41:33 2007 -0800 + + fixed X11.xcodeproj to get CFLAGS and LDFLAGS from autoconf script + +commit 7f2b9f3790456044d01bf8e6404f9a1239b41da6 +Author: Ben Byer +Date: Sat Mar 3 19:27:53 2007 -0800 + + autoconf fixes for XDarwin (created DARWIN_LIBS) + +commit ea1a72946d1aa4c256e6afb9d834c582ba4ac3a1 +Author: Aaron Plattner +Date: Wed Feb 28 14:26:47 2007 -0800 + + Add a canGrow argument to xf86InitialConfiguration. + + canGrow indicates to the DDX that the driver can enlarge the desktop via the + xf86_config->funcs->resize hook. If so, xf86InitialConfiguration will set + virtual[XY] to match the configuration it chooses and will leave the crtc config + size ranges alone. If FALSE, it will bloat the screen to fit the largest probed + mode and also set the crtc config max size to limit the desktop to the initial + virtual[XY] size. + +commit 04d15da95d608766c7832a7aa881be499c1395ba +Author: Aaron Plattner +Date: Wed Feb 28 13:36:58 2007 -0800 + + Add a screen resize hook to xf86CrtcConfigRec. + + This hook is called when the DDX needs to resize the screen. The driver is + responsible for changing virtualX and virtualY, along with any other related + screen properties (devPrivate.ptr, devKind, displayWidth, etc.). + + Use the size range from the crtc config instead of randrp->virtual[XY] when + reporting the min and max screen sizes to the DDX. + +commit b11dfac287d65de7b83f63749087cba4e8ddaf4a +Author: Matthias Hopf +Date: Fri Mar 2 12:30:26 2007 +0100 + + Legacy framebuffer support wasn't compiled if Xorg wasn't explicitly enabled. + +commit 2dafc46e3d814e02b25e5a2fa2e931f0257402a8 +Author: Ben Byer +Date: Thu Mar 1 17:44:39 2007 -0800 + + Fixed pointer events in Xquartz -- Keyboard events work, but + the keycodes are incorrect. + +commit 39ecd6fff4f946deebe310b4b26b171c842db223 +Author: Ben Byer +Date: Thu Mar 1 01:45:19 2007 -0800 + + Rewrote parts of the Xquartz event-handling code (thanks daniels and whot!) + It should still be considered a work in progress, but mouse events almost work. + +commit ed7ccc481ad1caaa518cafe944c2327a5d0b6c65 +Author: Ben Byer +Date: Thu Mar 1 00:51:10 2007 -0800 + + AIGLX support for Darwin -- works well enough to run + glxgears and glxinfo, but still needs more testing. + +commit 90ca76ba28fcd8bed945e33cf9674784fa2eb533 +Author: Jay Cotton +Date: Wed Feb 28 17:40:58 2007 -0800 + + Add sun_apm.c for Suspend-and-Resume support on Solaris + + + +commit 06c3021aec720837bef432656e88ae9b4e35101d +Author: Aaron Plattner +Date: Wed Feb 28 16:09:11 2007 -0800 + + Don't crash setting a NULL mode with a randr classic DDX. Also remember to update the screen size during modesets. + +commit 68c64ad7b1eea79c786b5a7f3459076780163a47 +Author: Peter Hutterer +Date: Thu Mar 1 09:51:20 2007 +1030 + + Xext: Update device's lastx/lasty when sending a motion event with XTest. + +commit 8b245758845523d5f8f017bb9d0e9aa57b616c28 +Author: Aaron Plattner +Date: Mon Feb 26 17:45:40 2007 -0800 + + Return BadMatch if a client tries to clone non-cloneable outputs. + +commit d9bcb22d199e8444b9762a35754e04d327dd5915 +Merge: 272d934... c16343a... +Author: Ben Byer +Date: Tue Feb 27 16:28:20 2007 -0800 + + Merge branch 'master' of git+ssh://bbyer@git.freedesktop.org/git/xorg/xserver + +commit 272d9341d0f7c3e9e0c9b9a8c0d4d8779cdcc5cf +Author: Ben Byer +Date: Tue Feb 27 16:27:26 2007 -0800 + + fix for hw/darwin/Makefile.am to properly use XSERVER_LIBS + +commit c16343ac2ca18391b21022b2edd02ad9f413d2b3 +Author: Eamon Walsh +Date: Tue Feb 27 14:14:47 2007 -0500 + + Make mfb, cfb, and afb support configurable at build-time. + +commit 5680efc0d2baf0a9451e82e490e3690fc23dda0f +Author: Alan Coopersmith +Date: Tue Feb 27 09:55:48 2007 -0800 + + Sun bug 6529003: Xorg should not be including on Solaris + + was removed from the latest Solaris Nevada build, but it's + been useless to Xorg for a long time (it only declared a couple of kernel + variables) + + +commit ab0fc8c1ad7ea2dc3389a4a4bb1c45bbded5e7ad +Author: Ben Byer +Date: Tue Feb 27 00:14:35 2007 -0800 + + verbiage corrected per daniels + +commit cdd4c84572cc3bdd004f8dca6d8b64e710344ac0 +Author: Ben Byer +Date: Mon Feb 26 23:57:02 2007 -0800 + + added hw/darwin/README.apple file with some todo items and props. + +commit 776d4d6587c57f94bca8732f915d07a0d4e137c8 +Author: Ben Byer +Date: Mon Feb 26 23:40:00 2007 -0800 + + X11.app now builds correctly + +commit 154d2c13f4ec22b7e6332808bbcd049d63784891 +Author: Ben Byer +Date: Mon Feb 26 19:39:26 2007 -0800 + + more changes for X11.app + +commit fa06e11f972e2a75c84b2f1586997ffc1239cbd9 +Author: Ben Byer +Date: Mon Feb 26 17:06:53 2007 -0800 + + added hw/darwin/apple directory, which contains source and data files to build + a version of the X11.app shipped with Mac OS X, using the X.org server. + +commit a16360733ea393ec1fc267e88fc604d9d7534484 +Author: Jay Estabrook +Date: Sun Feb 25 19:58:26 2007 +0000 + + Fix root bus/domain selection on alpha + +commit 566610680c4e1cab3e7fc7146adbeaba52fdd0ad +Author: Adam Jackson +Date: Fri Feb 23 15:20:35 2007 -0500 + + Don't install libi2c.a + +commit af550ea91c451cf4f831c2413266a19d1f211d0e +Author: Alan Coopersmith +Date: Thu Feb 22 14:38:40 2007 -0800 + + Move SecurityPolicy file format from Xserver(1) to it's own man page + + Don't make users looking for Xserver information page through pages of + details only interesting to the handful of people writing security policies. + +commit b1142cdbce76fed8cb22ba6d7ac027751dd56a76 +Author: Brice Goglin +Date: Thu Feb 22 12:26:04 2007 -0800 + + Bug #10034: 'man Xserver' typos: s/dqoute/dquote/ + + Bugzilla #10034: + Patch #8780: + +commit 3344a4eda704edc7dc30037f095de277a60a70bb +Author: Michel Dänzer +Date: Thu Feb 15 16:27:50 2007 +0100 + + DRI: Make sure number of DRI windows is accurate in driver ClipNotify hook. + + Always call DRI{De,In}creaseNumberVisible (which in turn calls + DRIDriverClipNotify) after updating pDRIPriv->nrWindows. + +commit 3c7a27dc77595ad018bb7c4f7cef6bc178268cb6 +Author: Michel Dänzer +Date: Wed Feb 14 16:17:18 2007 +0100 + + DRI: New ClipNotify driver hook. + + The hook is called whenever the clipList of any DRI window changes, be it via + DRIClipNotify, DRICreateDrawable or DRIDrawablePrivDelete. This allows the + driver to keep track of which DRI windows are visible where. + +commit eedf148e5a1273ebbf4dc8dcac9c435712fc00ea +Author: Michel Dänzer +Date: Fri Feb 2 18:27:40 2007 +0100 + + Track number of visible DRI windows separately for transitions. + + This allows e.g. doing page flipping with multiple DRI windows as long as + only one of them is visible. + +commit 8a42af6a935b1cf0e15102e986bb527f4fab31a8 +Author: Keith Packard +Date: Mon Feb 19 15:28:37 2007 -0800 + + Check for clientGone before sending events from XFixes (bug #1753). + + Freeing resources during client closedown can cause cursor changes which + attempt to send cursor events through the XFixes extension; a client in the + process of closing down has no file to send events to, causing a crash when + this path is hit. + +commit 4660eaaffb36f526f71d5847ae1309c10ee133c6 +Author: Ben Byer +Date: Sun Feb 18 14:09:51 2007 -0800 + + configure fixes for darwin + +commit 5631a67f648f5f151a849a918ee12871c71c32e9 +Author: Keith Packard +Date: Fri Feb 16 10:06:22 2007 -0800 + + Don't set subpixel order during startup; the screen won't be ready. + + in xf86CrtcSetMode, scrn->pScreen will be NULL during server startup time, + so don't try to set the subpixel order. subpixel order will be set in the + randr initialization anyways. + (cherry picked from commit 5f6f8616d862ce4a37f6d3df4bdbc44fd21cc82a) + +commit 096965ec9c7514f0c9fc0d17e5166f2d26781f87 +Author: Keith Packard +Date: Fri Feb 16 02:17:11 2007 -0800 + + Ensure drivers can use new modes header files. + + New modes header files required a few minor changes to be used by external + drivers, the most notable of which is the publication of the config file + parser header files. + +commit 55797dd252382d35ebab5d9e18a5e0e77872d775 +Author: Keith Packard +Date: Fri Feb 16 00:56:00 2007 -0800 + + Respect rotation in initial screen size computation. + +commit e4507825bf0328ea59673f2bbe652de3a9105c86 +Author: Keith Packard +Date: Fri Feb 16 00:41:29 2007 -0800 + + Enable startup-time rotation; change rotation pixmap creation API. + + Add monitor "Rotate" option taking one of "normal", "left", "inverted" or + "right". However, because initial mode selection is made before the screen + is completely initialized, we cannot create the shadow pixmap object at this + point. Pend the shadow pixmap creation until the block handler. + + Note that this code is not completely functional yet. + +commit 8606aeb9b2ab2dafc11e64436db4d3a7e67dbcc0 +Author: Keith Packard +Date: Thu Feb 15 22:23:16 2007 -0800 + + RRConfigureOutputProperty is a variable length request. + + Replace REQUEST_SIZE_MATCH with REQUEST_AT_LEAST_SIZE + +commit a88844eccb0e423e71d4fcb286866a026308babd +Author: Daniel Stone +Date: Sat Feb 17 20:35:07 2007 +0200 + + configure.ac: disable dmx per default + + Disable DMX until it gets ported to the new input API. + +commit e9a2cc7d9fcc73e16576be2522522cce675dc3f3 +Author: Daniel Stone +Date: Sat Feb 17 16:17:48 2007 +0200 + + config: error message cleanup + + Demote failure to connect from ErrorF to DebugF. + +commit 81876bc5ddc2f3eda5078fe4bd101917fb32e586 +Author: Ben Byer +Date: Sat Feb 17 04:07:11 2007 -0800 + + oops, missed a spot + +commit d287b76471f66c9aea54f969d050b35643cb2501 +Author: Ben Byer +Date: Sat Feb 17 03:47:42 2007 -0800 + + cleaned up some linking ugliness in hw/darwin/quartz + +commit 81444486be4f182dde778bac6f7edcbfc4368482 +Author: Ben Byer +Date: Sat Feb 17 02:23:11 2007 -0800 + + autoconf goodness for XDarwin, courtesy of pogma + +commit cf4994b0db2fef4c10ce8804adef766bc5118daf +Author: Ben Byer +Date: Sat Feb 17 01:21:43 2007 -0800 + + dix mods for Darwin + +commit cece0601571f6304e392a3a40505664544b249f3 +Author: Ben Byer +Date: Sat Feb 17 01:00:13 2007 -0800 + + build fix for configure.ac / BUILD_DARWIN, oops + +commit 00b0657b815b95964401c3e36eed54063afbd003 +Author: Ben Byer +Date: Sat Feb 17 00:55:32 2007 -0800 + + glx fixes for XDarwin + +commit 93777c7b96e560da087963040e372aecbfca7bbc +Author: Ben Byer +Date: Sat Feb 17 00:22:39 2007 -0800 + + more patches to make the Quartz part of XDarwin work again + (thanks Peter and Torrey!) + +commit 612144c811fdf06b7c03cf48a321388fe411acd4 +Author: Ben Byer +Date: Sat Feb 17 00:09:58 2007 -0800 + + More build fixes / updates for XDarwin: + quartz/cr: "Cocoa Rootless" support (deprecated in favor of xpr?) + quartz/fullscreen: Fullscreen support using Xplugin (not yet functional) + +commit 68d39d8571d8717d26cedc84015d537549520a14 +Author: Daniel Stone +Date: Fri Feb 16 23:02:13 2007 +0200 + + kdrive/ephyr: fix keysym type confusion once and for all + + Take keysyms in as an XID in hostx_load_keymap() and explicitly + convert them to CARD32 for loading into the server. Fixes Xephyr on + AMD64, wa-hey. + +commit 5507cb885d861e974be240120ada2ace2a980a72 +Author: Daniel Stone +Date: Fri Feb 16 23:01:27 2007 +0200 + + kdrive: delete input debugging, yet again ... + + I have no idea how this keeps on coming back. + +commit 84efe23ae834dd3a4d3f3e08832b69469c7382aa +Author: Ben Byer +Date: Fri Feb 16 04:37:38 2007 -0800 + + updated darwin/quartz/xpr (libXplugin interface for Mac OS X) support + +commit 5e7f7436a755a33e48ab91831cc6af710a8344ef +Author: Ben Byer +Date: Fri Feb 16 04:12:26 2007 -0800 + + merged in miext/rootless changes for XDarwin support + +commit f350909d1696fcfda87e8f12c729254d762313c9 +Author: Keith Packard +Date: Thu Feb 15 21:50:48 2007 -0800 + + Kludge around duplicate code added in hw/xfree86/modes. + + Code added in hw/xfree86/modes came from the server-1.3-branch. + Portions of this code had previously been integrated into xf86Mode.c + and edid_modes.c. + + To preserve hw/xfree86/modes as much as possible, the duplicate code from + the other files has been disabled; a more careful review would figure out + where that code actually belonged. + +commit 258beebc77510f84fbea66d6ebf29c5097bd11db +Author: Keith Packard +Date: Thu Feb 15 20:13:15 2007 -0800 + + Report correct RandR 1.0 sizeID. Report correct subpixel order. + + RandR 1.0 sizeID must be computed the same way every time, so when reporting + it in the ScreenChangeNotify event, just construct the usual 1.0 data block + and use that. + + subpixel geometry information can be computed by looking at the connected + outputs and finding any with subpixel geometry and using one of those for + the global screen subpixel geometry. This might be improved by reporting + None if more than one screen has information and they conflict. + +commit ef6b1235fd7d6dc422e8a150c089496a8e648067 +Author: Keith Packard +Date: Thu Feb 15 11:27:35 2007 -0800 + + Allow new modes code to build inside drivers as well as server. + + Use config.h for driver builds where xorg-config.h isn't available. + +commit 3dbe8f6b6ea32a9a137ad6e9235f74009b095bd8 +Author: Tilman Sauerbeck +Date: Thu Feb 15 17:51:01 2007 +0100 + + Distribute hw/xfree86/modes. + +commit d4eb4d065032112a38444e36f791cb468a5ca8f4 +Author: Keith Packard +Date: Thu Feb 15 20:36:20 2007 -0800 + + Merge crtc/output-based mode selection code. + + This code comes from the intel driver, so there's no history in this tree. + + As the crtc/output-based mode selection code uses ddc, the ddc and i2c + modules have been merged into the server. Attempts to load them are safely + ignored now. + +commit 37fe4c49dc3a5faf2d3d56112b6bd78453045f6a +Author: Peter Hutterer +Date: Fri Feb 16 09:57:57 2007 +1030 + + mi: Move WarpPointer event generation to miPointerMove to avoid duplicate + events, cache event array allocation. + +commit c2f3f705f1db8ca78292912544a7e416116175f3 +Author: Eamon Walsh +Date: Thu Feb 15 14:38:24 2007 -0500 + + Bug #6988: Change behavior of Security extension per user feature request. + +commit 811675733e97416c990e6dc9c19271b43d96248d +Author: Daniel Stone +Date: Thu Feb 15 19:09:00 2007 +0200 + + os: fix client privates leak + Minor leak here. Oops. + +commit 8f6961d385bda92703f18090cff551409d2710c9 +Author: Daniel Stone +Date: Thu Feb 15 19:08:46 2007 +0200 + + configure.ac: add xdarwin stubs + Add stub AM_CONDITIONALs to at least fix the build. + +commit a3b62623b8aac56b219633bdb2c2f6de19b0580b +Author: Daniel Stone +Date: Thu Feb 15 17:07:42 2007 +0200 + + change versioning for new server version scheme + See: + http://xorg.freedesktop.org/wiki/XDC2007Notes#head-2719037a1905516c45cf74f0e155c8703221e446 + +commit 0f6dd4aea6176507dbe1c90c950d332fecbcaacb +Author: Daniel Stone +Date: Thu Feb 15 16:14:57 2007 +0200 + + kdrive/ephyr: free screen struct + Free screen->driver on screenFini, instead of just leaking it. + +commit 9ecf79ca0111dd899ca88dd54156f71013220fcc +Author: Ben Byer +Date: Thu Feb 15 05:22:21 2007 -0800 + + Beginnings of an update Darwin driver + +commit 136bb4874aadf4a731d7eb8671e8bb641f9980a7 +Author: Ben Byer +Date: Thu Feb 15 05:14:38 2007 -0800 + + iokit support for XDarwin + +commit 3ead1afe78d2913f08c8144cb2d3813c6b159488 +Author: Ben Byer +Date: Thu Feb 15 05:09:29 2007 -0800 + + Beginning of patches to add XDarwin support to the modular tree; + special thanks to Torrey Lyons and Peter O'Gorman for making this possible. + + This is the automake framework for the XDarwin.app interface files. + +commit d570ff7c81858a3174686b46a088f67563b4a2d5 +Author: Peter Hutterer +Date: Wed Feb 14 17:09:33 2007 +1030 + + fix: WarpCursor needs to send MotionNotify. + +commit 81aa7f059d3cfd8d28420b7932b8ff7e06d67979 +Author: Eric Anholt +Date: Wed Feb 14 12:48:15 2007 -0800 + + Add missing dirty marking in a couple of fallback cases in the exaGlyphs path. + +commit a5f19c5150a7b3dc2ff3ad759ee1a6ab0ad8925c +Author: Eric Anholt +Date: Wed Feb 14 10:39:46 2007 -0800 + + Mark sync when UploadToScreen succeeds in exaGlyphs(). + +commit a492d494f51caf15a5cb979dc335387486c105d1 +Author: Alan Coopersmith +Date: Tue Feb 13 18:32:59 2007 -0800 + + Update Xvfb man page: remove monolith build instructions, use /var/tmp instead of /usr/tmp + +commit a23b0b069cac8a48e2b306b2095515d75f647705 +Author: Adam Jackson +Date: Mon Feb 12 17:50:00 2007 -0500 + + Typo fix. + +commit d21c95f80bdba2f29eedd57fb0b00e580391c08e +Author: Adam Jackson +Date: Mon Feb 12 17:22:39 2007 -0500 + + Hook up --with-builderstring for vendor build identification. + +commit 46784d24c11767455a4986449a8037295912dcee +Author: Adam Jackson +Date: Mon Feb 12 17:18:29 2007 -0500 + + Remove spurious LIBADD from xf4bpp + +commit c4b7e9d1c16797c3e4b1200b40aceab5696a7fb8 +Author: Aaron Plattner +Date: Tue Feb 6 14:57:22 2007 -0800 + + Add an RDTSC implementation to the x86 emulator. + + This instruction is being used in some debug VBIOSes. This implementation + doesn't even try to be accurate. Instead, it just increments the counter by a + fixed amount every time an rdtsc instruction in encountered, to avoid divides by + zero. + +commit 262b9b104a04e55969593ef96a16004e53ecd00a +Author: Soren Sandmann Pedersen +Date: Tue Feb 6 17:30:22 2007 -0500 + + Use the new 8888x0565mmx function in fbpict.c + +commit 876b806ec09d5ff0c6cd19df91006c4eefedfaa6 +Author: Soren Sandmann Pedersen +Date: Tue Feb 6 17:16:23 2007 -0500 + + Reapply patch to fix AMD CPU detection + +commit 13568d2aa43da4216bbcb46e1125ff28c323ac54 +Author: Soren Sandmann Pedersen +Date: Tue Feb 6 17:12:01 2007 -0500 + + Revert "Fix for AMD cpu detection. Bug 9614, Dan Williams." + + This reverts commit b2cd3b133748cc5aa541905a703a6fdb1cbbb1e6 since + unrelated changes in fbpict.c broke the build. + +commit 5a3334410367a2186b2c667fa1eb6cf0baf93e95 +Author: Soren Sandmann Pedersen +Date: Tue Feb 6 17:11:01 2007 -0500 + + Add new fbCompositeSrc_8888x0565mmx() function, based on patch by Dan + Williams. Bug 9682. + +commit b2cd3b133748cc5aa541905a703a6fdb1cbbb1e6 +Author: Soren Sandmann Pedersen +Date: Tue Feb 6 16:43:37 2007 -0500 + + Fix for AMD cpu detection. Bug 9614, Dan Williams. + + Credit for the fixes in this patch goes to: + + Marco Gritti + Jordan Crouse + +commit 760a38c4c7ab66ae653d3acb92f5cda4bd44edd6 +Author: Daniel Stone +Date: Mon Feb 5 03:39:36 2007 +0200 + + XkbCopyKeymap: fix copy-and-waste accident + + When we reallocated modmap, we accidentally clobbered syms with the + result, leaving syms definitely too small, and modmap also potentially too + small (as well as not actually allocated anymore). + +commit 17d85387d1e6851d35474b65929e268ca64ef65b +Author: Daniel Stone +Date: Thu Jan 18 15:23:57 2007 +1100 + + dmx, vfb, xnest: fix fbcmap compilation + + Don't always define XFree86Server, but only for damn fbcmap.c. + Split fbcmap.c into its own library to achieve this. + +commit 236f04b638e7d4d1656c6bedd8a6e8d7cec285ec +Author: Dave Airlie +Date: Mon Feb 5 09:09:12 2007 +1100 + + remove array_cache from everywhere + +commit eb228e8d1eaa78911541b2fec5d04a74c1299718 +Author: Alan Hourihane +Date: Sun Feb 4 22:06:59 2007 +0000 + + clean up more of the vbo fallout + +commit fb1bc1c65b88527b42a0e4abed23e5ddaae711b7 +Author: Dave Airlie +Date: Sun Feb 4 18:39:58 2007 +1100 + + add vbo to .gitignore + +commit d8e148ec841d340327e6813127b0e0ffc4db712d +Author: Dave Airlie +Date: Sun Feb 4 18:39:04 2007 +1100 + + update xserver for vbo code in mesa + +commit 5dcad9e9d7d9993d65f989219bee94a060bbf476 +Author: Alan Coopersmith +Date: Fri Feb 2 14:44:55 2007 -0800 + + Fix bus error on startup in 64-bit Xephyr + + hostx_get_visual_masks takes unsigned long * arguments, but was being + passed pointers to CARD32's. + +commit 170a55022ebc7b148bff93886eda152a0d5ce79a +Author: Alan Hourihane +Date: Fri Feb 2 20:56:12 2007 +0000 + + remove file + +commit e6a505be84f5f72349d6860dc5a5058367516019 +Author: Dan Nicholson +Date: Fri Feb 2 20:53:01 2007 +0000 + + The array_cache sources don't exist anymore in the Mesa tree, + so we shouldn't try to build them. + +commit af20485ec370801f2aabfaeae17bbd030a849bd1 +Author: Alan Hourihane +Date: Fri Feb 2 19:14:46 2007 +0000 + + Remove array_cache for recent Mesa changes + +commit cf5b29d75dad7c74543f49f010c817623a3df747 +Author: George Sapountzis +Date: Fri Feb 2 12:57:38 2007 +0200 + + dmx: drop leftover __GLXdrawablePrivateRec struct. + +commit 4f2f3233c808fd86bf9f6c09937feda9e0b367fd +Author: Eric Anholt +Date: Thu Feb 1 15:10:29 2007 -0800 + + Fix the size expectations of xRRSetCrtcGamma. + + It was using REQUEST_SIZE_MATCH (client request length must equal request size) + rather than REQUEST_AT_LEAST_SIZE (client request length must be at least + big enough for request size), and this request has data following the request + structure. + +commit 8274ea6aa97b06a56b7468c3908894c0ff72b687 +Author: Eric Anholt +Date: Thu Feb 1 12:15:54 2007 -0800 + + Set the Damage version supported in the server, instead of using damageproto. + + This was caught by distributions upgrading damageproto to 1.1, before the + server they had supported it. The server then advertised the new version + without supporting the protocol. + +commit 8bce182568f14edfb03911d8c5d791fd83bb6222 +Author: Eric Anholt +Date: Mon Jan 29 17:30:59 2007 -0800 + + Restore a few important lines killed in the previous commit. + + Typical results were failure to sync, and a black screen. + +commit 31f2d4a57e04f5ea635fbb50c508405c4fc37b65 +Author: Eric Anholt +Date: Mon Jan 29 09:39:33 2007 -0800 + + Bug #9680: Remove bogus blank length limiting in xf86SetModeCrtc(). + + Our modes typically come from EDID or default modes, and when the monitor + asks for a specific mode, deciding to tweak it usually results in incorrect + display. And if the user is specifying a mode by hand, tweaking it then is + still pretty rude. + + Reviewed by: ajax + +commit 1627af54497bee659ea30f2850b39cbbf576e22d +Author: Jonathan Lim +Date: Fri Jan 26 13:00:45 2007 +0100 + + Call linuxPciOpenFile() for r/w access if applicable. + + Currently, the call to linuxPciOpenFile() is always made for read + only access which causes the subsequent mmap call to fail when the + memory is mapped read/write. + + Xorg #9692 + +commit cf7ca9d09cba14d107152a5179de38e5ef7bd784 +Author: Alan Coopersmith +Date: Wed Jan 24 20:20:48 2007 -0800 + + Plug memory leak in doLoadModule() + +commit 5abd50e37ceda134897891ed32e05215db67e0b4 +Author: Alan Coopersmith +Date: Wed Jan 24 18:54:38 2007 -0800 + + Correct help lines for configure's --with-vendor-name flags + +commit b32a40817fc0e2ac2edf2fa22a8813087fce2e7b +Author: Alan Coopersmith +Date: Wed Jan 24 16:29:49 2007 -0800 + + Correct variable descriptions in comment for SecurityCheckResourceIDAccess + +commit a53586eebc166e35c1f48942205832810061daee +Author: Eric Anholt +Date: Wed Jan 24 13:36:25 2007 -0800 + + Warning fix for RRCrtcSetRotations(). + +commit 7a12952fd437b105ea0d013d680f9c3a775a183c +Author: Eric Anholt +Date: Wed Jan 24 13:34:29 2007 -0800 + + Bug #7639: Only swap out pixmaps (rather than everything) on VT switch in EXA. + + This is a new behavior for version 2.1 of EXA, and only takes effect if the + driver has requested that. Otherwise, the previous behavior remains the same. + +commit b6b855932109b4bc3454f07bef8cb079d79ca369 +Author: Keith Packard +Date: Thu Jan 25 00:29:20 2007 +0800 + + Make Xinearama screen information reflect CRTC rotation. + +commit 788cfce911793a26aed16f38f30678ecee82c873 +Author: Michel Dänzer +Date: Tue Jan 23 10:15:22 2007 +0100 + + Bump video driver ABI version to 1.2. + + This is necessary because server-1.2-branch bumped to 1.1 for xf86CVTMode and + we have xf86XVFillKeyHelperDrawable on top of that. + +commit 2dc866252c84ed0e7b3afa25e8a5312f448d405b +Author: Eric Anholt +Date: Mon Jan 22 08:41:50 2007 +0800 + + Really fix optimized render cases being hit when they shouldn't. + + I don't know how this define slipped in there. Fixes + 6fdfd9dad91d7b7aa292f8c4d268dd27c34de8d3. + +commit 0d6d373af95d0004d33b987d14ad7e04dd5d2003 +Author: Alan Coopersmith +Date: Fri Jan 19 14:52:23 2007 -0800 + + Update Xserver man page to match commit ed33c7c98ad0c542e9e2dd6caa3f84879c21dd61 + + Remove unused -xkbdb and -noloadxkb options. Rename -ar1 and -ar2 to + -ardelay and -arinterval, respectively. + +commit 14d6a9b327381a6bb2dac59c62728e5fd0f0bcfb +Author: Michel Dänzer +Date: Fri Jan 19 18:30:21 2007 +0100 + + fbdevhw: Only deal with RGB weight if default visual is True- or DirectColor. + +commit 27a01e100bff21ac0b70c6d72071d7226fc91264 +Author: Michel Dänzer +Date: Fri Jan 19 18:28:05 2007 +0100 + + fbdevhw: Consider mode set equal to mode requested if virtual width is larger. + +commit 65f4690ecb4576f60396fcccff8e5bd5d4b6645f +Author: Michel Dänzer +Date: Fri Jan 19 17:54:03 2007 +0100 + + __glXDRIscreenProbe: Use drmOpen/CloseOnce. + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=9275 . Based on patch from + Alan Swanson. + +commit 8b3a591cd39f2d51209dc71b641cac79663e1b16 +Author: Alan Coopersmith +Date: Thu Jan 18 16:03:30 2007 -0800 + + Update pci.ids to 2007-01-18 snapshot + + (includes a whole bunch of ATI device id updates) + +commit 0f0c321adf2850b3d7aafe281362bfe424cb0ca1 +Author: Alan Coopersmith +Date: Thu Jan 18 15:31:53 2007 -0800 + + Make xf1bpp build correctly with compilers that don't support -include + +commit a811e92104028ae60ba69f73e32ee1e0533b088c +Author: Eric Anholt +Date: Thu Jan 18 14:28:01 2007 -0800 + + Account for CRTC rotation in the cursor containment code. + +commit df147c10ce597c56c16cbca552e8a3e3ecb3cdaa +Author: Alan Coopersmith +Date: Wed Jan 17 16:47:07 2007 -0800 + + Xserver man page: remove bc, add -wr + +commit 2dfd1aab244a2c8da3b62b522b9a8434e474af17 +Author: Alan Coopersmith +Date: Wed Jan 17 14:39:28 2007 -0800 + + Always include compiler.h in cfbmskbits.h instead of checking #ifdef XFREE86 + +commit 42a48786acf54f83167de4f561526986d4e27033 +Author: Eric Anholt +Date: Wed Jan 17 14:34:42 2007 -0800 + + Add a setter for randr_crtc->rotations. + +commit cde17015dff1ced2aabb8b76c08f9110237821a5 +Author: Eric Anholt +Date: Tue Jan 16 13:01:03 2007 -0800 + + When changing a non-pending property, call the screen rrOutputSetProperty hook. + +commit e3add7c8ecbb2a0a662860f208f6ae7d1857c717 +Author: Eric Anholt +Date: Tue Jan 16 12:59:34 2007 -0800 + + Don't forget to add the property we configure to the properties list. + +commit 7fccec91c46baac4f8d2965180dc535b4eb7d65c +Author: Eric Anholt +Date: Wed Jan 10 13:10:43 2007 -0800 + + Bug #9555: Always define _GNU_SOURCE in glibc environments. + + This keeps us from having to define _POSIX_C_SOURCE, _BSD_SOURCE, and + _XOPEN_SORUCE to get the C environment we want in different places. It also + fixes the build on linux due to RTLD_DEFAULT having not been defined. + +commit 78f9592c112d4245f6119b98c244bbb4cae3e5aa +Author: Alan Hourihane +Date: Wed Jan 10 16:04:20 2007 +0000 + + lnx_ev56.c has to be built with -mcpu=ev56. Fix it. + +commit 6a2fb2928714ce77ee342cdc23a1178e5e766cf2 +Author: Eric Anholt +Date: Tue Jan 9 16:34:40 2007 -0800 + + Track rename of DamagePost -> DamageAdd. + +commit e3aa6ad201eb20862c11c000e76206e317a96dc9 +Author: Matthieu Herrb +Date: Tue Jan 9 14:14:19 2007 +0100 + + Multiple integer overflows in dbe and render extensions + CVE IDs: CVE-2006-6101 CVE-2006-6102 CVE-2006-6103 + +commit 359d20532bdcef6a540a551578d000afbb609c2d +Author: Michel Dänzer +Date: Tue Jan 9 09:53:45 2007 +0100 + + Require glproto >= 1.4.8 for GLX. + + It builds against 1.4.7 as well, but it hardcodes the GLX_EXT_tfp tokens that + were finalized in 1.4.8, so GLX_EXT_tfp breaks if the client side was built + against an older glproto. This will hopefully alert people to rebuild other + components (in particular Mesa) against the new glproto as well. + +commit 88740c4855babedbea420b5e1b35ae105d1f1026 +Author: Alan Coopersmith +Date: Mon Jan 8 17:36:07 2007 -0800 + + Use PKG_CHECK_EXISTS(libdrm) to determine if DRI should be enabled on Solaris + +commit 282a4dcaabc5f0cd6f7d3819aa648333b93b265e +Author: Michel Dänzer +Date: Mon Jan 8 19:22:41 2007 +0100 + + Attempt to fix drawable type checks in dixLookupDrawable(). + + Not sure this is 100% correct either, but it fixes at least one reproducible + crasher where it returned a pixmap to dixLookupWindow(). + +commit 0b73a7eb17fd848c6bdc6a65ba835aa2cbfc3cfd +Author: Eric Anholt +Date: Fri Jan 5 18:12:04 2007 -0800 + + Add support for the DamagePost (XDamage 1.1) request. + + This makes damageproto >= 1.1 a requirement to build. + +commit dfb2c10413e22afd8d486a982870f874326d5ef4 +Author: Ian Romanick +Date: Fri Jan 5 10:15:09 2007 -0800 + + Add missing #else from previous commits. + +commit f90c3e226b105bf77beb94723fc08bdff14834be +Author: Ian Romanick +Date: Thu Jan 4 15:38:16 2007 -0800 + + Re-regenerate from Mesa scripts. + + DO NOT HAND EDIT THESE FILES! For cryin' out loud, there's even a + comment to that effect in the file's header... + +commit b7ca5d14ce7ba410b0dab5c2289f6d7b75e763df +Author: Ian Romanick +Date: Thu Jan 4 15:37:33 2007 -0800 + + Incorporate new byte-order related configure changes. + +commit 8dd5771a1b91c331860b667fb18e484452000aad +Merge: 45aa26c... 7d2ec92... +Author: Ian Romanick +Date: Thu Jan 4 15:01:38 2007 -0800 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + + Conflicts: + + GL/glx/indirect_dispatch_swap.c + GL/glx/swap_interval.c + +commit 45aa26ccb4f61c2919ce2475d0907c6e1b177da2 +Author: Ian Romanick +Date: Thu Jan 4 14:55:51 2007 -0800 + + Regenerate from Mesa scripts. + + Regenerate source files from Mesa scripts. This causes the generated + files to use glxbyteorder.h. + +commit 6d603bb47ff9d238637adbf30c6e9697e6e7e6fa +Author: Ian Romanick +Date: Thu Jan 4 14:49:26 2007 -0800 + + Add new header file containing byte-order wrappers. + + Move the byte-order related wrappers out of the individual source + files into a dedicated header file. Modify the single hand-coded + source file that uses the byte-order wrappers to use the new header + file. + +commit 7d2ec92170ebbdfa10a05734cb7cfaac97d19d65 +Author: Eric Anholt +Date: Thu Jan 4 12:24:48 2007 -0800 + + Keep track of how many visuals we set up for GLcore, to avoid an invalid free. + + The proper fix would involve actually setting up the ARGB visual for GLcore, + but I just want the server to not crash at exit. + +commit aab2ca204279b638c7e5bb6b8427c58be9704c57 +Author: Eric Anholt +Date: Thu Dec 21 09:16:19 2006 -0800 + + Try dlsym(RTLD_DEFAULT) first when finding symbols. + + The previous mechanism failed when finding drm symbols now that libdrm has + moved to being linked by libdri instead of being linked into the server. + +commit 2fd4626fa6969b84d8e2f9db16d6e2d44c4bc499 +Author: Alan Coopersmith +Date: Wed Jan 3 15:44:55 2007 -0800 + + Make GLX byteswap macros more portable + + - Use autoconf tests instead of platform-specific #ifdef's to decide + which macros to use. + - Provide fallbacks for platforms like Solaris that don't provide any + of the existing known forms. + +commit 66fa87292ef26bd0f464481287f3af992cd5741c +Author: Aaron Plattner +Date: Wed Jan 3 10:27:07 2007 -0800 + + Fix BSF and BSR instructions in the x86 emulator. + + Patch courtesy of Michael Yaroslavtsev. + +commit 3b5b7ef5c2ab1d196806f6359e0972fd78d204dd +Author: Fredrik Höglund +Date: Wed Jan 3 21:05:35 2007 +0100 + + Move the code for resetting the DPMS mode in response to input events, + from WaitForSomething to mieqProcessInputEvents. + + mieqProcessInputEvents already handles resetting the screen saver. + +commit 953a9ef949b4c57d28daeec57031fe1ce368c27c +Author: Keith Packard +Date: Thu Dec 21 23:50:39 2006 -0800 + + Track physical screen size and send out updates when that changes. + + Events and internal data structures need to be updated whenever the physical + or pixel size of the screen changes. The code was ignoring the physical + size, so changing only that would not be registered anywhere. + (cherry picked from f42e3cea236fa0091ed398a818fc8e17b0e1b3df commit) + +commit e79602fca2f2cced66136729cdda4d356b0bdda0 +Author: Keith Packard +Date: Sat Dec 30 21:52:22 2006 -0800 + + Use RRScreenSetSizeRange in 1.0 compat. Check RRGetInfo for error. + + The RRScreenSizeSetRange function is used externally for 1.2 API drivers, + but can also be used in the 1.0 compatibility code. This also ensures that + the right changed bits are set so that clients are correctly notified when + the range changes. + + RRGetInfo can return an error, use that to return BadAlloc to clients + instead of blindly going on with various requests. + (cherry picked from f05dd384d38c76dd9662933a03625dfef5b1c81f commit) + +commit dc5eb4523298f966bd5fd9ae6672160034b5e82c +Author: Michel Dänzer +Date: Sun Dec 31 17:59:44 2006 +0100 + + fbdevhw: Override RGB offsets and masks after setting initial mode. + + This is a hack, but it should be a NOP for all the setups that worked before + and actually seems to fix some others... + + Based on a patch by Peter Teichmann from + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=338241 . + +commit d077c0da470ab7291e8d838eaace57b066477d6f +Author: Michel Dänzer +Date: Sun Dec 31 17:23:31 2006 +0100 + + fbdevhw: Use displayWidth for fbdev virtual width when appropriate. + + The fbdev API doesn't allow setting the pitch explicitly, so we have to set + the virtual width to the pitch we're using for drawing. This fixes corruption + after changing the virtual width with RandR. + +commit c385bcf0bde38dd869f7065f859dd4b4126f5690 +Author: Michel Dänzer +Date: Sat Dec 30 16:44:31 2006 +0100 + + fbdevhw: Fix some issues with the previous commit. + + Fix a TRACE_ENTER typo and only update the internal fbdev mode state cache + after actually setting a mode. + +commit f6815cb68b0f6698497348fc6e4214dacef33b95 +Author: Michel Dänzer +Date: Sat Dec 30 10:18:28 2006 +0100 + + fbdevhw: Consolidate modeset ioctl calling, report failure if it modifies mode. + + The fbdev API allows the driver to 'accept' modes it doesn't really support by + modifying it to the nearest supported mode. Without this check, e.g. vesafb + would appear to accept all modes, even though it actually can't set any modes + other than the bootup mode at all. + +commit 083b790515faaf134a78abc4b0a7ef0d6ea5db75 +Author: Eric Anholt +Date: Thu Dec 28 13:21:25 2006 -0800 + + Switch the default migration heuristic for EXA to "always". + + This has been what has been used the most successfully post-damagetrack. + The current thinking is that: + 1) We should be able to accelerate basically everything. So we don't need to + try to migrate trees of pixmaps permanently out of framebuffer to speed + CPU drawing up. + 2) Migration is cheaper in the thrashing case, so we don't want to go to a lot + of effort to try (and fail badly) to find a working set. + +commit cfbc7379f0232bb336461f6d2a8496d3d0763e7e +Author: Eric Anholt +Date: Thu Dec 28 13:15:11 2006 -0800 + + Export exaMove{In,Out}Pixmap(). + +commit 683ca3f7afaf15fd3ca7918f6175b5a9e4a6f05b +Merge: 05f9150... 9563b2e... +Author: Eric Anholt +Date: Wed Dec 27 16:11:31 2006 -0800 + + Merge branch 'exa-damagetrack' + +commit 05f915050cad72d4fb39cbb886be57beeac18749 +Author: Peter Hutterer +Date: Wed Dec 27 16:38:06 2006 +0000 + + dix/events: take screen number, not pointer, in PostSyntheticMotion + Since we were using PostSyntheticMotion incorrectly anyway, update the + declared API to match. + +commit c1674660a7115ebf993dcde78f4e45f756e4c951 +Author: Daniel Stone +Date: Sun Dec 24 06:28:44 2006 +0200 + + os: test for userland, not kernel + + It doesn't matter which kernel we're running on, the relevant part when + dealing with includes is what our userland is. + +commit 83080809f9a1c1d24b0318e54632f25f5940da25 +Author: Marc Aurele La France +Date: Sun Dec 24 06:28:21 2006 +0200 + + xfree86: deal with pitch that isn't a multiple of the granularity + + When the pitch isn't a multiple of the granularity, allocate more space to + compensate. + +commit 329f6417275bb1201ba66c29b202028eeab3a355 +Author: Daniel Stone +Date: Sat Dec 9 22:51:59 2006 +0200 + + XkbCopyKeymap: make sure sym_interpret is always valid + + Make sure we're not copying sym_interpret across from an empty source. + +commit d9e079d2a385203fdd18d958cfc19d759cab4ba8 +Author: Eamon Walsh +Date: Fri Dec 22 13:07:09 2006 -0500 + + Zero out client devPrivates on allocation. + +commit e437f357b6850a6c87ca6696870b3abd40e5b8ed +Author: Alan Coopersmith +Date: Tue Dec 19 16:38:34 2006 -0800 + + xorg.conf man page should say "XFree86-DGA", not "Xorg-DGA" + +commit d442998e39611be6805ea261f2286a2fd00f49b1 +Author: Eric Anholt +Date: Fri Dec 8 13:35:36 2006 -0800 + + Only do the _POSIX_C_SOURCE hackery on linux where it's required. + + On other OSes, the nasty hack was resulting in prototypes being hidden, so just + don't do it. + +commit 228b9f77696190e47d4c96d6e0809bf645751557 +Author: Eric Anholt +Date: Fri Dec 8 13:32:22 2006 -0800 + + Include sys/select.h to get FD_ISSET. + +commit 9563b2eea2f61246b6a9e14e00c701f693efa4e1 +Author: Michel Dänzer +Date: Tue Dec 19 18:57:22 2006 +0100 + + EXA: Lots of damage tracking fixes. + + Mostly due to exaDrawableDirty() now calculating the backing pixmap coordinates + internally, for cases where they aren't trivially known. There's a new + exaPixmapDirty() function for the other cases. + +commit 467c00cf450826e0bf06fe94470ec193af625d68 +Author: George Sapountzis +Date: Tue Dec 19 18:45:25 2006 +0100 + + exaGlyphs: mark dirty for software path also. + + This affects drivers with no UploadToScreen or UploadToScreen failures. + +commit 4334860e69e7d5b156082bd05c7a86708e5bad4c +Merge: 7e47176... fdcc22c... +Author: Michel Dänzer +Date: Tue Dec 19 16:29:26 2006 +0100 + + Merge branch 'master' into exa-damagetrack + + Conflicts: + + exa/exa_accel.c + exa/exa_migration.c + +commit fdcc22ca1704d3519156c66804528c21b04fea65 +Author: Michel Dänzer +Date: Tue Dec 19 16:11:17 2006 +0100 + + exaCopyNtoN: Fix usage of 'dx' and 'dy' instead of 'reverse' and 'upsidedown'. + +commit 67c2a86e59e915d9a5681e9d233478cfea3e51ed +Author: Michel Dänzer +Date: Tue Dec 19 15:44:18 2006 +0100 + + EXA: Compare backing pixmaps instead of drawables against driver limits. + + The driver operations are always contained within the backing pixmaps, it + doesn't matter if the drawables are bigger. + +commit 6b1e354dbb6e8ed9f2c654bbe7f8bbf241843d1c +Author: Eric Anholt +Date: Tue Dec 19 15:24:19 2006 +0100 + + EXA: Disable SHM pixmaps. + + See https://bugs.freedesktop.org/show_bug.cgi?id=6772 . + +commit 1b029fd896b76096905c516925ce0214fe14632c +Author: Alan Coopersmith +Date: Mon Dec 18 14:51:04 2006 -0800 + + Xorg & Xserver man page updates for 1.2 release + + - Added -extension & +extension to Xserver man page + - Changed Xorg synopsis from X11R6 to X11R7 + - Clarified Xorg ancestry description + - Moved Solaris to free/Open Source OS list + - Removed references to MetroLink module loader & getconfig + - Converted (1) to (__appmansuffix__) in a few more places + - Replaced http://www.freedesktop.org/cvs/ with http://gitweb.freedesktop.org/ + +commit a5fcf1e5e7452c9be82f63b6c2be2a25c4109523 +Author: James Steven Supancic III +Date: Sat Dec 16 12:02:38 2006 -0500 + + Fix RENDER issues (bug #7555) and implement RENDER add/remove screen + support (bug #8485). + +commit c92f7bef54fa737766d65fe32c200f405f39228c +Author: Kevin E Martin +Date: Sat Dec 16 12:01:49 2006 -0500 + + For Xvfb, Xnest and Xprt, compile fbcmap.c with -DXFree86Server + +commit 012807356883128fde58bb2d4f91dd356d6418fc +Author: Eamon Walsh +Date: Fri Dec 15 18:27:16 2006 -0500 + + Add loud warnings to deprecated lookup functions. + Hopefully this will alert external driver maintainers. + +commit ab1d5b0c31a1cfce95ab6b1d06f209f2c44e19ac +Author: Eamon Walsh +Date: Fri Dec 15 17:26:58 2006 -0500 + + Convert callers of LookupClient() to dixLookupClient(). + +commit f11dafaafc68f5cff1a1538d9566907786d8ab72 +Author: Eamon Walsh +Date: Fri Dec 15 16:51:58 2006 -0500 + + Convert callers of SecurityLookupDrawable() to dixLookupDrawable(). + +commit 10aabb729d1586db344f9c1abdf1cf45e7ddaa7a +Author: Eamon Walsh +Date: Fri Dec 15 16:36:29 2006 -0500 + + Convert callers of LookupDrawable() to dixLookupDrawable(). + +commit 25d5e0a629f82d95bd71daf9a920a70e095b5188 +Author: Eamon Walsh +Date: Fri Dec 15 15:50:46 2006 -0500 + + Convert callers of SecurityLookupWindow() to dixLookupWindow(). + +commit 04c721854fbf1bd6379c165a53fab2bdc09961c0 +Author: Eamon Walsh +Date: Fri Dec 15 14:11:40 2006 -0500 + + Convert callers of LookupWindow() to dixLookupWindow(). + +commit 670bbb87310503fcc17203cecfa6f4f2f5db51d2 +Author: Keith Packard +Date: Wed Dec 13 01:21:32 2006 -0800 + + RandR 1.2 rotation code must adjust width/height. + + Mode lines reflect the monitor mode, not the projected size into the frame + buffer. Flip width/height around so that the dimensions are oriented + correctly. + (cherry picked from 612a8e61803da8db0e305cbb093696b8e4284572 commit) + +commit 6c6901434ab469dd03b79fc98cd4a2b64d339305 +Author: Keith Packard +Date: Wed Dec 13 00:58:54 2006 -0800 + + RandR 1.0 refresh rates unscrambled. SetScreenConfig uses RRCrtcSet right. + + RandR 1.0 refresh rates were scrambled when working with a 1.2 driver that + returned sizes in a mixed order. SetScreenConfig was treating RRCrtcSet as + returning an RandR status instead of a Bool. + (cherry picked from 6dc711833d7387372012fdff1ce1df3aefa2d234 commit) + +commit 628c7daeb12713d28e85e6b49fa037a7748dff83 +Author: Keith Packard +Date: Tue Dec 12 22:59:03 2006 -0800 + + RandR: config time updates when hardware config changes. + + The config time in the RandR protocol reflects when the hardware state has + changed. It was getting changed anytime the driver changed the usage + of the hardware as well. + (cherry picked from 98d18a6578130adb411ca4bcc776fcb7e07f189f commit) + +commit d742025f435f3eb7458cf8284d59300bc9a850aa +Author: Keith Packard +Date: Tue Dec 12 20:16:49 2006 -0800 + + RandR mode list needs both output and crtc modes. + + When an output no longer reports the current mode, it must still be included + in the list advertised by the X server. Walk the crtcs to ensure it is + included. + (cherry picked from 78689d0d6630afcbcd3ce5394d12c2564a489f45 commit) + +commit 9e32bf98bc9ab17a137664d01f59a8f426f7ff3b +Author: Eamon Walsh +Date: Thu Dec 14 19:31:58 2006 -0500 + + Remove now-unused macro definitions from dix.h. + +commit 00f0705b3bb444ac934fc902cd23130f1777eab2 +Author: Eamon Walsh +Date: Thu Dec 14 19:15:21 2006 -0500 + + Remove instances of macros SECURITY_VERIFY_GEOMETRABLE and SECURITY_VERIFY_GC. + +commit 5e334f06a1ef89891f9df2a371e4662340bec26b +Author: Eamon Walsh +Date: Thu Dec 14 18:27:09 2006 -0500 + + Remove instances of macros VERIFY_GEOMETRABLE and VERIFY_GC. + +commit 51b69ff499c05f59cb1e577c4e8abf6f7f283b3e +Author: Eamon Walsh +Date: Thu Dec 14 17:53:43 2006 -0500 + + Remove instances of macro SECURITY_VERIFY_DRAWABLE. + +commit 0cf75e74322e2b6a6efc7acf892e04365fde503b +Author: Eamon Walsh +Date: Thu Dec 14 17:27:12 2006 -0500 + + Remove instances of macros LOOKUP_DRAWABLE and VERIFY_DRAWABLE. + +commit ab1886df73b73360fa3bd7ce8e01affc074cbc8d +Author: Eamon Walsh +Date: Thu Dec 14 15:42:19 2006 -0500 + + Add new, combined dix lookup functions (tweak). + +commit 60cdc592fe042c03ceb5d4c3344acfbbf5d8ae28 +Author: Eamon Walsh +Date: Thu Dec 14 14:46:03 2006 -0500 + + Add new, combined dix lookup functions. + +commit 6c46645cfc1afda8aeabfe0ed4d9342673b702f1 +Author: Eamon Walsh +Date: Thu Dec 14 14:45:42 2006 -0500 + + Naming change: Security*Access -> Dix*Access + +commit b88ad820fac81d0dfd557a384bf0406e8893e7af +Author: Alan Hourihane +Date: Wed Dec 13 12:13:11 2006 +0000 + + Set Int10Current->Tag for the linux native int10 module + Fixes bug #9296 + (cherry picked from 731952c561a3972d09d1315f4fd31466e459ccb9 commit) + +commit 81281cb298a5825bc7a2e692375a86199293bbbe +Author: Alan Hourihane +Date: Tue Dec 12 11:28:24 2006 +0000 + + Fix bad commit + +commit 792e0f71c6a435b2e28f8a4cdcc790f3b982e62c +Author: Alan Hourihane +Date: Mon Dec 11 14:54:49 2006 +0000 + + Fix Xming fails to use xkb bug + bug #5049 (Colin Harrison) + +commit 27d4b84f268ac21601f7f52a7e257f70753396b3 +Author: Alan Hourihane +Date: Mon Dec 11 14:50:08 2006 +0000 + + Fix Tooltip from minimized clients + + Bug #3678 (Colin Harrison) + +commit fb8364bca30fe9268e807b0a9a3ebf875ee1fce2 +Author: Adam Jackson +Date: Sun Dec 10 11:24:05 2006 -0500 + + Accept EDID > 1.3 but < 2.0 if we find it, assume it's compatible. + +commit d56249a15ead51ad4d2117d5538ada24af05b693 +Merge: f1f8df1... ec84f72... +Author: Jeremy C. Reed +Date: Fri Dec 8 15:52:37 2006 -0600 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit f1f8df1889ab656bb57596e2f85408f15f42cd5d +Author: Jeremy C. Reed +Date: Fri Dec 8 15:51:44 2006 -0600 + + For MANDEFS, also replace __mandir__ for $(mandir) which includes + the prefix. Noticed wrong path to man pages on both Ubuntu and on + NetBSD with pkgsrc. + +commit ec84f72d077eaf2e7768a1f5398f65a5e1714d08 +Author: Daniel Stone +Date: Fri Dec 8 21:31:47 2006 +0200 + + XkbCopyKeymap: always initialise map and preserve + + If we don't have map or preserve in the source map, make sure the + destination is initialised to NULL, and freed if it's a valid type. + +commit e59aeac1ff13ea53f44dba1ac7800f37f4532ca1 +Author: Daniel Stone +Date: Wed Dec 6 23:44:06 2006 +0200 + + xfree86: remove stray debug line + +commit 729fca33a417ae3dfb180caf0ea8946ef9eee1df +Author: Michel Dänzer +Date: Thu Dec 7 12:09:18 2006 +0100 + + Revert "xfree86 DDX: Delete DDX screens in ddxGiveUp()." + + This reverts commit a6381e69845f58d2b3282992b1f881015190f1bc. + + See https://bugs.freedesktop.org/show_bug.cgi?id=9224 . + +commit 4ea6dfb984063117eef5c2f931205b1c3eb3108b +Author: Daniel Stone +Date: Wed Dec 6 23:24:39 2006 +0200 + + whitespace police + +commit 4cba1a1ebfbdd7ab489b1b1ffb6656cbe88eb61e +Author: Daniel Stone +Date: Wed Dec 6 23:21:38 2006 +0200 + + config: bus reconnect support + + Add support for reconnecting to the bus when it restarts. + +commit 0c5dab5c8eaa174f28054b9d20244a709c015210 +Author: Daniel Stone +Date: Wed Dec 6 23:21:15 2006 +0200 + + config: move config.h to hotplug.h + + Also, move configInitialise to after OsInit, since the next commit will + make it use a timer. + +commit 72e7f2ac6cf0db474d0defa7918f2a3ba76c0e46 +Author: Daniel Stone +Date: Wed Dec 6 23:18:52 2006 +0200 + + GetPointerEvents: always send valuator events for MotionNotify + + Always chase a DeviceMotionNotify event with a DeviceValuator, which is + not required in the spec, but will silently break the lib if you don't + include. + +commit c458a70d650bd62b8f4706f022d1f3f347636db1 +Author: Daniel Stone +Date: Wed Dec 6 20:30:44 2006 +0200 + + GetPointerEvents: fix typo + + Fix typo that resulted in inverted axes when using an absolute positioning + device that didn't report y, and thus relied on the previous value. + +commit edabf45425f9ed79547f918cc0dfff4c268de386 +Author: Daniel Stone +Date: Sat Dec 2 16:37:19 2006 +0200 + + configure.ac: add CONFIG_LIB to Xvfb + +commit 8724af248cd6c93182fecd060fed09a556361080 +Author: Daniel Stone +Date: Sat Dec 2 16:20:34 2006 +0200 + + kdrive/mga: fix compiler warning + + Change a case that only made one test for an if, preventing the compiler + warning about all other PICT_* types being unsupported. + +commit 2f0a800ffdc881cdb3adf84f1ed97bbb63cba34c +Author: Daniel Stone +Date: Mon Nov 27 22:22:53 2006 +0200 + + config: move to block/wakeup handler + +commit 99378b58dbc63160382ad9c41f9cb0dd2a24e9d1 +Author: Daniel Stone +Date: Mon Nov 27 22:22:33 2006 +0200 + + kdrive/tslib: remove vendor-specific hacks + + Parts of the KDrive merge accidentally contained a bunch of + vendor-specific hacks; sorry. + +commit 8884a73a3f4efa8276c5e38b9573201574c4f1f6 +Author: Daniel Stone +Date: Mon Nov 27 22:39:56 2006 +0200 + + xfree86/input: re-add support for disabling drag events + +commit f2903c12bb4bb0b7c94b96c55af8fa55507f9d7d +Author: Daniel Stone +Date: Tue Nov 7 11:13:32 2006 +0200 + + SyntheticMotion: don't dereference sprite.screen when not using Xinerama + + (cherry picked from aa052e43c6c293e14f78837e00c6b7581f9713bb commit) + +commit d17ec01e8395a8f14b75a10c8bf082b3f5a4fb36 +Author: Daniel Stone +Date: Fri Dec 1 00:41:41 2006 +0200 + + remove CID support (bug #5553) + + Remove CID from all our fontpaths. + (cherry picked from 69820a10e33e4582c192360996e866007114639d commit) + +commit abe5e079af715713097ab0daad29a3e9f523c398 +Author: Alan Coopersmith +Date: Wed Dec 6 07:58:03 2006 -0800 + + Update pci.ids to 2006-12-06 from pciids.sf.net + +commit 724f9cb578086e8483a2d0636dd6eb05d664d31c +Author: Aaron Plattner +Date: Tue Dec 5 13:44:05 2006 -0800 + + Bug #9219: Use pWin->viewable instead of pWin->realized to catch InputOnly windows too. + +commit 3690de9b1b0902d395bc7d071fc05ebc8f75be2b +Author: Aaron Plattner +Date: Tue Dec 5 12:42:12 2006 -0800 + + Bug #9219: Return BadMatch when trying to name the backing pixmap of an unrealized window. + + Before this change, ProcCompositeNameWindowPixmap would name the screen pixmap + if !pWin->realized. + +commit f9f7d7f3be53c808abb5eaceb7a1abc55744a210 +Author: Alan Coopersmith +Date: Mon Dec 4 13:36:30 2006 -0800 + + Check for __sparc as well as __sparc__ for compatibility with Sun cc + + (gcc defines __sparc__, Sun cc defines __sparc) + +commit ac90ce58ba1da3ed605adf75f4d54c34b578c402 +Author: Eamon Walsh +Date: Fri Dec 1 21:12:21 2006 -0500 + + Naming change: Security*Operation -> Xace*Operation + +commit f44f14fe564d834568a0afefba944223a73ea0f5 +Author: Eamon Walsh +Date: Fri Dec 1 20:48:15 2006 -0500 + + Define calls away when not building XACE, allowing ifdef's to be removed. + +commit a5d6499d666fea4a9988118ddd3a5e4c9cfcc32c +Author: Alan Coopersmith +Date: Fri Dec 1 16:42:37 2006 -0800 + + Fix syntax error in configure check for SYSV_IPC that broke with Sun cc + +commit 89b2aa9be81613cb1a06bd535bf50ecf2a00208d +Author: Keith Packard +Date: Mon Nov 27 21:40:24 2006 -0800 + + Destroying RandR crtc or output overwrites memory. + + RRCrtcDestroyResource and RROutputDestroyResource had matching + bugs that would overwrite memory past the end of the storage + of the crtc or output arrays. Oops. + (cherry picked from 4202b23ed86405a4cebfdcf239df1b023c1d10ca commit) + +commit 23ba72323af785516db6cbcf6c1b2fa907a8232f +Author: Keith Packard +Date: Thu Nov 30 23:16:42 2006 -0800 + + RandR ListOutputProperties has nAtoms element, not nProperties + + Earlier RandR 1.2 encoding revisions used 8-bit nProperties field. + Final RandR 1.2 spec uses 16-bit nAtoms field instead. + (cherry picked from 66b6358a393972946f16394918db2401c51dc5ed commit) + +commit ccd804c6c01cdfffe938fa5336be9b5668a6f0c0 +Merge: 9423ac1... 82912ad... +Author: Drew Parsons +Date: Fri Dec 1 15:21:57 2006 +1100 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 9423ac134a2a9800787c4978d384827cc4e61fc8 +Author: Drew Parsons +Date: Fri Dec 1 15:21:05 2006 +1100 + + GNU/FreeBSD support in GLX: include byteswap.h for FreeBSD systems + defining __GLIBC__, as done already for Linux and Hurd (cf. bug #5613). + Also includes some more __GNU__ checks on top of those made in + commit ade4bf09076d13dbf3549c0a2d987a0afe76d5c1. + Thanks Petr Salinger (Debian bug #400869). + +commit 82912ad7709e8cf4a5f8a9fa6b47f789842a3fe9 +Author: Alan Coopersmith +Date: Thu Nov 30 20:13:52 2006 -0800 + + Make solaris version of xf86OSRingBell return void like other OS'es + +commit 8956f63a941bf0a5f157d47b33e6221601a75040 +Author: Alan Coopersmith +Date: Thu Nov 30 19:53:29 2006 -0800 + + Tell automake to STFU about the *.O files + + automake will not stop whining about the *.O files not being in normal library + name format, so just tell automake they are PROGRAMS so it builds them without + bitching. + +commit ee9bdd3f4a14a42fb0747acc420966f0f669129b +Author: Aaron Plattner +Date: Wed Nov 29 12:01:43 2006 -0800 + + Add DIX_CFLAGS to util builds. + + Fixes a build breakage when $(top_srcdir) != $(top_builddir) because + -I$(top_srcdir)/include is missing for the cvt, ioport, pcitweak, and scanpci + builds. + + Signed-off-by: Adam Jackson + +commit a6381e69845f58d2b3282992b1f881015190f1bc +Author: Michel Dänzer +Date: Wed Nov 29 19:25:09 2006 +0100 + + xfree86 DDX: Delete DDX screens in ddxGiveUp(). + + This allows video drivers to clean up in the FreeScreen hook things they set up + in the PreInit hook. + +commit b0c8558b9d9a9984c0067960392e28f5a7622b29 +Author: Keith Packard +Date: Sun Nov 26 19:31:48 2006 -0800 + + Ensure RandR resource types are registered before resources are created. + + Now that resources can be created during server initialization, make sure + the crtc, output and mode resource types are created before attempting to + create associated resources. + (cherry picked from commit ec83d674167e7045d5317b179c9998e3172a26dc) + +commit 6245e9dd4719c5dc15ff45d49cf626123794038b +Author: Keith Packard +Date: Tue Nov 21 16:52:28 2006 -0800 + + Allocate correct size for RRPropertyRec (oops). + + Neglected to change the allocation size from sizeof (PropertyRec) to + sizeof (RRPropertyRec). Lots of fun crashes this way. + (cherry picked from commit 0626eb8e5c9fa05de6bdc9aa0c654f5148bf7cff) + +commit 24abce8032940e96bb2ccf9e463a7fff6f36283a +Author: Keith Packard +Date: Tue Nov 21 01:15:26 2006 -0800 + + Change RandR property datatype to include pending/valid values. + + This patch tracks the protocol changes which introduce more complex + semantics for RandR output properties including pending and valid value + information. + (cherry picked from commit af55c65bea40669fdc038aa34c6a1ec9ecb33e87) + +commit f62ac3ec39c6593df476985c630e499864c19c72 +Author: Eric Anholt +Date: Tue Nov 28 10:31:40 2006 -0800 + + Separate DDC mode list creation from MonPtr creation. + + This will be used by the intel driver, and likely other RandR 1.2 drivers. + +commit fbd09443385c533416fa530399d54f130afaf985 +Author: Eric Anholt +Date: Tue Nov 28 10:15:51 2006 -0800 + + Replace bad mode name-setting code with xf86SetModeDefaultName(). + +commit 4ad0bde661be2af4a17771d66066d49736e85cbe +Author: Eric Anholt +Date: Tue Nov 28 10:12:02 2006 -0800 + + Clean up a bunch of long lines and trailing whitespace. + +commit 05778432dc6e688bc0beff0c20ffd7e27b74888e +Author: Eric Anholt +Date: Tue Nov 28 10:07:57 2006 -0800 + + Move code to get a mode list from EDID data from ddcProperty.c to edid_modes.c. + +commit 38ecc66cd9c61346a46697bbf1d8319f4f6f9800 +Author: Eric Anholt +Date: Tue Nov 28 10:06:15 2006 -0800 + + Typo that was missed in testing. + +commit 834e4b079866594b50be64ae79f3cb2a5baa2070 +Author: Matthias Hopf +Date: Tue Nov 28 18:57:13 2006 +0100 + + Fix potential NULL pointer access in timer code. + + https://bugzilla.novell.com/show_bug.cgi?id=223718 + +commit 5dbcd34a0a6c0d10dbfea8fdc9d7dfe7a0261b19 +Author: Eric Anholt +Date: Mon Nov 27 16:26:14 2006 -0800 + + Register dependency on new RandR protocol. + +commit 16f8f10dc2106bc6253b2d89a1f8efee8d80e2ba +Author: Eric Anholt +Date: Mon Nov 27 16:21:31 2006 -0800 + + Move mode handling helpers from ddcProperty.c to xf86Mode.c. + +commit b4b0d901d98371a8aa7b17d195e18e83e2a6a618 +Merge: 64de3ba... d6cd031... +Author: Eric Anholt +Date: Mon Nov 27 15:43:15 2006 -0800 + + Merge branch 'randr-1.2' + + Conflicts: + + dix/events.c + dix/getevents.c + hw/xfree86/common/xf86Mode.c + hw/xfree86/dri/Makefile.am + hw/xfree86/os-support/drm/xf86drm.c + hw/xfree86/os-support/xf86drm.h + +commit d6cd0313c7f23f32c9c7dda00ff739e772bf7db3 +Author: Eric Anholt +Date: Mon Nov 27 14:46:50 2006 -0800 + + Add some mode helper functions from the intel driver. + + This also removes static from some other functions that had been copied out + to at least the intel driver, but perhaps others that were doing mode list + handling. + +commit 64de3baf85f6df274f71f736016f0848567cd9f6 +Author: Aaron Plattner +Date: Wed Nov 22 14:46:51 2006 -0800 + + Add a -showDefaultLibPath option. + + A corollary to the previous change, this option prints $libdir. + +commit 0a2a6e4070718b90af7ca0e047f028e0cabdfb9d +Author: Aaron Plattner +Date: Fri Nov 17 18:27:23 2006 -0800 + + Add a -showDefaultModulePath option. + + As discussed on the mailing list, people would rather have an X command-line + option to print the module path so installers can know where to put modules, + rather than the installers using `pkg-config --variable=moduledir xorg-server`, + since some distros choose not to install xorg-server.pc. + +commit 61832cb94c8a4d62cddb92188caeed86519e9d62 +Author: Brian +Date: Wed Nov 22 09:16:43 2006 -0700 + + Regenerated from Mesa w/ latest gl_API.xml file + +commit 61863f09d22935406371e92bb75173d55ff9b29f +Author: Brian +Date: Wed Nov 22 09:16:17 2006 -0700 + + Regenerated from Mesa, fixes glMap* protocol problem (bug 8899) + +commit 33ff4cec5ff7533ec725f71d357c096dfb0acb79 +Author: Alan Hourihane +Date: Tue Nov 21 21:23:17 2006 +0000 + + Issue CloseDownDevices() in os/log.c and remove from dix/main.c. + + This ensures that all calls to FatalError() will shutdown the input devices. + +commit ca2874b273232d9f51881b1cd754ed6847bfaf47 +Merge: c9a5f9d... e2f6dac... +Author: Alan Hourihane +Date: Sat Nov 18 19:56:32 2006 +0000 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit c9a5f9d3911c2e6a8f81b0721c9eb914fb7719b5 +Author: Alan Hourihane +Date: Sat Nov 18 19:55:42 2006 +0000 + + Shutdown input devices if FatalError occurs during startup. + Fixes Xdmx problems when the input device has been initialized + and the keyboard map has been destroyed. + +commit e2f6dacc736527790ed8e304698678afc17f71c6 +Author: Dave Airlie +Date: Sat Nov 18 11:26:55 2006 +1100 + + dri: setup libdrm hooks as early as possible. + + This is due to radeon doing drm stuff before DRI extension gets initialised + +commit ef47d9c3ba63e9a6243fe5c81ccc60c8246352b4 +Author: Keith Packard +Date: Thu Nov 16 13:50:48 2006 -0800 + + Reduce calls to RRGetInfo. + + RRGetInfo can be expensive. Don't invoke it when quering Xinerama + information or setting a new CRTC configuration. + (cherry picked from commit b5aa9eb8e6eda36856a075f4b008c33f6c706bad) + +commit 07b26e690cd9a4fc626132feed0702515cbe5a88 +Author: Keith Packard +Date: Thu Nov 16 09:48:33 2006 -0800 + + Remove RandR output options. + + RandR output options are now expected to be handled by properties instead. + (cherry picked from commit 8b2a7e94a1dc2776ab2cfaaebb309be02502602a) + +commit f17e3c34dfd1f1418440bdebf45764e4dbf550f0 +Author: George Sapountzis +Date: Thu Nov 16 02:18:03 2006 +0200 + + Fix GL context destruction with AIGLX. + + The logic for freeing GL contexts introduced by "Fix AIGLX VT switching." is + inverted. As it is now, GL context destruction is deferred for glxDRIEnterVT(). + +commit ae3c9ad4abe66784d7ee474455003d2745699286 +Author: Bjorn Helgaas +Date: Thu Nov 16 17:29:06 2006 +0100 + + Bug 9041: Check the return code in xf86MapDomainMemory(). + +commit 6ff7f2ad6a5e2e769244590578e6809974b5235d +Author: Eric Anholt +Date: Tue Nov 7 13:13:53 2006 -0800 + + Fix build on FreeBSD after input-hotplug. + (cherry picked from commit 4e6e4baead6c565363abbcd9e06cc685be121596) + +commit 2eab230d9bd3f73ffe1b5a42111f89e85904ee11 +Author: Jeremy C. Reed +Date: Tue Nov 14 16:37:18 2006 -0600 + + For NetBSD, define PCVT_SUPPORT (System has PCVT console). + + Noticed by Joerg Sonnenberger. This fixes problem with console + switching. + + This was in original imake NetBSD.cf. + +commit 26d2e45bdb0cf4d18ba7b0365425da49d60b3d5c +Author: Matthias Hopf +Date: Tue Nov 14 15:33:07 2006 +0100 + + Bug #9023: Only check mice for "mouse" or "void" if identifier is != NULL. + +commit a724b7f1302ba7a59f140b521f13d2ddf0fcf9bf +Merge: 6facd95... f80a8ae... +Author: Jeremy C. Reed +Date: Mon Nov 13 20:32:26 2006 -0600 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 6facd958c2e7098cb68eac2810a88b8cd40f19c0 +Author: Jeremy C. Reed +Date: Mon Nov 13 20:23:06 2006 -0600 + + On DragonFLy, default to /dev/sysmouse (just like on FreeBSD). + + TODO: use autoconf to handle this so the code is not platform + based but feature based. + +commit f80a8ae6e6820378ea70ac0849cee8bf3055e0e8 +Author: Adam Jackson +Date: Mon Nov 13 18:26:05 2006 -0500 + + Disable Xprt server build by default. + +commit 5bfe7f4dfc6ab51b6790d74faf11574385234423 +Author: George Sapountzis +Date: Mon Nov 13 01:54:32 2006 +0200 + + DRI: call drmSetServerInfo() before drmOpen(). + + Also, remove some libdrm remnants. + +commit acb5ff4c73ac4d52201d7c421f488e2ead5c8b9c +Author: Jurij Smakov +Date: Sat Nov 11 14:09:15 2006 +0200 + + ffs: handle 0 argument (bug #8968) + + Handle an argument of 0 in ffs(), instead of looping indefinitely. + Add an ffs prototype to dix.h, and add includes to ffs.c. + (cherry picked from 34164e551e4c3909322d50b09835ca4ac1d49d68 commit) + +commit ca094684196886a4a1c10273049fae0705a3edc2 +Author: Alan Coopersmith +Date: Fri Nov 10 18:02:05 2006 -0800 + + Correct symlink-mesa.sh usage message + +commit 28337cc1060bc08adef81c304dd9ed02d0a0e37b +Author: Eric Anholt +Date: Thu Nov 9 19:51:17 2006 -0800 + + Fix typo before the last commit. + +commit e1720b1089328af80ca0cb85e5289ced05263f95 +Author: Eric Anholt +Date: Thu Nov 9 18:53:37 2006 -0800 + + Bug #8868: Remove drm from SUBDIRS now that the directory is gone. + +commit 0dee48b8af3e054228aef0d15c1cb1c9e23790cc +Author: Keith Packard +Date: Wed Nov 8 23:17:55 2006 -0800 + + Add RRInit function to create resource types for RR objects. + + To allow RandR objects to be created before the screen object exists, + the resource types must be registered with the resource database. + A driver wishing to create RandR objects must call RRInit before doing so. + + Also, fix a segfault when setting Output data before it is associated with a + screen. + +commit ec77a95a02329a2ee3a94d7de9d2a234aecb9ca0 +Author: Keith Packard +Date: Wed Nov 8 21:36:35 2006 -0800 + + Allow RandR objects to be created before the associated ScreenRec. + + xf86 drivers need to create RandR object in the PreInit stage, + before the ScreenRec is allocated. Changing the RandR DIX code + to permit this required the addition of functions that later associate the + objects with the related screen. + + An additional change is that modes are now global, and no longer associated + with a specific screen. This change actually makes mode management cleaner + as there is no more per-screen list of modes to deal with. + + This changes the RandR 1.2 ABI/API for drivers. + +commit fd91630b73100e9d77ccb492c52807448bc772a5 +Author: Dave Airlie +Date: Thu Nov 9 09:30:33 2006 +1100 + + make X server use system libdrm - this requires libdrm >= 2.3.0 + + This patch blacklists the load "drm" line, moves some functions in dri module + links dri module against libdrm, and removes the X copy of libdrm + +commit 0409e1627a167db2efc1355f292d3c02a6989ffc +Author: Adam Jackson +Date: Wed Nov 8 16:17:20 2006 -0500 + + 'make dist' fixes. + +commit 7e0aeebb8f8a5dff3cb4d88756e535dd70edeec4 +Author: Adam Jackson +Date: Wed Nov 8 12:03:37 2006 -0500 + + Bug #6786: Use separate defines for server's Fixes support level. + +commit b5d09d4adb8088719ff494a4281a793717046576 +Author: Rich Coe +Date: Wed Nov 8 18:10:14 2006 +0200 + + CheckConnections: don't close down the server client (bug #7876) + When an appgroup is shutting down, the list of clients can change, so make + sure we're not trying to shut the server down. + +commit 0567a6337b84fa045b5732e98203f488274aa2a2 +Author: Bram Verweij +Date: Wed Nov 8 18:00:52 2006 +0200 + + xfree86/linux acpi: fix tokenising + Split on a space, rather on the 'video' string, as strtok takes a char, + not a string. + +commit e7900d68c3ee657158813f0650886d680c0a9a3c +Author: Daniel Stone +Date: Wed Nov 8 15:36:47 2006 +0200 + + remove trailing whitespace + Whitespace police in full effect. + +commit 2035f115b7db3c4b7deabeab0d814b3107d6ef30 +Author: Daniel Stone +Date: Wed Nov 8 15:28:10 2006 +0200 + + xfree86: remove xf86Keymap.h + +commit 809e2841aaa54662a42498aacec558bc813bba1c +Author: Daniel Stone +Date: Wed Nov 8 15:27:58 2006 +0200 + + xfree86: add general handler, port ACPI to it (bug #5665) + + Add 'general' handler registration, which will not trigger DPMS when an + event comes in. + Make ACPI use this. + +commit b5438f7fb2879e0226b578f60b22a490e73c3a83 +Author: Daniel Stone +Date: Wed Nov 8 15:24:58 2006 +0200 + + Get*Events: massive reorganisation + + Reorganise the code logically, and put more comments in. + Clip valuators in proximity calls. + +commit b0a7443ca8bd224994f98c1c1e25de88f2573224 +Author: Daniel Stone +Date: Wed Nov 8 15:23:52 2006 +0200 + + configure.ac: axe redundant SDL test + +commit 332f179db7c38310db1f752d45f51b6d8301fd30 +Author: Daniel Stone +Date: Wed Nov 8 15:23:35 2006 +0200 + + kdrive/sdl: fix compilation + +commit 988757a44197c91027109076e2e33ff6510ed71d +Author: Daniel Stone +Date: Wed Nov 8 14:06:51 2006 +0200 + + config: error messages non-fatal, and before we free them + + Move error messages before we free the error structure, and make them all + non-fatal. + +commit e2b78df5800fb4e3f0ed01b38a1974ba3577949c +Author: Daniel Stone +Date: Tue Nov 7 11:13:56 2006 +0200 + + xkb: warning fix + +commit b55007d8cc9d20baa23d5de67683e414c827d3e5 +Author: Daniel Stone +Date: Tue Nov 7 11:13:32 2006 +0200 + + SyntheticMotion: don't dereference sprite.screen when not using Xinerama + +commit f93d10ce9bb4a6de83b561f44fb7b046def16234 +Author: Daniel Stone +Date: Mon Nov 6 18:33:45 2006 +0200 + + dix: remove staggeringly broken vendor workarounds + + Dear SGI, + No. + + Scant regards, + Daniel + +commit 389275d240e4ba19d62fda0f138a45c7ecb245ff +Author: Daniel Stone +Date: Sun Nov 5 02:47:59 2006 +0200 + + XkbCopyKeymap: don't iterate broken types, or dereference null pointers + + Don't iterate invalid destination types (>= num_types) when coping key + types. + Don't free key_aliases if it's NULL (theoretical, but sure). + Make sure dst's label_font gets allocated if it's NULL. + (Thanks, Chris Lee.) + +commit d585b4189aff8d7952847f75b19b4f092ab3b88b +Author: Daniel Stone +Date: Sat Nov 4 21:47:55 2006 +0200 + + xkb: fix uninitialised warning + + Fix uninitialised warning with memset(); we never actually use it + uninitialised, but gcc doesn't know that. + +commit b6d7b537ed8975363ad0f7c4180a62822358e418 +Author: Daniel Stone +Date: Sat Nov 4 21:43:22 2006 +0200 + + os: fix sun extensions test + + 'else if' is not very valid, plus the logic is kind of broken, so just + move it outside the ifdef in the first place. + +commit 8ba0c7b62c78dead722b0c8aa414f37bac4414b7 +Author: Daniel Stone +Date: Sat Nov 4 21:41:03 2006 +0200 + + xace: avoid 'unused variable pScreen' + + Initialise pScreen explicitly, as REGION_* macros ignore pScreen. + +commit c3ea1f7db494365032526dc06a7283384bd0ecd1 +Author: Daniel Stone +Date: Sat Nov 4 21:38:31 2006 +0200 + + dix/mi: still more warning fixes + + Fix up prototypes for PrintChildren and PrintWindowTree in the dix. + Make miPrintRegion be unconditionally defined, and move the prototype into + regionstr.h. + Change a bunch of ScreenPtr pScreen = foo; to + ScreenPtr pScreen; pScreen = foo; in window.c, so we avoid unused variable + references (as inline REGION_* doesn't reference pScreen). + +commit 3a9b96425851b495503bd2eb0fd0d01c08f6a097 +Author: Daniel Stone +Date: Sat Nov 4 21:33:09 2006 +0200 + + dix: add missing prototypes + + Add missing prototype for ffs, and include headers from ffs.c. + Move PostSyntheticMotion prototype to input.h. + +commit 6716488fa256798070017232405b107d5c985479 +Author: Daniel Stone +Date: Sat Nov 4 21:30:23 2006 +0200 + + dix: remove unused debug code + +commit 51813d77bfb84609a58a98e678efe9b6c0bf5503 +Author: Daniel Stone +Date: Sat Nov 4 21:29:05 2006 +0200 + + dix: remove unused variable + +commit 844090a5b557705dd0adce2b7ed98813b5104d85 +Author: Daniel Stone +Date: Sat Nov 4 21:21:29 2006 +0200 + + xfree86/xf86misc: warning fixes + +commit 61b570d0c1eb448f0aa08b4598118f0d43bc7345 +Author: Daniel Stone +Date: Sat Nov 4 21:21:09 2006 +0200 + + xfree86/os-support: update prototype for OSRingBell + +commit c51fadc07d938f6a3edfd5620170fcb7d6486a11 +Author: Daniel Stone +Date: Sat Nov 4 21:20:45 2006 +0200 + + mieq: annotate with some more comments + +commit 578899139f133746634a7bf8845e25362b5dfca2 +Author: Daniel Stone +Date: Sat Nov 4 20:35:55 2006 +0200 + + RemoveGeneralSocket: don't touch EnabledDevices + + RemoveGeneralSocket. Harmless, but. + +commit ae58d349c1cf5d63ad3616c485baa858350978d5 +Author: Laurence Withers +Date: Sat Nov 4 19:34:37 2006 +0200 + + CreateColormap: fix return value (bug #7083) + + Return BadMatch when an unsupported visual type is given, not BadValue -- + this is correct according to the spec. + +commit 96f78e3886791b723ccd9ba40bea701603537b0c +Author: Erik Andren +Date: Sat Nov 4 19:29:49 2006 +0200 + + remove XFree86 changelogs (bug #7262) + + Without being able to tie these to specific commits, the text changelog is + useless, as well as being huge. + +commit 5a40448f2d0ac2c86c617bebe3fb649174bf0d7f +Author: Eric Anholt +Date: Tue Nov 7 15:48:05 2006 -0800 + + A couple more cases of error message before freeing strings. + +commit 05f1c302460a14c8fa9a943a12d69adcd3c30d58 +Merge: 3e7e0e3... 46af6d1... +Author: Adam Jackson +Date: Tue Nov 7 18:42:54 2006 -0500 + + Merge branch 'autoconfig-for-7.2' + +commit 3e7e0e35094d09e0e764818ed125314be75be01a +Author: Eric Anholt +Date: Tue Nov 7 14:13:23 2006 -0800 + + Report the error before freeing the error strings. + +commit 4e6e4baead6c565363abbcd9e06cc685be121596 +Author: Eric Anholt +Date: Tue Nov 7 13:13:53 2006 -0800 + + Fix build on FreeBSD after input-hotplug. + +commit 20e9144c0746943624ff77a61791b8596f3f8458 +Author: Keith Packard +Date: Tue Nov 7 12:49:28 2006 -0800 + + Add $(DIX_CFLAGS) to remaining Makefile.am files + +commit 5e946dd853a4ebc2722ae023429ce5797de3d7a6 +Author: Eamon Walsh +Date: Tue Nov 7 13:50:19 2006 -0500 + + Bug #8937: Extension setup functions not called on server resets + +commit 1dcda4f3c56214464c0b6123fea6daa69aae69fc +Author: Keith Packard +Date: Tue Nov 7 01:29:51 2006 -0800 + + Avoid dereferencing sprite.screen when Xinerama is not running. (#8925) + + With Xinerama support built into the X server but not in use, + sprite.screen is NULL and yet the SyntheticMotion + macro would dereference it. Avoid that by just passing sprite.screen + to PostSyntheticMotion which can then dereference it when Xinerama is + enabled. + + Also, define PostSyntheticMotion in dixevents.h and include dixevents.h in + getevents.c + +commit c20d3bf7533da0bf26beaf7d8c359d18edbd70e8 +Merge: 028bbdc... 3d39c02... +Author: Keith Packard +Date: Tue Nov 7 01:21:28 2006 -0800 + + Merge branch 'origin' into randr-1.2 + +commit 3d39c02fe6aaa602c52f1d4f0ea6cd3bd000cf9f +Author: Eamon Walsh +Date: Mon Nov 6 21:25:52 2006 -0500 + + More work on Bug #8875: revert previous fix and try using client argument + instead of serverClient. Also don't use totalClientSize as it is not + initialized until after the first call to InitClient. + +commit 75fe0670eb1f71144246f1c20759d58788bbee00 +Author: Eamon Walsh +Date: Mon Nov 6 15:30:25 2006 -0500 + + whitespace adjust + +commit 0539d9cf2423fc0bed6f5c413beba3080f8abd85 +Author: Eamon Walsh +Date: Mon Nov 6 15:29:17 2006 -0500 + + Bug #8875: Security extension causes Xorg to core dump on server reset + +commit aa0261a98e9d5b1349b33e2639bd83c556dd4000 +Author: Juliusz Chroboczek +Date: Mon Nov 6 02:29:49 2006 +0100 + + Improve vm86 error handling in Xvesa. + +commit 6b2c65fdd169037c6ede250d4a8fec3d29a080ae +Author: Juliusz Chroboczek +Date: Mon Nov 6 00:30:09 2006 +0100 + + Fix typo in Xvesa: incorrect reporting of DAC capabilities. + +commit 028bbdc0417173803695808ba9f48498519273a3 +Merge: 50504c6... 8deaaa3... +Author: Keith Packard +Date: Sat Nov 4 17:46:26 2006 -0800 + + Merge master back to randr-1.2 + +commit 50504c68e1d407232cf83465981b235e542ef31f +Merge: 8b87ce1... cde8806... +Author: Keith Packard +Date: Sat Nov 4 17:43:19 2006 -0800 + + Merge branch 'randr-1.2-origin' into randr-1.2 + +commit 8b87ce19741753eafbd99e7093bc3dea8f26e838 +Author: Keith Packard +Date: Sat Nov 4 17:41:25 2006 -0800 + + Allow X server to build against libdrm 2.1 + +commit 7ffbe9d232e3a4621a204448d67e434736465cbe +Author: Keith Packard +Date: Sat Nov 4 17:41:09 2006 -0800 + + Add DIX_CFLAGS to hw/vfb/Makefile.am + +commit 2db62bce0725ba2d88cbe40fc440b6bda45046f3 +Author: Keith Packard +Date: Sat Nov 4 17:40:34 2006 -0800 + + Define fbHasVisualTypes in fb.h as it is exported + +commit 8deaaa312ad7f9b492a2ae8ad17d74650112c25c +Author: Bernhard Rosenkraenzer +Date: Sat Nov 4 18:59:39 2006 +0200 + + automake: avoid use of reserved _SOURCES keyword (bug #8866) + Avoid using _SOURCES unless we're directly referencing a program or + library to be built; use _SRCS instead. Shuts automake 1.10 up. + +commit f72927d26cd112d321f7bf187df3c740b3129d22 +Author: Samuel Thibault +Date: Sat Nov 4 19:00:57 2006 +0200 + + xfree86/hurd: remove OsMouseProc (bug #5613) + Remove OsMouseProc, let the mouse driver deal with it. + +commit 0273610578485564c3c0be11b336b6554cc31b43 +Author: Samuel Thibault +Date: Sat Nov 4 19:02:04 2006 +0200 + + xfree86/hurd: add bell support, remove SERVER/LOADER defines (bug #5613) + Add no-op bell ringing support, and remove obsolete @SERVER_DEFINES@ and + @LOADER_DEFINES@ from CFLAGS. + +commit ade4bf09076d13dbf3549c0a2d987a0afe76d5c1 +Author: Samuel Thibault +Date: Sat Nov 4 19:03:13 2006 +0200 + + mesa/indirect: include byteswap.h on GNU userland (bug #5613) + Include byteswap.h on all GNU-userland systems (including with the Hurd + and FreeBSD kernels), not just Linux. + +commit 412e93349e1656c9650115328af4be0e59a66f74 +Author: Samuel Thibault +Date: Sat Nov 4 19:05:02 2006 +0200 + + kdrive: make building of Linux support conditional (bug #5613) + Only try to build Linux support on Linux. We should probably disable all + OS-dependent DDXes if we don't have a workable OS (and only build + Xephyr/Xfake), but that's future work. + +commit cde8806c2930788ba8076e94651d391e45f3ccdb +Author: Eric Anholt +Date: Fri Nov 3 16:36:34 2006 -0800 + + Don't bump the refcnt if the new mode is NULL. + +commit 97fd471a627be185bee8cda3f709cfccea3fa12d +Author: Aaron Plattner +Date: Fri Oct 27 12:36:56 2006 -0700 + + Fix standard VESA modes. + + The built-in mode timings were off slightly for the 640x480@60, 640x480@72, + and 1024x768@75 modes. + +commit 22ee2e4e1f1d9fd9ca9f25c9bf25370034b771d4 +Merge: 49a2668... bd0c829... +Author: Alan Coopersmith +Date: Fri Nov 3 12:54:56 2006 -0800 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 49a26681b2bdd95ed65c425f1fa1441d2f092a6e +Author: Alan Coopersmith +Date: Fri Nov 3 12:54:43 2006 -0800 + + Add DTrace probe points for X server <-> client communications + + See http://people.freedesktop.org/~alanc/dtrace/ for more details + +commit bd0c829654903ca45543dfa59cda967c4fafd8ac +Author: Bjorn Helgaas +Date: Fri Nov 3 18:54:06 2006 +0100 + + Do not map full 0-1MB legacy range + + If we're mapping something in the "legacy range" (0-1Mb), we shouldn't + expand the requested range to the entire 0-1Mb range. Typically this + is for mapping the VGA frame buffer, and some platforms support mmap of + the frame buffer but not the entire 0-1Mb range. + + For example, HP sx1000 and sx2000 ia64 platforms can have memory from + 0-0x9ffff, VGA frame buffer from 0xa0000-0xbffff, and memory from + 0xc0000-0xfffff. On these platforms, we can't map the entire 0-1Mb + range with the same attribute because the memory only supports WB, + while the frame buffer supports only UC. But an mmap of just the + frame buffer should work fine. + +commit c1828a8ff51c8db326c47e6710f4f42fab94fb6d +Author: Egbert Eich +Date: Fri Nov 3 18:32:48 2006 +0100 + + Fixing mach64 driver bailing out on ia64 + + Mach64 driver bails out on ia64 because it cannot map device + memory. It turns out that some bogus and unneeded code attempts + to find the root bridge of the device and fails to do so proberly + as there this host-to-pci bridge is not existant. This code has + been around for years although it completely unclear what it had + been intended for. Fixing this by eliminating the bogus code. + +commit d50fc413b39f52663b46084c28e81fc4933a7b49 +Author: Matthias Hopf +Date: Thu Nov 2 18:53:41 2006 +0100 + + Fix device path in altixPCI.c to be domain aware. + +commit 1d731fc54a2cf5d3f353d8ee1c7c4989df27f011 +Author: Matthias Hopf +Date: Thu Nov 2 18:50:15 2006 +0100 + + Add domain support to linuxPciOpenFile(). + + Loosely based on patch from David S. Miller + See also bug #2368. + +commit caaa113acf4144fd47a1ac93ca440d78d1983e54 +Author: Matthias Hopf +Date: Thu Nov 2 18:38:45 2006 +0100 + + Fixing domain support for ia64 + + ia64 specific functions + defines. + Still uses /proc interface for some scaning code. + Based on code from Egbert Eich . + +commit 16c5043fc0c84b14323cd211c2645106455ac320 +Author: Matthias Hopf +Date: Thu Nov 2 18:22:09 2006 +0100 + + Fix 2 warnings. + +commit 072c022e731c3aadf34096f16364e29df47280d2 +Author: Matthias Hopf +Date: Thu Nov 2 17:58:19 2006 +0100 + + Fix obviously wrong boundary checks + cleanup unused vars. + + Also disable compilation of code that is no longer used anywhere in the whole + Xserver tree. + +commit 5afc6c1a14fea2966017493b045fa7209faeb8eb +Author: Matthias Hopf +Date: Thu Nov 2 15:42:03 2006 +0100 + + Added linux 2.6 compatible domain aware device scanning code. + + Additional scanning code uses the /sys interface of 2.6 kernels. + Cleaned up the use of tags and already split domain/bus/dev/fn. + +commit 6319f7d713971f70f06166480f069eca3bcace36 +Author: Egbert Eich +Date: Thu Nov 2 12:50:52 2006 +0100 + + Make int10 fully domain aware. + +commit f4dd2665b0f9aa9c00a5152c73bc72cb7514eeb5 +Author: Matthias Hopf +Date: Thu Nov 2 12:36:12 2006 +0100 + + Added missing domain stripping in already domain aware code. + +commit 46901063e8edc82b67989f4e5eec39d17c67dc98 +Author: Matthias Hopf +Date: Thu Nov 2 12:25:03 2006 +0100 + + Build with -D_PC on ix86 only. + +commit 543b397277d1f03b8091e44812010abcd5d80102 +Merge: 4056e6e... 645d057... +Author: Keith Packard +Date: Thu Nov 2 19:00:35 2006 -0800 + + Merge branch 'origin' into randr-1.2 + +commit 037f23e6f8fbe6e6fc8e71ed21958fc553df72d0 +Author: Alan Coopersmith +Date: Thu Nov 2 18:30:58 2006 -0800 + + Convert Xprt DDX to new motion history api + +commit 7dc54a40e900cbea1e509620623b091d54a3c2d1 +Author: Alan Coopersmith +Date: Thu Nov 2 16:38:47 2006 -0800 + + Remove references to xf86Info.kbd* from solaris code + +commit e46f7f78b362e76f5a553184e3f5ec7e109aa39d +Author: Alan Coopersmith +Date: Thu Nov 2 16:38:12 2006 -0800 + + sun_bell.c needs to #include "xf86_OSlib.h" + +commit 58bf9a142d1957f4d77038ee4ce7b1116b1f7955 +Author: Alan Coopersmith +Date: Thu Nov 2 14:43:02 2006 -0800 + + PostSyntheticMotion needs to be extern, not static, since it's in getevents.c + +commit 1ecd45fb8e4250fb51daa2bdf1a960af0f8b53fb +Author: Daniel Stone +Date: Thu Nov 2 04:51:03 2006 +0200 + + Makefile.am: add config to DIST_SUBDIRS as well + +commit 01afa533aa872d1a101a41153f95d800e68fea3e +Author: Daniel Stone +Date: Thu Nov 2 04:32:37 2006 +0200 + + xfree86/os-support: axe more unused files + +commit 57c1409151cb1f6e0e528fb92ebda58f86f12c1a +Author: Daniel Stone +Date: Thu Nov 2 04:21:06 2006 +0200 + + xfree86/os-support: remove unused file from dist + +commit de5a4c63747a417cdece919f4fb5a4004a3ee7bb +Author: Daniel Stone +Date: Thu Nov 2 04:18:33 2006 +0200 + + xkb: note that we allow full xi interaction + We now allow maps to be set (etc) on different keyboards, so stop putting + XkbXI_KeyboardsMask in unsupported. + +commit 1d65429a9e03871969552d0c31b022546cc46b12 +Author: Daniel Stone +Date: Thu Nov 2 04:12:55 2006 +0200 + + xfree86: don't attempt to enable and disable non-DIX devices + Don't try to enable and disable devices with no entry in the DIX, such as + the evdev brain. + +commit 64139c1950ea825c0a0124abc5f88499e91f797f +Author: Daniel Stone +Date: Thu Nov 2 03:22:09 2006 +0200 + + bump to 1.2.99.0 + +commit 18c246a13b887b865de6a17e6cd1c259b9bc383d +Merge: 794f2e7... 4843d82... +Author: Daniel Stone +Date: Thu Nov 2 03:21:37 2006 +0200 + + Merge branch 'input-hotplug' + +commit 4843d823f4d38d8bd468ce3a8feddbff229ed416 +Merge: ba9f513... a7b944f... +Author: Daniel Stone +Date: Thu Nov 2 03:18:13 2006 +0200 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit ba9f5138fc32a7a7b97bcf941bc92751b7c6c2c0 +Author: Daniel Stone +Date: Thu Nov 2 03:16:10 2006 +0200 + + xfree86: allow starting with no input devices + Add a server flag (AllowEmptyInput), which will inhibit adding the + standard keyboard and mouse drivers, if there are no input devices in the + config file. + +commit be291a6d9764cf29a7d9a8114d47d9f41ce856e9 +Merge: a2d6242... 6fdfd9d... +Author: Daniel Stone +Date: Thu Nov 2 03:15:25 2006 +0200 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit a7b944f0d96c3e0e15e75378a04def1ac96089fb +Author: Alan Coopersmith +Date: Wed Nov 1 16:17:49 2006 -0800 + + If getpeerucred() is available, include pid & zoneid in audit messages too + +commit fbfb35189ef6666707097704b43e052cb2f919ae +Author: Alan Coopersmith +Date: Wed Nov 1 15:11:48 2006 -0800 + + Bug #1997: AUDIT messages should contain uid for local accesses + + + +commit a2d6242106bb3a440faa9cad157e0120dbfa7b6e +Author: Daniel Stone +Date: Thu Nov 2 00:46:33 2006 +0200 + + kdrive:remove Change{Keyboard,Pointer}Device + This was removed in the DIX, so just axe it. + +commit d9a5e3e964b6c91fbca88b50674fce9660b972a4 +Author: Daniel Stone +Date: Thu Nov 2 00:45:23 2006 +0200 + + XkbCopyKeymap: be more careful with levels, allocate compat/geom + Take various extra precautions with copying levels across (thanks Chris + Lee for a gdb session), including allocating when we don't already have a + coherent map. + Only free type components if they're present. + Allocate geometry and compat components if we don't already have them in + the dest map. + +commit 6fdfd9dad91d7b7aa292f8c4d268dd27c34de8d3 +Author: Eric Anholt +Date: Wed Nov 1 14:29:59 2006 -0800 + + Fix several cases where optimized paths were hit when they shouldn't be. + + This fixes a number of rendercheck cases. + +commit 40f84793bca40dcc6883d51aefa1bda44bd1ac61 +Author: Alan Coopersmith +Date: Wed Nov 1 14:34:46 2006 -0800 + + Propogate $LIBS for xtrans, clock_gettime, libm, etc. to libs used for each server + +commit d7d931abe01a8cf555b027f2bcfcccd5e9053e52 +Author: Daniel Stone +Date: Wed Nov 1 23:48:58 2006 +0200 + + configure.ac: remove check for rate/period + Keyboard stuff is now handled in the kbd driver. + +commit 81728558a044fdde0e1d63da7b6314755f77296e +Author: Daniel Stone +Date: Wed Nov 1 23:10:26 2006 +0200 + + input: add non-keyboard bell ringing function + Add a generic 'ring the bell' function (console bell on Linux and BSD, + /dev/audio on Solaris), and add DDX functions for this. Make this the + core keyboard's bell. + Port Xvfb and Xnest to this. + Port XFree86 to this, with OS-specific hooks for Linux, BSD, and Solaris + taken from foo_io.c in the old layer. + +commit 3df454719f9cbf6a046cb7458019ec621b3b42ee +Author: Daniel Stone +Date: Wed Nov 1 23:02:57 2006 +0200 + + kdrive: add KdRingBell prototype + +commit 4056e6e79a4e37101d298ae29139c83d3816368b +Author: Keith Packard +Date: Wed Nov 1 00:29:46 2006 -0800 + + Move physical size from mode to output. + + Modes can be shared across different sized monitors this way. + + Also caught some missing byteswapping and an incorrect return type. + +commit c03311a1e78daa291477a67b1bb7206772108c5d +Author: Alan Coopersmith +Date: Tue Oct 31 16:05:48 2006 -0800 + + Fix automake error: BUILT_SOURCES was defined multiple times on Solaris + +commit a2434ec5f3c9dc79d1f05c2d704a82a766718ed4 +Author: Alan Coopersmith +Date: Tue Oct 31 15:57:59 2006 -0800 + + Make _POSIX_C_SOURCE hack work with Solaris headers + + Solaris headers are very literal - if you ask for POSIX_C_SOURCE 199309L, + they limit to only the functions in that standard and no more, unless you + also specify __EXTENSIONS__ to allow functions beyond the standard base. + +commit 645d0576205532a3610ae351267d5b84d76236bd +Author: Matthieu Herrb +Date: Sun Oct 29 18:19:56 2006 +0100 + + Handle building in a separate objdir + +commit 59584c375f4e4b2670a92002ecb7a78a0bc50cce +Author: Matthieu Herrb +Date: Sun Oct 29 17:49:46 2006 +0100 + + kill GNU-make'ism. + +commit 0107320fac0913aae2cb169992e31c670b4bd2f7 +Merge: 06b6b97... a34446f... +Author: Thomas Hellstrom +Date: Sun Oct 29 15:23:35 2006 +0100 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 06b6b971d065226b983ba25da7ea8236ec37df04 +Author: Thomas Hellstrom +Date: Sun Oct 29 15:22:37 2006 +0100 + + Make sure we have 64-bit file-offsets in libdrm. + +commit 644ee2434a4e09f5baea00a486911f8c24b9a261 +Author: Daniel Stone +Date: Sun Oct 29 03:52:11 2006 +0300 + + kdrive: avoid null dereferences + Avoid jumping into NULL pointers for OS or card functions which do not + exist. + +commit 738d2e88171bcce8782d670a1cda9a1d941d7977 +Author: Daniel Stone +Date: Sun Oct 29 03:48:02 2006 +0300 + + kdrive: move bell ringing into an OS function + Move the bell into an OS function, and use that if it's declared; else, + fall back to using the driver's function. + Remove the Linux keyboard bell function; just move it into the OS layer. + Use named initialisers when converting the old structures, and eliminate + unused functions. + +commit 96e32805d12fc36f0fa0926dbfb0dd8a5cadb739 +Author: Daniel Stone +Date: Sun Oct 29 03:43:34 2006 +0300 + + Xi: disallow changing core keyboard and pointer + Just short-circuit the change core keyboard/pointer requests. + +commit 68f595ca6c7883e030947b7f95c50e92aa733f2b +Author: Daniel Stone +Date: Sun Oct 29 03:41:34 2006 +0300 + + GetTimeInMillis: use correct units for clock_gettime + Make sure we're treating the nanoseconds as a long, not an int, so we + don't overflow. + +commit 51a06b3c44509c72279b5cfcf2b52b9a35c461b0 +Author: Daniel Stone +Date: Sun Oct 29 03:40:57 2006 +0300 + + WaitForSomething: only rewind when delta is more than 250ms + Only rewind time when we're more than (original delta + 250ms) away from + executing the timer. + When we're walking the timer list, use a goto to iterate all of them from + the start again, since timers may drop out of the list. + Don't bother trying to be smart in TimerSet, we'll pick it up in + WaitForSomething anyway. + +commit a34446f5b3d90714969a90583c49cb1eae1c9651 +Author: Eamon Walsh +Date: Fri Oct 27 13:43:43 2006 -0400 + + Add missing file to list in Makefile.am + +commit 92d04e746bd9b8ad3ee217c165ace20468e079cf +Author: Thomas Hellstrom +Date: Fri Oct 27 18:26:30 2006 +0200 + + Import libdrm functions for the drm memory manager. + +commit 196c5836f463c28f633bbba847f59acd5935359d +Author: Daniel Stone +Date: Fri Oct 27 01:27:31 2006 +0300 + + CoreKeyboardProc: annotate with FIXME + Setting an empty keymap by default isn't wildly useful. + +commit f9a1e456f8a4eaa1a9c71fd0fe5231140975c22d +Author: Daniel Stone +Date: Fri Oct 27 01:25:39 2006 +0300 + + CoreKeyboardProc: don't leak keymap and modmap + SetKeySymsMap does a copy here, so try not to leak them. + +commit a5be65401769fabcb5001dc63035c69f9e4a2712 +Author: Daniel Stone +Date: Fri Oct 27 01:25:21 2006 +0300 + + mieqEnqueue: only compare DEVICE_BITS of deviceid + Only compare DEVICE_BITS of the two deviceids, so we don't decide that + a valuator event isn't for us, because (id | MORE_EVENTS) != id. + +commit 85212eb504f860b054eb0f0a5029fed86cb8d1c0 +Author: Daniel Stone +Date: Fri Oct 27 01:23:58 2006 +0300 + + getValuatorEvents: make sure we put MORE_EVENTS in the right places + Make sure we put MORE_EVENTS in with the device id if there are, in fact, + more valuator events coming. + +commit 794f2e7291ccb4e48f9fbfc8f08302e3aac0f79f +Author: Myron Stowe +Date: Thu Oct 26 20:38:58 2006 +0300 + + xfree86: re-enable chipset-specific drivers for Linux/ia64 + Re-enable chipset-specific support for Linux/ia64, by linking in + lnx_ia64.c. + +commit 8c0556e7cb1de8c387ddd886a03a8f8afff1fd0e +Merge: cdc8a4b... 004d00e... +Author: Daniel Stone +Date: Thu Oct 26 15:21:22 2006 +0300 + + Merge branch 'master' into input-hotplug + +commit 004d00e6689f452fc9fdf91f5ffc6d6aed697d54 +Author: Daniel Stone +Date: Thu Oct 26 01:10:08 2006 +0300 + + GetTimeInMillis: simplify monotonic test + We don't actually need to get the CPU clock ID, which means we don't need + the monotonic_usable test. Since there's now only one branch, the + compiler will treat that as likely, so we don't need xproto 7.0.9 anymore. + + The fallthrough to gettimeofday() is preserved. + +commit cdc8a4b7b2f099b8860a54c5c9f488e6f7c4913a +Merge: 3da918a... d285833... +Author: Daniel Stone +Date: Thu Oct 26 00:28:30 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit d285833290316cb5dd1e7f1e52c96be3e9cf21cd +Author: Daniel Stone +Date: Wed Oct 25 23:57:00 2006 +0300 + + GetTimeInMillis: spuport monotonic clock + Add support for CLOCK_MONOTONIC from clock_gettime, and use that in + GetTimeInMillis() if available, falling back to the old gettimeofday() + implementation. + + This is _slightly_ faster on some 64-bit architectures, and _slightly_ + slower on others (though barely measurable). + +commit d3e57faffee63df1424a209d0418d3a712f91ae6 +Author: Daniel Stone +Date: Wed Oct 25 23:55:43 2006 +0300 + + WaitForSomething: allow time to rewind + If time rewinds dramatically, reset all the timers to fix their expiry. + +commit e21604914dccece6bc64c69b55512d1f1a969235 +Author: Keith Packard +Date: Wed Oct 25 09:48:23 2006 -0700 + + Merge master back in and clean up some unfinished code (closes 8745) + +commit becbda6d519a11c2c211afb8d46f9ea1a2676bc3 +Author: Michel Dänzer +Date: Wed Oct 25 11:39:27 2006 +0200 + + Fix test for Option "IgnoreABI". + + This option has plenty of potential for wasting the time of bug triagers + without pretending it's always on. + +commit 59511974db843fa7e11133894cfc10c20fdaf60f +Merge: 054f8cd... 598ac7a... +Author: Keith Packard +Date: Tue Oct 24 17:26:20 2006 -0700 + + Merge branch 'master' into randr-1.2 + +commit 598ac7a83698327b607084abaebcbd22f8d25fbb +Merge: 828c34e... 948a97b... +Author: Keith Packard +Date: Tue Oct 24 17:23:12 2006 -0700 + + Merge branch 'origin' + +commit 828c34e83ccdf3bcd2844d5af8b0cac4164b04ab +Author: Keith Packard +Date: Tue Oct 24 17:23:02 2006 -0700 + + Byte swap RRSelectInput enable flags. + +commit 3da918a16c8908fdfaf89f2a1bcaec19e01528a9 +Author: Daniel Stone +Date: Wed Oct 25 02:22:07 2006 +0300 + + mipointer: remember to update pointer location + Update pointer location so it doesn't get quickly reset by the next + pointer update. + +commit aabc087998e680c2fcf0ebc1c5022c1fe8f58f0c +Author: Daniel Stone +Date: Wed Oct 25 02:21:39 2006 +0300 + + GetPointerEvents: always ensure correct number of events + Ensure correct number of valuator events are returned, and that we always + increment events correctly. + +commit 65cd5aa4d754624566c2263015f1a018d137fce1 +Author: Daniel Stone +Date: Wed Oct 25 01:12:45 2006 +0300 + + kdrive/input: remove unnecessary #ifdef XINPUTs + Xi is now mandatory, so don't bother with the ifdefs. + +commit 0514d53e10b3521bb708a9cbde4bab525248eadb +Author: Daniel Stone +Date: Wed Oct 25 01:10:44 2006 +0300 + + xfree86: remove motion history handling + Remove motion history handling, as we now deal with this in the DIX. + +commit b1debebf8fe20ded20ba27e871fd1a6a9de029e3 +Author: Daniel Stone +Date: Wed Oct 25 01:10:20 2006 +0300 + + mi: remove mi motion history + This is now unneeded as we do motion history in the DIX. + +commit b9e180e632d04bf685ade9e32bd0b20882794486 +Author: Daniel Stone +Date: Wed Oct 25 01:09:19 2006 +0300 + + port all users to the new DIX motion history API + Port KDrive, Xvfb, and Xnest, as well as the virtual core devices, to the + new motion history API. Make GetPointerEvents also update the history. + +commit 5b38eb69cdaa154791c7f74e35dbe4d3256b19bd +Author: Daniel Stone +Date: Wed Oct 25 01:08:29 2006 +0300 + + dix: add motion history support + Add motion history support (sort of based on the XFree86 DDX's + implementation) to the DIX. + +commit 11fb58be77ac163844e494b2b0a260cf28a7ecd1 +Author: Daniel Stone +Date: Wed Oct 25 01:07:36 2006 +0300 + + miscellaneous warning fixes + Use the correct type for time, and fix the mi prototype of EnqueueEvent. + +commit 2a74b8a91da1a98669993078f7fe9081f2d743ce +Author: Daniel Stone +Date: Wed Oct 25 01:04:53 2006 +0300 + + xfree86: re-bump input abi to 1.0, yet again + +commit 37d1fffe79c35ada056ce9a56292c000014fe48a +Author: Daniel Stone +Date: Tue Oct 24 23:06:57 2006 +0300 + + inputstr: try to keep device structs the same size + Try to make sure DeviceIntRec and friends stay the same size, + regardless of whether or not XKB is enabled. + +commit 9f9ac01a819ee96fb5be5d7d346c91f461bf3979 +Author: Daniel Stone +Date: Tue Oct 24 23:01:05 2006 +0300 + + inputstr: fix indentation + +commit 0cd6a3d8efb5cc1ce4f85ab95bcdf4fb66c7245d +Author: Daniel Stone +Date: Mon Oct 23 06:56:07 2006 +0300 + + xfree86/input: add proximity support, free valuators + Re-add support for proximity events, and remember to both va_end our + varargs, and free our valuators. + +commit cccf7ae0ff24d0c84b5144c457f3f86bbbc36e12 +Author: Daniel Stone +Date: Mon Oct 23 06:55:21 2006 +0300 + + GetProximityEvents: add (untested) function + Add untested first guess at what GetProximityEvents should look like. + +commit 35fa4ac12b3da33f81e2a12bc9661ed075f323ed +Author: Daniel Stone +Date: Mon Oct 23 06:23:45 2006 +0300 + + GetPointerEvents: break into separate functions + Break out clipAxis, clipValuators, and getValuatorEvents, into + separate functions, to be used by the proximity event code. + +commit a7c2d9a15dc2ff253bb69c3b0738ad993521b9c7 +Author: Daniel Stone +Date: Mon Oct 23 06:08:27 2006 +0300 + + kdrive: numerous warning fixes + +commit c8f76fb3a473a022d497bd0acd6c84f58fc6efbe +Author: Daniel Stone +Date: Mon Oct 23 05:12:15 2006 +0300 + + xfree86/input: disallow pointer device changes, fix drag event calculation + Don't allow users to change the core pointer. + Fix xf86SendDragEvents to check the device button state, not the core + pointer's. + Remove unused xf86CheckButton. + +commit c5b5b046e86b159a9d32451308f38246cc4587f7 +Merge: fab1d37... 948a97b... +Author: Daniel Stone +Date: Mon Oct 23 02:58:30 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit fab1d37ecbeee9777ad1485b0cc62b55042d5014 +Author: Daniel Stone +Date: Mon Oct 23 02:57:00 2006 +0300 + + xfree86/options: don't blindly dereference NULL pointers + Sure, conf_idev should be initialised, but if it's not, try to make the + best of a bad situation. + +commit 523fe64ba16cf7a40f4095432d81300726d83e8d +Author: Daniel Stone +Date: Mon Oct 23 02:56:28 2006 +0300 + + kdrive/lots of DDXes: make stubs use KdOsAddInputDrivers() + In theory, removing LinuxPciScan should make these drivers OS-independent. + +commit 57f98e2b72d5c7fea93a9f6da86228ffb4856bf3 +Author: Daniel Stone +Date: Mon Oct 23 02:55:41 2006 +0300 + + kdrive/tslib: port to new absolute API, remove debugging + Port to new absolute device (not touchscreen) API, and remove some + leftover debugging. + +commit a6dc629052f0ad509cfa30e98217043a63c09552 +Author: Daniel Stone +Date: Mon Oct 23 02:54:59 2006 +0300 + + kdrive/os: add KdOsAddInputDrivers + Add KdOsAddInputDrivers, which adds all relevant input drivers. + + Could possibly be refactored to KdAddInputDrivers, which called through + OsFuncs to a new function, if it existed. + +commit ac240b00ff6fc354c1aa641406ae8b49244c0b8b +Author: Daniel Stone +Date: Mon Oct 23 02:54:07 2006 +0300 + + kdrive/input: use Absolute instead of Touchscreen + Adjust to suit Zepheniah's new absolute device API. + +commit b1ba4b3e8ad427af1fa8618b0bd839f741ec2ce3 +Author: Daniel Stone +Date: Mon Oct 23 02:53:15 2006 +0300 + + kdrive/neomagic: include vesa.h, use DebugF + +commit 29f28dd1a8a7ed07e945a67946e3510f4b32d12a +Author: Daniel Stone +Date: Mon Oct 23 02:52:52 2006 +0300 + + configure.ac: add XSERVER_LIBS to XNEST_LIBS + +commit 2f33f4065d89ae2b6fdda43c7105d72f89920cae +Author: Daniel Stone +Date: Mon Oct 23 02:52:35 2006 +0300 + + Xnest: port to new input API + Port Xnest to Get{Pointer,Keyboard}Events, plus the new mieq API. + +commit 08928afb0500d46b0caa0a1d1244dee2ed80e6a0 +Author: Daniel Stone +Date: Mon Oct 23 02:51:52 2006 +0300 + + Xnest: disable XKB, reshuffle code + Disable XKB, as we can't yet use it; move Composite disabling to + ddxInitGlobals, along with XKB. + +commit cd3b16a57efaf89108054f18a94c91e2dd74fafa +Author: Daniel Stone +Date: Mon Oct 23 02:51:13 2006 +0300 + + Xvfb: port to new mieq API + +commit bf4df9b73f0c1a84093aaf9a2e2cbc56fb341c60 +Author: Daniel Stone +Date: Mon Oct 23 02:50:53 2006 +0300 + + include: move POINTER_* flags from inputstr.h to input.h + Given they're just numeric constants, they should be included in + input.h, not inputstr.h. + +commit 4dd91c45abea9fb561a5acb10290e29487df6722 +Author: Daniel Stone +Date: Mon Oct 23 02:50:03 2006 +0300 + + miinitext: Xi and XKB are not hardware-only extensions + Xi is now a required extension, and XKB can be used without hardware, + so include them both when NO_HW_ONLY_EXTS is defined. + +commit 562096a012f4bb8f44d5ec6320a32f4010c189e4 +Author: Daniel Stone +Date: Mon Oct 23 02:49:22 2006 +0300 + + XkbCopyKeymap: increment shapes and outlines when copying + Remember to increment the source and destination shapes when copying, + instead of just endlessly copying the first one. + +commit eec182259112fba240751f974f7e5ca09fce8b9d +Author: Daniel Stone +Date: Mon Oct 23 02:48:30 2006 +0300 + + dix/getevents: move SyntheticMotion to getevents.c + Mostly, this is just a cheesy hack to ensure that getevents.o gets + included when linking. Sigh. + +commit bc701a14292da5abfb601e3a040651a74f46df8f +Author: Daniel Stone +Date: Mon Oct 23 00:08:32 2006 +0300 + + dix/getevents: cosmetic cleanups, remove keymap copy from GKVE + Remove keymap copy from GetKeyboardValuatorEvents, as + SwitchCoreKeyboard now takes care of this for us. + Remove unused variable and function prototype. + Update comments to be as informative as possible. + +commit b03e2f7029506640a8fe5cb88818b329c23503ff +Author: Daniel Stone +Date: Sun Oct 22 19:56:49 2006 +0300 + + xi: fix NIDR return yet again + For a one-line function, it was pretty broken. + +commit 90de7ce25a84cfe6c6790f9af2bc2399d25b9b9c +Author: Daniel Stone +Date: Sun Oct 22 19:54:36 2006 +0300 + + xi: fix return type for NIDR + +commit f46dc272913ffb6b5b234a7ec6f4ba5cae44a831 +Author: Daniel Stone +Date: Sun Oct 22 19:51:35 2006 +0300 + + xi: add NewInputDeviceRequest to stubs + +commit 31a6307b7ba5adaa96deb8101ddfcda0262f537d +Author: Daniel Stone +Date: Sun Oct 22 19:49:31 2006 +0300 + + xi: change DEVICE_TOUCHSCREEN to ABS_{AREA_CALIB} for stubs + +commit eae6594d03a606ddf1f433b5897b5938aa940c1e +Author: Daniel Stone +Date: Sun Oct 22 16:39:44 2006 +0300 + + Xi: swap control in DevicePresenceNotify + +commit be21630164e865eca72ff2a686a38ae4e30fd79c +Author: Daniel Stone +Date: Sun Oct 22 16:33:02 2006 +0300 + + dix, Xi: make use of deviceid in DevicePresenceNotify + Use the deviceid and control fields in DevicePresenceNotify since + the last push to inputproto to send a DPN whenever a control changes + on a device. + +commit f08b6b2367705cb5b60e996e6328197430bf1919 +Author: Daniel Stone +Date: Sun Oct 22 12:30:02 2006 +0300 + + kdrive: change DEVICE_TOUCHSCREEN to DEVICE_ABS_{CALIB,AREA} + +commit 77e724585f6c53feb55475b94d8cfcb6acf1159b +Author: Daniel Stone +Date: Fri Oct 20 00:44:46 2006 +0300 + + minor formatting fixes + +commit 948a97b97e93cee05a23f1f1ae699c5e181bc8ce +Author: Drew Parsons +Date: Sat Oct 21 23:09:22 2006 +1000 + + Minor typo fix to xorg.conf man page. + +commit 04554a3adcddc32de5fdb0b3122da0bcdd4c24a9 +Author: Drew Parsons +Date: Sat Oct 21 22:06:43 2006 +1000 + + Minor typos in Xserver man page. + +commit e26a494f417c3c700636ee68892c3015b2e0f27a +Merge: 736b0d5... aeba855... +Author: Zephaniah E. Hull +Date: Sat Oct 21 04:26:14 2006 -0400 + + Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 736b0d5078597abbda80444deef852879260af90 +Author: Zephaniah E. Hull +Date: Sat Oct 21 04:24:49 2006 -0400 + + DEVICE_TOUCHSCREEN becomes DEVICE_ABS_CALIB. + + Update the DEVICE_ABS_CALIB stuff to include the new elements. + + New DEVICE_ABS_AREA support. + + dev->touchscreen becomes dev->absolute, with _CALIB and _AREA stuff in it. + + Update xfree86 to compile with this, kdrive needs an update too. + +commit edd5f1745461f995670969cb736d1569ca94643f +Author: Carl Switzky +Date: Thu Oct 19 17:30:54 2006 -0700 + + Add ast driver/device info to Xorg server & config utilities + +commit aeba855b07832354f59678e20cc29a085e42bd99 +Author: Daniel Stone +Date: Fri Oct 20 00:30:28 2006 +0300 + + move keymap copy to event processing, from enqueuing + + Move the keymap copying to event processing time (in + ProcessInputEvents), instead of being at event enqueuing time. + Break SetCore{Pointer,Keyboard} out into separate functions. + Change mieqEnqueue to take a device pointer, that asks for the + _original_ device associated with this event. + +commit a8d3dad9d9f2b9053843e655abe463a68ba8dcb7 +Author: Daniel Stone +Date: Fri Oct 20 00:28:40 2006 +0300 + + xi: add DEVICE_ENABLE control + + Add DEVICE_ENABLE control, which allows runtime enabling and disabling + of specific devices. + +commit b0780312d80ea4af0136227f90fdd7ada3db71c5 +Author: Alan Coopersmith +Date: Thu Oct 19 13:51:53 2006 -0700 + + Pre-release message should tell users to check git, not CVS, for updates + +commit c5dc997baf57ffa08025efadbbaf761296ce4bc4 +Author: Joshua Baergen +Date: Thu Oct 19 11:14:26 2006 -0700 + + Create xorg.conf.example (Gentoo bug #138623). + +commit d029c8f1b72019446a5c873f55ffa43504b03dfb +Author: Alan Coopersmith +Date: Wed Oct 18 18:11:06 2006 -0700 + + Use getisax() instead of asm code to determine available x86 ISA extensions on Solaris + +commit a8a0abdbea0573c861a5af9d58f3ce66790455ca +Author: Daniel Stone +Date: Wed Oct 18 10:59:07 2006 +0300 + + config/dbus: always unref the connection, not close + +commit 80642f37d40216035786eaf490952d16f6b5f597 +Author: Adam Jackson +Date: Tue Oct 17 14:53:28 2006 -0400 + + Stop building xorgcfg by default. + +commit 5e17cde27b064174584d478130b0f95dcef78deb +Author: Matthias Hopf +Date: Tue Oct 17 17:06:44 2006 +0200 + + StorePixels() macro could create invalid *x++=*x... code - fixed. + +commit 205c6788d7a34704e36b23f1a93d89e9b986266a +Author: Daniel Stone +Date: Mon Oct 16 23:48:09 2006 +0300 + + config/dbus: properly initialise vtable + + Properly initialise the vtable, so we don't end up with an unregister_function + pointing to god knows where. + +commit 85ac2f16abe9f6e88b4e71609da334d336a9a600 +Author: Alan Hourihane +Date: Mon Oct 16 12:39:05 2006 +0100 + + Small modification to blocking signals when switching modes. + +commit 0901eec87ee9f3a2a067695bdbd569ff42149879 +Author: Michel Dänzer +Date: Sun Oct 15 16:57:09 2006 +0200 + + Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms. + +commit a232693c8c2a206aac47c07b133c071938204e0b +Author: Michel Dänzer +Date: Sun Oct 15 16:48:59 2006 +0200 + + Add per-drawable Xv colour key helper function. + + This allows overlay Xv adaptors to work slightly better with compositing + managers. + + Bump the video driver ABI minor so drivers only need to check for this at build + time. + +commit 5563861ab7e56ec891cfce6b34af43fec53ccee3 +Author: Alan Coopersmith +Date: Fri Oct 13 19:05:28 2006 -0700 + + Make sure xorgcfg files are included even when dist made with --disable-xorgcfg + +commit e1dd1904c6c7ce33f347d822272831d54a6497c8 +Author: Alan Coopersmith +Date: Thu Oct 19 13:51:53 2006 -0700 + + Pre-release message should tell users to check git, not CVS, for updates + +commit 62d24097932708fbbb62a23614fe63b4b7acf3bd +Author: Joshua Baergen +Date: Thu Oct 19 11:14:26 2006 -0700 + + Create xorg.conf.example (Gentoo bug #138623). + +commit 357b37b3826fa6e9878c0bd895164259c2ed3c0d +Author: Alan Coopersmith +Date: Wed Oct 18 18:11:06 2006 -0700 + + Use getisax() instead of asm code to determine available x86 ISA extensions on Solaris + +commit 1b1698af41b9038d9f9dbf521737d0baab5a2237 +Author: Zephaniah E. Hull +Date: Wed Oct 18 04:57:22 2006 -0400 + + Pass SetDeviceValuators down to the driver. + NOTE: This changes the LocalDeviceRec struct, which breaks input drivers. + +commit 5eca750fe2f3f243fb352271ad8da196af0cb16a +Author: Adam Jackson +Date: Tue Oct 17 14:53:28 2006 -0400 + + Stop building xorgcfg by default. + +commit df979b75c8cd8a7e0566aea58031bb9b8f5cd3d3 +Author: Matthias Hopf +Date: Tue Oct 17 17:06:44 2006 +0200 + + StorePixels() macro could create invalid *x++=*x... code - fixed. + +commit d430e76a161c963169067875c3654f5fd8f42b19 +Author: Alan Hourihane +Date: Mon Oct 16 12:39:05 2006 +0100 + + Small modification to blocking signals when switching modes. + +commit 6dd4fc4652f942724039dc2317c560ea7276ab59 +Author: Daniel Stone +Date: Mon Oct 16 00:22:00 2006 +0300 + + xkb: fix virtual modmap size computation + Compute virtual modmap size bounded by nVModMapKeys-1, rather than + nVModMapKeys. + + This is sort of a best guess. The other way seems a little more + logical, but also leads to segfaults pretty quickly if you hammer + GetMap hard enough. So let's try this one. + +commit a484ba15277e66e7ef9b21b238dcbf760695bc63 +Author: Daniel Stone +Date: Sun Oct 15 23:47:34 2006 +0300 + + XkbCopyKeymap: copy server vmods, and name atoms + Copy server->vmods, and all the atoms in names. + +commit ad355fecee3965be576596aeed5da54d776edf1d +Author: Daniel Stone +Date: Sun Oct 15 21:59:06 2006 +0300 + + xkb: make sure we set the map on the right device, not necessarily core + Forgot that all XKB requests took a device spec: the comparison of + 'if working on the core keyboard, does this device send core events; or, + is this device the core keyboard?' was broken. Instead, what we want is + 'if working on the core keyboard, does this device send core events; or, + is this device the one we're working on?'. + +commit 4ae7745a0dc86de6346409a69c1e396e0b954514 +Author: Daniel Stone +Date: Sun Oct 15 21:48:01 2006 +0300 + + xfree86 input: always open devices on NewInputDeviceRequest + +commit acd8419948003032056a56d46adbef7c35e7739c +Author: Daniel Stone +Date: Sun Oct 15 20:42:31 2006 +0300 + + config: unref connection, don't close it + Just unref the connection instead of explicitly closing it (thanks, Rob + McQueen). + Add a commented-out unregister_object_path call: unfortunately, when we + call it, libdbus segfaults. But if we don't unregister the path, we + can't register it again. So regenerations are broken either way, but a + little less violently like this. + +commit fc9b5f84b244ea08480b73bd15ac919b875800fb +Author: Daniel Stone +Date: Sun Oct 15 20:01:01 2006 +0300 + + dix/devices: add devices in proper forward order + Add devices in forward order with the normal linked list convention. + Previously, AddInputDevice would add all the devices in reverse order to + off_devices, before they were added again in reverse order to devices with + EnableDevice. + This just makes both work in forward order, which provides the ordering as + you'd expect when hotplugging devices (i.e. adds them to the head, not the + tail). + +commit ec35e7198debf938f1115f584e675ce5995743e3 +Author: Daniel Stone +Date: Sun Oct 15 19:44:49 2006 +0300 + + config: add replies and dbus api documentation + Add replies, which use standard X error values, to the two currently-supported + input configuration requests. + Document the D-BUS API we use. + Make sure we free everything when we encounter an error. + Add a _source option to all incoming requests, noting that it came from a + client. + Reject all requests to add a device where an option name contains an + underscore. + +commit 7e4717683d6c08d1e490a60b7493a94bbc57bf8d +Author: Michel Dänzer +Date: Sun Oct 15 18:12:28 2006 +0200 + + exaDrawableDirty: Fix initialization of BoxRec. + + This will hopefully fix the partial window corruption experienced by some + people. + +commit 3ad1642f1bbaa5f96558cdf3384b40f7122f8781 +Author: Michel Dänzer +Date: Sun Oct 15 16:57:09 2006 +0200 + + Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms. + +commit f9bfee50981006a2c58d3f73e2b0d123bb2a41b7 +Author: Michel Dänzer +Date: Sun Oct 15 16:48:59 2006 +0200 + + Add per-drawable Xv colour key helper function. + + This allows overlay Xv adaptors to work slightly better with compositing + managers. + + Bump the video driver ABI minor so drivers only need to check for this at build + time. + +commit a05044cfc14a8bc6cc31236dcecada60bec09924 +Author: Daniel Stone +Date: Sat Oct 14 22:14:56 2006 +0300 + + xkb: better support of XkbDfltXIId + XKB.h specifies that XkbDfltXIId should be used where the client doesn't + care about the device identifier. We take this to mean core devices, + where practical. + +commit 4d8030076ed1a7680bdfcb7b89af1045bdc40304 +Author: Daniel Stone +Date: Sat Oct 14 22:14:07 2006 +0300 + + dix: move GetKeyboardEvents/GetPointerEvents to a new file, export symbols + Move GKE and GPE to a separate file, to help stem the events.c explosion. + Mark GKE/GKVE/GPE as _X_EXPORT. + +commit 6afc7c284690b1e2bb7544b5bc4f31a3f6a05519 +Author: Daniel Stone +Date: Sat Oct 14 15:54:35 2006 +0300 + + dix/devices: remove XACE merge debris + +commit 93302452e737bd91a893eb495592538d40d921e5 +Author: Daniel Stone +Date: Sat Oct 14 15:54:12 2006 +0300 + + XkbCopyKeymap: add geometry support + Add a first cut at geometry support, which seems to generally work. + +commit b9108a13fc126d97c0393f911a1d9292563444ce +Author: Alan Coopersmith +Date: Fri Oct 13 19:05:28 2006 -0700 + + Make sure xorgcfg files are included even when dist made with --disable-xorgcfg + +commit 054f8cd2675a80b14bc1ce266377fcfee2335cee +Author: Keith Packard +Date: Fri Oct 13 17:34:53 2006 -0700 + + Limit pointer to valid crtc areas. Add event swapping. Fix change tracking. + + Add function to keep pointer within valid crtc areas. + Finish event delivery and swapping code. + Separate configuration from layout changes to send correct events. + +commit 335b503c5e7041bb0c44611e496d1c46f554e630 +Merge: bd3d93b... cf948b7... +Author: Daniel Stone +Date: Fri Oct 13 18:10:45 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit cf948b7b04dfeb61a294889027b9a54f6b9b478e +Author: Alan Hourihane +Date: Fri Oct 13 14:48:10 2006 +0100 + + Block IO on switchmode just as we do for VT switching + to avoid cursor movements signalling io. + +commit a6df780e4d3f90cc699b0b864bade03d6f15afd7 +Author: Ian Romanick +Date: Wed Oct 11 15:41:22 2006 -0700 + + Fix bug #8608. + + Regenerate files based on recent commits to Mesa (that fix Mesa bug + that return pixel data. + +commit 042d4a407d0eca9131d0420b0b9189559aac326d +Author: Aaron Plattner +Date: Mon Oct 9 16:32:11 2006 -0700 + + Bug #8459: Don't forget to include AM_CFLAGS in libfb_la_CFLAGS on non-MMX platforms. + + Reported by Edgar Toernig. + +commit 1b94c117e0f294ef2f89bf24d45ba7a8e45efe35 +Author: Matthias Hopf +Date: Tue Oct 10 19:37:22 2006 +0200 + + Fixing probably long-standing bug in domain support. + +commit 6776c0f0e9677a65ec36ceef9618ff701b99596c +Author: Alan Coopersmith +Date: Mon Oct 9 17:24:37 2006 -0700 + + Use bash on Solaris to run symlink-mesa.sh + + symlink-mesa.sh won't run with Solaris Bourne Shell (/bin/sh) so explicitly + run it with /usr/bin/bash instead + (cherry picked from cde68728860179dc84e615ccb378ce992513fd62 commit) + +commit bd3d93be82d91e4cf35ae317dfd658d1706257ea +Author: Daniel Stone +Date: Sun Oct 8 23:21:12 2006 +0300 + + xkb: remove random broken vendor workarounds + +commit 33406da096b4ae21134484113b280e07d0c8f0d9 +Author: Daniel Stone +Date: Sun Oct 8 23:20:56 2006 +0300 + + GetKeyboardEvents: add first_valuator argument to GKVE + +commit ef7e05e9de57b9c9c27ed3307eede6d8fc6c1af3 +Author: Daniel Stone +Date: Sun Oct 8 21:42:15 2006 +0300 + + xfree86/xinput: pass first_valuator params, don't clip to first screen bound + Pass first_valuator to GetPointerEvents/GetKeyboardValuatorEvents. + Don't clip axis bounds to that of screen 0 when initialising axes. + +commit 1546a398144619a14ff06aaf84ebc1bf293eac66 +Author: Daniel Stone +Date: Sun Oct 8 21:40:53 2006 +0300 + + GetKeyboardValuatorEvents: also take first_valuator param + Take a first_valuator parameter, which specifies the first valuator. + +commit b05a11478edc7e6d1e38ef7f8d6788c7bd917493 +Author: Daniel Stone +Date: Sun Oct 8 21:23:12 2006 +0300 + + doc/extensions: rename to c-extensions + The old name could be somewhat confusing. + +commit 41bb9fce47f6366cc3f7d45790f7883f74289b5a +Author: Daniel Stone +Date: Sun Oct 8 20:34:32 2006 +0300 + + mipointer: take device arguments, split miPointerAbsoluteCursor + Update mipointer API to take a device argument to (almost) all functions, + and split miPointerAbsoluteCursor into a couple of separate functions. + Remove miPointerAbsoluteCursor call from mieq, as we now deal with it in + GetPointerEvents. + Make miPointerSetPosition (successor of miPointerAbsoluteCursor) take + pointers to x and y, so it can return the clipped values. + Modify callers of miPointer*() functions to generally use the new + functions. + This should fix things with multi-head setups. + +commit be8dfafd1d58b27bbfd953fc1216311523353db1 +Author: Daniel Stone +Date: Sun Oct 8 20:32:16 2006 +0300 + + warning cleanups + Fix still more warnings. + +commit ca474e0920dd29ebe7ccf346cddc526732ad01ba +Author: Daniel Stone +Date: Sun Oct 8 20:30:49 2006 +0300 + + Xi: move SendEventToAllWindows and FindInterestedChildren to exevents + Move SendEventToAllWindows and FindInterestedChildren from chgptr to exevents, + so the DIX can more easily use it. + Clean up two warnings (type mismatch, unused variable) in exevents.c. + +commit c2fab469b66f2796c541e911202faa411d116b04 +Author: Daniel Stone +Date: Sun Oct 8 18:26:26 2006 +0300 + + dix/devices: clean up debugging + +commit 4493acb88c59721f7807093a3ed3c39396c2076d +Author: Daniel Stone +Date: Sun Oct 8 17:51:03 2006 +0300 + + xkb: add FIXMEs to procedures which need to act on all core devices + Add FIXME comments above request handlers which need to act on all core-sending + devices if called on the core keyboard. + +commit ef68273f5bdb27a492ec0b69548ec4fbede46c08 +Author: Daniel Stone +Date: Sun Oct 8 17:44:37 2006 +0300 + + mi/mipointer: deprecate functions which don't take a device + Deprecate all mi pointer functions which don't take a device argument, and + replace them with versions which do, in preparation for MPX. + +commit 6eab4c55890660089067da0e944256b1ed3a8c67 +Author: Daniel Stone +Date: Sun Oct 8 17:24:33 2006 +0300 + + doc/extensions: document C extension use in the X server + +commit 80cdd26581508dd17c5d0a5739cd540113996bbb +Author: Daniel Stone +Date: Sun Oct 8 17:23:54 2006 +0300 + + mi/pointer: mark public pointer functions as deprecated + Deprecate miPointer functions which don't take a device pointer. Pointer + movement should be handled through GetPointerEvents, and functions which + take a device as an argument (e.g. miPointerPosition) will be added. + +commit 97030b6c6b0fb6ff629ae31e483704d0a2207a53 +Author: Daniel Stone +Date: Sun Oct 8 17:07:05 2006 +0300 + + config: fix compilation + Accidentally built with --disable-config, didn't notice that the previous + commit to clean up the debugging broke things horribly. + +commit 14b157bdb1f2cd5feba03ba0815d7c5b2dd6633f +Author: Daniel Stone +Date: Sun Oct 8 17:04:12 2006 +0300 + + include: actually declare DebugF + DebugF is ErrorF when DEBUG is defined, else a no-op. + +commit 9e37de193f5d7412ffd8de76d5eed0158c0a3609 +Author: Daniel Stone +Date: Sun Oct 8 16:32:15 2006 +0300 + + configure.ac: reactivate warnings when building with gcc + We were inadvertently stomping XSERVER_CFLAGS after adding the warnings, so + move them after we do that. + +commit b559cbb1601f93cb03ea3dcfb2c5ca94ee6b73bb +Author: Daniel Stone +Date: Sun Oct 8 16:23:14 2006 +0300 + + dix/CoreProcessKeyboardEvent: remove debugging for every key event + Also change #ifdef DEBUG/ErrorF/#endif to DebugF in FixKeyState. + +commit 3ae4d250185e71a0a218c062426f92b9b1adbf05 +Author: Daniel Stone +Date: Sun Oct 8 16:20:42 2006 +0300 + + xfree86 Xinput: remove still more excessive debugging + There isn't any more debugging left for input events in the XFree86 DDX. + +commit 58314756aeecbb8fb04706c3e04d98e9ac531a02 +Author: Daniel Stone +Date: Sun Oct 8 16:18:05 2006 +0300 + + GetPointerEvents: add first_valuator parameter + Add a first_valuator parameter. Looks correct by inspection, but untested + with first_valuator != 0 as yet. + +commit 84f5d2291c1fe92fd8358e999e909bf3aab86c98 +Author: Daniel Stone +Date: Sun Oct 8 15:30:24 2006 +0300 + + GetPointerEvents: fix relatively harmless typo + Change !(cp->button || !cp->valuator) to (!cp->button || !cp->valuator). + +commit cfc3e9ede2dc83741bd38bf3df13f096ecb8adc0 +Author: Daniel Stone +Date: Sun Oct 8 15:27:52 2006 +0300 + + config: remove excessive debugging + +commit 8d8e7f8bae4099f9e90ef9aac687607dae1d32bf +Author: Daniel Stone +Date: Sun Oct 8 15:26:54 2006 +0300 + + kdrive/input: remove excessive debugging in NIDR + +commit 22a836fafd39a8ef413826dc2c94bc5f96990e2d +Author: Daniel Stone +Date: Sat Oct 7 14:16:51 2006 +0300 + + xfree86/loader: bump input major ABI version + Bump input major ABI version to 1.0, since we removed the OS keyboard + layer. + +commit 4c342246300e06bdf5c9c62cc1d2f6aa57a524db +Merge: 8382234... 49a70c8... +Author: Alan Coopersmith +Date: Fri Oct 6 18:01:13 2006 -0700 + + Merge branch 'XACE-modular' + +commit 3686cd0fbf56d883f2f3b3fda11ffba1058b74e4 +Author: Daniel Stone +Date: Fri Oct 6 17:20:42 2006 +0300 + + xkb: make XkbSetControls work on all core-sending devices + +commit 7b4dc171b036107cfba87a1a16bf692b982005a5 +Author: Daniel Stone +Date: Fri Oct 6 16:26:54 2006 +0300 + + xkb: remove unused #ifndef + +commit ab56f0c5b516269bb99ae8b5f479e49e61a3af76 +Author: Daniel Stone +Date: Fri Oct 6 16:12:36 2006 +0300 + + xkb: simplify core device loop in GetKeyboardByName + +commit 4b6e2f12f7296e17b2850f36b3adcf8156125cbe +Author: Daniel Stone +Date: Fri Oct 6 16:08:21 2006 +0300 + + xkb: make LatchLockGroup work on all core-sending devices + Apply the settings to all devices sending core events, if we're working on the + core keyboard. + +commit ebf9b3bbbb04acb78cdf8a84e47a96755fbfe854 +Author: Daniel Stone +Date: Fri Oct 6 14:17:59 2006 +0300 + + xkb: update all core-sending keyboards on GetKeyboardByName + Update the keymaps of all keyboards which send core events on + GetKeyboardByName; still a few other procedures which need this treatment. + +commit 1178796a4dff5ebf0bd9fb3cacb35be9709b41e5 +Author: Keith Packard +Date: Thu Oct 5 22:31:35 2006 -0700 + + Add preferred modes for each output. Round vrefresh. Deliver crtc events. + +commit de63a469dcd0a8ae98554bca540ac0106cccf2a5 +Merge: 9c7440b... 8382234... +Author: Daniel Stone +Date: Thu Oct 5 20:29:19 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit b4659faf9b455b44ac8e691cc7a8fc00a967c80b +Merge: c4f30c6... 8382234... +Author: Keith Packard +Date: Wed Oct 4 14:46:04 2006 -0700 + + Merge branch 'master' into randr-1.2 + +commit c4f30c63538e1451f15ed1991439869127d9b148 +Author: Keith Packard +Date: Tue Oct 3 21:06:11 2006 -0700 + + Add mode origins and output options. Fix memmoves in resource free funcs. + + Output options and mode origins both affected driver ABI. memmove mistakes + were causing 'Freeing resource which isn't there' messages. + + Prune unused non-user defined modes from available list now. + +commit 8382234a7f318057de66490299d63807cefb5201 +Author: Alan Coopersmith +Date: Tue Oct 3 17:49:48 2006 -0700 + + Update pci.ids to Tue 2006-10-03 daily snapshot + +commit 96edf7b853c1045d12d957a2957a11879100a2de +Author: Alan Coopersmith +Date: Tue Oct 3 17:48:50 2006 -0700 + + Don't insert RCS tag into generated pci id header files + +commit df800d87e04ce984a8a9ab4252ac6478ab1e4426 +Author: Alan Coopersmith +Date: Mon Oct 2 11:28:47 2006 -0700 + + Add (void) casts to clear compiler errors about ?: results having type mismatch + +commit 9c7440bdf5a4ecd113e102004c804a2ba354c422 +Author: Daniel Stone +Date: Mon Oct 2 20:58:33 2006 +0300 + + xkb: remove the world's most staggeringly broken vendor workaround + Certain versions of LynxOS needed to sleep up to five seconds for closing a + pipe to actually, y'know, be useful. + +commit d7c89c7c1c8c1e110345d9d8d300adbf5fe5804a +Author: Daniel Stone +Date: Mon Oct 2 02:15:36 2006 +0300 + + symlink-mesa.sh: expand *.{c,h} + +commit d6ea96b13e2ea01c51998c41ae2a3677bdedf61c +Author: Ivan Pascal +Date: Mon Oct 2 02:17:14 2006 +0300 + + xkb: fix wrapping when switching between groups + Use XkbCharToInt as that's what we're doing. + +commit 3c98cebb6e954855528794fec46830f456cbdec1 +Merge: fa1ac94... 2cf1098... +Author: Daniel Stone +Date: Mon Oct 2 02:18:17 2006 +0300 + + Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit fa1ac94178cf976d4c8dae9a4dc8703303a62d4b +Author: Ivan Pascal +Date: Mon Oct 2 02:17:14 2006 +0300 + + xkb: fix wrapping when switching between groups + Use XkbCharToInt as that's what we're doing. + +commit c31672e6aab168262bd7824a8082ecdf841fc3c0 +Author: Daniel Stone +Date: Mon Oct 2 02:15:36 2006 +0300 + + symlink-mesa.sh: expand *.{c,h} + +commit 2cf1098436d6b4382d9ed3f6b88214d37bdd8ddb +Author: Daniel Stone +Date: Sat Sep 30 17:05:46 2006 +0300 + + dix/events, mi/eq: remove utterly ridiculous debugging + Remove debugging which can cause long-lived Xorg logs to grow well above 1GB + if built with --enable-debug. + +commit 518db35ca3f569e7cb95dbddeddb93f3691de498 +Merge: 5d99e05... 84eb2c0... +Author: Daniel Stone +Date: Fri Sep 29 00:35:21 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit 5d99e05f05a42a82a9f02844df9bfebaa673759d +Merge: ad631af... 5893375... +Author: Daniel Stone +Date: Fri Sep 29 00:35:07 2006 +0300 + + Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit ad631afcf3fbc74024cddaaacd05d38addc047a2 +Author: Daniel Stone +Date: Fri Sep 29 00:34:23 2006 +0300 + + make core keyboard/pointer map functions act on all core-sending devices + Make Set{Keyboard,Modifier,Pointer}Mapping act on all devices which send core + events. + Change LegalModifier to accept a DeviceIntPtr. + +commit 84eb2c0a06de60e88e14bb03fabe661d7cd8f1d3 +Author: Brian +Date: Thu Sep 28 15:09:40 2006 -0600 + + Replace hard-coded filesnames with loops (all .c and .h files). + Should fix problems with Mesa adding/removing source files, for the most part. + Patch by Dan Nicholson. + +commit 4bc5dc2854e33bf343cdea44a3c3b4c41f6f4145 +Merge: cf6e968... f9542e7... +Author: Aaron Plattner +Date: Thu Sep 28 13:27:13 2006 -0700 + + Merge branch 'wfb' + +commit f9542e749544c7a3084fd72ecc6642ca3262f7c7 +Author: Aaron Plattner +Date: Thu Sep 28 13:26:54 2006 -0700 + + Restore the global xx* symbols and add them to wfbrename.h. + + I don't think they're ever used, but it's best to just leave them alone for ABI + compatibility. + +commit cf6e9687ffcc52af0d64e9098186570719a575a2 +Author: Jeff Smith +Date: Thu Sep 28 15:34:17 2006 -0400 + + Bug #8449: Yet another Mesa symlink script resync. + +commit a5d639cd87f30f9b3d765352d27253940f33b2b7 +Author: Daniel Stone +Date: Wed Sep 27 16:15:27 2006 +0300 + + remove merge detritus + +commit 2206a92a97901977910a6e39b4174ca805f9f4a7 +Author: Michel Dänzer +Date: Wed Aug 30 19:15:55 2006 +0200 + + Push information about cliprects of DRI windows to the DRM. + +commit 54d371e7a4ebab79a0f616669e2f601d8370cef3 +Author: Michel Dänzer +Date: Wed Aug 30 19:12:17 2006 +0200 + + Add wrapper for new ioctl to update drawable information in the DRM. + +commit ad321fad4b9ab3a2c70cfff37ca6c8faaa5cce9c +Merge: 5e9d33f... f7c1d94... +Author: Daniel Stone +Date: Sun Sep 24 17:56:43 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit f7c1d942416db8d0d4c5a21f5ece1ccacb926b69 +Author: Brian +Date: Sat Sep 23 10:38:10 2006 -0600 + + Check for visual==NULL in dmxBECreateColormap() before calling XCreateColormap() + to prevent potential segfault. + +commit 945b7c63946f5257d0f9b0dcf2f8f4882fb2c6f8 +Author: Brian +Date: Sat Sep 23 10:35:25 2006 -0600 + + The fbcmap.c file used by Xdmx _must_ be compiled with XFree86Server defined. + Otherwise, Xdmx generates a slew of protocol errors. + +commit 891e9c3e6cbd0869a57395b96c8e18ff522c2bb4 +Author: Brian +Date: Sat Sep 23 10:28:24 2006 -0600 + + Replace broken DMXDBG3() with DMXDBG2() + +commit a10039a100dfe5f87e29e9cc4fa656176e0890f9 +Author: David Nusinow +Date: Thu Sep 21 23:58:32 2006 -0400 + + Allow the xfree86 ddx utils to be optionally built. Patch by Eugene Konev. + +commit ce78b0cd2b1c35d60eb5683a1d00222aa4797c79 +Author: Adam Jackson +Date: Thu Sep 21 20:42:47 2006 -0400 + + Close with Pclose() that which we open with Popen(). + +commit c1655f0fd457f9bdf0857c5e0904639925bb01f1 +Author: Aaron Plattner +Date: Thu Sep 21 14:45:17 2006 -0700 + + Bug 8386: Grow parser buffers to fit an entire line if it's longer than CONFIG_BUF_LEN. + +commit b36fde9257263fa502147df37e8331184c323e14 +Author: Keith Packard +Date: Thu Sep 21 09:52:04 2006 -0700 + + When no mode is specified, don't validate mode-specific parameters. + +commit 8b4ed47c5d39f219866e3c72fa973c6fc4c70f18 +Author: Drew Parsons +Date: Thu Sep 21 22:19:44 2006 +1000 + + * Install Xprint's Xsession script to $(sysconfdir)/X11/Xsession.d + * Removing outdated references to CDE and dt, rename script to + 92xprint-xpserverlist. + +commit 219546fd76750f358ffb6738f17b9237c58c15a6 +Author: Keith Packard +Date: Wed Sep 20 22:43:05 2006 -0700 + + Steal Xinerama code from SiS driver. Add missing files. + + Provide a Xinerama implementation when DIX version isn't enabled. This + version exposes each crtc as a separate 'screen' and reports the size of + that patch. The extension also sends ConfigureNotify events to the root + window whenever crtcs change so that applications will re-fetch xinerama + information. This actually works for metacity. + +commit bde0a4c12cb393a6d7f1552b067624da1b0502ae +Author: Keith Packard +Date: Wed Sep 20 19:42:34 2006 -0700 + + RRSetCrtcConfig status fix. RRGetScreenResources timestamp fix. + + RRSetCrtcConfig was returning the wrong status values. + RRGetScreenResources was always returning currentTime. + +commit d812f486a01a6276aed7b4ebd3cd8eb8ddfe10d3 +Author: Donnie Berkholz +Date: Wed Sep 20 15:39:39 2006 -0700 + + Really fix sparc on 64-bit kernel/32-bit userland. + + Commit b3a3020fd018df8bc5a8193d36e1a1c7ae8af8ba used a sparc64 ifdef instead of + sparc. But for 32-bit userland, __sparc64__ is not defined so the wrong code is + used. + +commit 09f7499851bd2f2eba1e30460c61c7a82ed9e853 +Author: Keith Packard +Date: Wed Sep 20 13:15:20 2006 -0700 + + typo + +commit 9f870e0aa1ada238d6a0cd099996e8c47f6ba1d9 +Author: Keith Packard +Date: Wed Sep 20 13:14:53 2006 -0700 + + When setting output state, leave output unchanged when setting to current. + +commit d16e83413e7e06adebd629d04de57bbedd8c3765 +Author: Aaron Plattner +Date: Wed Sep 20 12:47:17 2006 -0700 + + Hide or rename more global symbols to avoid clashes with libfb. + + Rename composeFunctions, xxSetup, and xxPrintVisuals. Hide the other xx* + symbols by making them static. + +commit d08718d8fd31477e90f13b9e122504c515b46ee0 +Author: Keith Packard +Date: Wed Sep 20 12:05:52 2006 -0700 + + Avoid calling xalloc(0). Change rrScreenSizeSet to rrScreenSetSize. + +commit ef1f3248cb5fff0a02c0059f865c4d931eba23a6 +Author: Keith Packard +Date: Tue Sep 19 22:48:54 2006 -0700 + + Split out 1.0-style info and new property routines to their own files. + +commit 07112adb0802d28488de5a495aa61bb3cfc280b6 +Author: Keith Packard +Date: Tue Sep 19 00:46:27 2006 -0700 + + RRGetScreenResources and RRGetOutputInfo are working now. + + Removed separate id field in RRModeRec. + Pull screen subpixel order from Render extension. + Implement RGetScreenResources and RRGetOutputInfo + +commit afe5e9483b352ed06075ed68a6ffa50799194e2d +Author: Keith Packard +Date: Mon Sep 18 12:18:22 2006 -0700 + + RandR working with old clients and old API. + +commit 2be1ac15aee592782d7693b8de2c3815478a094e +Author: Keith Packard +Date: Mon Sep 18 12:11:18 2006 -0700 + + Remove smashing of CFLAGS from server build. + + CFLAGS is a user variable, extracted from the environment at configure time + and settable by the user at build time. We must not override this variable. + +commit bf07893947cfca945598e194ed416fda6162b11c +Author: Keith Packard +Date: Sun Sep 17 23:03:23 2006 -0700 + + Split out RandR dispatch code from randr.c to rr*dispatch.c. + + More disassembly to ease ongoing development. + +commit 3e745745fecef1cb59e53bde52ded311b51e1dac +Author: Keith Packard +Date: Sat Sep 16 23:21:37 2006 -0700 + + Split RandR implementation into separate files. + + RandR is getting too big to live in one file; split into one file per object + type (crtc, mode, screen), leaving the rest of the code in randr.c. + + Code is slowly approaching the point where it will drop-in as a replacement + for the old 1.0 implementation. + +commit d17fb9672e238a089e463ac74cc4cd3325b67e1f +Author: Keith Packard +Date: Sat Sep 16 21:44:42 2006 -0700 + + Start moving to new randr 1.2 definition + +commit 8dec74321d916f204f8182f1b93a65defbe50e78 +Author: Keith Packard +Date: Mon Jul 17 14:43:07 2006 -0400 + + Successful legacy RandR API/Protocol emulation for query. + + These changes clean up minor errors to make it possible to list the + available modes for a monitor using legacy APIs in both the X server DDX and + RandR protocol. Setting modes is untested, so it probably doesn't work. + +commit cab3a0145f2483fe43b5db5f5dd2076db9757fe5 +Author: Keith Packard +Date: Mon Jul 17 01:21:11 2006 -0400 + + RandR: New data structure, old API. At least it compiles now + +commit d95c758630f4aacec339a7ec80d2c4a9d7de1e4a +Author: Keith Packard +Date: Sat Jul 1 19:46:38 2006 -0700 + + Preliminary RandR 1.2 work + +commit f057de4f73fa593fa3fc5f05f65b89e76273b158 +Author: Adam Jackson +Date: Sat Sep 16 03:49:11 2006 -0400 + + Don't install librac.a. + + Thanks, automake. + +commit 49a70c8570b03aff8239324a2474918a6fbc52a0 +Merge: d1110c5... 05231e3... +Author: Eamon Walsh +Date: Fri Sep 15 15:26:57 2006 -0400 + + Merge branch 'master' into my-XACE-modular + +commit 46af6d1e953f1eefb6edbba3d29fb9700e42c2bb +Author: Adam Jackson +Date: Thu Sep 14 19:28:44 2006 -0400 + + Always believe the monitor when it reports a reduced-blanking mode. + + CVT reduced blanking modes are typically only seen on digital connections to + LCDs, but there are some monitors that report them as supported over the + VGA connector too, which is perfectly legitimate, electrically speaking. + +commit 63acf18b7e4ce3a9f7deab3a9088a1c41cab0191 +Author: Adam Jackson +Date: Thu Sep 14 19:26:37 2006 -0400 + + In xf86MatchPciInstances, fail gracefully when there's no PCI device at all. + + This allows the autoconfig logic to fall through sanely on non-PCI machines, + which importantly includes Xen virtual machines. + +commit a8f9936f55c5364bb02e8c3187507eb1f70e2ef2 +Author: Adam Jackson +Date: Thu Sep 14 19:24:41 2006 -0400 + + Prefer driver-provided modes when matching name strings to modelines. + + Well, kinda. Strictly we prefer M_T_BUILTIN strongest since those are modes + where the driver has said it absolutely can't do anything else (VBE). Then + we look for user-defined modes, ie, modelines from the config file. Then + we consider modes reported by the monitor via EDID. Finally if nothing has + matched yet we consider the default mode pool. + + Within each of the above-mentioned classes, modes with the M_T_PREFERRED bit + take priority over other modes in the same class. + + This logic ensures that the timings sent to the monitor exactly match the + timings it reported as supported, which occasionally don't match the numbers + you might get for that mode from CVT or GTF. + +commit 81ef1b6d6063c20db4963abf7b7848e235aa4ebb +Author: Adam Jackson +Date: Thu Sep 14 19:18:58 2006 -0400 + + Mark EDID modes as driver modes. Infer virtual size from driver modes. + + This allows the server to guess an appropriate initial virtual size and + resolution. The heuristic is to select the largest driver-reported mode + that matches the monitor's physical aspect ratio. We revalidate this + estimate after mode validation, since we may have filtered away all + modes that would fill that size. + + Also, the EDID preferred timing is now marked as M_T_PREFERRED as well. + +commit 43d9edd31e31b33b9da4a50d8ab05004881c8d5a +Author: Adam Jackson +Date: Thu Sep 14 19:09:02 2006 -0400 + + Attempt to add the 'mouse' driver in more situations. + + Always add a mouse driver instance configured to send core events, unless + a core pointer already exists using either the mouse or void drivers. This + handles the laptop case where the config file only specifies, say, + synaptics, which causes the touchpad to work but not the pointing stick. + We don't double-instantiate the mouse driver to avoid the mouse moving twice + as fast, and we skip this logic when the user asked for a void core pointer + since that probably means they want to run with no pointer at all. + +commit 739224d05eb4f356c9cab9dcb8a44a8d78287765 +Author: Adam Jackson +Date: Thu Sep 14 19:03:32 2006 -0400 + + Load the default module set when no Module section is given in the config. + + Also, synchronize that list with the list for the pseudoconfig file used + when starting with no config file. These really need to be better unified. + +commit beac2bf1e48e6b77dbf7d95f086abc5abcd90cf0 +Author: Adam Jackson +Date: Thu Sep 14 19:01:13 2006 -0400 + + Expand the default sync ranges to be large enough for 800x600@60. + +commit 71a15a7d5721073eccb3a275f353b3aa584c0d68 +Author: Adam Jackson +Date: Thu Sep 14 19:00:10 2006 -0400 + + Publish the raw EDID block as a property on the root window. + + This was removed in the patch for bug #5386, but is still useful. + +commit 7939c8dfb7c7bed4febcdc12922fb2e17619ea36 +Author: Adam Jackson +Date: Thu Sep 14 18:57:57 2006 -0400 + + Bump the default pixel depth to 24, and default bpp to 32. + +commit 72af975f9c8de0ff6796f1ce4b76dcf841d21e99 +Author: Adam Jackson +Date: Thu Sep 14 18:56:34 2006 -0400 + + Fix up EDID blocks where the max pixclock exceeds the preferred mode clock. + + Base EDID only lets you specify the maximum dotclock in tens of MHz, which + is too fuzzy for some monitors. 1600x1200@60 is just over 160MHz, but if + the monitor really can't handle any mode at 170MHz, then 160 is more + correct. Fix up the EDID block before the driver can see it in this case, + so we don't spuriously reject modes. + +commit d05e0a97bb704a4986cf638487205da759c4ce17 +Author: Adam Jackson +Date: Thu Sep 14 18:49:12 2006 -0400 + + Enable DPMS by default. + +commit 334f7db9f653113d5d46236911d7de2ec4173f28 +Author: Adam Jackson +Date: Thu Sep 14 18:46:10 2006 -0400 + + Allow hsync and vsync ranges to be overridden independently again. + +commit ced46e17777b635df9371c4cfaec3f8968b4dbcf +Author: Adam Jackson +Date: Thu Sep 14 18:41:59 2006 -0400 + + Record all standard timings from EDID as modes, instead of just the first five. + +commit d89fee68d0e49211871cd9eb3893ed55c1d478a6 +Author: Adam Jackson +Date: Thu Sep 14 18:41:15 2006 -0400 + + Record the maximum dot clock of the monitor, and filter by it. + +commit fa8ef7166839a7435e0017683f3e3c7f7904b285 +Author: Adam Jackson +Date: Thu Sep 14 18:33:00 2006 -0400 + + Don't translate monitor gamma to X gamma. + + The X gamma is used to set the output ramp of the card. Setting a 2.2 output + gamma going into a 2.2 monitor gives an effective gamma of 4.84, which is + very much not what you want. + +commit 511c60bc7399b07c267d686a969880e5ec92408a +Author: Luc Verhaegen +Date: Thu Sep 14 18:30:36 2006 -0400 + + Bug #5386: Synthesize modelines from EDID data. + +commit 05231e336db8f959c15dda518641976f061df1a6 +Author: Ian Romanick +Date: Thu Sep 14 14:13:39 2006 -0700 + + Use correct opcodes for GLX_EXT_texture_from_pixmap. + + Regenerate from glX_API.xml 1.3 from Mesa. The glproto package and libGL + (from Mesa) must also be updated. + +commit 0a62840e2ce25e5c2554e7e5ab4c9c5b96899e2d +Author: Bill Nottingham +Date: Wed Sep 13 15:40:23 2006 -0700 + + Bug 7641: fix comment written to Xorg.conf (s/VertSync/VertRefresh/) + + X.Org Bugzilla #7641 + Patch #6349 + +commit 182e5e0f4ba4c98a34bc52bdf4032ba315fe80ad +Author: Drew Parsons +Date: Tue Sep 12 14:30:46 2006 +1000 + + Xprint: revert installation of /etc/X11/Xsession.d/cde_xsessiond_xprint.sh + pending resolution of #8232. + +commit 594d4019c613b0f4bf8f48cc074ecc3c8366f1d7 +Author: Tilman Sauerbeck +Date: Tue Sep 12 01:15:40 2006 +0200 + + transformIsIdentity() now doesn't accept a zero matrix as the identity. + + Added a non-zero test for one of the diagonal values. + +commit fc30370d14125f86ee1192890a184881fa139546 +Author: Tilman Sauerbeck +Date: Mon Sep 11 19:43:09 2006 +0200 + + Bug #8226: Fixed SetPictureTransform()'s handling of the argument matrix. + + It now recognizes scaled variants of the identity matrix, too. + +commit 2b357e9a2f9038cf9cd07da908e3103a3d0965c9 +Author: Donnie Berkholz +Date: Sun Sep 10 22:17:20 2006 -0700 + + If we're installing libxf86config, install headers needed to build against it. + +commit 58933757862c458e2da39bd464e50d9c0e41b313 +Author: Zephaniah E. Hull +Date: Sun Sep 10 15:50:51 2006 -0400 + + Warning fix, and a syntax fix in a #if 0 section of code. + +commit 0a3740a0000191e3039fe183ae51b938d0548340 +Author: Zephaniah E. Hull +Date: Sun Sep 10 15:49:25 2006 -0400 + + Typo correction, 'i' is not a '1', so no longer crash on some Xi requests. + +commit 8d709f0280b458515b32c2b87938749428e5c149 +Author: Zephaniah E. Hull +Date: Sun Sep 10 15:48:35 2006 -0400 + + Remove a merge artifact so that we can compile. + +commit b3a3020fd018df8bc5a8193d36e1a1c7ae8af8ba +Author: Jesse Barnes +Date: Sun Sep 10 11:13:18 2006 -0700 + + the new PCI mapping routines are broken on sparc64 (in fact they look + broken for any 32 bit X server running on a 64 bit kernel) so #ifdef + them out for now. the PCI rework tree will make all this crap go away, + so I think we can tolerate the extra #ifdef for the next release. + +commit 60db190ecfce52cbfa888c0af3210634f9186bed +Merge: 5e9d33f... 6525610... +Author: Zephaniah E. Hull +Date: Sun Sep 10 03:49:17 2006 -0400 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 65256109bb8f5a26704ed960e1dd113981df5787 +Author: Drew Parsons +Date: Sun Sep 10 17:40:37 2006 +1000 + + * Define XPSERVERLIST with `/etc/init.d/xprint get_xpserverlist` + instead of `/bin/sh /etc/init.d/xprint get_xpserverlist` + - allows the initscript to set its own different shell under #! + - allows disabling of XPSERVERLIST by making the script non-executable + * Allow files to be installed by using dist_*_DATA instead of EXTRA_DIST. + Also, use dist_*_SCRIPTS to install scripts. + * Fix minor typos in man pages. + +commit d1110c5c83a7f439158f369ab2f3ae614fa9d2a5 +Author: Eamon Walsh +Date: Fri Sep 8 15:28:48 2006 -0400 + + Generalize the handling of configuration files that ship with extensions. + +commit 9deb579dc9366590203afe0576bf88643ab36c89 +Author: Eamon Walsh +Date: Fri Sep 8 15:25:17 2006 -0400 + + Zero out newly created ExtensionEntry structures, but only after the + devPrivates have been initialized. + +commit cec392656cda1c938d5462e1949e6eef489f9168 +Author: Eamon Walsh +Date: Fri Sep 8 15:24:23 2006 -0400 + + Zero out newly allocated ClientRec structures. + This is required to initialize the devPrivates to a known state. + +commit 0fba09cdfcc78161f5c92bef6cca53e5309656bd +Author: Eamon Walsh +Date: Fri Sep 8 15:23:06 2006 -0400 + + Include dix-config.h. + +commit c93877100eb98647c5b6b8556730d54677f730b6 +Author: Eamon Walsh +Date: Fri Sep 8 15:21:57 2006 -0400 + + Don't need to allocate memory now that devPrivates are being used. + +commit 86450998da616e3d00d4d6293acc35eccc2061e7 +Author: Kristian Høgsberg +Date: Thu Sep 7 15:35:16 2006 -0400 + + Fix AIGLX VT switching. + + See https://bugs.freedesktop.org/show_bug.cgi?id=7916 + + There may be a simpler, less intrusive fix that involves just rearranging + DRI locking between 2D and 3D drivers around VT switch. + +commit 5e9d33fe87f9d24e55c468d4b2bb761c9efdb26a +Merge: 629798c... 64479ff... +Author: Daniel Stone +Date: Thu Sep 7 15:43:31 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit 629798c73ad76a77fa6a55bc6403fd9b95ade2bb +Author: Daniel Stone +Date: Thu Sep 7 15:17:04 2006 +0300 + + XkbCopyKeymap/SrvXkbCopyKeymap: free geom harder, add cheery comments + Unconditionally free geometry when copying the keymap (so we have none on + core, oh well), add a couple of heartening comments. + +commit 64479fffa22581cc7d753065c33eda5520b7db9a +Author: Ian Romanick +Date: Wed Sep 6 16:13:21 2006 -0700 + + Remove prototypes and externs for non-existant functions and variables. + +commit a0179281a6522ec59830e8f2549633741bc56e10 +Author: Ian Romanick +Date: Wed Sep 6 15:45:48 2006 -0700 + + Remove prototypes for non-existant functions. + +commit 8356be492c6b46abdffa08b13836571ed872e16f +Author: Michel Dänzer +Date: Wed Sep 6 15:20:55 2006 +0200 + + Make sure _XSERVER64 is defined when it should be and gets tested. + +commit f6ce0839ba5b73247097826d28f7388fe248ec0c +Author: Michel Dänzer +Date: Wed Sep 6 13:18:02 2006 +0200 + + Fix #include paths for fontcacheproto headers. + +commit f39fd4242902eaa862321d39337f429dd14ebacf +Author: Aaron Plattner +Date: Tue Sep 5 15:23:54 2006 -0700 + + (unsigned long)(1 << 31) = bad news on x86_64. + (cherry picked from 410e5b1d738ba47b36778e6cbed44023a27ce259 commit) + +commit 410e5b1d738ba47b36778e6cbed44023a27ce259 +Author: Aaron Plattner +Date: Tue Sep 5 15:23:54 2006 -0700 + + (unsigned long)(1 << 31) = bad news on x86_64. + +commit 0b81fccd2ee4e054e5cffb739de07460ff2c13f7 +Merge: 20c4ac6... c281351... +Author: Eamon Walsh +Date: Tue Sep 5 18:03:25 2006 -0400 + + Merge branch 'master' into my-XACE-modular + + Conflicts: + + configure.ac + +commit c2813514cf7b1a36caa848cbc2ceef99cf2eb769 +Author: Ian Romanick +Date: Thu Aug 31 15:36:13 2006 -0700 + + Add missing file from previous commit. + +commit 0f9cfb2f752a9010ff07f4b2bd891db0cc30b8e6 +Author: Ian Romanick +Date: Thu Aug 31 13:54:10 2006 -0700 + + Implement GLX_SGI_swap_control. + + Regenerate from glX_API.xml 1.2. Add infrastructure to support + GLX_SGI_swap_control for AIGLX when the DRI driver enables it. Tested + with R300. + +commit a9ef5862919313582f72fc0cfb5ab0af4df6507e +Author: Ian Romanick +Date: Thu Aug 31 13:47:50 2006 -0700 + + Fix problems with vertex program protocol + + There were two sets of bugs in the vertex program (ARB and NV) + protocol. First, several of the ARB functions were missing the + 'doubles_in_order="true"' annotation. Second, after the ARB decided + that glVertexAttrib*ARB functions must not alias fixed-function state + for GLSL, Nvidia re-assigned GLX protocol opcodes for + glVertexAttrib*NV (circa Septeber 2004). For some reason gl_API.xml + was never updated to reflect this, and the updated version of the + GL_NV_vertex_program spec never made into the registry. + + This is just a server-side regeneration from gl_API.xml version 1.68. + +commit 69d5becce4ca2cfc8f8de53672ed54a47de62164 +Author: Matthew Allum +Date: Thu Aug 31 17:30:24 2006 +0100 + + Fix previous commit breaking other kdrives pulling in fbdev.a + +commit fd609956f27d76ee76ac8623787f0fc8633a5546 +Author: Matthew Allum +Date: Thu Aug 31 17:18:57 2006 +0100 + + Add framebuffer device command line switch for Xfbdev + +commit 2fb7b8795a9a36cce61f6449f6ca26ffd1b071f0 +Author: Ian Romanick +Date: Tue Aug 29 16:35:32 2006 -0700 + + Minor extension tweaks. + + GLX_EXT_texture_from_pixmap should always be enabled. + GLX_SGI_video_sync is only for direct rendering and should never + appear in the server's string. + +commit 1c8851ad491dd02d1c79e620b46384956838ed42 +Merge: d59b52f... 5ddbf4b... +Author: Ian Romanick +Date: Tue Aug 29 16:34:04 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit d59b52fc08f2d80b38993e383e61c3eeb0bb0763 +Author: Ian Romanick +Date: Tue Aug 29 14:40:13 2006 -0700 + + Make sure unsupported extensions are disabled. + + GLX protocol isn't supported for GLX_SGI_swap_control or + GLX_SGI_video_sync. Remove them from the list of available extensions + until they are supported. + +commit db6d04d4b87fd9b6409a3ddf0479a88440c2eda1 +Author: Ian Romanick +Date: Tue Aug 29 14:35:08 2006 -0700 + + Add support for AIGLX drivers to enable GLX extensions that they support. + +commit 5ddbf4bcd46fe0d3d682668c2748c712fea410ae +Author: Matthew Allum +Date: Tue Aug 29 22:07:15 2006 +0100 + + Re-add support for tslib (1.0 release) and Xcalibrate extension. + +commit 4524a2bf6f22c871ed109b027a065f0262137dc5 +Author: Daniel Stone +Date: Tue Aug 29 23:49:26 2006 +0300 + + configure.ac: move tslib from KDRIVE_PURE_LIBS to KDRIVE_LIBS + Yeah. That was dumb. + +commit 942b4369990a255257f66835caf8671432c405a3 +Merge: 77d315b... 393dc0a... +Author: Ian Romanick +Date: Tue Aug 29 13:30:37 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 77d315bd2fd2f9014c831d313efbe5821189177c +Author: Ian Romanick +Date: Tue Aug 29 13:30:20 2006 -0700 + + Remove __glXNoSuchRenderOpcode because it is no longer used. + +commit 260c3f32b69c98f8fc5360f860f69d32c19f04a7 +Author: Daniel Stone +Date: Tue Aug 29 23:18:12 2006 +0300 + + configure.ac: fix XSDL test + +commit 393dc0a3388d56186181b2bd9bcc1d267747e709 +Author: Daniel Stone +Date: Tue Aug 29 22:53:54 2006 +0300 + + kdrive: remove @KDRIVE_LIBS@ from Xfoo_DEPENDENCIES + +commit cff23616fe45e10c6786a303c8dcfc0a80463a53 +Author: Daniel Stone +Date: Tue Aug 29 22:44:09 2006 +0300 + + configure.ac: allow disabling of XSDL + +commit 89d272bb183e85715d8e6047929fb2d912033d82 +Author: Daniel Stone +Date: Tue Aug 29 15:05:31 2006 +0300 + + [PATCH] kdrive/linux keyboard: remove more debugging spew + +commit bd6f539ff9409aa7d9056fabe120b457b0a15997 +Author: Daniel Stone +Date: Tue Aug 29 13:21:58 2006 +0300 + + [PATCH] kdrive/linux keyboard: silence excessive debugging noise + +commit 5436fce09003e20744a388fa4ae49007c9cf8ede +Author: Daniel Stone +Date: Tue Aug 29 13:21:40 2006 +0300 + + [PATCH] GetKeyboardValutorEvents: be even more careful + + Don't accept devices without a keyboard feedback class. + +commit 0eb7299f445455a7bcacf2410e83227b23259675 +Author: Daniel Stone +Date: Tue Aug 29 13:19:12 2006 +0300 + + [PATCH] XkbCopyKeymap: still more range fixes + + Make sure we don't stomp preserve if it doesn't already exist, and fix a + couple of range-related thinkos in level name copying. + +commit 7fa3383e3c8eea7d1eb0e556393f2431cf8e6ed2 +Merge: 8d77d44... ebbdc13... +Author: Daniel Stone +Date: Tue Aug 29 15:16:01 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit ebbdc1342a243b301723390696f742dc91f59764 +Author: Adam Jackson +Date: Mon Aug 28 18:17:32 2006 -0400 + + Remove calls to LoaderCheckUnresolved(), since it's now a stub. + +commit 8d77d44fda3aacbae62864a3620e09095b79e92d +Merge: d6f36bd... 2fde560... +Author: Daniel Stone +Date: Sun Aug 27 23:08:49 2006 +0300 + + Merge branch 'origin' into input-hotplug + +commit 20c4ac6e038607ebbf6c04639670514c016d8597 +Merge: 13c6713... 8d4f21a... +Author: Eamon Walsh +Date: Fri Aug 25 18:49:46 2006 -0400 + + Merge branch 'my-XACE-SELINUX' into my-XACE-modular + +commit 13c6713c82763a85c725c998b37ad02156d803ba +Author: Eamon Walsh +Date: Fri Aug 25 18:17:01 2006 -0400 + + Add four new XACE hooks: auditing, key event notification, window init + +commit 2fde560bbb9c1148f26fd969dc30c4e736672b7c +Author: Ian Romanick +Date: Fri Aug 25 13:01:51 2006 -0700 + + Enable GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate. + + Re-generate from gl_API.xml 1.65. This provides the missing bits for + GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate. + Enable those extensions. + +commit e2d529963ed40b5f113cf82c17809d241cd4aac1 +Author: Ian Romanick +Date: Fri Aug 25 12:05:16 2006 -0700 + + Enable vertex and fragment programs. + + Implement glGetProgramStringARB and glGetProgramStringNV. With these + functions implemented, GL_ARB_{vertex,fragment}_program, + GL_NV_{vertex,fragment}_program, and related extensions can be enabled. + +commit d6f36bd28009881ef7f7a20cdadb3808d808ed97 +Author: Daniel Stone +Date: Fri Aug 25 12:43:17 2006 +0300 + + xfree86/parser: use 'kbd' driver when 'keyboard' specified + Now that we've completely ditched the old driver, we should probably make a + best-effort attempt to keep configs working. + +commit 7c4167f0d6b33c9c602b04fcfd246fd3aeddd709 +Merge: 393f834... cd2da4e... +Author: Daniel Stone +Date: Fri Aug 25 11:15:33 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit 393f8347edcccfc24d8902a86ea9def7ada2537b +Author: Daniel Stone +Date: Fri Aug 25 10:46:32 2006 +0300 + + xorgconf.cpp: kbd, not keyboard + +commit c33e39c86be2010b169ffbd8adbe53b93222dc5f +Author: Ian Romanick +Date: Thu Aug 24 20:33:57 2006 -0700 + + Finish support for GL_ARB_texture_compression. + + Fill in __glXDisp_GetCompressedTexImageARB and + __glXDispSwap_GetCompressedTexImageARB to finish support for + GL_ARB_texture_compression. With this extension (and the related + compression extensions), the server-side GLX supports all of the + protocol for GL 1.4. w00t! + + The bad news is that this has received only minimal testing, and Mesa + does not contain any good tests for GL_ARB_texture_compression. + +commit cd2da4e41eae233b50f8830d9a8f5d1d916a5a1b +Author: Ian Romanick +Date: Thu Aug 24 18:00:16 2006 -0700 + + Remove GL/glx/g_disptab.c, GL/glx/g_disptab_EXT.c, and + GL/glx/g_disptab_EXT.h. Unfortunately GL/glx/g_disptab.h has to be + kept around a bit longer. + +commit a29e6dd2d2d45c18c52737bb3b7945aafcea5032 +Author: Ian Romanick +Date: Thu Aug 24 17:58:52 2006 -0700 + + Add some missing bits of GL_SGI_color_table. + +commit ae608b2071d882966e9c7ede71f846b1ecec0b23 +Merge: 2c86527... b879356... +Author: Ian Romanick +Date: Thu Aug 24 14:56:33 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 2c865277fe1d056981d1020e1af001d2319252c0 +Author: Ian Romanick +Date: Thu Aug 24 14:54:49 2006 -0700 + + Regenerate from gl_API.xml 1.63. Enable extensions. + + gl_API.xml 1.63 corrects some problems with GLX protocol for + GL_EXT_paletted_texture and GL_SGI_color_table. Regenerate from that + file, and enable those extensions and GL_EXT_shared_texture_palette. + +commit 7d5de5c6657304246473d7ddd5c29bb0c7a3bc34 +Author: Ian Romanick +Date: Thu Aug 24 14:49:46 2006 -0700 + + Regenerate from gl_API.xml 1.62. Functions move, no real changes. + +commit 3a36b0a24aa9e9e238faa7f00100f59800f5142b +Merge: db1ab1b... b879356... +Author: Daniel Stone +Date: Thu Aug 24 23:35:28 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit db1ab1bdb2f79eca593fe247056309a16ebd29c6 +Author: Daniel Stone +Date: Thu Aug 24 23:33:59 2006 +0300 + + XkbCopyKeymap: fix various range issues + Fix a bunch of range issues caused by incorrect assumptions (e.g. that the + design was at least halfway sensible), and copy types by hand, instead of + just blindly memcpy()ing the lot, since it itself cleverly contains a ton + of allocated pointers. + +commit 5fb8d947bb88d715b9b236342885c445cb5a9387 +Author: Daniel Stone +Date: Thu Aug 24 23:16:43 2006 +0300 + + configure.ac: more thinkos + Fix auto tests for vidmode and xf86dga. I win at life. + +commit 4e37c07ba6e5d299d4f8922dc6cf054c814f7baf +Author: Daniel Stone +Date: Thu Aug 24 23:16:17 2006 +0300 + + config: clean up debugging messages, make failure to acquire name fatal + Bomb with FatalError when we can't acquire the bus and name. + Clean up a bunch of debugging ErrorFs to be hidden behind #ifdef DEBUG. + +commit b879356ce96929d02bcb75b9aa24b17ac7e28125 +Author: Adam Jackson +Date: Thu Aug 24 15:50:15 2006 -0400 + + More #ifdef USE_DEPRECATED_KEYBOARD_DRIVER. + +commit 4ed311cf1c29090c53e474a3001c5702ff8409df +Merge: 73e58ad... b29b236... +Author: Matthias Hopf +Date: Thu Aug 24 20:17:10 2006 +0200 + + Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver + +commit b29b236d88789fd45d823a55dbedb393bb134c5b +Author: Lukáš Turek <8an@centrum.cz> +Date: Thu Aug 24 15:57:09 2006 +0200 + + Adapt to Mesa header name change. + +commit ce4a0a4ddafd3833d7025f83ed3729915c8aba70 +Author: Alan Hourihane +Date: Thu Aug 24 13:56:22 2006 +0100 + + Apply patch in bug #7919, blit improvements in + multiwindow mode for Xming/CygwinX + +commit 866ca1f929c95689bac9f0a0b3478f7b4d77214b +Author: Daniel Stone +Date: Thu Aug 24 15:46:44 2006 +0300 + + configure.ac: fix XF86VidMode test + +commit 2b06c69c8feaf3bdc065635ee711efa45b3033b3 +Author: Daniel Stone +Date: Thu Aug 24 14:51:26 2006 +0300 + + GKVE: pass correct arguments to XkbCopyKeymap + Fix horrendous thinko. Indicators now work perfectly. + +commit 4adf9af313c9f63b6ad734e174efe1d36ddb5813 +Merge: 33af05d... 67bd672... +Author: Daniel Stone +Date: Thu Aug 24 10:59:33 2006 +0300 + + Merge branch 'master' into input-hotplug + +commit 67bd672c880869ef625ae0c0163c3ec1eba46abf +Author: Alan Hourihane +Date: Thu Aug 24 08:47:06 2006 +0100 + + Fix typo + +commit 733c4beb16c2c4ad9e9a4ea9a85b09fc5062a775 +Author: David Nusinow +Date: Wed Aug 23 22:39:42 2006 +0000 + + Add xorg.conf IgnoreABI option which does the same thing as -ignoreABI + +commit b983773d446cef6a0948ca264ed48126e404ae9a +Merge: 0623d36... d9a8656... +Author: Ian Romanick +Date: Wed Aug 23 17:16:50 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 0623d3643fc28ebc514b2ca872c985d0cf0c753a +Author: Ian Romanick +Date: Wed Aug 23 17:16:02 2006 -0700 + + Fix the sorting of the extension string. Add a few extensions that + are supported by the new code. A few of these were actually supported + before but weren't advertised. + +commit 5d2caacff570dd68bb3fb05e776e02515b2a9da0 +Author: Ian Romanick +Date: Wed Aug 23 16:47:00 2006 -0700 + + Refector __glXDisp_Render and __glXDispSwap_Render to DoRender. + Refector __glXDisp_RenderLarge and __glXDispSwap_RenderLarge to + DoRenderLarge. + +commit 866bb3f34046045c9fa0744db1d76e035b3da9c7 +Author: Ian Romanick +Date: Wed Aug 23 16:41:53 2006 -0700 + + Memo to myself: Whenever a Makefile.am changes, autogen.sh must be + re-run. This is especially true if the change is to remove a source + file. + + Fix RenderLarge to actually use the new protocol decode tables. + +commit d9a86566c21afd7985673f3ed851b055d9dac46f +Author: Alan Coopersmith +Date: Wed Aug 23 16:15:19 2006 -0700 + + Add LOCALCONN to dix-config.h template for xtrans + +commit f6fd7d8f8393f93705e76b2b2777a0d9bcafa991 +Author: Ian Romanick +Date: Wed Aug 23 16:05:37 2006 -0700 + + Convert protocol decode tabels for Render and RenderLarge to use nice, + compact N-way search trees generated by scripts in Mesa. + +commit 7ae82b5fc8721be78b43a322bbf2c46aac08b8cf +Author: Ian Romanick +Date: Wed Aug 23 16:00:48 2006 -0700 + + Fix __glXDispatchInfo::dispatch_functions and + __glXDispatchInfo::size_table. dispatch_functions had the const in + the wrong place, and size_table was declared as an array of two + pointers to int_fast16_t instead of a pointer to an array of 2 + int_fast16_t. cdecl to the rescue! + +commit 39a620d17809dc71fb5ad61a955fe3c442f90a05 +Author: Ian Romanick +Date: Wed Aug 23 14:24:34 2006 -0700 + + Rename __glXDrawArraysSize to __glXDrawArraysReqSize. This makes its + name match the pattern of all the other functions in + __glXRenderSizeTable. + +commit 86406455f0e5fc977431948611e9bb5fda1e1d46 +Author: Ian Romanick +Date: Wed Aug 23 13:30:59 2006 -0700 + + Re-generated files after a fix to glX_API.xml (in Mesa). + +commit d7a7f12361d31001bbd9394a57de029ef0b934b8 +Author: Ian Romanick +Date: Wed Aug 23 13:30:13 2006 -0700 + + Convert protocol decode tables for Single, VendorPrivate, and + VendorPrivateWithReply message to use nice, compact N-way search trees + generated by scripts in Mesa. + + The Render protocol decode tables are next... + +commit bdec9680fa74dd23cf319d09af1940f8cf71a5b1 +Author: Adam Jackson +Date: Wed Aug 23 14:43:23 2006 -0400 + + Make sure Composite is never enabled for Xnest. + +commit 9f2a108051aad9b024ab737b45fc12290a113e37 +Author: Adam Jackson +Date: Wed Aug 23 14:38:34 2006 -0400 + + Make 'Xvfb -render' also disable Composite, lest we segfault on startup. + +commit 33af05d58f1f4f021036e9ce4b60fd76dbaebe73 +Author: Daniel Stone +Date: Wed Aug 23 19:05:50 2006 +0300 + + XkbCopyKeymap: use correct range for MapNotify + We haven't copied {min,max}_key_code by the time the notifies run, so use + src instead of dst to determine number of keys, et al. + +commit 6323a11d0db4d3cf0317af83f0362730142f5325 +Author: Daniel Stone +Date: Wed Aug 23 18:53:04 2006 +0300 + + XkbCopyKeymap: optionally send NewKeyboardNotify/MapNotify events + Optionally send a NewKeyboardNotify or MapNotify event when copying the + keymap; modify GetKeyboardValuatorEvents to make use of this. + +commit 728fbadd16a748b45c80bc2c65c46f82cf803578 +Author: Daniel Stone +Date: Wed Aug 23 14:33:59 2006 +0300 + + gitignore: ignore vi swap files + +commit 8f8487ff997670a4af0293fed77ff920cfc39fb1 +Author: Daniel Stone +Date: Wed Aug 23 14:33:41 2006 +0300 + + xkb/gkve: copy XKB map, not pointer-assign + Write a new function to copy an XKB map (does everything but geometry at + the moment), and use that instead of nasty pointer assignments. + +commit 52ba722e4c89c052609b4fc62e965d92778aa2dd +Merge: 9138d5a... 0554125... +Author: Eamon Walsh +Date: Mon Aug 21 18:49:31 2006 -0400 + + Merge branch 'XACE-modular' into my-XACE-modular + +commit 05541259bdb0dfaab015a01caa3722b7a1b782e2 +Merge: c2535f6... a1ac044... +Author: Alan Coopersmith +Date: Mon Aug 21 13:07:41 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular + +commit a56b98bb047003a05e26ca9365c212a2da7ac200 +Author: Daniel Stone +Date: Fri Aug 18 18:03:41 2006 +0300 + + dix: enable null root cursor + + Enable a blank root cursor, selectable with --enable-null-root-cursor at + configure time. + +commit 0704bb298cc826cd117815898c6bc015a693c2c9 +Merge: c140369... a1ac044... +Author: Daniel Stone +Date: Fri Aug 18 17:30:14 2006 +0300 + + Merge branch 'master' into input-hotplug + +commit a1ac0440bba690368aa4226468ce571be1a09d95 +Author: Daniel Stone +Date: Fri Aug 18 17:30:00 2006 +0300 + + dix: fix whiteroot thinko + Note to self: run git update-index _after_ testing, not just before. + +commit c14036977fef7b8787c0b68f5262fa0b6a2834f5 +Author: Daniel Stone +Date: Fri Aug 18 17:24:34 2006 +0300 + + input.h: add InitCoreDevices prototype + +commit 1c2cb30cd88ba4453f9da339025f8ff39f7f5412 +Merge: 633b6a6... 70ddd0f... +Author: Daniel Stone +Date: Fri Aug 18 17:05:50 2006 +0300 + + Merge branch 'origin' into input-hotplug + +commit 19f673b7788d32c220e7e06734f1074b0e4a999c +Merge: cb0a565... 70ddd0f... +Author: Daniel Stone +Date: Fri Aug 18 17:05:41 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit cb0a565d2b2cf8823abbd77b4426cc2237731dc1 +Author: Daniel Stone +Date: Fri Aug 18 17:04:48 2006 +0300 + + dix: add whiteroot flag + Add a -wr option to use a white root window, and use a BackPixel rather + than BackPixmap for both white and black root windows. + +commit 70ddd0f39d5118db72a1a4e473cbfb502f1ed9ec +Author: Alan Hourihane +Date: Fri Aug 18 14:43:10 2006 +0100 + + Fix bug #5735, Serious flaw in CygwinX clipboard + integration prevents paste from X to Windows apps + (Brett Stahlman & Colin Harrison) + +commit 708b225689b5a4ba9ffe3372b584b715ef9eacdc +Merge: e1f4565... ee5e2cb... +Author: Alan Hourihane +Date: Fri Aug 18 09:13:52 2006 +0100 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit e1f4565be5ce80be4655e81f77f4073fa3fbf8d0 +Author: Alan Hourihane +Date: Fri Aug 18 09:11:48 2006 +0100 + + Fix bug #7302, make Xn.hosts work from the + Microsoft Windows install directory on Xming. + (Colin Harrison) + +commit 1880defe4eaba02f9585b154d0883235eabc6d11 +Author: Alan Hourihane +Date: Fri Aug 18 09:09:53 2006 +0100 + + Fix bug #7281, clipboard viewer should not + call SetClipboard viewer when bogus in Xming/CygwinX + (Colin Harrison) + +commit a1a8e4f7f5917f537eb3dd51d3d6fa3e129236ce +Author: Alan Hourihane +Date: Fri Aug 18 09:08:12 2006 +0100 + + Fix bug #7280, round title corner background + should be transparent not black in Xming/CygwinX + (Colin Harrison) + +commit ee5e2cbd2bee610a95facc6b486c4a5070973099 +Author: Adam Jackson +Date: Thu Aug 17 17:29:32 2006 -0400 + + Un-cut-and-paste the mode rejection message. + +commit 43e42eef1f5a22703eb64fc9cffecde036ea38e0 +Author: Adam Jackson +Date: Thu Aug 17 16:22:07 2006 -0400 + + Fix default mouse device on Linux, again. + + It would be really nice if we only did this in one place instead of 40. + +commit 633b6a69f560c0a77dcff78fdef5fcf0041e2e04 +Merge: 95dbfcf... 7da5144... +Author: Daniel Stone +Date: Thu Aug 17 21:25:14 2006 +0300 + + Merge branch 'master' into input-hotplug + +commit 7da51447eaab34292e14077fb5a48e6b2e587781 +Author: Daniel Stone +Date: Thu Aug 17 21:24:07 2006 +0300 + + events.c: fix tiny XEvIE thinko + Make sure xeviehot gets updated after the ConfineToShape() call. + +commit 5d082f05632906c29296a44ef5c3a4962c0cbe62 +Author: Daniel Stone +Date: Thu Aug 17 21:18:18 2006 +0300 + + events.c: make XEvIE a little less verbose + Change a lot of: + #ifdef XEVIE + xeviehot.x = + #endif + sprite.hot.x = ... + #ifdef XEVIE + xeviehot.y = + #endif + sprite.hot.y = ... + to one single + #ifdef XEVIE + xeviehot.x = sprite.hot.x; + xeviehot.y = sprite.hot.y; + #endif + at the end of the functions. + +commit 95dbfcf8828c041c218145afc87d21a6c9c7bc02 +Author: Daniel Stone +Date: Thu Aug 17 21:18:18 2006 +0300 + + events.c: make XEvIE a little less verbose + Change a lot of: + #ifdef XEVIE + xeviehot.x = + #endif + sprite.hot.x = ... + #ifdef XEVIE + xeviehot.y = + #endif + sprite.hot.y = ... + to one single + #ifdef XEVIE + xeviehot.x = sprite.hot.x; + xeviehot.y = sprite.hot.y; + #endif + at the end of the functions. + +commit c6c39afde3e5f43b623ca6b52162b83c98a28d45 +Author: Daniel Stone +Date: Thu Aug 17 21:13:09 2006 +0300 + + dix/events.c: add YAFIXME + Add another FIXME to the cacaphony of XXX and FIXMEs in this file. + +commit f9624e0109cf12b6af43fb4235aaa0b54340a4bb +Author: Daniel Stone +Date: Thu Aug 17 16:09:51 2006 +0300 + + kdrive/input: verify SIGIO with --enable-debug + +commit 73e58adda96c1d1b5176d819107faa7697c3eb94 +Author: Matthias Hopf +Date: Wed Aug 16 18:17:58 2006 +0200 + + Fixed segfault w/ broken Xinerama configs. + +commit cd3f744b1f983f71476db99c050045d981c5f5b2 +Author: Daniel Stone +Date: Tue Aug 15 15:54:13 2006 +0300 + + fix missing brace, trim unused variables + +commit 5d073697adb3864133fa3221b82ab8d2f4a59758 +Author: Daniel Stone +Date: Tue Aug 15 15:37:10 2006 +0300 + + kdrive/input: minor warning cleanups + And also a compiler error fix when VERIFY_SIGIO is defined. + +commit 47c1c948e69cfba950ad37a3133fa2db0bd0ff2c +Author: Daniel Stone +Date: Tue Aug 15 15:25:16 2006 +0300 + + kdrive/input: only run special key behaviours on non-XKB + Only attempt to manually deal with special key behaviours (e.g. terminating + the server) when not using XKB, and leave locking behaviour up to GKVE. + +commit 34228d8b280ef105a0c60b8de5dacf70a5ce24b5 +Author: Daniel Stone +Date: Tue Aug 15 15:23:53 2006 +0300 + + GPE: fix absolute button events / GKVE: (non-XKB) don't repeat lock keys + Fix absolute button events in GPE, where we would previously send valuator + events without bumping numEvents accordingly, causing the core event to + go missing. + In the non-XKB path in GKVE, implement proper lock behaviour (one press to + enable, one press to disable, discard releases). + Fix debug_events prototype. + +commit d003bada3352ec7d734498c4c732904876a9d1e2 +Merge: d6433be... a815b9b... +Author: Daniel Stone +Date: Sat Aug 12 22:48:55 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit a815b9b990e068f02d9cbba2b17f2cc3a30a9310 +Merge: 37943e2... 984babe... +Author: George Sapountzis +Date: Sat Aug 12 21:58:33 2006 +0300 + + Merge branch 'master' of git+ssh://gsap7@git.freedesktop.org/git/xorg/xserver + +commit d6433be3cca807dd78fbb1f45d9ba0212283083d +Merge: 2bf9e3d... 984babe... +Author: Daniel Stone +Date: Sat Aug 12 21:50:52 2006 +0300 + + Merge branch 'master' into input-hotplug + +commit 2bf9e3dc1ec5fd7bf84a4a96899e5663a721d4a4 +Author: Daniel Stone +Date: Sat Aug 12 21:50:39 2006 +0300 + + make DIX more tolerant of devices without a CtrlProc (Debian #269860) + Return BadDevice on client requests for devices without a CtrlProc, instead + of tanking horribly. + +commit 984babe86bf82002b4d6589b2750c7b5a5489bd5 +Author: Daniel Stone +Date: Sat Aug 12 21:43:38 2006 +0300 + + remove obsolete vendor defines + Remove random behaviour changes for SGI and MetroLink. + +commit 37943e2f1abc6709ff739000372b0394d5cd18c5 +Author: George Sapountzis +Date: Sat Aug 12 20:54:33 2006 +0300 + + Call exaTryComponentAlphaHelper() for solid src also. + + Also, rename to exaTryMagicTwoPassCompositeHelper() as it is now called for + non-component-alpha masks also, and add function description from + http://anholt.livejournal.com/32058.html. + +commit f7919c287936f55569c2301ebb1b5f52358e70fa +Author: Bastian Blank +Date: Sat Aug 12 20:43:25 2006 +0300 + + xfree86: don't do legacy IO on ARM or S/390 (Debian #362641) + Don't attempt to poke legacy IO ranges on ARM or S/390. + +commit 59dcc62906d8ee597cd43aa307f414cb47995cea +Author: Daniel Stone +Date: Sat Aug 12 20:39:08 2006 +0300 + + xfree86: remove Xqueue support completely + +commit e641000b98e7c2e92e3c801eaa42aa15d5c16ad0 +Author: Samuel Thibault +Date: Sat Aug 12 19:41:59 2006 +0300 + + xfree86: add Hurd support (#5613) + Add support for GNU/Hurd. + +commit 5a3488ccac8e5dabd9fc98bc41ef178ead1b2faf +Author: Daniel Stone +Date: Sat Aug 12 19:25:06 2006 +0300 + + configure.ac: fix execinfo.h test (Debian #363218) + Define HAVE_EXECINFO_H as well as HAVE_BACKTRACE, when we find execinfo.h. + +commit 26c3cd1c9e3f52548389817a6d89a377e20c4269 +Merge: 008aa7e... c4951e0... +Author: Daniel Stone +Date: Sat Aug 12 18:58:18 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit 008aa7eb6ed090384e6c44f861410e317c78a1cd +Author: Daniel Stone +Date: Sat Aug 12 18:56:05 2006 +0300 + + completely remove OS keyboard layer + Completely axe the keyboard layer from os-support. + +commit c4951e0a6b6cf3eeee710cc5cda1d9bc929ee3d7 +Author: Adam Jackson +Date: Thu Aug 10 20:49:06 2006 -0400 + + Fix a mode sanity check to not break reduced-blanking setups (LCDs). + +commit e1921f014b102e3eecf3b41972f8672cf23264d6 +Author: Adam Jackson +Date: Thu Aug 10 20:43:15 2006 -0400 + + Rename some mode tokens to better reflect their use. + + Per #5386, M_T_EDID -> M_T_DRIVER, since it's really for any driver-detected + mode. Also add M_T_PREFERRED bit, to select a 'best' mode out of a set. + +commit c2535f67923bde0bfb0e72363467110806e2f40f +Merge: c0cb8d1... db82e12... +Author: Alan Coopersmith +Date: Thu Aug 10 10:37:59 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular + +commit 9525c2709ea3245c6518d4c3b5a0a4afff37181d +Author: Daniel Stone +Date: Thu Aug 10 20:29:57 2006 +0300 + + configure.ac: fix xephyr conditionals + Fix Xephyr build conditions, allowing it to actually be disabled. + +commit 6d8d4abaaacf08140b673472d985117d448a62e7 +Author: Daniel Stone +Date: Thu Aug 10 20:28:06 2006 +0300 + + configure.ac: allow conditional building of XF86{DGA,Misc,VidMode} + Allow conditional building of the above three extensions, defaulting to + auto. + +commit cec284f2b3e948deb9e56a1a8519fddf693ab952 +Author: Daniel Stone +Date: Thu Aug 10 18:03:58 2006 +0300 + + kdrive: properly ifdef composite enabling + +commit 45bce556e8665412b9f6e89f88ed5bedb41de1ba +Author: Daniel Stone +Date: Thu Aug 10 18:02:47 2006 +0300 + + GetMaximumEventsNum: be more conservative + Be slightly more conservative in our maximum event count if we're using + XKB (and thus don't need to count the extra repeat events). + +commit 172d45b9b75f95c997d1e9358040eead496e2a06 +Merge: 3832a3d... db82e12... +Author: Daniel Stone +Date: Thu Aug 10 14:14:54 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit 3832a3d7db0f3b5d7167e3b3b5ea6d6b3d96351a +Author: Daniel Stone +Date: Thu Aug 10 14:13:51 2006 +0300 + + GKVE: don't repeat modifiers when using XKB + Make sure we don't ever repeat modifiers (previously was repeating when + using XKB); only do explicit KP/KR repeats in the non-XKB case. XKB will + take care of repeating when we're using it. + +commit 9f188416bb6b4837d4c3f8773053d5eee0ff0ee1 +Author: Daniel Stone +Date: Thu Aug 10 14:00:34 2006 +0300 + + core devices: clear devicePrivates on close + +commit 539d1f33475484d35fb5a377efc76dba2d868e3f +Author: Daniel Stone +Date: Thu Aug 10 14:00:14 2006 +0300 + + GKVE/GPE: have DDX allocate events + Don't allocate events on every GKE/GKVE/GPE call, just have the DDX manage + it instead. Introduce GetMaximumEventsNum(), which is the maximum number + of events these functions will ever produce. + +commit db82e12fac5eaa16a39fc1bd0bc31ad95089dc95 +Author: Adam Jackson +Date: Wed Aug 9 14:55:17 2006 -0400 + + Remove TargetRefresh option from the autoconfig logic. + + The default target of 75Hz is almost always wrong for LCDs. + +commit fcd4167e8913f77bdf9e17a6955d0f2a9f4eeb10 +Author: Adam Jackson +Date: Wed Aug 9 14:48:51 2006 -0400 + + Remove the bc flag from the -help text, since it's gone. + +commit 767f372dd02232469f9fd804b811a17eaf762e1e +Merge: c4f5de6... 462bb61... +Author: Tilman Sauerbeck +Date: Wed Aug 9 20:23:30 2006 +0200 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit c4f5de6cc3b935025829af971b0b8010c1ecfedb +Author: Tilman Sauerbeck +Date: Wed Aug 9 20:21:52 2006 +0200 + + Sanitized glxdri's Block/Wakeuphandler calling. + + __glXDRIleaveServer() and _enterServer() used to call DRIDoBlockHandler + (resp DRIDoWakeupHandler) directly. They are now calling DRIBlockHandler + (resp DRIWakeupHandler) to account for driver specific block/wakeup + hooks. + +commit 5506b4ad200745236f997c121e8200179c47b749 +Merge: 4be9abb... 462bb61... +Author: Daniel Stone +Date: Wed Aug 9 07:21:01 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit 4be9abb8504b3761b5f3a01851e4eb3da86c76e2 +Author: Daniel Stone +Date: Wed Aug 9 07:20:16 2006 +0300 + + kdrive: remove ddx_DEPENDENCIES + Remove foo_DEPENDENCIES as they weren't guaranteed to just be libs, + and loader arguments (-lfoo, -Lfoo) might've crept in. + +commit 462bb61b0fe968fae1b99cf98ec6f7de09105dcd +Author: Aaron Plattner +Date: Tue Aug 8 18:07:22 2006 -0700 + + Add CompositeRegisterAlternateVisuals. + + This provides drivers the ability to add their own alternate visuals and then + register them with Composite for implicit redirection. + +commit fe351a711ef55c3ae1e784d4551147c080eda109 +Author: Daniel Stone +Date: Tue Aug 8 14:54:10 2006 +0300 + + GKVE: send XkbMapNotify, not XkbNewKeyboardNotify + Sending MapNotify is more correct in this case than NKN, so do that. + +commit 31089816317f27c668b12a15c74fdd226a8df9f7 +Merge: ab3ebfe... 12dbd8a... +Author: Daniel Stone +Date: Tue Aug 8 12:01:12 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit ab3ebfefdb7d21aba72a5030f6f93bf4fafed709 +Author: Tiago Vignatti +Date: Tue Aug 8 12:00:34 2006 +0300 + + xorgcfg: fix compilation error + Add missing parentheses to IS_KBDDRIV macros. + +commit 12dbd8a02f797ad57a1be683a02a1fcb1ca35438 +Author: Daniel Stone +Date: Mon Aug 7 23:43:40 2006 +0300 + + remove optional R3 backwards compatibility + Remove the permitOldBugs flag, which enabled backwards compatbility with + broken R2/R3 era clients. + +commit 7721ee308fbbb6fc9c969f15fe04b3346c04f843 +Author: Daniel Stone +Date: Mon Aug 7 23:03:02 2006 +0300 + + config client: fix minor race with event queue + Fix a small race whereby you could remove a device while events from it + were still in the queue, by calling ProcessInputEvents immediately before + RemoveDevice, to (hopefully) flush the event queue. + +commit 458c63a84110f64c7fce397a531a3a779c2239a2 +Author: Daniel Stone +Date: Mon Aug 7 23:02:17 2006 +0300 + + enable adding devices after removal of a middle device + Allow new devices to be added after a device that _wasn't_ the last on the + list was removed, by ensuring inputInfo.numDevices always increases, and + never decreases. + +commit a31d11a7a8485cdc799f76c4d407d3b7f7c9b350 +Author: Daniel Stone +Date: Mon Aug 7 23:01:23 2006 +0300 + + GKVE: get rid of bogus double-release check + Get rid of a bogus double-release check which broke non-XKB servers. + +commit bedc4ecf23c7150e3156e0d24602ed3bc3977225 +Author: Daniel Stone +Date: Mon Aug 7 23:00:45 2006 +0300 + + xephyr: aid input debugging + Add the 'ephyr' mouse and keyboard drivers to the driver list so we can + re-add devices. + Set the names properly in Ephyr{Keyboard,Mouse}Init, not in InitInput. + +commit baf93b3abe1e88d82ee6a3d6939f50f96ded271a +Author: Daniel Stone +Date: Mon Aug 7 21:12:45 2006 +0300 + + kdrive: move map initialisation to KdNewPointer + Do a linear n -> n initialisation on the map up until KD_MAX_BUTTON in + KdNewPointer, moving it out of both KdParsePointer, and KdPointerProc. + Also remove dead pointer acceleration code. + +commit ccb53340b66a778abf10182fd88a7d699207fb84 +Author: Daniel Stone +Date: Mon Aug 7 21:12:00 2006 +0300 + + ephyr: cleanup + Remove extraneous KdAddPointerDriver call. + +commit d1c18af27e0aed73104743afb4bf4b8d3d1186cf +Author: Daniel Stone +Date: Mon Aug 7 21:11:38 2006 +0300 + + GPE: use button map for DBP/DBR, not just BP/BR + Make sure we use the button map for extended events, not just core. + +commit 9b7ecbd1dd8d092221897e29c85f3306c7367716 +Author: Daniel Stone +Date: Mon Aug 7 21:09:32 2006 +0300 + + kdrive: prevent overrun in map + We actually need n + 1 elements for the mouse button map, not n. + +commit eb6e8d4042252b13328dbb122e0e6186796a80ac +Author: Daniel Stone +Date: Mon Aug 7 21:05:37 2006 +0300 + + kdrive: increase maximum number of buttons + Increase KD_MAX_BUTTONS to 32. + +commit 1c72290cdf4d9b214e1b9c0526cb7cb8641051f3 +Author: Aaron Plattner +Date: Mon Aug 7 09:57:58 2006 -0700 + + Use DrawablePtrs instead of PixmapPtrs for Prepare/Finish access. + + Also, define some wfb functions even if FB_ACCESS_WRAPPER is not defined. This allows a client to use libfb and libwfb at the same time. + +commit afcad4ad99bbfc8bdcd0f4fdd70e072108410d30 +Author: Daniel Stone +Date: Mon Aug 7 18:11:05 2006 +0300 + + xfree86 ddx: always free GKE/GPE events + free() events we get passed back from GKE and GPE so we don't just, er, + leak them all. *cough*. + +commit 98fdf874eeadd5b37413922d8afba8415d0c56bb +Author: Daniel Stone +Date: Mon Aug 7 16:51:39 2006 +0300 + + move all autorepeat logic to DIX + Move core autorepeat logic for keyboards down to the DIX, remove it from + KDrive. + +commit 5c7001fef8ffc6e3d8585a37d3f79a9495be8ed0 +Author: Daniel Stone +Date: Mon Aug 7 16:51:09 2006 +0300 + + memcpy() events in + memcpy events into our event structure instead of doing pointer assignment. + +commit c85e64cba1d2d88f676ca7cf23b52a6f8219e90e +Merge: a406f6b... f54b71b... +Author: Daniel Stone +Date: Mon Aug 7 15:54:55 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit f54b71b772a1f587394ae3968782b611e52f0e2d +Author: David Nusinow +Date: Sun Aug 6 18:11:00 2006 +0000 + + Document enable/disable flag for AIGLX in xorg.conf manpage. + +commit a406f6bfeaa46e3236f7ab46813fe6c30b936a35 +Author: Daniel Stone +Date: Fri Aug 4 12:40:19 2006 +0300 + + mieq: don't leak events + free all events posted through mieqEnqueue. + +commit 997ba45b192f21810099ed888792a45f1677a9ce +Author: Daniel Stone +Date: Fri Aug 4 11:18:16 2006 +0300 + + fix incorrect button test + Test for n (1..nButtons) being under nButtons, not button (1..(1< +Date: Thu Aug 3 18:24:04 2006 -0400 + + Make SecurityLookupIDBy* part of the base functionality. + +commit 45c229f526bf1dafb5e81b50d700449ba4e1613d +Author: Eamon Walsh +Date: Thu Aug 3 14:26:06 2006 -0400 + + Remove LBX code. + +commit 96e45626c43b7674b66e0258b0b1730d5ce71357 +Author: Eamon Walsh +Date: Wed Aug 2 20:29:59 2006 -0400 + + Rebase Security extension to use devPrivates for storing security state. + +commit 3c23dec5962b8b81ae838fe0ee2c7b0a789f5386 +Author: Eamon Walsh +Date: Wed Aug 2 13:39:49 2006 -0400 + + Call ClientStateCallback on serverClient devPrivates initialization. + +commit ee02e647882a4be29e1130bd79904ee79ed6b802 +Author: Aaron Plattner +Date: Tue Aug 1 13:45:43 2006 -0700 + + Wrap libwfb memory access. + + Use the READ and WRITE macros to wrap memory accesses that could be in video + memory. Add MEMCPY_WRAPPED and MEMSET_WRAPPED macros to wrap memcpy and + memset, respectively. + +commit 39169fd373b97f34923f6494d697d9429d0b8aa3 +Author: Matthew Allum +Date: Tue Aug 1 13:39:22 2006 +0100 + + Back out 'mystery' spurious host window hints. + +commit f737cc38baea6af8bf284c9e207e60a7d90eebe1 +Author: Eamon Walsh +Date: Mon Jul 31 19:58:42 2006 -0400 + + Adding devPrivates support to the ExtensionEntry structure. + +commit b04d64854712678701d5243aacf5cc93444cfadc +Author: Eamon Walsh +Date: Mon Jul 31 19:35:08 2006 -0400 + + Added devPrivates support to the ExtensionEntry structure. + +commit a69335dc299be6de8b82ed34de1cb30f1255feb4 +Author: Aaron Plattner +Date: Mon Jul 31 14:15:55 2006 -0700 + + Make ReadMemoryProcPtr take a const pointer. + + Fixes some warnings when using READ with a const pointer. + +commit b74c845a1233f78b841ff8840272c50873300c20 +Merge: 3112a6c... 02daa6b... +Author: Ian Romanick +Date: Mon Jul 31 10:26:06 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 3112a6c4f26d5e9258b8def7ce4109b4bd408c67 +Author: Ian Romanick +Date: Mon Jul 31 10:25:31 2006 -0700 + + Noting uses libdummy.a, so don't build it. Only libdummy-nonserver.a + is actually used. + +commit 02daa6bb103e53e5a33db2bb6acbe57d0bf2c30e +Author: Matthew Allum +Date: Mon Jul 31 17:32:05 2006 +0100 + + Improve XRes to; + - Better estimate general pixmap memory usage. + - Account for pixmaps shared between clients. + - Account for window background and border pixmaps, + and GC stripple and tile pixmaps. + +commit 24051ef97406f28c102cf46a78223400b61fdae2 +Author: Daniel Stone +Date: Sun Jul 30 12:15:33 2006 +0300 + + remove filename that's too long for tar + +commit ecb7d43a76d507d04891ab7f189b23be5eccda51 +Author: Daniel Stone +Date: Sun Jul 30 11:52:41 2006 +0300 + + add sym.h to sources + +commit bf2d7499c84c94f228d03b21448f5688b3cda1a8 +Author: Daniel Stone +Date: Sun Jul 30 11:17:02 2006 +0300 + + add securitysrv.h + +commit e87e68634d8eb66ab783e2802e2d5d12ff1031be +Author: Daniel Stone +Date: Sun Jul 30 11:11:59 2006 +0300 + + remove .cvsignores from EXTRA_DIST + +commit ed0c807de9f07468385fcbd2e8a9c0737759a461 +Author: Daniel Stone +Date: Sun Jul 30 11:08:54 2006 +0300 + + bump to 1.1.99.3 + +commit a68dc013a33d867e65a7e76b3eec5947b862a5b4 +Author: Daniel Stone +Date: Sun Jul 30 11:08:47 2006 +0300 + + remove README (which doesn't exist) from EXTRA_DIST + +commit 87fe85f38b6f781bf0e2eb555526e3d77779f9fa +Merge: 3518e2d... 654619d... +Author: Daniel Stone +Date: Sun Jul 30 10:51:34 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit 654619d76c779606f2315782fc01d1410399fa3b +Author: Kevin E Martin +Date: Fri Jul 28 17:16:32 2006 -0400 + + Revert xkb changes that broke XkbGetKeyboard() + +commit 79016d4036786b091a9b9d1133a6cdfedd6c277d +Author: Luc Verhaegen +Date: Fri Jul 28 16:02:02 2006 -0400 + + Bug #5386 (partial): Move CVT mode generator from cvt(1) to server core, and + export it from the X server to modules. + +commit e6ae1612be519ee6224d354244d076d85d44a750 +Author: Aaron Plattner +Date: Thu Jul 27 18:24:59 2006 -0700 + + Add fbHasVisualTypes and fbSetVisualTypesAndMasks to wfbrename.h and include -DXFree86Server. + +commit 2a4ceb09ed5a09dc5763754ab865ec23df91ac9f +Author: Adam Jackson +Date: Wed Jul 26 19:39:17 2006 -0400 + + Remove dead function prototypes. + +commit 990a4009057e068f41d20b95aa0c59357185650d +Author: Adam Jackson +Date: Wed Jul 26 19:03:39 2006 -0400 + + Remove getconfig horrorshow. Replace with a static built-in rule list for now. + +commit 377a581ddf5e428a368efb1b59fcb317666fecdd +Author: Aaron Plattner +Date: Tue Jul 25 15:27:31 2006 -0700 + + Switch to using void* pointers. + + Pass the size of the data pointed to by src or dst as an argument to + wfb{Read,Write}Memory. This allows one set of macros to be used with any size + pointer. Assumes that sizeof(FbBits) >= sizeof(FbStip). + +commit a4005c15fbb48231cb958c32b2c791a2d23a135a +Author: Aaron Plattner +Date: Mon Jul 10 18:58:09 2006 -0700 + + Add framebuffer access wrapper infrastructure. + + Create fbPrepareAccess macros to call into the driver to set up the + wfbReadMemory and wfbWriteWemory pointers. Call these from fbGetDrawable and + fbGetStipDrawable. + + Add the READ and WRITE macros, which expand to simple memory accesses for fb, + and calls through the function pointers for wfb. + + Add fbFinishAccess macro to give the driver an opportunity to clean up. Add + calls to this in the appropriate places. + +commit 319efac445cebda5a2ac1db67efebe54bc47ba9d +Author: Aaron Plattner +Date: Fri Jul 7 18:45:30 2006 -0700 + + Prefix all of the exported symbols in libwfb.so with "wfb". + + For now, just #define all of the exported symbols in wfbrename.h. Later, + we should add FBPREFIX() around the exported symbols and use -fvisiblity=hidden + to hide the rest. + +commit 7608a63ff7409f399c9a26962a304b84196a1868 +Author: Aaron Plattner +Date: Thu Jul 6 17:05:21 2006 -0700 + + Build infrastructure for libwfb.so. + + Builds fb/* twice, defining FB_ACCESS_WRAPPER for libwfb.la. Define a macro, + FBPREFIX(X) which expands to fbX for libfb.la and wfbX for libwfb.la. Use the + macro on [w]fbModuleData so the new module loads. + +commit 39158e98acb29e97a2682d4a37385f9141b484c4 +Author: Adam Jackson +Date: Wed Jul 26 18:39:28 2006 -0400 + + Remove another latent PowerMAX hunk. + + All your favorite running jokes of 2005, today! + +commit 3518e2d0debc97e2bacdefe604b280e7fdfdd216 +Merge: eb7733a... 3821f6a... +Author: Daniel Stone +Date: Wed Jul 26 11:29:21 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit eb7733a48a92405660d5d2ab60913b62c30daaed +Author: Daniel Stone +Date: Wed Jul 26 11:28:45 2006 +0300 + + kdrive: drop excessive NewInputDeviceRequest debugging + +commit 3821f6aeaa714582ee0a631de96c6e7cfd96303e +Author: Kristian Høgsberg +Date: Wed Jul 26 01:56:02 2006 -0400 + + Unlibc-wrap DMX glxscreens.c and fix tag-removal typo. + +commit 4ea475924c557ad0819b796f5369e5e669465709 +Author: Daniel Stone +Date: Tue Jul 25 20:00:48 2006 +0300 + + re-add OpenedHand copyright + Ae-add OpenedHand copyright, accidentally dropped in KDrive new world + order patch. Sorry guys. + +commit ca3f4fc1b0c21a0620ab1eb35c199cd55d795095 +Author: Daniel Stone +Date: Sun Jul 23 19:02:12 2006 -0400 + + add fallback ChangeDeviceControl, allow XOpenDevice on closed device + Add a fallback ChangeDeviceControl, which allows the attributes we know about + so far. + Allow XOpenDevice on closed devices. + +commit e73e5e2a4d8f22889d840a7719479f9af686cb9c +Merge: a73cef1... 8977b07... +Author: Daniel Stone +Date: Sat Jul 22 13:56:30 2006 -0400 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit 8977b07434d75ca396d236dc1324f0c862b633c7 +Author: Dave Airlie +Date: Sun Jul 23 03:36:47 2006 +1000 + + glx: fix typo from tag removal + +commit a73cef1f005ca66db18e952e676ee5a21b829700 +Merge: 672ca15... 70869fc... +Author: Daniel Stone +Date: Sat Jul 22 12:07:22 2006 -0400 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit 70869fc6777f87cd05794446caa739e3d9a91ffe +Author: Adam Jackson +Date: Fri Jul 21 23:39:37 2006 -0400 + + Yet more dead code. + +commit 7c1b2ee7a8238c267bc97e78bbff204dc7723dd3 +Author: Adam Jackson +Date: Fri Jul 21 23:35:13 2006 -0400 + + static markup, more dead code. + +commit 1c4f90b1d05d4c49279f3224a6dd94850a6bd8d0 +Author: Adam Jackson +Date: Fri Jul 21 23:03:21 2006 -0400 + + Open-coded path checks make baby Jesus cry. + +commit 114264584ca43091a5e07282566a30a6378a1502 +Author: Adam Jackson +Date: Fri Jul 21 22:55:41 2006 -0400 + + Remove a useless open() of the module we're about to load. + +commit 985611d5cd079f97da700c7b8e898d33da004be0 +Author: Adam Jackson +Date: Fri Jul 21 22:37:59 2006 -0400 + + Delete some long-unused testing code. + +commit 672ca156bfb11440e6e234650bfba9d38e1edb52 +Merge: d14d91f... 6cf844a... +Author: Daniel Stone +Date: Fri Jul 21 19:58:42 2006 -0400 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit 6cf844ab69926b6d23619a12c97734af3881ba67 +Author: Daniel Stone +Date: Fri Jul 21 19:57:28 2006 -0400 + + loader: walk directory paths with readdir(), don't stat() everything + Walk the directories with readdir, and don't stat everything we can + find. Thanks to davej for the public humiliation reminding me to go back + and re-fix this one. + +commit d14d91f094c3897c889f6aafb66d738820dae0aa +Author: Daniel Stone +Date: Fri Jul 21 19:57:28 2006 -0400 + + loader: walk directory paths with readdir(), don't stat() everything + Walk the directories with readdir, and don't stat everything we can + find. Thanks to davej for the public humiliation reminding me to go back + and re-fix this one. + +commit 87a6346bf7f086b5f98b2b2ecd52f27efe864e56 +Merge: b73fb2a... 0486d39... +Author: Daniel Stone +Date: Fri Jul 21 19:36:25 2006 -0400 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit 0486d3966d2888ef86d36c19f31bdbc2a3e8c652 +Author: Daniel Stone +Date: Fri Jul 21 19:35:04 2006 -0400 + + fix kbproto dependency + Depend on kbproto >= 1.0.3, for unconditional definition of + XkbSA_XFree86Private. + +commit b73fb2ae35a82e0bdd48f01132e971fb84946ff1 +Merge: e7ac27a... aff404f... +Author: Daniel Stone +Date: Fri Jul 21 19:30:26 2006 -0400 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit e7ac27ad81efbea6128b3cec443ca98e228d14ad +Author: Daniel Stone +Date: Fri Jul 21 19:29:28 2006 -0400 + + revert accidental deletion of lnx_io.c; re-delete lnx_kbd.c + Thinko'd which file to remove after merging from master. + +commit 81913a12910e39d7ea6af8657c1c66cc6791cd65 +Author: Daniel Stone +Date: Fri Jul 21 19:10:26 2006 -0400 + + remove undead files from master + Remove dead files which worked their way back in when merging from master. + Ugh. + +commit 7465010d59ec435bd00b738f0cef766b352dc7eb +Merge: 1d31ed7... 0aaac95... +Author: Daniel Stone +Date: Fri Jul 21 19:05:41 2006 -0400 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug + +commit 1d31ed778284082e1060bff63317c94581d9eb9b +Author: Daniel Stone +Date: Fri Jul 21 19:02:52 2006 -0400 + + xephyr: load keysyms at init, not enable + Load keysyms at init time, not enable, so we don't get the wrong map width. + +commit 63dfaa1d5ba556e09314ec914936e5471aab94b0 +Author: Adam Jackson +Date: Fri Jul 21 18:47:18 2006 -0400 + + Delete internal usage of the symbol ref/req lists. + +commit bca9364f3f4a2376edbcf57a34f704ce28be21ba +Author: Adam Jackson +Date: Fri Jul 21 18:41:46 2006 -0400 + + Remove the loader's required and referenced symbol lists, dead code. + +commit aff404f293ed86a44a093a51a9f11e79e6c3f4f6 +Author: Adam Jackson +Date: Fri Jul 21 18:24:37 2006 -0400 + + Detach xf4bpp from cfb. + +commit 0aaac95b0d12089b256c97f6ff955c8c229ae095 +Author: Adam Jackson +Date: Fri Jul 21 17:56:00 2006 -0400 + + Remove RCS tags. Fix Xprint makefile braindamage. + +commit eeaad0e956640aac653d194a992df7792e4abcbb +Author: Aaron Plattner +Date: Thu Jul 20 18:19:07 2006 -0700 + + Fix the RandR failure path for rotated screens. + +commit 22db3fdb54d2f7f6b72638b46c186af6db04e214 +Merge: 2f98841... 93cd538... +Author: Ian Romanick +Date: Fri Jul 21 13:55:37 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 3eeb62e8f587732e6b433c2b9c6879eb26a3f1b4 +Author: Kristian Høgsberg +Date: Fri Jul 21 16:33:28 2006 -0400 + + bug #890: completely remove deprecated keyboard driver + Remove all remnants of the old built-in keyboard driver. + +commit 60ea7b51fe2b8a19a08b63db48504971a7a50ee6 +Author: Daniel Stone +Date: Fri Jul 21 15:23:37 2006 -0400 + + xorg ddx: move to new input API, remove old keyboard driver + Remove most of the rest of the old keyboard driver. + Move to the new Get{Keyboard,Pointer}Events API, which is mostly + complete at this stage: just missing the proximity events. + +commit d32dc8bf19e1071fc30af2f0bc6a6699b351f39e +Author: Daniel Stone +Date: Thu Jul 20 18:40:47 2006 -0400 + + be more careful in IVAS + + Don't walk off the end of a NULL pointer in InitValuatorAxisStruct. + +commit 7711c56d2e2aeae4dcd6d9297bc144c1cb3cfab1 +Author: Daniel Stone +Date: Thu Jul 20 18:38:57 2006 -0400 + + xephyr: fix keymap, pointer; dix: fix multiple axes + + Initialise our axes properly in the DIX, and make sure we don't + unnecessarily clip maxval when it's not set. + Fix keymap copying in Xephyr (to some degree: it's still broken), + and set nAxes and nButtons properly. + +commit f18c3122a57df9770087e5fc70ac488552222233 +Author: Daniel Stone +Date: Thu Jul 20 16:49:17 2006 -0400 + + sanitise debug output + + Don't spit out huge chunks of pointless ephemera, especially without + --enable-debug. + +commit 463e0fe35bec3c91b19be9aacf34babb146a88c9 +Author: Daniel Stone +Date: Thu Jul 20 16:45:15 2006 -0400 + + update KDrive to new input API + + Update KDrive to fit the new API (mieqInit and InitPointerDeviceStruct), and + include InitTouchscreenDeviceStruct in the DIX. + +commit 1987af8c498a1bf394a8951ca6d5b0b7f7a35188 +Author: Daniel Stone +Date: Thu Jul 20 16:39:54 2006 -0400 + + add virtual core devices to DIX + + Add virtual core devices, with proper keymaps etc, to the DIX. + +commit 737e6e4836a6af26fedc22cda8e7d366b52c8fa7 +Author: Kristian Høgsberg +Date: Wed Jul 19 20:10:48 2006 -0400 + + define SDevicePresenceNotifyEvent prototype + +commit 7f36cc533e7f6ae44e973c5f00f9bfec7c6b7b50 +Author: Daniel Stone +Date: Wed Jul 19 20:09:13 2006 -0400 + + distribute config.h + +commit e896195eab726a2b307200958308eda8c93dd3cd +Author: Daniel Stone +Date: Wed Jul 19 20:05:33 2006 -0400 + + remove extraneous font debugging code + + Some of it didn't compile, and some of it was just unnecessary. + +commit 99c57674c002c5e88c6db34488a27b05004c9197 +Author: Daniel Stone +Date: Wed Jul 19 19:59:11 2006 -0400 + + avoid using font servers with built-in fonts + +commit ecfad74c48f633916305bcc25baaaad74aa52b78 +Author: Daniel Stone +Date: Wed Jul 19 19:55:13 2006 -0400 + + add support for built-in fonts + + Use --enable-builtin-fonts to only use built-in fonts, and avoid loading + fonts. + +commit 0a2068d123520d35818c38a555ae3ba06d8ca7fb +Author: Daniel Stone +Date: Wed Jul 19 17:29:23 2006 -0400 + + Xi: add XExtension{Keyboard,Pointer} types + + Report XExtensionKeyboard for non-core keyboards, and XExtensionPointer for + non-core pointers/mice. + +commit c7577f9b88aac84d59404f29d994ee7af583d33b +Author: Kristian Høgsberg +Date: Wed Jul 19 17:27:58 2006 -0400 + + Xi: add DevicePresenceNotify + + Add support for DevicePresenceNotify events. + +commit 3a23e499017d5823157806029263edac53c663fd +Author: Daniel Stone +Date: Wed Jul 19 17:00:23 2006 -0400 + + make XInput mandatory + + Always build Xi, since GetPointerEvents/GetKeyboardEvents relies on it. + +commit 02d09105113fb9b560a770fe15f7bb041165831c +Author: Daniel Stone +Date: Wed Jul 19 16:51:04 2006 -0400 + + new KDrive input world order + + Convert KDrive to GPE/GKE interface. + Add first-class drivers and enumerate every device separately through + Xi, instead of lamely attempting to aggregate them. + Add XKB support to the Linux keyboard driver. + Add 'thumb button' support to the tslib driver. + Rejig InitInput, so each DDX has to add a list of drivers it supports. + Support NewInputDeviceRequest, et al. + +commit a274e7296b1bdd6f6c921f28b087610cec9548e0 +Author: Daniel Stone +Date: Wed Jul 19 13:56:23 2006 -0400 + + add GetPointerEvents/GetKeyboardEvents framework + + Add GetPointerEvents (with XFree86 pointer acceleration) and GetKeyboardEvents + to the DIX. Extend the ValuatorClass structure to account for same. + +commit b308dbf273f8c26361b0fee7aca64aec3245f60b +Author: Daniel Stone +Date: Wed Jul 19 12:15:18 2006 -0400 + + add DEVICE_TOUCHSCREEN and DEVICE_CORE Xi controls (DeviceIntRec ABI break) + + Add DEVICE_TOUCHSCREEN and DEVICE_CORE controls to the Xi code, and the + TouchscreenClassRec and a coreEvents flag, to toggle propagation of core + events. + +commit c9a3d9baa81ceb940032ffe529d9eadf2d202ab2 +Author: Daniel Stone +Date: Wed Jul 19 11:41:16 2006 -0400 + + xorg DDX: implement NewInputDeviceRequest + + Implement NewInputDeviceRequest for Xorg, mainly written by Kristian Høgsberg. + Move MatchInput to xf86Helper.c, as xf86LookupInputDriver. + +commit 02a95311568e24e1055ea52c7df8cb7aa3f38ad0 +Author: Daniel Stone +Date: Wed Jul 19 10:05:12 2006 -0400 + + add basic D-BUS configuration mechanism + + Also move LookupDeviceIntRec into the DIX, and add InputOption type, and + NewInputDeviceRequest prototype (DIX requests DDX to add a device). Does not + link without an implemented NIDR. + +commit 93cd53860c3aca182a0a02543c41b5d71d65926b +Author: Daniel Stone +Date: Thu Jul 20 16:52:31 2006 -0400 + + kdrive: allow debugging + +commit cd0874dda1c30ef91a7d2b3cd455676422599ccf +Author: Daniel Stone +Date: Wed Jul 19 20:13:02 2006 -0400 + + never define MEMBUG + + Definining MEMBUG causes allocations to randomly fail. + +commit 093943d4d02f1dbc8935b8cf835866a6e3885193 +Author: Daniel Stone +Date: Wed Jul 19 20:09:55 2006 -0400 + + define DEBUG in DIX + + Which makes #ifdef DEBUG actually useful. Incredible. + +commit 68b0678254240a984db9adefefb0cf68e9bfd4e4 +Author: Daniel Stone +Date: Wed Jul 19 20:08:32 2006 -0400 + + exa: only disable cw when COMPOSITE is built + +commit 27df2eda795681c9f05e2907d74e2c102d3441e4 +Author: Daniel Stone +Date: Wed Jul 19 16:18:28 2006 -0400 + + fix KdXvCopyPackedData to actually work + + Remove extraneous bit shift in KdXvCopyPackedData, so it's actually + useful. + +commit 00b24f119f03da86fa98ffea545c5b041810ce53 +Author: Daniel Stone +Date: Wed Jul 19 17:01:20 2006 -0400 + + fix minor typo + +commit f8a7a1e40c14a85ebde11c5854c07a8d529d38b9 +Author: Daniel Stone +Date: Wed Jul 19 17:06:00 2006 -0400 + + fix XEvIE build without XKB + + Don't unconditionally play with XKB stuff in XEvIE. + +commit 2f98841fde6bad807967ed15e954291240714198 +Author: Ian Romanick +Date: Thu Jul 20 16:08:27 2006 -0700 + + Remove unused variable. + +commit 985c34bf06af70a7296db8307899a17347a25558 +Author: Adam Jackson +Date: Thu Jul 20 17:33:13 2006 -0400 + + Remove the DDXTIME conditional, for being unused. + +commit c69c00d6523a35232a32e54a533811fc2b37815a +Merge: 4636935... 84683f1... +Author: Ian Romanick +Date: Thu Jul 20 12:08:38 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 84683f19b4d1c712281036bcabf8dc623e64b26a +Author: Daniel Stone +Date: Tue Jul 18 18:16:12 2006 -0400 + + get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE + Get rid of almost all uses of these definitions. They're still defined for + delinquent out-of-tree drivers, and also for the Mesa build. As well as + for miinitext.c. But largely gone. + +commit 881953813c7307f2aac4057b48d233e5f4a574cd +Author: Adam Jackson +Date: Mon Jul 17 13:50:38 2006 -0400 + + Fix the Linux ACPI reopen code to use a repeating timer, rather than a + one-shot sleep-and-reopen attempt. + +commit f029e9a32dcaa95b84e08ec173a0cc78fd92bdbf +Author: Kristian Høgsberg +Date: Sat Jul 15 22:05:38 2006 -0400 + + Un-glx-libcwrap DMX GLX proxy so it works without GL/include. + +commit 46369350d40819ecc2a9f37ed4aaa95866b80997 +Author: Ian Romanick +Date: Fri Jul 14 15:51:55 2006 -0700 + + Add some const qualifiers to serveral function parameters. + +commit 490fb304599b1f24b36439e5c1397781e7d2f612 +Author: Ian Romanick +Date: Fri Jul 14 15:26:56 2006 -0700 + + Rearrange code in xf86int10ParseBiosLocation to use strncasecmp. This + eliminates the need for the first use of xstrdup in this function. + The second use of xstrdup was *never* necessary and has also been + eliminated. + +commit d3ee49bcbafe4b4e6b308686020847e978473779 +Author: Ian Romanick +Date: Fri Jul 14 15:13:35 2006 -0700 + + Refactor common code from the generic.c and linux.c version of + xf86ExtendedInitInt10 to xf86int10GetBiosLocationType and + xf86int10GetBiosSegment. + + These changes were tested on MGA hardware on x86-64 with various + combinations of InitPrimary and BiosLocation. + +commit 8793c7fd4ba7d1b3e2eff3f2c18d042ee9bb3f62 +Author: Ian Romanick +Date: Fri Jul 14 09:11:39 2006 -0700 + + Refactor identical xf86InitInt10 function from generic.c and linux.c + to helper_exec.c. + +commit 1450fd596433f7adfe3d0798dc2ddceb9d0a9034 +Author: Ian Romanick +Date: Fri Jul 14 09:10:32 2006 -0700 + + Trivial refactor of libint10_la_SOURCES. + +commit 4c225a3a8b2e7e5e5510347d8473f1318bbac769 +Author: James Steven Supancic III +Date: Thu Jul 13 10:03:57 2006 -0400 + + Bug #7482: Fix Xdmx's Render code to match reality; fixes BadLength client + crashes. + +commit bb3aa94845a74d7718ba9539bb76203ec82957fc +Author: Drew Parsons +Date: Tue Jul 11 18:26:55 2006 -0700 + + Bug #7346: Disable Composite extension in Xprt + + Xorg Bug #7346 + Patch #6184 + +commit 10f3e32726d5b4981abd1a3a022e5b4f219fb41e +Author: Gustavo Pichorim Boiko +Date: Mon Jul 10 16:37:53 2006 -0700 + + Fix the configure check for the --{enable,disable}-dpms option + +commit 2194d99d9ca3c607e0f5ddd911ee3df536d77564 +Author: Matthieu Herrb +Date: Sun Jul 9 16:16:08 2006 +0200 + + Replace GNU make-ism. + +commit 90a9b82272446fdaebe71c966325fd7e670f75c6 +Author: Matthew Allum +Date: Sat Jul 8 21:57:07 2006 +0100 + + Fix crash in Xephyr when running on host X with keymap width < 4 ( i.e xvnc ) + +commit 21e3e3ca298dce22e5fad6ef38aa6fe9736a1d3b +Merge: e805621... 39b2f7b... +Author: Matthew Allum +Date: Sat Jul 8 21:13:52 2006 +0100 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit e8056218944e873135c93039d1e9646d51364467 +Author: Matthew Allum +Date: Sat Jul 8 21:10:58 2006 +0100 + + Add support to Xephyr for simulating 8bit grayscale. + +commit 39b2f7b2182aedb1ab45415efb4c263012ace512 +Author: Tilman Sauerbeck +Date: Sat Jul 8 19:55:53 2006 +0200 + + Bug #3042: Use autoconf to get the correct name of a struct member. + + This allows us to remove the kernel version ifdefs from the code, which + are ugly and broken. + +commit 63f13e01ee6e7df1753f2113f4cff9538596be0a +Author: Tilman Sauerbeck +Date: Sat Jul 8 11:33:44 2006 +0200 + + Bug #7097: do case-insensitive comparison for some hotkeys. + + xkb's strcasecmp implementation has been moved to the dix so it's now + safe to just use strcasecmp(). + +commit 5416f90e9c939027005fc01fa3ce3df56919ae0d +Author: Kristian Høgsberg +Date: Thu Jul 6 21:22:34 2006 -0400 + + Implement GLX_MESA_copy_sub_buffer. + +commit b84374b2917a91a7732e780ffab6a29c807a3ecc +Author: Kristian Høgsberg +Date: Thu Jul 6 02:28:55 2006 -0400 + + Add GLX_MESA_copy_sub_buffer marshalling support. + +commit 2152e2d364bdd179cf218cde446c763d8c8bb833 +Author: Ed Catmur +Date: Thu Jul 6 17:45:36 2006 -0700 + + Remove hardcoded 'lib' in XPRINTDIR. + +commit 233c004641483a75985e09fea5416ab2c7a97fc4 +Author: Ed Catmur +Date: Thu Jul 6 17:41:53 2006 -0700 + + Generate xprint.pre from xprint.cpp. + +commit b3e4d1d1f4bcf900146d7b8cd19e008209294663 +Author: Adam Jackson +Date: Thu Jul 6 18:51:29 2006 -0400 + + PPC64 build fix. + +commit f847f3c0a956c0aec8ade8e32f770daae147f40b +Author: Keith Packard +Date: Thu Jul 6 15:33:31 2006 -0700 + + xorgcfg now needs libxkbui version 1.0.2 or better. + + Old versions of libxkbui use XkbStrCaseCmp which doesn't exist any longer; + the server fails to link with that version of the libkbui library, so + require the current version (1.0.2). + +commit 27ffd7e03c05dd2083a10e5acebd2b385d729eeb +Author: Keith Packard +Date: Thu Jul 6 14:43:10 2006 -0700 + + GL proto version 1.4.7 needed for texture-from-pixmap defines. + + GLX_TEXTURE_TARGET_EXT and GLX_TEXTURE_RECTANGLE_EXT are defined as a part + of the new texture from pixmap GL extension in gl proto version 1.4.7 and + are now used by the X server code. + +commit d7a96dd6f18e54c26fc5881772d033ac078db3a1 +Author: Adam Jackson +Date: Thu Jul 6 17:39:14 2006 -0400 + + Switch the default mouse device on Linux to /dev/input/mice. + +commit 8d07ee070ecf0d403d9d27c80764d343b80af6f0 +Author: Ian Romanick +Date: Thu Jul 6 12:48:51 2006 -0700 + + Refactor linuxGetIOSize and linuxGetSizes. Eliminate the unnecessary + optimization in the search loop. + +commit 704e645207d88a2d0a372cf69f6abd778ed4c30b +Author: Adam Jackson +Date: Thu Jul 6 14:22:33 2006 -0400 + + Remind dlloader that it needs to search the global scope as well as the + loaded modules. Fixes LoaderSymbol() on symbols provided by the server. + Spotted by Aaron Plattner. + +commit 28b95fd9d1c2f078aaaac75c310a27b17c74a6fc +Author: Kristian Høgsberg +Date: Thu Jul 6 03:25:38 2006 -0400 + + Drop unused GL/include subtree. + + Woo, less Makefile's to generate. + +commit fc1a55671dceae0e2a701e044ff8203fae5eb1ba +Author: Kristian Høgsberg +Date: Thu Jun 29 04:35:45 2006 -0400 + + Implement glXCreateWindow and glXDestroyWindow. + +commit ee012588d28b468bd41da8d216210f8cb2bf8cb5 +Author: Kristian Høgsberg +Date: Thu Jun 29 04:25:54 2006 -0400 + + Move __GLXdrawable lookup and creation into GetDrawableOrPixmap. + + Also refactors __glXSwapBuffers to use GetDrawableOrPixmap for + getting the __GLXdrawable. This patch paves the way for GLXWindows + with XIDs different from the X Windows they are created for, a + prerequisite for glXCreateWindow(). + +commit 8b5bc6a9ab487fdea754266b120c686d75d9e100 +Author: Kristian Høgsberg +Date: Thu Jun 29 00:05:01 2006 -0400 + + Drop global GLX error integer variables and use __glXError() instead. + + Also drop glxerror.h (__glXError is now declared in glxserver.h) + and global.c (last remaining globals are in glxext.c now). + + With this change we now support all GLX 1.3 error codes. + +commit 7cf3ec7b59223f15314a0629f122ecb796678421 +Author: Kristian Høgsberg +Date: Wed Jun 28 17:00:23 2006 -0400 + + Move createDrawable from __GLXcontext to __GLXscreen. + +commit eea8efe4516750b2505b52ebc9f769f5e8a6f94c +Author: Kristian Høgsberg +Date: Wed Jun 28 15:59:01 2006 -0400 + + Add marshalling for GLX 1.3 requests. + + Also, hook up glXGetDrawableAttributes and glXQueryContext to existing + DoGetDrawableAttributes and __glXQueryContextInfoEXT. + +commit eb35f812a5b65adcc5f6cbb91b31b69cae5d7f3d +Author: Greg Kroah-Hartman +Date: Wed Jul 5 13:27:26 2006 -0700 + + add another file to .gitignore + +commit 863f5cc31b747bc9f2fcd6a9e20c613a11733bf4 +Author: Greg Kroah-Hartman +Date: Wed Jul 5 13:26:34 2006 -0700 + + fix compiler warning in hw/xfree86/common/xf86Config.c + +commit f059b61ab3af25b03c704669eddb838d3ce4366c +Author: Greg Kroah-Hartman +Date: Wed Jul 5 11:47:25 2006 -0700 + + fix compiler warning about xnestRecolorCursor() not being defined + +commit cc3e99f747586f9d32622e5a682de39891b1fcba +Author: Greg Kroah-Hartman +Date: Wed Jul 5 10:13:19 2006 -0700 + + fix some more compiler warnings due to defines being declared differently + +commit 59836c0f2abee3339e1aa30dacadb82e477943d6 +Author: Greg Kroah-Hartman +Date: Wed Jul 5 09:30:48 2006 -0700 + + fix wrong function pointer type in hw/dmx/dmxcmap.c + +commit 12563db59dd613ecc926e3bed9534152ebc0a2fb +Author: Eric Anholt +Date: Mon Jul 3 12:52:27 2006 -0700 + + Revert "Optimize out computing a gradient pixel if the mask value is 0." + + This reverts cf46242e337481cd3b9b39d77dd621d2a63b11f9 commit. It wasn't meant + to be pushed to master yet, and doesn't work. + +commit 002e28c12c74aa63777f65cbfb382c2bfd0d6850 +Author: Eric Anholt +Date: Mon Jul 3 12:48:12 2006 -0700 + + Correct AGP memory deallocation argument on *BSD. + + This fixes leaks and eventual crashes with RandR resizing on Intel. + +commit cf46242e337481cd3b9b39d77dd621d2a63b11f9 +Author: Eric Anholt +Date: Wed Jun 28 18:35:59 2006 +0200 + + Optimize out computing a gradient pixel if the mask value is 0. + + Obtained from: kdrive CVS (DavidR XGL fb/ megapatch) + +commit a838fb70c52a829872680f6a2a2e7dd6d2dc9247 +Author: Eric Anholt +Date: Mon Jul 3 19:22:36 2006 +0200 + + Bump server version to 7.1.99.2 for gradient and repeat fixes. + +commit 25d871d98462f0481ee419295ddc94b8c79dc881 +Author: Eric Anholt +Date: Mon Jul 3 19:22:26 2006 +0200 + + Fix source picture filter check for multiple screens. + + Now, we only check for filter commonality if we're operating on a source + picture, and we compare the id (screen-independent index of the filter name) + rather than the pointer to the filter (per-screen state). + +commit 7106a77df37c06d2b5568eceeb9297096bff3137 +Author: Eric Anholt +Date: Sun Jul 2 12:41:35 2006 +0200 + + Fix bugs in support for new repeatTypes in XAA and EXA. + + EXA now won't pass pictures with new repeatTypes to drivers. We can add a flag + for them to support it at a later time. + +commit f5e92542a14f51029347b6476e4e4af69144930b +Author: Eric Anholt +Date: Fri Jun 30 12:03:47 2006 +0200 + + Bug #7366: Fix crashes when setting filters on source pictures. + + Now, filters may only be set on source pictures when the filter is common to + all screens. Also, like SetPictureTransform, ChangePictureFilter is now not + called on source pictures. + +commit 6ef457913955d4289081c7d07d528963ccf5272c +Author: Eric Anholt +Date: Fri Jun 30 03:01:14 2006 +0200 + + Bug #7366: Fix two crashes in operations on source pictures. + + A screen's ChangePictureTransform now isn't called when changing the transform, + as source pictures aren't associated with screens. Also, attempting to set + an AlphaMap to a source picture will fail with BadMatch just like a Window + would, preventing another crash. + +commit 50a3e1ad18c815a5adafee22beccdf970bae62d6 +Author: Rudo Thomas +Date: Sat Jul 1 12:34:36 2006 -0700 + + Missing close parenthesis in one of the setuid() fixes. + +commit 124a81eb389dfa510ac07ca93ee17c4c9d6e56ea +Merge: d3d6c5f... 179737d... +Author: Keith Packard +Date: Sat Jul 1 11:12:50 2006 -0700 + + Merge branch 'origin' + +commit d3d6c5f4d05e0ca5b566e19657e0fe2b3898482a +Author: Paul Mackerras +Date: Sat Jul 1 11:10:18 2006 -0700 + + Bug #7381: Coordinates get wrapped in accelerated line drawing on pixmap + + XAAPolylinesWideSolid was adding the drawable origin onto each element in the + pPts array. Since the values got stored back into the pPts array, they got + truncated to 16 bits, causing the overflow I saw. This patch avoids storing + the coords back into the pPts array (and actually reduces the size of the + code too :). Now the 32-bit sum of coords + origin doesn't get truncated to + 16 bits, and the problem is solved. + +commit 179737d4a07ed10a734fe017b5680f8e78ffda96 +Author: Jens Granseuer +Date: Wed Jun 7 01:46:00 2006 -0700 + + Bug 7145: fix build with gcc 2.95 & other c89 compilers + + Move variable declarations to start of blocks as required by c89 + +commit 6bd4c254396cb0f4e8ae21ff455ebb15cd9f4f10 +Author: Martin Bochnig +Date: Mon Jun 26 01:52:24 2006 +0200 + + Updated Solaris aperture driver to build on sun4v & amd64 kernels + Updated for Solaris 10 changes to DDI + +commit 54d9acd5113318274e291abab4554b8e678227df +Author: Kristian Høgsberg +Date: Tue Jun 27 19:44:52 2006 -0400 + + Add damage tracking to GLX_EXT_tfp implementation. + + - Only update when pixmap content actually change; + - Only update the regions that acutally changed. + + This is a worthwhile optimization, but it doesn't completely remove + the bottleneck, as mesa still uploads then entire texture whenever + it changes. + +commit adfe8e7437ff739f54d1d074008e8cc0e3bcb4d3 +Author: Eric Anholt +Date: Tue Jun 27 21:49:00 2006 +0200 + + Bump server release to 7.1.99.1. + + This will be important for a couple of cairo workaround tests. + +commit 63c169e3b1f7d6a7375a414fcd50cce32358a525 +Author: Eric Anholt +Date: Tue Jun 27 04:11:47 2006 +0200 + + Fix MMX Saturate implementation. + + The code was expanding the source blend factor from the wrong channel. Fixes + cairo's clip-operator test. + +commit ff6b59a0dbadbe61a53e48c23965d3073d95791b +Merge: b3c8693... 48c8715... +Author: Alan Coopersmith +Date: Mon Jun 26 13:02:33 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit b3c869304cd85af034aa9debaa874e29d14fcbe6 +Author: Peter Breitenlohner +Date: Mon Jun 26 10:48:44 2006 -0700 + + Free small, one-time memory leak in xdmcp -from handling + + Part of Patch #6046 + +commit 48c871564d493203d434d5da015903399287f619 +Author: Eric Anholt +Date: Mon Jun 26 15:57:32 2006 +0200 + + Move EXA_PM_IS_SOLID() to the public API, since drivers will want it frequently. + +commit afb84c2fca56887b3bfe7aa93f337c49b087acdc +Author: George Fufutos +Date: Sat Jun 24 15:23:14 2006 +0200 + + Bug #6911: Check return value of exaGetPixelFromRGBA(). + +commit 930b9a069a425818d4e9965f53be7df1f4d7d422 +Author: Michel Dänzer +Date: Sat Jun 24 15:21:17 2006 +0200 + + Bug #6818: Avoid infinite loop in exaLog2() with negative arguments. + +commit 36756fdb2ddc154b406f664a6af0f38d26e6973d +Author: Michel Dänzer +Date: Sat Jun 24 15:09:24 2006 +0200 + + Make sure is actually included when needed. + + configure only defines HAVE_BACKTRACE, not HAVE_EXECINFO_H. + + This could cause problems on platforms where the size of a pointer is greater + than that of an integer, see + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=363218 . + +commit 4426215a6e99f84550aaac23ac9c2018668bfbc1 +Author: Michel Dänzer +Date: Sat Jun 24 15:02:56 2006 +0200 + + Bug #7213: Fix the XFree86-DRI extension for byte-swapped clients. + + These clients are by definition non-local and thus not direct rendering + capable, but they still need the QueryVersion and QueryDirectRenderingCapable + requests to find out cleanly. + +commit a195a3debca02572d9f7d7a9976b5bf67acc5d08 +Author: Michel Dänzer +Date: Sat Jun 24 14:54:52 2006 +0200 + + Fix byte swapping in some GLX requests. + +commit bc6cfde19887eff7a07dc739ffa29609fb55b83d +Author: Eric Anholt +Date: Fri Jun 23 20:07:34 2006 -0700 + + Use correct OSNAME setting so we can find os-specific modules like libdrm. + +commit c7ac485a59709572307b9a4a9abacc52c7021b65 +Author: Eric Anholt +Date: Wed Jun 21 09:34:55 2006 -0700 + + Remove the default case from fbcompose.c switches which should cover all cases. + + Instead, stick the NULL return default case afterwards, so that the compiler can + warn us when we've got unimplemented cases. Removes some unimplemented and + unused 8bpp, depth 4 picture format names. + +commit 2cf1f39ca974c81a2f52d2f7509aa3d098a87176 +Author: Eric Anholt +Date: Wed Jun 21 09:30:59 2006 -0700 + + Add a manpage for EXA. + +commit d67fd106968e371d8be3966ed5ecdd3c69f36e3a +Author: Adam Jackson +Date: Thu Jun 22 12:47:51 2006 -0400 + + Add kdrive servers to .gitignore + +commit bf17c6dede1c0cf1edee10f2cc7e1e619b944d3a +Author: Adam Jackson +Date: Thu Jun 22 12:24:09 2006 -0400 + + Drop libz from the server's link line, it was only needed for LBX. + +commit c0cb8d1fb80540e093da54da3ee2f55bdf139274 +Author: Alan Coopersmith +Date: Wed Jun 21 18:12:41 2006 -0700 + + Use XACE, not XCSECURITY to decide if SecurityLookup* are exported + +commit 3177dc498a955cd58cd6054a7c7e69724db4a59b +Merge: 3f19803... 91dcac5... +Author: Alan Coopersmith +Date: Wed Jun 21 18:06:06 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 3f19803e0b1adc66e695f63f915b8dc85eb84215 +Author: Alan Coopersmith +Date: Wed Jun 21 18:05:51 2006 -0700 + + APPGROUP requires both X-ACE & XC-SECURITY now + +commit 91dcac5295486cc55a34ad91704bfa483bd31eeb +Merge: d8135eb... 77c947b... +Author: Adam Jackson +Date: Wed Jun 21 20:49:30 2006 -0400 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit d8135eb9e414bf6957f64c5102ee0ef7c2404c6f +Author: Adam Jackson +Date: Wed Jun 21 20:49:21 2006 -0400 + + Unbreak unbreaking the loader. Re-add the symbol reference lists so that the + linker will include everything it's supposed to. This is a terrible solution, + but ld semantics don't let you do anything better. + +commit f83cee0338eca095ad601374a87775be823a2565 +Author: Eamon Walsh +Date: Wed May 5 20:07:37 2004 +0000 + + Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE + +commit 15c9002d68a7eeb02a6db1f231af7a18a3cf7512 +Author: Alan Coopersmith +Date: Wed Jun 21 16:24:20 2006 -0700 + + Correct ifdef - should be XACE, not XSECURITY + +commit 90af38fa0c46c2081d2becac262a614c26ba6ef1 +Merge: 3e098ef... 77c947b... +Author: Alan Coopersmith +Date: Wed Jun 21 16:23:31 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + + Conflicts: + + Xext/appgroup.c + +commit 3e098efa35ba70ad4d5699af3130a3b02e1cb06e +Author: Alan Coopersmith +Date: Wed Jun 21 16:21:03 2006 -0700 + + Correct ifdef - should be XACE, not XCSECURITY + +commit 77c947b900faf34f425eef1549d8210c475e093b +Author: Alan Coopersmith +Date: Wed Jun 21 16:18:41 2006 -0700 + + Move Xserver internal API for appgroup from Xagsrv.h to appgroup.h + + (Since all use is inside the xserver module, might as well keep the header + in the Xserver module instead of in proto/XExt to allow easier synchronization + of updates.) + +commit 40aafaf154ba8a2cba857689d1481be2d4a610c2 +Author: Greg Kroah-Hartman +Date: Wed Jun 21 14:36:09 2006 -0700 + + fix a number of compiler warnings in os/* + +commit 77aa701e898c6525322cc4029d95167dd9f6e618 +Author: Greg Kroah-Hartman +Date: Wed Jun 21 14:16:48 2006 -0700 + + add some function prototypes to hw/xprint/DiPrint.h as they are exported + +commit 865884d050e1778180f7677e15f9ee1625ea4bb2 +Author: Greg Kroah-Hartman +Date: Wed Jun 21 14:16:28 2006 -0700 + + fix compiler warning in dix/xpstubs.c when XPRINT is not defined + +commit ed18d776f02e2ab235954501ef64936af9f9d909 +Author: Kristian Høgsberg +Date: Wed Jun 21 16:22:14 2006 -0400 + + Fix #2488 for fb too: sample pixel center when transforming. + +commit ea5e0eabd1303a55d8fc10f44d21a3d371ce8919 +Author: Matthias Hopf +Date: Wed Jun 21 17:08:51 2006 +0200 + + Bug 4320: Fastpath corner case improvement for Composite. + +commit 9af315a9be19b48faa1249e0575cbe3d1e31dec5 +Author: Eamon Walsh +Date: Wed May 5 20:07:37 2004 +0000 + + Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE + +commit f68ecfa482b2c2037f929710310c7b9ce6fe9291 +Author: Alan Coopersmith +Date: Tue Jun 20 19:01:34 2006 -0700 + + Add X-ACE to build system + + - Added --disable-xace to configure.ac and issue configure error if trying + to build XC-Security without X-ACE + - Added XACE #define to dix-config.h + - Added X-ACE sources to Xext/Makefile.am + +commit a46c06dab8392cf8012c7cc0b916de9a9e569671 +Merge: 49b368c... d44b2a0... +Author: Alan Coopersmith +Date: Tue Jun 20 18:40:18 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + + Conflicts: + + Xext/appgroup.c + Xext/security.c + dix/devices.c + dix/dispatch.c + dix/dixutils.c + dix/events.c + dix/extension.c + dix/property.c + dix/window.c + os/access.c + +commit d44b2a0a57fb89741173c31676af0ccc822387dc +Author: Alan Coopersmith +Date: Tue Jun 20 18:22:51 2006 -0700 + + Move Xserver API for security extension to securitysrv.h + +commit a54435946544a039fc333bb5e3438501d0d1ffc6 +Author: Alan Coopersmith +Date: Tue Jun 20 18:14:27 2006 -0700 + + Move Xserver API for security extension to securitysrv.h + +commit 49b368c0bb04816c4a3579071c596b2398cae3ec +Merge: 63f6e6b... 481d401... +Author: Alan Coopersmith +Date: Tue Jun 20 16:22:39 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 481d4012e74d9b0e98911f0ae02700ecf4cfc5ac +Author: Alan Coopersmith +Date: Tue Jun 20 16:16:19 2006 -0700 + + Don't add -ldl to XORG_LIBS if it's not needed for dlopen + +commit 63f6e6bbfd0d3677e29621af982c9392ead98dd7 +Merge: 88ede2c... 6df52fb... +Author: Alan Coopersmith +Date: Tue Jun 20 16:03:34 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 6df52fb7745c185c0168060f69cc6b4f5315914e +Author: Alan Coopersmith +Date: Tue Jun 20 16:02:55 2006 -0700 + + Delete code that's been inside #if 0 since X11R6.7. + +commit 88ede2cec79281a43cecb43ee6dec65770f82530 +Merge: 227a319... 2b58685... +Author: Alan Coopersmith +Date: Tue Jun 20 15:29:55 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 227a3193405147fbbee2971cc15bac92cc13285a +Author: Eamon Walsh +Date: Tue Jun 1 21:09:25 2004 +0000 + + Add XACE extension source files. + + (Copied from XACE-SELINUX branch in Xorg monolith CVS since these were never + imported to modular cvs or git trees.) + +commit 2b58685402e70f123e131fd8146e6083ff5214a4 +Author: Matthieu Herrb +Date: Tue Jun 20 21:07:53 2006 +0200 + + Check setuid() return value. Bugzilla #7116. + +commit 4365d16c8629e824973ee0c357efdfbfd28b672c +Author: Kristan Høgsberg +Date: Mon Jun 19 22:13:22 2006 -0400 + + Pull over convolution filter fixes from xgl-0-0-1 branch. + + Cherry-picking patches: + + 8a5ea68800b9d7dca90ff4e573ad8533852f1ea3 and + 4d755fe14274a7293748ce9aa666ab85df6297c5 + +commit f818e0ab60da3779ab2602c6e6d3ff261b50917e +Author: Eamon Walsh +Date: Wed May 5 20:07:37 2004 +0000 + + Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE + (cherry picked from 0106715000196c7b349a0b4494b61545f0f5e138 commit) + +commit 0707eb33d6826e1300a905edea28c12134600b12 +Merge: 37f0ae0... 98d17bb... +Author: Alan Coopersmith +Date: Mon Jun 19 17:09:51 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver + +commit 37f0ae02457bd22b27f8f30a373e5cb19f2fbaea +Author: Eamon Walsh +Date: Wed May 5 20:04:52 2004 +0000 + + Replace XC-SECURITY code with XACE security hooks + (cherry picked from 8526cd6395490b03b279f1962df777fb0e4a9878 commit) + +commit 98d17bba716619e3402bd74c7c3e1c01d055ef6e +Author: Alan Coopersmith +Date: Mon Jun 19 17:07:59 2006 -0700 + + Tell git to ignore emacs *~ droppings and git .msg files + +commit 569c808a2375be71f835ee8693605487484bd22e +Author: Eric Anholt +Date: Mon Jun 19 16:42:09 2006 -0700 + + Fix crash when using PICT_x4a4 by supplying an appropriate fbFetchPixel_x4a4. + +commit 8d9ccc90a54c786ca4ba5620ab0a965e3f3bc8ea +Author: Eamon Walsh +Date: Wed May 5 20:15:41 2004 +0000 + + Add XACE extension + (partially cherry picked from 8d4f21ab53c44ca48501d6211ea6db0c0b8af916 commit) + +commit 55426650417df4ec22ea0e2a67f6074f0ac1d54e +Author: Eric Anholt +Date: Mon Jun 19 15:04:46 2006 -0700 + + Clean up gcc warnings from picture format CARD32 -> enum change. + +commit 520c80f4b807ae6419e70fe2b524532465b509ac +Author: Eric Anholt +Date: Mon Jun 19 14:40:27 2006 -0700 + + Don't forget to step the rows when verifying the equivalence of fb/sys areas. + + This is only used by fakexa, but we would have missed some errors without this + fix. + +commit e793f0eeee3e9c83b6a7b50d451fb6db12839087 +Author: Eric Anholt +Date: Mon Jun 19 14:06:02 2006 -0700 + + Correct component ordering when fetching [ax]4b4g4r4 pixels. + + Noticed by: rendercheck + +commit e1672a12eb70836a2ceec803d505294897ae8cd2 +Author: Eric Anholt +Date: Mon Jun 19 13:20:56 2006 -0700 + + Convert PICT_* names from #defines to an enum to aid in debugging. + +commit 9742d55c820a260a42a4537502295931d4529deb +Author: Greg Kroah-Hartman +Date: Mon Jun 19 14:40:14 2006 -0700 + + update .gitignore to handle Xprint move + +commit d97a21acb878bc4e5e6542912fbd820503bba312 +Author: Greg Kroah-Hartman +Date: Mon Jun 19 14:36:54 2006 -0700 + + fix compiler warnings in hw/xfree86/i2c/fi1236.c + +commit 29c78321e86956c4ce0c1c899d82557f927e04da +Author: Greg Kroah-Hartman +Date: Mon Jun 19 14:36:41 2006 -0700 + + fix compiler warning in hw/xfree86/i2c/tda9850.c + +commit 9f2793551f335e5fb08990fc8bb9e05e0ffb68d5 +Author: Greg Kroah-Hartman +Date: Mon Jun 19 11:50:47 2006 -0700 + + fix compiler warning in hw/vfb/InitOutput.c + +commit b20ae5ddb7682bafcee6f8bf0c8208a3f70b882b +Author: Greg Kroah-Hartman +Date: Mon Jun 19 11:38:52 2006 -0700 + + fix compiler warnings in hw/xfree86/xf4bpp/ppcGC.c + +commit 4d258f31967141e3c4a6e4abbef89ffa717e85aa +Author: Greg Kroah-Hartman +Date: Mon Jun 19 11:27:47 2006 -0700 + + fix compiler warnings in XTrap/xtrapdi.c + +commit 870cecb72c2cba44dc64cb202917453603c8f287 +Author: Greg Kroah-Hartman +Date: Mon Jun 19 11:22:42 2006 -0700 + + fix compiler warnings in XTrap/xtrapdiswp.c + +commit a28652f9c35fbc009245382a5cc2a022f42366fc +Author: Adam Jackson +Date: Mon Jun 19 00:57:18 2006 -0400 + + Another round of loader sense-beating. Remove the (unused) server export + lists, a really bad hash table, the last vestiges of the other backends, + and some miscellaneous cleanups. Good for dropping 300k from the size of + the built server on x86. + +commit 98a602fab1f307a07a96868d7dae12b6f8d7f405 +Author: Adam Jackson +Date: Sun Jun 18 23:54:04 2006 -0400 + + Don't bother building RAC as a module, that's just absurd. + +commit 76aaf7eae7409162c5ed2963f2e27d019cb30263 +Author: Eric Anholt +Date: Sun Jun 18 19:47:29 2006 -0700 + + Add a couple of (doxygen) comments I wrote while looking at modesetting. + +commit 6aaf0e5b581b06fc73e56f863a26cd9d684eb9c0 +Author: Eric Anholt +Date: Sun Jun 18 19:12:15 2006 -0700 + + Add options to disable EXA acceleration for Composite/UTS/DFS, and always print + + out how much memory EXA is managing for offscreen pixmaps. + +commit 21ef7e17ef6dca177461c9438b9df707a4d664a2 +Author: Eric Anholt +Date: Sun Jun 18 18:57:55 2006 -0700 + + Add some missing .gitignore stuff for Mesa symlinks and other generated files. + +commit 71fbda8049f64c7fefae8ab817fb5f37ee2ee134 +Author: Adam Jackson +Date: Sun Jun 18 21:07:28 2006 -0400 + + Xprint/ -> hw/xprint + XpConfig -> hw/xprint/config + +commit 868e2cab706e317618646e064b0559d4e68c7b32 +Author: Eric Anholt +Date: Fri Jun 16 10:17:51 2006 -0700 + + Add explicit dependencies (Xorg_DEPENDENCIES = ) on the internal libraries + (such as libcw.la) that we link into the server, causing it to be rebuild + automatically when they're updated. Some system libraries are included, but + don't appear to cause any harm. You would think this would be automatic... + +commit 53f74b6aa95fe57fda45fd8a051595e772f00402 +Author: Eric Anholt +Date: Fri Jun 16 10:14:30 2006 -0700 + + Bugzilla #5120, #7246: In CW's GC ops, validate the backing GC against the + backing drawable if the serial numbers differ. Fixes crash in XAA which + occurred when the DDX bumped the serial number on the backing drawable and + expected it to get re-validated, and we didn't because the wrapped drawable + hadn't been bumped. + +commit b90088321e6ef84970aa97d7c851af93f49bf4b7 +Author: Ian Romanick +Date: Mon Jun 12 15:22:31 2006 -0700 + + Add arrayobj.c to the Makefile as well. + +commit f9f33b72e34eaeccea2a20f4a3dd68c2dbefc90e +Author: Michel Dänzer +Date: Mon Jun 12 20:19:11 2006 +0200 + + Track per-drawable damage to minimize UTS and DFS transfers. + + Based on work by Eric Anholt. + +commit 6060b612de6b41f872d034c6130770c1d189d0a3 +Author: Eric Anholt +Date: Mon Jun 12 20:12:31 2006 +0200 + + Provide option to report damage after operation is complete. + +commit 041ef23192b193b87f6cfc3e74e2e77f9f47cd4b +Author: Ian Romanick +Date: Mon Jun 12 09:39:18 2006 -0700 + + Add new Mesa files arrayobj.c and arrayobj.h. + +commit caad8b724b97074e41de447fe77dda189f287a26 +Author: Greg Kroah-Hartman +Date: Fri Jun 9 11:24:57 2006 -0700 + + fix compiler warnings in record/set.c + + (note this only fixed up the function definitions for the static functions + which can not cause any abi incompatibility) + +commit 51489bb5ed86cb6aa07e26a13618765c29f913e4 +Author: Greg Kroah-Hartman +Date: Fri Jun 9 10:59:47 2006 -0700 + + more .gitignore updates + +commit c4d251bd3e88cf8dfd6872537dbe30c07344b196 +Author: Greg Kroah-Hartman +Date: Fri Jun 9 10:46:18 2006 -0700 + + updated .gitignore with more pre-generated files + +commit 9f31ef83be61a900c701fcbc9a43ffae40ca7005 +Author: Greg Kroah-Hartman +Date: Fri Jun 9 10:44:46 2006 -0700 + + fix compiler warning in hw/xfree86/loader/loaderProcs.h + +commit 490ffc205a7714145cac0c63efeb6374ea28141f +Author: Greg Kroah-Hartman +Date: Fri Jun 9 10:44:25 2006 -0700 + + fix compiler warning in hw/xfree86/loader/loadmod.c + +commit 6119845d1ff832ea2b7c9cbe7ed6c6637cdcf305 +Author: Greg Kroah-Hartman +Date: Fri Jun 9 10:14:08 2006 -0700 + + fix compiler warnings in hw/xnest/Keyboard.c + +commit 1a7335ff932baa59a3283c50dd6007d81989b7e3 +Author: Greg Kroah-Hartman +Date: Fri Jun 9 10:02:08 2006 -0700 + + remove unneeded externs from Xprint/ps/psout.c + +commit 9583859d538394e98ac1f38b8e6f0997e321621d +Author: Greg Kroah-Hartman +Date: Fri Jun 9 09:59:22 2006 -0700 + + remove unneeded "extern" in Xprint/ddxInit.c + +commit cb9e29c184474edd75645e3b52e22a097a242e40 +Author: Greg Kroah-Hartman +Date: Fri Jun 9 09:54:50 2006 -0700 + + removed unneeded extern in Xprint/ps/PsWindow.c + +commit 96c19a3ec1b7e43782d373b8015fa0ca24cb4f5b +Author: Greg Kroah-Hartman +Date: Fri Jun 9 09:51:28 2006 -0700 + + put function prototype for ShapeExtensionInit() in proper place + + based on FIXME in mi/miinitext.c + +commit 576e6fb1124a47493371210adf99d6f2076e72c5 +Author: Adam Jackson +Date: Thu Jun 8 17:49:02 2006 -0400 + + Bug #7120: Multimonitor (non-Xinerama) support for xwin servers. + (Tom Whittock) + +commit d42cf4a2a4980fdd29fb15c4fd8fddda67b36256 +Author: Adam Jackson +Date: Thu Jun 8 17:46:53 2006 -0400 + + Bug #7121: fix clipboard handling in Xming (Colin Harrison) + +commit 3930da3f6209312dd0f10aba0b16ef45996a07fe +Author: Greg Kroah-Hartman +Date: Thu Jun 8 11:27:29 2006 -0700 + + fix compiler warnings in Xprint/ps/psout.c + +commit c496a3b9c981dc079fcc6c0ac4db3aa912b3dcf1 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 11:23:53 2006 -0700 + + fix compiler warning in Xprint/ps/PsImageUtil.c + +commit ea24b5a25c2544f3b3de6480da125edb23a6b3a9 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 11:22:01 2006 -0700 + + add proper function prototypes for Xprint/ps/PsCache.c to Xprint/ps/Ps.h + +commit ee2bb4d1929e20436cf0e830ece02fe07db2d524 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 11:15:34 2006 -0700 + + fix compiler warnings in Xprint/ps/PsArea.c + +commit 92303d534a91cb0ea30e4cd0f639efd70b9739b4 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 11:12:16 2006 -0700 + + fix compiler warning in Xprint/ps/PsGC.c + +commit cf6169f9e99e6e8ab264f284cfa13cb379b36207 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 11:09:56 2006 -0700 + + fix compiler warnings in Xprint/ps/PsFonts.c + +commit 1abc7f96edf37a1e2c766b9cdba7fc9b2cb06d19 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 11:06:51 2006 -0700 + + fix compiler warnings in Xprint/ps/PsInit.c + +commit 2dc291384c550badf55542ae645240e166676848 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 11:04:40 2006 -0700 + + fixed compiler warnings in Xprint/ps/PsPixmap.c + +commit aef092e0290143c2b8b1cb98fdf55c9630032aaf +Author: Greg Kroah-Hartman +Date: Thu Jun 8 10:53:17 2006 -0700 + + fix compiler warnings in Xprint/ps/PsPolygon.c + +commit 511b231ded61159ebd70cab020ca1ca003fd0784 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 10:41:34 2006 -0700 + + fix compiler warnings in Xprint/ps/PsPrint.c + +commit 35fccb0068e8d73d1e6a16aefdc771506e620f83 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 10:40:24 2006 -0700 + + remove some compiler warnings in Xprint/ps/PsText.c + + Note that one of the existing warnings is pointing out a + real bug (uninitialized use for fontPage in PsPolyText16()) + if anyone really cares about this code. + +commit 1ac30947f4a222ba78558eddf8e5f03cec31f613 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 10:35:18 2006 -0700 + + fix compiler warnings in Xprint/ps/PsWindow.c + +commit 9fa73721f0c3df73e508da909a5665f47a54cb57 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 10:27:28 2006 -0700 + + fix up EnableDisableExtension() and EnableDisableExtensionError() prototypes + +commit c405659626477f2009603d8c0e381b8b62277bb6 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 10:19:24 2006 -0700 + + comment out QualifyName in Xprint/Init.c which is not used anymore + + If someone else wants to delete this function, that's fine with me too. + +commit a940b851faba569e36983f7885aefa72f7bf2ade +Author: Greg Kroah-Hartman +Date: Thu Jun 8 10:17:53 2006 -0700 + + fix function pointer warning in Xprint/Init.c + +commit 9e0c82386ae389bcc296a5ad44e996790b033ad3 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 10:16:37 2006 -0700 + + fix already-defined warning in Xprint/Init.c + +commit 40fb7eecaf14a76f35ac2dc350ad2fffdaf6e0d0 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 10:11:17 2006 -0700 + + fix noDamageExtension warning in Xprint/Init.c + + Also took out duplicate definition of this variable in mi/miinitext.c + +commit 494895e0fbbf0a71bc535c0a2358c9db54c95c5a +Author: Greg Kroah-Hartman +Date: Thu Jun 8 09:43:44 2006 -0700 + + Properly define dispatchExceptionAtReset to fix compiler warnings + +commit d90eecf40ea768b2bf6340f15bb0af9dab2f3cf3 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 09:11:41 2006 -0700 + + add some missing function prototypes to Xprint/AttrValid.h to fix compiler warnings + +commit bccde1609153dee93f6fe5a138fc0c0f2fe08212 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 09:01:59 2006 -0700 + + fix incompatible pointer warning in Xprint/ddxInit.c + +commit 60bd8893d50ed1da9b94f4b96a07ea432e23f467 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 09:01:21 2006 -0700 + + Properly #ifdef out ddxBeforeReset() to fix compiler warning + +commit ac21e6a594eac69101aa8920d70a9d60412b57f6 +Author: Greg Kroah-Hartman +Date: Thu Jun 8 09:00:42 2006 -0700 + + remove unused variable warning in Xprint/ddxInit.c + +commit 71dd44b0ad617dd36ce4ed328f9e1e8c5ef713a5 +Author: Greg Kroah-Hartman +Date: Wed Jun 7 19:17:26 2006 -0700 + + Fixed up most "warning: function declaration isn't a prototype" warnings from Xprint/ + +commit 839305bac98856a2bb1d96691e4dcf49db229f90 +Author: Greg Kroah-Hartman +Date: Wed Jun 7 19:12:23 2006 -0700 + + Remove unused variables from Xprint/attributes.c + +commit 7a40ac2585028860730ffcd333eb3fe9de63680c +Author: Greg Kroah-Hartman +Date: Wed Jun 7 16:23:45 2006 -0700 + + remove a bunch of unused variables in Xprint/Init.c (fixing the compiler warnings) + +commit 163980138cc0bfc9124456781b3dc45a49e2a129 +Author: Greg Kroah-Hartman +Date: Wed Jun 7 16:11:20 2006 -0700 + + remove some unused local variables in Xprint/Oid.c + +commit 8e41640db884a4633b598d0a52b269e6547c8bf0 +Author: Greg Kroah-Hartman +Date: Wed Jun 7 15:56:43 2006 -0700 + + add bison generated files to .gitignore + +commit 78f4ab6b89fca3086b9c9471b40c11c23fbb6142 +Author: Greg Kroah-Hartman +Date: Wed Jun 7 14:12:40 2006 -0700 + + Fix compiler warning about undefined ReinitializeRootWindow function + +commit 757f40fca50a99377e437949ee77b983c8cd6087 +Author: Greg Kroah-Hartman +Date: Wed Jun 7 14:09:13 2006 -0700 + + updated the .gitignore file with more auto-generated files + +commit cc465800ddca5fb6c9ec09fdfa8f1f05359cf396 +Author: Greg Kroah-Hartman +Date: Wed Jun 7 14:03:35 2006 -0700 + + Fix compiler warnings about SetVendorRelease and SetVendorString + +commit 785c9789704ed142fe98cd17b5995e4a95b7141f +Merge: 21ebcfd... 36d786e... +Author: Greg Kroah-Hartman +Date: Wed Jun 7 13:20:21 2006 -0700 + + Merge ../xserver + +commit 36d786e9f051c5c95c1cc8c098c84e118ed3cc85 +Author: Greg Kroah-Hartman +Date: Wed Jun 7 12:47:50 2006 -0700 + + add more files to .gitignore + +commit 8f5aa38abf1158a789b5528df9d98826342e30cf +Author: Greg Kroah-Hartman +Date: Wed Jun 7 12:33:44 2006 -0700 + + fix compiler warning about XKB_IN_SERVER redefinition + +commit 101ae616962c355388722e05ab8413eb5f5c3402 +Author: Greg Kroah-Hartman +Date: Wed Jun 7 12:06:22 2006 -0700 + + Add PanoramiXExtensionDisabledHack to globals.h as it was missing. + +commit e5b72bd9c6fb06640a5de4031be0dc9b04b4b215 +Author: Greg Kroah-Hartman +Date: Wed Jun 7 12:05:39 2006 -0700 + + Remove 3 compiler warnings in the Xext/xevie.c file + +commit e3c11f66516521959127b9ab8fd88cc4c954f5bb +Author: Greg Kroah-Hartman +Date: Wed Jun 7 12:05:01 2006 -0700 + + Added first cut at a .gitignore file to make using git easier. + +commit 21ebcfd7027b2a6182d4065e56a2ef814f5181ae +Author: Adam Jackson +Date: Wed Jun 7 14:17:31 2006 -0400 + + Demolish now-unused loader functions. + +commit f90761b06eaa5fa44fe85289e54eed5f47eff3b9 +Author: Adam Jackson +Date: Wed Jun 7 13:58:24 2006 -0400 + + Add a token for EDID-supplied modes. + +commit d00aa6b8559d3e5f70c6558ce0abd12f7d758491 +Author: Adam Jackson +Date: Wed Jun 7 11:44:36 2006 -0400 + + Delete a (now misleading) message from the crash handler. + +commit f8535edec736cf19740bd41ed2adfe531f2c26ac +Author: Keith Packard +Date: Tue Jun 6 10:29:34 2006 -0700 + + Remove ChangeLog file. + +commit 8444bb77c91cf8a23d32b3cc9749e2a3d3f9f9eb +Author: Daniel Stone +Date: Mon Jun 5 20:22:06 2006 +0000 + + When we can, bound the maximum number of PCI devices to attempt to scan, by + the number found on the system. Only implemented for Linux right now. + +commit 11cf4d2fde9219e8d6ca427acae89a0c9f5d71b1 +Author: Keith Packard +Date: Mon Jun 5 07:15:23 2006 +0000 + + Update AC_DEFINE_DIR to version compatible with CVS autoconf which requires + double eval to avoid leaving ${prefix} in output + +commit 52fc7c8dc70226cc7f03454e9be86a627672295f +Author: Adam Jackson +Date: Mon Jun 5 03:00:24 2006 +0000 + + Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing + XFree86LOADER ifdefs, non-loadable hasn't been supported for a while + now. Remove completely gratuitious REMOVE_LOADER_CHECK_MODULE_INFO + ifdefs surrounding a call to a function added in XFree86 4.1 (!). + Miscellaneous static markings. + +commit d22582dc5a070f72d4653e24d1e4ebe4a112276e +Author: Adam Jackson +Date: Sun Jun 4 16:13:26 2006 +0000 + + Remove a stray LBX reference. + +commit ddc6b99505e227f99585b8c2392da524022a73e6 +Author: Daniel Stone +Date: Sat Jun 3 11:24:33 2006 +0000 + + Bump to 1.1.99.2. + +commit 4fd668940f2155c4b06d24b6da8bcccd01f66f4c +Author: Daniel Stone +Date: Sat Jun 3 10:58:37 2006 +0000 + + Bug #6619: Fix disappearing hardware cursor. (Colin Harrison) + +commit ee71cb61f8da29bcf36ea4b199d629e34f89b119 +Author: Daniel Stone +Date: Sat Jun 3 10:54:38 2006 +0000 + + Bug #6956: Fix crash when removing session leader before its children. + (Rich Coe) + +commit cd384af3058fe15077c57eccdffed3b61e261e7f +Author: Daniel Stone +Date: Sat Jun 3 10:50:23 2006 +0000 + + Completely remove relocation pointer table. + +commit 8e8c6faecddbe014d8760822e1f705b43a00fa33 +Author: Daniel Stone +Date: Sat Jun 3 10:48:37 2006 +0000 + + Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno) + +commit 5b703f847d166176920077c1e6ba1d9559fc8481 +Author: Daniel Stone +Date: Fri Jun 2 12:05:32 2006 +0000 + + Fix type confusion. + +commit 56f21bda1ce95741c88c423b60bd709eef26eb12 +Author: Daniel Stone +Date: Thu Jun 1 22:30:52 2006 +0000 + + Bug #6583: Only open /proc/bus/pci/devices once. (Bill Nottingham) + +commit a9ed5a87902a839a5a135af03db78f113b18bd86 +Author: Daniel Stone +Date: Thu Jun 1 22:06:41 2006 +0000 + + Kill LBX, too. + +commit df6da66525836d515f408a82f1a13ca5251ff0f7 +Author: Daniel Stone +Date: Thu Jun 1 20:56:39 2006 +0000 + + Simplify the unsupported XI function list. + +commit 97203f1cf6e5b7c6389f69cbb1b75ac675d09531 +Author: Daniel Stone +Date: Thu Jun 1 20:41:21 2006 +0000 + + Clean up a warning, and remove excess multiple-suffix code. + +commit 6d594ebc667afd404556ec3e108c810946b20ac5 +Author: Daniel Stone +Date: Thu Jun 1 20:22:39 2006 +0000 + + Ditch more alternate-loader braindamage. + +commit c9468177486833d521ec62c7b0266b4be8200de7 +Author: Daniel Stone +Date: Thu Jun 1 20:18:30 2006 +0000 + + Kill a.out, COFF and ELF loaders with FIRE. + +commit a3a4221495dfe4cc0a3874a08dd5364ef45a7f2e +Author: Adam Jackson +Date: Thu Jun 1 19:53:06 2006 +0000 + + Add bitmap to the ignored module list. + +commit ee689c104287140db38bbd26959ab1b4847c168e +Author: Daniel Stone +Date: Thu Jun 1 19:49:55 2006 +0000 + + Ignore requests to load GLcore and speedo. + +commit 07c731a2bc21e6b98f28a2c0ebc42f01b67b824b +Author: Adam Jackson +Date: Thu Jun 1 19:37:53 2006 +0000 + + Bug #5089: Die, libbitmap, die! + +commit 32be08ba7242da74de5defd6a4dcb536a273f57a +Author: Daniel Stone +Date: Thu Jun 1 19:22:38 2006 +0000 + + Remove horrendously ugly DDX backward-compatibility. + +commit d81edb9e00680e3c0001f343fa1d0c310b86cb93 +Author: Daniel Stone +Date: Thu Jun 1 19:22:01 2006 +0000 + + Forgot to remove this one too. + +commit a73e0f8cdfec1c9199ffe696146ba7d677c4c10d +Author: Daniel Stone +Date: Thu Jun 1 18:47:47 2006 +0000 + + Die XTESTEXT1, die! + +commit fc5ca97284ef237a91f6adb433148ff57a673c08 +Author: Matthieu Herrb +Date: Tue May 30 22:56:36 2006 +0000 + + Powerpc machines also need ioperm_noop.c + +commit 07b168c8d8b2d79a4e7cf8dc5124eafc0f2bbcd0 +Author: Adam Jackson +Date: Tue May 30 16:10:59 2006 +0000 + + Properly document the DPMS, SyncOnGreen, and TargetRefresh options. + +commit 107defd920d9b1eb52b15e8ca8665bc48bb933d6 +Author: Kristian Høgsberg +Date: Mon May 29 19:53:18 2006 +0000 + + Remove superfluous definition of tfp tokens. + +commit fd8bde8bb0f9d796b3464973b53285c0a6d22a31 +Author: Daniel Stone +Date: Mon May 29 11:14:03 2006 +0000 + + Remove -xkbmap argument. + +commit db0680cf70b8367e1f8a7fff9c0f6ec414db0542 +Author: Daniel Stone +Date: Mon May 29 09:26:32 2006 +0000 + + Minor #include cleanups. + +commit c38aab293a06f43c04f14223f94f822d91d73396 +Author: Matthieu Herrb +Date: Sat May 27 23:15:05 2006 +0000 + + check buffersize before reading next char, fixes the "mouse stuck at left" + bug (bugzilla #3113) for BSD systems using wscons. (Dale Rahn). + +commit 2102fdd0a58e18aeaa842b2ec73b6071970fafb7 +Author: Jeremy C. Reed +Date: Fri May 26 00:12:18 2006 +0000 + + RGB color database and XErrorDB install to "share" not "lib" by default (by + app/rgb and libX11). + TODO: They are customizable, so maybe cpprules.in should be extended. + +commit 354086d7e8e13fc7acbcc6603ca2a03c8cc806ee +Author: Jeremy C. Reed +Date: Thu May 25 23:32:33 2006 +0000 + + Don't do fixup_video_driver_list if no drivers. (I had signal 11 and core + dump when drivers not installed yet.) + TODO: fix fixup_video_driver_list to handle NULL argument. + +commit c6b1cff43238deded11dc58945778aec3d844598 +Author: Matthieu Herrb +Date: Thu May 25 13:27:42 2006 +0000 + + update to build against Mesa CVS HEAD (Carlos Eduardo Rodrigues Diogenes). + +commit 99724c16c9c58eb3e20ba91c79464747b8ee3fcf +Author: Matthieu Herrb +Date: Thu May 25 10:14:39 2006 +0000 + + typo + +commit 5c7aef148de23f39027fda647bbb53bb5b992683 +Author: Matthieu Herrb +Date: Thu May 25 09:57:47 2006 +0000 + + Don't destroy a pixmap twice on server exit (bugzilla #4247). + +commit 693079442377daa2dc48bf318a0d7dd256cb2738 +Author: Jeremy C. Reed +Date: Wed May 24 22:58:03 2006 +0000 + + NetBSD also has curses.h instead of ncurses.h. (TODO: Maybe instead of + checking for SCO, UnixWare, Sun SVR4 and NetBSD, the curses.h versus + ncurses.h should be tested in configure.) + +commit 9477e5e0be04f4f6fa311de8b3693fbc8a082fbf +Author: Jeremy C. Reed +Date: Wed May 24 22:43:13 2006 +0000 + + On NetBSD, add -li386 for i386 and -lx86_64 for x86_64 to SYS_LIBS. (x86_64 + on NetBSD not tested.) + +commit b3031532ca96b22e81863202efb8bbcb9d701fac +Author: Jeremy C. Reed +Date: Wed May 24 20:11:38 2006 +0000 + + Remove tolower() which was missed in the _XkbStrCaseCmp/strcmp changes. + +commit eb696f72a0819edef550bce9ff55730c02f70452 +Author: Alan Coopersmith +Date: Tue May 23 16:17:09 2006 +0000 + + Add AC_SUBST([SOLARIS_ASM_CFLAGS]) that I forgot when splitting them out of + the XORG_CFLAGS. + +commit bc0c56c407117d1545e20d21f7d30eb3472d618b +Author: Adam Jackson +Date: Mon May 22 15:47:56 2006 +0000 + + Bug #6924: Restore the ABI for DrawableRec and ColormapRec to the state + they were in prior to the fix for #6438. Based on a patch from Andy + Ritger. + +commit cc3b882bd141218052cdde0144fc2a707ceee83d +Author: Alan Coopersmith +Date: Sat May 20 00:55:44 2006 +0000 + + Update to 2006-05-19 snapshot + Remove entries now present in pci.ids + Regenerate from updated pci.ids & extrapci.ids + +commit 0b2c2b6bba5b578d5f0ac2d709d5d2ce7cb32bef +Author: Adam Jackson +Date: Fri May 19 20:29:47 2006 +0000 + + Remove dead DPMS timer functions from the installed headers. (Fredrik + Höglund) + +commit deebf6bd51117c01a3217f134bd952481b9e41ab +Author: Adam Jackson +Date: Thu May 18 23:52:51 2006 +0000 + + Bug #4139: Fix a BAR remapping bug that could lead to IERR and system hang. + (Egbert Eich) + +commit 91239d83f4e27835cf871348b5ff6c892bd4f4f4 +Author: Adam Jackson +Date: Thu May 18 23:52:41 2006 +0000 + + file getemptypci.c was initially added on branch server-1_1-branch. + +commit c11cfcfaffc79be5686c666f881c4c08f69e1b86 +Author: Adam Jackson +Date: Thu May 18 23:48:57 2006 +0000 + + Bug #6377: Ignore disabled BARs, and allow matching BARs aligned to less + than 16 bytes. (Felix Kühling, ATI) + +commit fa9a49a92db52de968d7147c71c6b9a8fd480f1e +Author: Adam Jackson +Date: Thu May 18 18:18:41 2006 +0000 + + Bug #5877: Avoid burning CPU when acpid dies. Require acpid to be running + for ACPI support on Linux. Minor errno handling fixes. (Valery + Inozemtsev, Adam Jackson) + +commit 7893dadb2f6df218a4f4ea30a41c1aa9838da1f0 +Author: Adam Jackson +Date: Thu May 18 14:39:59 2006 +0000 + + Bug #6827: Fix texel fetch in fbFetchTransformed to avoid crashes. Still + not 100% correct, but better than 7.0. (Radek Doulik, Matthias Hopf) + +commit 2892dd6d2e34957650ef1630a94d471dfa71f888 +Author: Daniel Stone +Date: Wed May 17 16:20:03 2006 +0000 + + Make Xv symbols conditional. (Enrico Wiegelt) + +commit a317bf482257f0e1b612dec7961fdfa564f0b9f2 +Author: Daniel Stone +Date: Wed May 17 15:00:18 2006 +0000 + + Make DBE support conditional. (Enrico Wiegelt) + +commit 321dbed5f5a857a23525167ab85d4d7699429132 +Author: Adam Jackson +Date: Mon May 15 18:27:18 2006 +0000 + + Bug #5209: Fix APM/ACPI support, again. (Michel Dänzer, Valery Inozemtsev) + +commit dd38d3bd673cf830c2cd591fe1245909aa729892 +Author: Matthieu Herrb +Date: Sun May 14 16:22:24 2006 +0000 + + Don't use AM_CONDITIONAL inside shell conditionals. Bugzilla #6916. + +commit 6558ba4e62dba99f2a4d830f1c16f8d1c255b316 +Author: Søren Sandmann Pedersen +Date: Fri May 12 21:53:28 2006 +0000 + + Fri May 12 17:51:26 2006 Søren Sandmann + Keep track of the previous item and update its next pointer when deleting + from the linked list. + +commit 9e239a0df7ededb50de091e5271cbfddd2b683c3 +Author: Matthias Hopf +Date: Thu May 11 11:23:43 2006 +0000 + + Bug #5796: Wrong fastpath selection for repeating sources. + +commit 9db5d2dfc33e384ea4db1b7cbc377e0b05cfb3ff +Author: Matthias Hopf +Date: Thu May 11 10:18:08 2006 +0000 + + Bug #4320: Improved XAA Composite fastpath. + +commit 9a2a63ca3ff30d15e82a29e75a3720ba5b446978 +Author: Adam Jackson +Date: Wed May 10 15:44:27 2006 +0000 + + Bug #3561: Crash fix in the Record extension. (Paul Anderson) + +commit ab1a0249ba5e3174f18a1db212bc511fd7d74cb0 +Author: Adam Jackson +Date: Tue May 9 22:36:01 2006 +0000 + + Bug #6867: Yet another Render crash fix. (Michel Dänzer) + +commit 24310f827b71009c7510a674d2f92ced89847e37 +Author: Adam Jackson +Date: Tue May 9 18:12:50 2006 +0000 + + Revert accidental commit + +commit 86ffb46358965509aa3ee536f15cb5a4e5e04426 +Author: Adam Jackson +Date: Tue May 9 18:04:29 2006 +0000 + + Bug #5209: Re-enable building APM and ACPI support. (Michel Dänzer) + +commit b46d6a44fa97a3e66de828385026b7f84d9e59b8 +Author: Alan Coopersmith +Date: Wed May 3 23:45:16 2006 +0000 + + Make Xephyr build on Solaris: + Add #include on Solaris for FNONBLOCK/FASYNC definitions + hw/kdriver/linux/Makefile.am Move agp.c & agp.h to KDRIVE_HW_SOURCES since + they're not needed for Xephyr-only builds + Add -lrt to XEPHYR_LIBS if needed to get nanosleep(). + +commit fc91ca069dd55490b99b096f029e0864b049120c +Author: Adam Jackson +Date: Wed May 3 17:50:10 2006 +0000 + + Redact a few mentions of speedo font support. + +commit b9a9cf618566bdd796556b8a1f31949f66184352 +Author: Matthieu Herrb +Date: Tue May 2 14:09:30 2006 +0000 + + Typo in ALLLOCATE_LOCAL() arguments, causing mis-computation of the buffer. + Bugzilla #6642. + +commit 1e8a594957d84a37e66183e9c0cb9d42b62bdb24 +Author: Alan Coopersmith +Date: Tue May 2 01:37:25 2006 +0000 + + Fix Solaris build with Sun compilers to work when exa is built before + hw/xfree86/os-support/solaris (as it is by default now). + +commit 724dbc2f8bbe2f21bf16f20ca7b8bb555516626c +Author: Alan Coopersmith +Date: Tue May 2 01:30:37 2006 +0000 + + Use min() [defined in include/misc.h] instead of MIN() [not defined in any + Xorg header]. + +commit ad124742ae2a265a54a4a7ac91709ec6fd6ced34 +Author: Adam Jackson +Date: Sun Apr 30 20:33:27 2006 +0000 + + Remove stray mfb/cfb references. + +commit 291e89d4f2a4bb3177b2dfe6421680e23f120b8e +Author: Adam Jackson +Date: Sun Apr 30 19:16:14 2006 +0000 + + Remove NEED_LINEHELPER BC cruft for pre-R6 DDXes. + +commit fdcacc5a4bc1d6cb7347fc66041a9c686c5c74d1 +Author: Eric Anholt +Date: Fri Apr 28 03:27:12 2006 +0000 + + Add Polylines and PolyPoint acceleration as well. This is primarily to + clean up fallback debugging output, so I can focus on more imporant + cases. Performance is comparable but without hardware stalls, and + passes Xlib9. + +commit 005529a1c9c9e78f06565dff081f03b74988081e +Author: Eric Anholt +Date: Fri Apr 28 03:26:30 2006 +0000 + + Correct some bugs causing performance issues in the "Smart" scheme. + +commit 8738bc295bba229e36d064713e0c28aa8720c494 +Author: Eric Anholt +Date: Thu Apr 27 20:27:27 2006 +0000 + + Improve EXA fallback debugging output to include the locations of pixmaps. + This is being used in tracking down recent compositing performance + regressions. + +commit 83b061776a57025076fc26d6d01fe2e049c2243b +Author: Eric Anholt +Date: Thu Apr 27 19:17:34 2006 +0000 + + Add trivial PolySegment acceleration for 0-width horizontal/vertical lines, + which still happen somewhat frequently and were cluttering up my + fallback debugging output. x11perf says it's a major performance win in + those cases (though probably irrelevant), and it passes Xlib9. + +commit 69164ec00c749787dd59d5913ec6b3d159ad74d7 +Author: Eric Anholt +Date: Thu Apr 27 02:15:19 2006 +0000 + + In drawing glyphs, shortcut our way to exaComposite instead of going + through the whole CompositePicture stack and doing things like + computing damage over again. This is a sizeable win for text drawing + with a compmgr. Also avoid calling down into the server for dealing + with the scratch pixmap when we are able to do UploadToScreen + successfully and never need it. + +commit 3d4ca57b69c40d27fe191170d0819013f8cc4947 +Author: Eric Anholt +Date: Wed Apr 26 18:27:40 2006 +0000 + + Add a helper for the Component Alpha Over case, which breaks the operation + down into an OutReverse and an Add. Turn off the fallback to software + glyphs when component alpha, now that we expect all (new) drivers to be + able to support it. Also, make Xephyr fall back in the CA Over case to + exercise this code. This speeds up my rgb24text and ls -lR in + gnome-terminal by a factor of 5. + +commit 26fa45b64258894201496f921eccb0cb7028c28c +Author: Dave Airlie +Date: Wed Apr 26 11:40:58 2006 +0000 + + Bug #6751: Use the Linux PCI ROM interface on Linux properly. The old + domain code, still modified BARs not a good idea, Just talk to sysfs, + if 0 read, fallback to old methods. + +commit c339b221d3f59130a39e63d4cec3de7e3de95bf3 +Author: Dave Airlie +Date: Wed Apr 26 11:31:07 2006 +0000 + + Bug #6750: This patch detects Intel bridges that are transparent but aren't + reported as such. From the Linux kernel fixups. This patch also removes + the reserved BIOS area from the area to allocate resources in. + +commit 6d156c044085881c6ecbd8a13521c0a26df71c30 +Author: Eric Anholt +Date: Wed Apr 26 01:33:15 2006 +0000 + + Improve the migration debugging output. + +commit eaed7545a25a08b3223bf620c2ab6f80fe7cfdf6 +Author: Eric Anholt +Date: Wed Apr 26 01:32:55 2006 +0000 + + Fix a bug in the intersection computation that could concievably cause + incorrect results to be returned (but would probably usually be + over-conservative). + +commit 5d00859c6e7d4b7ebce56f438ec4993334de2328 +Author: Eric Anholt +Date: Tue Apr 25 23:56:17 2006 +0000 + + Bug #4668: Check if the lists of glyphs don't have any intersecting glyphs, + and if they all have a maskFormat matching the format of the actual + glyphs If so, we can avoid the temporary pixmap for accumulating + glyphs, which reduces the number of operations done, and makes it + easier on the migration system. This fixes some significant performance + issues, particularly with subpixel antialiasing. Note that it does + increase the amount of damage computation which is done, so is not + always a win with a compositing manager running. + +commit 074dc9a023b3967ce00aa42c26a7c988423afe8a +Author: Eric Anholt +Date: Tue Apr 25 16:47:23 2006 +0000 + + Add an option to verify at the point of migration that pixmaps which aren't + marked dirty are in fact not dirty. This will hopefully help catch + issues like the previous commit. Leave it on in fakexa. + +commit 702d9226d57ec1584de2e8a85c268795650b1094 +Author: Eric Anholt +Date: Tue Apr 25 15:46:04 2006 +0000 + + Don't forget to mark the drawable as dirty in exaPutImage(). Fixes + corruption with drivers that have UTS. (Michel Dänzer) + +commit 39ca0867c7dd6f3bdecc52aec8df435946682098 +Author: Donnie Berkholz +Date: Mon Apr 24 05:44:06 2006 +0000 + + Remove another reference to cfb16. + +commit 81f3c2937df6230542f3223c201da8c41ff59945 +Author: Donnie Berkholz +Date: Mon Apr 24 05:39:47 2006 +0000 + + strlcpy() doesn't exist on Linux, so use the implementation in os/. + +commit a715634d23fb3124261dbbd8d7d4e6522551bb9b +Author: Matthieu Herrb +Date: Sun Apr 23 13:14:50 2006 +0000 + + Don't access free memory after unloading a module. Bugzilla #4168. + +commit 79dc6892610c9f8385cde4f0d601cc7481225c16 +Author: Benjamin Herrenschmidt +Date: Sat Apr 22 03:22:17 2006 +0000 + + When reading the kernel keyboard mapping (readKernelMapping in + os-support/linux/lnx_KbdMap.c) we overrun the usefully-named global + array 'map', scribbling on other random static variables elsewhere. + This is fixed by changing the size of at2lnx. (David Woodhouse). Bug + #5169 + +commit b37c515320dc8df2b1d160cc3f37d6bfac109b91 +Author: Keith Packard +Date: Wed Apr 19 21:56:13 2006 +0000 + + Add support for x4a4 format (depth 4 at 8bpp). Bug #6325. + +commit c947d796aad0b81d661a10b787deed967376da79 +Author: Eric Anholt +Date: Tue Apr 18 19:18:43 2006 +0000 + + Missed in previous commit: Add a new migration scheme, called "Smart" for + lack of a better name. This one behaves somewhat between Greedy and + Always. It moves in if we can accelerate, unless the destination is + clean and shouldn't be kept in framebuffer according to the score, in + which case we migrate out (and force-migrate anything where migration + is free). This should help fix lack of acceleration for drivers without + UTS since removing exaAsyncPixmapGCOps, and has removed one performance + trap with Radeon I'd noticed. It is the new default. + +commit b17a4de83e7ab18bef29ae898195889638f1cc6a +Author: Eric Anholt +Date: Tue Apr 18 19:14:07 2006 +0000 + + Add a new migration scheme, called "Smart" for lack of a better name. This + one behaves somewhat between Greedy and Always. It moves in if we can + accelerate, unless the destination is clean and shouldn't be kept in + framebuffer according to the score, in which case we migrate out (and + force-migrate anything where migration is free). This should help fix + lack of acceleration for drivers without UTS since removing + exaAsyncPixmapGCOps, and has removed one performance trap with Radeon + I'd noticed. It is the new default. + +commit 771b366abe0bc060592b548612ec413291e14bf0 +Author: Eric Anholt +Date: Tue Apr 18 18:50:35 2006 +0000 + + Fix exaGetPixmapFirstPixel to migrate as unaccelerated. Also adds a bit of + fallback debugging info to PolyGlyphBlt. + +commit 782d61a03176264e0a9eb222ae97be3d175cf0ab +Author: Donnie Berkholz +Date: Tue Apr 18 17:28:44 2006 +0000 + + Update all prefixes in config tools, so they mostly work again. Also, make + RgbPath commented out when using xorgconfig. Start using + /dev/input/mice as the default mouse location on Linux. + +commit 0f065059dcaf9c452f1cdec115f619f697fd71cc +Author: Donnie Berkholz +Date: Mon Apr 17 07:27:43 2006 +0000 + + Wrap a couple more SDK headers in if XORG, as per Dave Airlie's commit on + 2006-01-18. + +commit ba632f697a782cd47870705b6cecaac2c60d30ff +Author: Donnie Berkholz +Date: Mon Apr 17 07:10:31 2006 +0000 + + Fix kdrive build by linking in libexa before KDRIVE_LIBS. + +commit 0e62d92d5b809bc3a6503e9bc386cf961fc22557 +Author: Adam Jackson +Date: Fri Apr 14 23:43:32 2006 +0000 + + Coverity #804: Another leak on OOM path. + +commit d61219aaadf9e4aa83644a69627d3a1d3282c95f +Author: Adam Jackson +Date: Fri Apr 14 23:38:11 2006 +0000 + + Coverity #806: Another memory leak on OOM path. + +commit 1b04e313920447e4c1f42bdd5a61f188d463210c +Author: Adam Jackson +Date: Fri Apr 14 23:32:22 2006 +0000 + + Coverity #847, #848, #849: Three more memory leaks. + +commit 6545051902f2ce00c98bd1373f97ebc942667e9c +Author: Adam Jackson +Date: Fri Apr 14 23:10:59 2006 +0000 + + Coverity #1003, #1004: Two more useless null checks. + +commit ab1d420022fb09d36a0d6ad948c38147c65b9adf +Author: Adam Jackson +Date: Fri Apr 14 23:09:38 2006 +0000 + + Coverity #1005: Avoid a null deref. + +commit d01e0956a8903fb41e8a34c78973b9b2860b6446 +Author: Adam Jackson +Date: Fri Apr 14 23:08:10 2006 +0000 + + Coverity #1007: Fix a silly null check. + +commit 6d29f659318364afe046dc242d6f506ce40a944a +Author: Luc Verhaegen +Date: Fri Apr 14 23:01:35 2006 +0000 + + CVT means Coordinated Video Timing instead of Common. + +commit 82b6ea1a4b414426072bf001daeb3e9de0e93589 +Author: Adam Jackson +Date: Fri Apr 14 22:51:19 2006 +0000 + + Bug #6580: Don't install xf86drm.h, that's libdrm's job. + +commit aefa347bded9a3179ab139d0ccddce314040e9b9 +Author: Ian Romanick +Date: Thu Apr 13 21:08:25 2006 +0000 + + Fix build for added file to Mesa CVS. This is always fun. :( + +commit 6aadd454e70d83921685b58bf57ec30d95920734 +Author: Daniel Stone +Date: Mon Apr 10 10:11:19 2006 +0000 + + Fix stupid thinko. + +commit c9f6e60d42dec82d06995c05a2a011c338cadd87 +Author: Daniel Stone +Date: Mon Apr 10 08:50:33 2006 +0000 + + Coverity #826: Fix potential memory leak. + +commit 1357af2474be9a3bce7ee2350fd4252eee89a3b1 +Author: Daniel Stone +Date: Sun Apr 9 17:39:10 2006 +0000 + + Coverity #340: Fix potential NULL dereference. Clean up proliferation of + 'register int n' in loops of ProcXkbGetNames. + +commit f324be00c547effc698ae6679d12ffe90bd90e43 +Author: Daniel Stone +Date: Sun Apr 9 17:28:42 2006 +0000 + + Coverity #324: Fix potential NULL dereference. (Alan Coopersmith) + +commit 7637aa17f21e26d979fbb210a638d6751c98b1eb +Author: Daniel Stone +Date: Sun Apr 9 17:26:17 2006 +0000 + + Coverity #169: Fix potential fgets() into NULL (?!?). + +commit d5bc41b88272b4a3a1841cc1189720b0549db215 +Author: Daniel Stone +Date: Sun Apr 9 17:15:51 2006 +0000 + + Coverity #323, #445, #446, #447: Fix potential NULL dereferences. + +commit 2387bfa5ff5ed82f3f732fb9152c1ea95850a914 +Author: Aaron Plattner +Date: Fri Apr 7 18:56:04 2006 +0000 + + Bump the ABI versions. Due to Glyph privates and the XV update below, the + video driver ABI needs to be bumped to 1.0. The rest of the ABI minor + versions were bumped to include the LoaderGetABIVersion function. + Add a DrawblePtr argument to the XV hooks. This allows drivers to determine + that the target window is redirected and draw to the appropriate place. + +commit dc43909219fe2a4d03139638814b89032b2921b9 +Author: Søren Sandmann Pedersen +Date: Fri Apr 7 17:49:32 2006 +0000 + + Fri Apr 7 13:46:45 2006 Søren Sandmann + Use FreeResource instead of deleteCompOverlayClient() + +commit 94e7213d594dbbb53a6bb05d1dab7514c4ff5350 +Author: Adam Jackson +Date: Fri Apr 7 16:08:50 2006 +0000 + + Remove libc wrapper types from Xisb interfaces. + +commit 47bdc9528c2dd4ea9d59a0944c023173ea7a7a66 +Author: Daniel Stone +Date: Fri Apr 7 16:07:50 2006 +0000 + + Coverity #844, #845, #846: Fix memory leaks. + +commit 2c90c3bfef8563f739a72bb645dd52b35b6ff6d5 +Author: Daniel Stone +Date: Fri Apr 7 15:57:17 2006 +0000 + + Coverity #987: Avoid potential NULL dereference. + +commit 843146cfbaef234e13df9a62b6f0232a5efdf7f0 +Author: Daniel Stone +Date: Fri Apr 7 15:53:21 2006 +0000 + + Coverity #1216: Fix double-close of file on error. + +commit 5dacc822327689c0f096093756473c96fba67d76 +Author: Keith Packard +Date: Fri Apr 7 02:20:11 2006 +0000 + + Coverity #333, #334 - eliminate unncessary test for always true condition + in fbEvenStipple. + +commit 75a9afdbf42e4196471774102e1758f18866bec6 +Author: Adam Jackson +Date: Fri Apr 7 01:53:43 2006 +0000 + + Coverity #488: Avoid smashing an array on malformed config files. + +commit 20c1ef2cc30abe45eeaf5b0833cbc0095ed05c02 +Author: Adam Jackson +Date: Fri Apr 7 01:50:07 2006 +0000 + + Coverity #769: Fix a potential memory leak for systems that allocate on + malloc(0) + +commit 5ef711032b821be82fd7281fe64872bcbaff0327 +Author: Adam Jackson +Date: Fri Apr 7 01:41:00 2006 +0000 + + Coverity #838: Plug two more memory leaks. + +commit 69477ea4b6e666940c5dd4422bedfa6432dead04 +Author: Adam Jackson +Date: Fri Apr 7 01:37:11 2006 +0000 + + Coverity #837: Fix another another memory leak. + +commit b472ce7307dd88a21c7713a2b127e34f5c2bc817 +Author: Adam Jackson +Date: Fri Apr 7 01:35:43 2006 +0000 + + Coverity #836: Fix another memory leak. + +commit 9c84ed5f8d9eded1a8b509c9cad1ca0ebcf2166a +Author: Adam Jackson +Date: Fri Apr 7 01:34:29 2006 +0000 + + Coverity #835: Plug memory leak in extension section parsing. + +commit 12924d0da36ad2266bb040caac58534c07e85261 +Author: Adam Jackson +Date: Fri Apr 7 01:29:39 2006 +0000 + + Coverity #812: Fix parser memory leak. + +commit 49abff79957799e9229d5c0226ee1b0d7505003d +Author: Adam Jackson +Date: Fri Apr 7 01:26:33 2006 +0000 + + Coverity #818: Avoid memory leak on error path. + +commit bda292120fc97f890c1f58a31177c0f7c0bfa048 +Author: Adam Jackson +Date: Fri Apr 7 01:23:50 2006 +0000 + + Coverity #985: Avoid segfault on malloc failure. + +commit 536628bb4bcb0a0d749e0c01412a5eb5d6d24063 +Author: Adam Jackson +Date: Fri Apr 7 01:18:01 2006 +0000 + + Coverity #1037: Sanity check idx before use. + +commit 53e97ce4ddd993248561c245143b61915ea254b5 +Author: Adam Jackson +Date: Thu Apr 6 22:04:12 2006 +0000 + + missed a line while removing cfb16 + +commit 4ae12636694af05cee4287b119bde08e9ceaa8aa +Author: Adam Jackson +Date: Thu Apr 6 18:59:11 2006 +0000 + + Remove cfb16, no longer used. + +commit e1fc15a85fb367ee9afd63c920c3327c3f45158d +Author: Fredrik Höglund +Date: Wed Apr 5 21:08:45 2006 +0000 + + Put the screensaver extension back in the Xext module. + Move the screenSaverSuspended variable to DIX globals. + Restore the old link order for the Xorg and Xdmx binaries. + +commit 383c2e1e9ec54ab9de356993ad552c1aa6ec094f +Author: Ian Romanick +Date: Wed Apr 5 19:52:12 2006 +0000 + + Include fbmmx.h in fb/fbwindow.c when USE_MMX is defined. Fixes build + problem on x86-64 resulting from fbHaveMMX being a macro instead of a + function on that platform. + +commit 4697da177d545a2f8bb6fd0d6588a1c40532c339 +Author: Adam Jackson +Date: Tue Apr 4 18:30:28 2006 +0000 + + Initial checkin + +commit 83ea57bcc82f478a7ecdcd6ed73ca4be01cd9c26 +Author: Adam Jackson +Date: Tue Apr 4 14:39:06 2006 +0000 + + Bug #5729: Convert xf8_16bpp to fb. chips(4) users please test. + +commit 4c7da861185080d15b3ff4301af4af0e85a71f93 +Author: Adam Jackson +Date: Tue Apr 4 14:17:04 2006 +0000 + + Bug #5300: Fix missing spaces in the Build OS line in the log. (Egmont + Koblinger) + +commit fb6f61b50f1c701041680e49f6a406a6603f1577 +Author: Adam Jackson +Date: Tue Apr 4 12:36:16 2006 +0000 + + Bug #4806: Dump the raw EDID contents in hex to the log file for better + debugging. (Philip Prindeville) + +commit 14af50371c7f23855781924cdf6afa6ab7566a87 +Author: Adam Jackson +Date: Mon Apr 3 22:00:06 2006 +0000 + + Bug #2142: Make font path logging more readable. (Eduard Fuchs) + +commit 373f9f92566290d979730c09c9c5c5d50e23390c +Author: Adam Jackson +Date: Mon Apr 3 21:45:54 2006 +0000 + + Bug #4766: Convert all Xprint drivers to fb. + +commit d9b8bfbfafe8758ceb629606607e37546d51ca52 +Author: Adam Jackson +Date: Mon Apr 3 21:16:30 2006 +0000 + + Bug #5478: More use of fbSOlidFillmmx. (Jim Huang) + +commit b0e67782653033c6518944adfbf23e466bd8bc39 +Author: Adam Jackson +Date: Mon Apr 3 19:50:15 2006 +0000 + + Bug #6346: Build fix when using gcc -mno-sse. (Jonathan Adamczewski) + +commit 66500819b1ca730a7b1df400a8368a08cbe49335 +Author: Daniel Stone +Date: Mon Apr 3 11:37:30 2006 +0000 + + Bug #1358: Make ISO_Prev_Group cycle/wrap as ISO_Next_Group does. + +commit 2a6c11aa3b06f13dad94f3441c7184e6720a2bf4 +Author: Alan Hourihane +Date: Mon Apr 3 09:12:28 2006 +0000 + + Fix a server crash due to memsetting beyond allocated memory when running + GL applications. + +commit f6ca2b3ea92b7fe98408c51a17a590435e808b1d +Author: Adam Jackson +Date: Mon Apr 3 02:15:55 2006 +0000 + + Coverity #38: Dead branch elimination. + +commit 9b9dd747d8f4697c6d5c947c160d5991c7c8fde5 +Author: Adam Jackson +Date: Mon Apr 3 02:13:47 2006 +0000 + + Coverity #75: Dead variable elimination. + +commit 3f87aeefb4be3ac23ae636d3756ffdc446eaa62d +Author: Adam Jackson +Date: Mon Apr 3 02:12:11 2006 +0000 + + Coverity #82: Dead variable elimination. + +commit 61926dbe592468076f8c9a666f0098d067d2213e +Author: Adam Jackson +Date: Mon Apr 3 02:09:05 2006 +0000 + + Coverity #271: Fix an unbelievably boneheaded NULL chase. + +commit 7ef95da8a3e22e710882590fc47d56893159cb5d +Author: Adam Jackson +Date: Mon Apr 3 01:51:54 2006 +0000 + + Coverity #616: Fix a rare memory leak. + +commit 01ebd633017249c496f378df511586c973d49708 +Author: Adam Jackson +Date: Mon Apr 3 01:43:33 2006 +0000 + + Coverity #833: Fix a rather nasty memory leak. + +commit a01f17d6dec02f80144e108f748783cb4e429ebb +Author: Adam Jackson +Date: Mon Apr 3 01:35:05 2006 +0000 + + Coverity #983: Move some risky debugging code inside #ifdef DEBUG. + +commit c03cfca3806f45948627715b25b46839a07be979 +Author: Adam Jackson +Date: Mon Apr 3 01:31:59 2006 +0000 + + Coverity #986: Prevent a NULL chase. + +commit 07ecf49521973bbb205b199c39e1171f1163df2b +Author: Adam Jackson +Date: Mon Apr 3 01:28:11 2006 +0000 + + Coverity #992: Prevent a NULL chase. + +commit c6b3b3354c2d9139b19b132051d434e97dd19715 +Author: Adam Jackson +Date: Sun Apr 2 22:51:42 2006 +0000 + + Bump to 1.1.99.1. + +commit 7e085f52b6f07c076bd3bcfdce27c17d14d7822e +Author: Kristian Høgsberg +Date: Sun Apr 2 22:31:13 2006 +0000 + + Use xf86LoaderCheckSymbol to check for DRI symbols instead of dlsym, + avoiding RTLD_DEFAULT. (__glXDRIscreenProbe): Change GLX-DRI to AIGLX + in LogMessage for consitency. + +commit b2097b99a2e6cc045ee9b6d80946bc06c4d9302c +Author: Adam Jackson +Date: Sun Apr 2 21:45:03 2006 +0000 + + ../stub + +commit 4e3a4cfdd1d7153eb88aab05ed02ddb32601ae93 +Author: Eric Anholt +Date: Sun Apr 2 06:22:05 2006 +0000 + + Use RTLD_DEFAULT, rather than relying on NULL happening to map to it as it + does on Linux. + +commit 323fec20292fc5ad90bfee9015ecccdc13c968ad +Author: Adam Jackson +Date: Sun Apr 2 00:46:20 2006 +0000 + + Reorder link order for Xdmx to fix new screensaver variable reference + properly; remove previous awful hack. + +commit a605b9ffd3c2e7d227e35b911761f720bf07b7e6 +Author: Adam Jackson +Date: Sun Apr 2 00:09:43 2006 +0000 + + Fix some includes to point into X11/fonts/ properly. + +commit e5b1d38e142807b59ce4ec89764c949f707ec541 +Author: Adam Jackson +Date: Sat Apr 1 23:53:33 2006 +0000 + + Disable Xprint freetype support momentarily. Needs ttf2pt1.c, which exists + in the monolith but has an advertising clause in the license. + +commit ccca76b8083b83825fa16483b44e8926a35412bb +Author: Eric Anholt +Date: Sat Apr 1 23:41:23 2006 +0000 + + Clean up warnings and a debug printf. + +commit 6afa814ab16f351b2eb787e5bf481a1f9738b391 +Author: Eric Anholt +Date: Sat Apr 1 23:28:17 2006 +0000 + + Pull out fb's tile handling during fbValidateGC so we can do the necessary + exaPrepare/FinishAccess()es. Revealed by xtest with fakexa. + +commit 277f612d4eeb89adb8ccda4e8fd3d211d8d1705e +Author: Adam Jackson +Date: Sat Apr 1 23:19:08 2006 +0000 + + Hack around the new screensaver variable for DMX, which is otherwise + blissfully ignorant of it. + +commit 5f95146fcfcae60cc29265799ba3b851647105d6 +Author: Eric Anholt +Date: Sat Apr 1 22:35:16 2006 +0000 + + Export exaPrepare/FinishGC to the rest of EXA, and use it in the ImageGlyph + implementation to avoid unprepared access to the tile. Also, relocate + the fbGetDrawable to avoid using a stale dest pointer after + exaSolidBoxClipped() may have migrated it. Revealed by xtest. + +commit c720ffe875e4b2038746ff9b4767f8b90db0a307 +Author: Eric Anholt +Date: Sat Apr 1 22:17:44 2006 +0000 + + Use fb's depth-to-planemask computation, which doesn't suffer from getting + a 1 planemask at depth 32. Fixes Get/PutImage xtest tests. + +commit 5c0a2088e229d05c38e5df7daea45af0d7db7daf +Author: Daniel Stone +Date: Sat Apr 1 21:49:44 2006 +0000 + + Bug #6428: Fix off-by-one error when walking off the end of the vmodmap + list. + +commit 1e764feab595b781dab22d6e41c26f118c9d41b5 +Author: Daniel Stone +Date: Sat Apr 1 21:20:31 2006 +0000 + + Bug #5801: Check for MTRR support under Linux. Minor refactoring of MTRR + checks for other OSes. + +commit 978c7b14a18caffde5600480824d04492fc32aef +Author: Daniel Stone +Date: Sat Apr 1 21:02:40 2006 +0000 + + Make Xprint AC_ARG_ENABLEs and AC_ARG_WITHs unconditional also. + +commit 71a6f2ef6c1138c5c6918a54dfb856183f4f242c +Author: Daniel Stone +Date: Sat Apr 1 20:58:42 2006 +0000 + + Unconditionally run XP_USE_FREETYPE AM_CONDITIONAL, not only in the Xprint + path. + +commit d1e90113fc32b6ddc4dbe1a074763c31bc133e75 +Author: Eric Anholt +Date: Fri Mar 31 23:22:29 2006 +0000 + + Don't attempt to Prepare/FinishAccess NULL pDrawables. Exposed by new + gradient testing in rendercheck. + +commit 2e38fedd29e7e55d01e3edce6a73b8ceaac17911 +Author: Eric Anholt +Date: Fri Mar 31 19:41:28 2006 +0000 + + Add an option to EXA for the DDX to request that EXA hide the pixmap's + devPrivate.ptr when pointing at offscreen memory, outside of + exaPrepare/FinishAccess(). This was used with fakexa to find (by NULL + dereference) many instances of un-Prepared CPU access to the + framebuffer: + - GC tiles used in several ops when fillStyle == FillTiled were never + Prepared. + - Migration could lead to un-Prepared access to mask data in render's + Trapezoids and Triangles + - PutImage's UploadToScreen failure fallback failed to Prepare. + +commit f480dc797b51f080f912efc7867d6d8e50be074c +Author: Eric Anholt +Date: Fri Mar 31 19:25:42 2006 +0000 + + Revert mistaken commit to exa_unaccel.c. Should have been to + exa_offscreen.c: Correct a typo in debug-only offscreen validation + code. (Wang Zhenyu) + +commit 1a8167c1baa767fc056d1e17d96d0ea98a5f3b17 +Author: Eric Anholt +Date: Fri Mar 31 19:16:51 2006 +0000 + + Correct a typo in debug-only offscreen validation code. (Wang Zhenyu) + +commit 7ea30b507f4ce5ce20fbfaca80f7d5b53a99eb1d +Author: Fredrik Höglund +Date: Fri Mar 31 18:49:38 2006 +0000 + + Move the screensaver extension from module to builtins. + Add the server side implementation of the ScreenSaverSuspend request. + Require scrnsaverproto >= 1.1, and change the linking order of the Xorg + static libs. + +commit acca49b1a5a6c034f3b9d51d9016b8a7d43da809 +Author: Søren Sandmann Pedersen +Date: Fri Mar 31 17:39:35 2006 +0000 + + Fri Mar 31 12:37:16 2006 Søren Sandmann + Fix copyright statement + +commit b074ce22470ba0a51eda2af7100d09a260a1e8bb +Author: Egbert Eich +Date: Fri Mar 31 15:11:51 2006 +0000 + + fixed typo. + +commit 710bb2e6c8b2874406e48fa8ad24539290c98d41 +Author: Daniel Stone +Date: Fri Mar 31 14:52:57 2006 +0000 + + Reindent with -cbi0. + +commit 7c44bb8c49656133eae675377edea55322d254ca +Author: Daniel Stone +Date: Fri Mar 31 07:33:34 2006 +0000 + + Simplify XkbWriteXKBKeymapForNames a bit, and remove debug spew. + +commit 4c317bbc1259fa555dc5d5278226b21c42845c0c +Author: Daniel Stone +Date: Fri Mar 31 07:21:41 2006 +0000 + + Add full FreeType support for Xprint. (Drew Parsons) + +commit 759033703ce17b20d57756206f48a7ae410a50d1 +Author: Eric Anholt +Date: Thu Mar 30 21:44:36 2006 +0000 + + Remove the exaAsyncPixmapGCOps mostly-unaccelerated ops vector, and always + plug in the accelerated one, even if the destination pixmap is + currently offscreen. This was a leftover from when kaa originally got + accelerated offscreen pixmap support, and its only concievable use was + to avoid a little overhead on ops to in-system pixmaps that weren't + going to get migrated. At this point, we probably care more about just + getting everything accelerated that we easily can, which should happen + with the new migration support. + +commit b9203dc068ccd4c0d22d49a94b910783432b96a8 +Author: Eric Anholt +Date: Thu Mar 30 21:25:43 2006 +0000 + + Don't do an extra fallback path for CopyWindow while swappedOut, since + exaCopyNtoN takes care of the fallback anyway, and we don't care about + the performance of this path. + +commit 5c04610f8aeceed9ec7cd0ca8c5eb314cacc3c25 +Author: Eric Anholt +Date: Thu Mar 30 21:21:59 2006 +0000 + + Add a dependency on EXA, so it rebuilds when the library does. The manual + indicated I shouldn't do this, but experience indicates I should. + +commit 8ec42a10ff04e51e8d0b4cffb15064d901bc398d +Author: Kristian Høgsberg +Date: Thu Mar 30 20:08:44 2006 +0000 + + Mark the ARGB FBConfig as nonconforming to prevent drivers and apps from + falling over. + Add @GLX_DEFINES@ so GLcore gets compiled with TLS support if configured. + Only destroy the mesa buffer if it got initialized. + +commit 08e319091fae7a60ae9fa757659cfde2966af9e9 +Author: Egbert Eich +Date: Thu Mar 30 18:53:41 2006 +0000 + + Added notice to last ChangeLog entry + Fixes for some vsw4 failures on 64bit BE platforms such as PPC64 and s390x. + Provided by Hong Bo Peng of IBM (slightly modified). Patches try to + resolve some of the careless mixtures of ulong and uint (which are + different size on + 64bit). > This patch will break the driver ABI! < Bugzilla #6438. + +commit 9da1d2257d02155cc8b4541cf5fcb4e64d756945 +Author: Egbert Eich +Date: Thu Mar 30 18:48:11 2006 +0000 + + Fixes for some vsw4 failures on 64bit BE platforms such as PPC64 and s390x. + Provided by Hong Bo Peng of IBM (slightly modified). Patches try to + resolve some of the careless mixtures of ulong and uint (which are + different size on + 64bit). Bugzilla #6438. + +commit 6d7ad353bafe914f0b50887daaeaae89ada6ebd3 +Author: Kristian Høgsberg +Date: Thu Mar 30 18:29:53 2006 +0000 + + Regenerate these files using updated scripts to avoid unused variable + warnings. + +commit 2153fa97482bae5737def3ecd4fe1cdc03834991 +Author: Eric Anholt +Date: Thu Mar 30 05:24:27 2006 +0000 + + Bug #2986: Add PutImage acceleration for the ZPixmap, planeMask ~= + FB_ALLONES, bitsPerPixel >= 8, GXcopy cases. With the radeon driver on + my machine, this gives about 10% speedup in PutImage + 10x10 and 500x500, and 40% speedup for 10x10 ShmPutImage, up to 65% + improvement in 500x500 ShmPutImage. Also fixes a crasher in GetImage + that slipped in at the last minute. + +commit 3cf46cc1e32efc0e4be1d88be111ba0438e0f021 +Author: Eric Anholt +Date: Thu Mar 30 05:15:58 2006 +0000 + + Add an UploadToScreen implementation, for testing PutImage support, and + make the DownloadFromScreen more robust. + +commit e799dd68e2bd0fa8ac3c344111fb12e1f32d4c10 +Author: Eric Anholt +Date: Wed Mar 29 22:25:17 2006 +0000 + + Bug #2986: Add acceleration of GetImage using DownloadFromScreen for the + ZPixmap, planeMask ~= FB_ALLONES, bitsPerPixel >= 8 case. I'm pretty + convinced that this is the only case that we care about at all. Tested + with xwd -root and xwd on a gnome-terminal, in a composited environment + or not. + +commit 4bb5ab0b4453208573b91b334940f190a8f7210a +Author: Eric Anholt +Date: Wed Mar 29 22:03:18 2006 +0000 + + Add a DownloadFromScreen implementation, used for testing GetImage + acceleration, and set the migration scheme to Always on init (since + this is all for testing, and Always should make migration happen more + frequently than Greedy). + +commit e31e8ace1043eab340d6b60a6e98b23ebf102786 +Author: Deron Johnson +Date: Wed Mar 29 17:51:54 2006 +0000 + + Fix composite overlay window bug 6411 + +commit ff6f88348c7498e83b0b143ef3737fd6eb0995e4 +Author: Adam Jackson +Date: Wed Mar 29 01:05:09 2006 +0000 + + More warning cleanup. + +commit 52d9ce7f4fc599d30dec2e61fc1720597043d91c +Author: Kristian Høgsberg +Date: Tue Mar 28 21:45:14 2006 +0000 + + Fix another typo. + +commit 7df64898eac46a487e8eab2af7213d133b9ca419 +Author: Kristian Høgsberg +Date: Tue Mar 28 07:46:04 2006 +0000 + + Fix a couple of typos. + +commit bd283c2464e2c0e1fd0aca1dedff0f39c2564c34 +Author: Aaron Plattner +Date: Tue Mar 28 07:21:50 2006 +0000 + + Add a new export, LoaderGetABIVersion. This function allows modules to + query the versions directly instead of having to guess. Bug #6416: Add + LoaderGetABIVersion. + +commit a06342eccc76035ff859fee4d283b288c90ee923 +Author: Kristian Høgsberg +Date: Tue Mar 28 02:57:07 2006 +0000 + + Add --enable-glx-tls ./configure option to enable use of TLS for storing + current GL context. Use this option to let AIGLX load DRI drivers + compiled for TLS. + +commit 77531dfb9f9f3ca0e38ad0555ee3735d6f28cf19 +Author: Adam Jackson +Date: Tue Mar 28 01:22:01 2006 +0000 + + Silence some editorializing in the configure help text. + +commit 7deaaa797cf8e7ca71e9b34fa6f413d1ed2b3dab +Author: Adam Jackson +Date: Tue Mar 28 01:21:00 2006 +0000 + + Big old pile of warning fixes. + +commit 7342dbe4b2108827eaf30993ceeecbd828da2290 +Author: Adam Jackson +Date: Tue Mar 28 00:18:31 2006 +0000 + + Remove long-dead screen region code. + +commit 0e88cefbfecbff0c7dd606ce0caca840f45cbc0d +Author: Daniel Stone +Date: Mon Mar 27 23:03:47 2006 +0000 + + Prune XKB code to only what we need to run the server. Remove dead + !XKB_IN_SERVER codepaths. Remove HAVE_CONFIG_H codepaths. + +commit 5be8a66d324f3d5840b134ad29069eace64e6f12 +Author: Daniel Stone +Date: Mon Mar 27 22:28:32 2006 +0000 + + Fix remnants of previous busted _XkbStrCaseCmp commit. + +commit 9e202dfe40e2bdd66f461a6ba531e927f82096ae +Author: Daniel Stone +Date: Mon Mar 27 22:25:56 2006 +0000 + + Remove remnants of XkbCF code. + +commit 7257590651328f89d23e80da1ec6241542a660cd +Author: Daniel Stone +Date: Mon Mar 27 21:15:06 2006 +0000 + + Move XFree86 DDX XKB actions into dixmods. + +commit d7b9e2b0e9d6889ea6b05e63892e612f4e5f19f5 +Author: Daniel Stone +Date: Sat Mar 25 23:09:50 2006 +0000 + + Bug #3819: Remove open-coding of strcasecmp. + +commit b3570dd94aa72f94e537a17680150e91e7712f5a +Author: Daniel Stone +Date: Sat Mar 25 22:37:58 2006 +0000 + + Remove INITARGS braindamage, change to void; add XkbExtensionInit prototype + to xkb.h. Explicitly initialise nTypes in xkb.c. + +commit 1ef60ce8ebb681b3cfb5e515be5c187c0442dcda +Author: Daniel Stone +Date: Sat Mar 25 22:35:48 2006 +0000 + + Really remove all DDX pre-config code. + +commit ec10f70b2114e5369a5b2f34b084dcf55634dcb4 +Author: Daniel Stone +Date: Sat Mar 25 21:52:49 2006 +0000 + + Remove XkbCF DDX configuration code. + +commit aae4238360b842ac34dc8ee16e165a1821f9a801 +Author: Daniel Stone +Date: Sat Mar 25 20:17:58 2006 +0000 + + Fix two glaring unconditional-NULL-dereferences. + +commit a68c11bb1d7c5419004a1714e49dffac57304e78 +Author: Adam Jackson +Date: Sat Mar 25 19:52:05 2006 +0000 + + Mark everything in xf86sym.c as _X_EXPORT. + +commit ae935832facfa81a9689882406ecca74b0346790 +Author: Fredrik Höglund +Date: Fri Mar 24 20:50:13 2006 +0000 + + Refactored the screensaver and DPMS timer code to use the screensaver timer + for both screensaver and DPMS. Removed the SetDPMSTimers() and + FreeDPMSTimers() functions. + +commit d1746ec0f0c8a0b750f390e7a7faf21b67683f4a +Author: Kristian Høgsberg +Date: Fri Mar 24 17:58:39 2006 +0000 + + Make sure DRI module is loaded before calling DRI functions. + +commit f1616508c95d12dfaad2cfd61b40228b3dba6f60 +Author: Alan Coopersmith +Date: Thu Mar 23 23:54:08 2006 +0000 + + Add ast driver/pci id (Carl Switzky, Sun Microsystems) + +commit 6d2896b384e17512e8f12036daabcd575d21f804 +Author: Kristian Høgsberg +Date: Wed Mar 22 22:49:52 2006 +0000 + + Improve error logging. + +commit 5449634e3c9428005aba5b3322ced7e86c62f185 +Author: Søren Sandmann Pedersen +Date: Wed Mar 22 21:37:49 2006 +0000 + + Wed Mar 22 16:28:46 2006 Søren Sandmann + Use inline assembly for copy area, since gcc doesn't generate movq + instructions. + +commit 5b3084c64f7bd1232603ffb3e985600b8d045453 +Author: Søren Sandmann Pedersen +Date: Wed Mar 22 21:13:08 2006 +0000 + + Wed Mar 22 16:05:09 2006 Søren Sandmann + Use inline assembly for solid fills, since gcc doesn't use the movq + instructions. + +commit a08e5e0c68baaf85b0fc3ecde74a6bcf80bcd4bf +Author: Søren Sandmann Pedersen +Date: Wed Mar 22 18:44:26 2006 +0000 + + Wed Mar 22 13:42:44 2006 Søren Sandmann + Patch by Keith Packard to make sure redirected windows don't get considered + "FullyObscured". + +commit 966d93ef6d1f2ed02f3b81b5bf5a1ebbdd48c93d +Author: Kristian Høgsberg +Date: Tue Mar 21 22:54:38 2006 +0000 + + Make the server distcheck and tag 1.0.99.1 snapshot. + Bump CVS version to 1.0.99.1. + Distcheck fixes. + +commit 8e3ad87d01c102591c7dc25614f6ac10e444a1b1 +Author: Kristian Høgsberg +Date: Tue Mar 21 22:32:13 2006 +0000 + + #include indirect_dispatch to get prototypes for FBO functions. + Fix a couple of warnings. + +commit dcc43d57cbe9d2b65384fe9ba2e4e4fbb43cb0a1 +Author: Donnie Berkholz +Date: Mon Mar 20 20:10:29 2006 +0000 + + Finish glx_ansic.h wrapper changes to make Xvfb and Xnest link again. + +commit 9509c6799e31e96677b6d07bdf24ea91ddd30020 +Author: Adam Jackson +Date: Mon Mar 20 19:32:18 2006 +0000 + + dead file removal + +commit 61a020265c5915e3d671d5b2047b81a5d15594c3 +Author: Adam Jackson +Date: Mon Mar 20 18:43:18 2006 +0000 + + Bug #5549: Fix build for sparc64. (Matthieu Herrb) + +commit 6eb4e2303aaab8d64e3f6cbc0bbee55689bdcb82 +Author: Adam Jackson +Date: Mon Mar 20 14:01:05 2006 +0000 + + Bug #6213: Check geteuid's return value, not its address, otherwise + unprivileged users can set the modulepath and run arbitrary code. Patch + from Matthieu Herrb. (CVE-2006-0745, Coverity #4) + +commit 8c1bb37d0649b269b78c457b8b41ff59a41d89af +Author: Daniel Stone +Date: Fri Mar 17 08:55:07 2006 +0000 + + Typo fix, reindent. + +commit 2d2d38d17cc2558f8a41166a4a1578bc4c663c37 +Author: Kristian Høgsberg +Date: Fri Mar 17 01:47:25 2006 +0000 + + Check for glproto when building GLX and make sure we have at least 1.4.6. + Drop glx_ansic.h wrapper and call xalloc, xrealloc, xfree and str-funcs + directly. + +commit 2c11cde3367fcd22740b577a4364b1e41cf3e1d2 +Author: Kristian Høgsberg +Date: Fri Mar 17 00:35:18 2006 +0000 + + More patches from David Reveman: + Add GL_ARB_texture_non_power_of_two, GL_EXT_framebuffer_object and + GL_NV_texture_env_combine4 extensions. + Add __GLXcontext destructor and flush context cache there and on + loseCurrent. + Chain back to new __GLXcontext destructor. (__glXMesaContextForceCurrent): + Set render table on forceCurrent. (init_screen_visuals): Index pVis + array correctly. (GlxGetMesaProvider): Add this. + Hook up FBO marshalling. + +commit 14aafc258cd774cf937f9798a888c2d3c97ccacf +Author: Eric Anholt +Date: Thu Mar 16 18:43:55 2006 +0000 + + Change EXA so that exaMoveOutPixmap() retains the framebuffer copy of the + pixmap, and damage is tracked so that a later exaMoveInPixmap won't + result in an upload if no upload is necessary. This will likely improve + the performance of the "Always" migration scheme significantly, and is + a step in the path to more exact damage tracking between framebuffer + and system memory. + +commit d0d336efd58896718f31a400651bacd9b769fb5a +Author: Daniel Stone +Date: Thu Mar 16 16:29:17 2006 +0000 + + Add support for ZX2 PCI-E local bus adaptors. (Alex Williamson, HP) + Use soft timeout register to avoid MCAs when probing for non-existent local + bus adaptors on ZX2. (Alex Williamson, HP) + +commit 175980580e572745a9a381b4432e3ba0457d3ba3 +Author: Adam Jackson +Date: Wed Mar 15 23:05:53 2006 +0000 + + Bump to requiring fixesproto >= 4.0 and compositeproto >= 0.3. + +commit 6fe377af5a82deb6f8b0f3b75414335e7845caac +Author: Matthieu Herrb +Date: Wed Mar 15 21:25:38 2006 +0000 + + - OpenBSD needs -Wl,-export-dynamic to export symbols from main executable + to modules. + - Probe for OpenBSD aperture driver and define HAS_APERTURE_DRV + accordingly. + +commit 21f7f2fb113ee4f9cd011c3cc2d45d43bbdd35fa +Author: Felix Kuehling +Date: Wed Mar 15 18:43:32 2006 +0000 + + Enable correct handling of the BTS instruction (opcode 0f ab) The code was + there but #ifdefed out. Insead of BTS, BT was executed. This patch + enables the BTS function and hooks it up the the correct opcode. (ATI + Technologies Inc.) + +commit b726aa502a871c700bc42b5325abf2c6820ff756 +Author: Felix Kuehling +Date: Wed Mar 15 18:37:44 2006 +0000 + + Update to build against Mesa CVS HEAD. + +commit c74464d92cd673ff0669375757caab798cc57e95 +Author: Eric Anholt +Date: Wed Mar 15 16:59:45 2006 +0000 + + Don't let pinned pixmaps get migrated in when using the "Always" migration + scheme. This notably keeps the visible screen from getting migrated in + to a new location in framebuffer. + Reported by: Michel Dänzer. + +commit b9c43cde1e368903786977b06368d5e36db9ffe8 +Author: Adam Jackson +Date: Wed Mar 15 16:56:10 2006 +0000 + + Coverity #1042, 1043: Nuke some dead variables. + +commit 5e106a71b9f8077216d41619402952b0005dd8a4 +Author: Adam Jackson +Date: Wed Mar 15 16:49:04 2006 +0000 + + Coverity #807: Fix a memory leak in XFixesExpandRegion. + +commit a3ef63696cac950b2520e7c85564befc0a830fde +Author: Adam Jackson +Date: Wed Mar 15 16:36:31 2006 +0000 + + Coverity #490: Fix a range check in xf86vidmode extension. + +commit 152090ce442e94de1ae920208a92931af6493c8c +Author: Adam Jackson +Date: Wed Mar 15 16:33:12 2006 +0000 + + Coverity #487: Check version number correctly. + +commit 72cc6307257fcbb800267464487bf918ee674328 +Author: Adam Jackson +Date: Wed Mar 15 16:32:05 2006 +0000 + + Coverity #491: Check version number correctly. + +commit 460f2ea4a594a53536f34c4ad27795fceec50bcc +Author: Adam Jackson +Date: Wed Mar 15 16:21:04 2006 +0000 + + Coverity #794: Fix a highly unlikely memory leak. + +commit 116d158e85ec43577ff69aeb3271ab1f888500c9 +Author: Adam Jackson +Date: Wed Mar 15 16:16:24 2006 +0000 + + Coverity #269: Compare the requested ABI class against the ABI class of the + module, not the module class. + +commit d8221a9b70a11606a0f7e1f69afee6049d7f182f +Author: Adam Jackson +Date: Wed Mar 15 16:11:34 2006 +0000 + + Coverity #484: Fix an off-by-one in module refcounting. + +commit 6bb2dc02a7cffd6ed7dd28e88d584920a4150749 +Author: Adam Jackson +Date: Wed Mar 15 16:01:47 2006 +0000 + + Coverity #337: Remove useless NULL check. + +commit 1e5c0842af99027cc6c30a16f967d8b60c9a894d +Author: Adam Jackson +Date: Wed Mar 15 15:34:57 2006 +0000 + + Coverity #1053: Nuke a dead variable. + +commit 7314d16cde4c3f99d9d9f1d539f0c5ff4942e653 +Author: Benjamin Herrenschmidt +Date: Wed Mar 15 03:18:42 2006 +0000 + + Fix DRIExtensionInit() to not register callbacks when it hasn't been + initialized for the current server generation. Fixes a problem where it + would use stale private index and blow up in colorful ways if no driver + called DRIScreenInit() on the second generation (which happens due to a + bug in radeon that i'll fix separately). Note: clearing the index in + DRIReset() wouldn't work as DRIReset() is called before the + CloseScreen() chain + +commit 02d80a0de93f7592e69065b0fbe5820dcdebdb44 +Author: Benjamin Herrenschmidt +Date: Wed Mar 15 03:12:32 2006 +0000 + + Make xf86 linear allocator smarter when dealing with alignment constraints + when falling back to X/Y allocations. Fixes various problems of Xv + allocation failures, notably with "nv" driver. + +commit c1601717d536419693b3ef6e8a3d69b9f2fdc2b3 +Author: Eric Anholt +Date: Wed Mar 15 01:20:08 2006 +0000 + + Add a new migration scheme, "always", which will move pixmaps to their + desired location always (unless they don't fit in FB, in which case + they all get moved out for software rendering). The default remains as + before, but can be controlled by the MigrationHeuristic xorg.conf + option (which is intentionally not documented, as it may be + short-lived). This is part of the exa-damagetrack work, which appears + stable in testing with fakexa, unlike the work as a whole. + +commit a90cff266cc81993ed804fb320c1dbfe5e0d4787 +Author: Eric Anholt +Date: Wed Mar 15 00:13:52 2006 +0000 + + Add more doxygen documentation, including notes on WaitMarker() and + MarkSync() that I noticed were needed while reading the VIA driver. + +commit 693e42114f1127528448126d78a5209dd1198d8d +Author: Eric Anholt +Date: Tue Mar 14 21:30:12 2006 +0000 + + Move migration logic to a new function, exaDoMigration(). This is largely a + manual conversion to allow for different migration schemes to be + implemented reasonably, but does include some minor improvements such + as accounting for pinned pixmaps not being acceleratable, and for our + current GetImage and GetSpans not being accelerated. + +commit d30905478078036383977ae9d4a3685c2e2c642f +Author: Eric Anholt +Date: Tue Mar 14 20:38:06 2006 +0000 + + Pull code for getting the (0,0) pixel from a pixmap out to a separate + function, since it gets repeated (with bad error handling, in one + case). + +commit 01aa209f2056ef04e3f2735756a0f8b4a67a3d87 +Author: Kristian Høgsberg +Date: Tue Mar 14 19:32:27 2006 +0000 + + Bail out early if screen doesn't support DRI. + +commit 0cc34266d6e84bb491fcf9aa74e34615b2fca4fc +Author: Deron Johnson +Date: Mon Mar 13 22:43:42 2006 +0000 + + Updated ChangeLog for my latest composite and xfixes changes. + +commit 450018f48b2796345a4eaccbb94c1971ebd30114 +Author: Deron Johnson +Date: Mon Mar 13 21:59:55 2006 +0000 + + Part 3 of 3 (Other parts are in proto and lib) Composite Version 0.3: + CompositeGetOverlayWindow, CompositeReleaseOverlayWindow Xfixes Version + 4.0: XFixesHideCursor, XFixesShowCursor + +commit e5956f49b217b0ee9c9f35b6a58f339a8d22b1d7 +Author: Kristian Høgsberg +Date: Mon Mar 13 01:54:59 2006 +0000 + + First batch of AIGLX fixes from David Reveman. + Add getter for Mesa provider. + Export this for Xgl. + Move resource tracking out of drawable constructor to allow wrapping. + Use corrent reply size #define. + Add this function. (DoGetDrawableAttributes): Fix array length. + +commit eb63e50d95da4e1e08fc6fcec46ac63d5e3b7bf4 +Author: Matthieu Herrb +Date: Sun Mar 12 17:14:03 2006 +0000 + + Fix build when AIGLX is false. + +commit 9ed3463450469c3108e0be7e4baabc0a403a78b2 +Author: Eric Anholt +Date: Sun Mar 12 03:04:52 2006 +0000 + + Improve doxygen formatting, and attempt to clarify the 1:1 ratio of + successful PrepareCopy()s to DoneCopy()s. + +commit 9a7fba5fd07c8831d0acab8d901605de537ae273 +Author: Eric Anholt +Date: Sun Mar 12 03:02:26 2006 +0000 + + Make exaCopyNtoNTwoDir() call DoneCopy() at the end of each string of + consecutive Copy() calls (rather than exactly once at the end of the + function). + Reviewed by: jbarnes + +commit c3342c8000f6d2bfb61e2cf95e028d11b59698fa +Author: Kristian Høgsberg +Date: Sun Mar 12 00:11:34 2006 +0000 + + Merge accel_indirect branch to HEAD. + +commit b1b731c28630965d9e2defe62d1108270dc8264c +Author: Alan Coopersmith +Date: Sat Mar 11 02:43:51 2006 +0000 + + Fix buffer size checks to prevent 2-byte buffer overflows. (Coverity #480, + #481, #482, #483) + +commit fc0772de36315f19f5b57220db69f48a3b1fdc9a +Author: Alan Coopersmith +Date: Sat Mar 11 02:10:14 2006 +0000 + + Add HAS_MMAP for Xvfb + Fix Xvfb option parsing to exit on bad arguments, not just issue error + messages and continue on. (Coverity #492) + +commit f2ecbb30187000547a98ca7cbaee433ea4ba8fe3 +Author: Alan Coopersmith +Date: Sat Mar 11 01:58:32 2006 +0000 + + Pass sizeof the correct buffer to XmuSnprintf. (Coverity #489) + +commit d6955798489813ef77cca13cf5f5c67d49e6dece +Author: Eric Anholt +Date: Fri Mar 10 21:36:24 2006 +0000 + + If fakexa is enabled, create a larger buffer in the Ximage, but keep the + same width/height for front-buffer drawing. The fakexa code then uses + this extra space for offscreen pixmaps. Note that this tones down the + absurdity of fakexa's offscreen pixmap alignment requirements (odd + alignment is too weird, so stick with "24", which is still strange but + exists out there). It also fixes a couple of bugs in the fakexa + implementation revealed by using offscreen pixmaps. + +commit 5b1a7b478f072f56e836f2d4c0fbc1985842e2bb +Author: Eric Anholt +Date: Fri Mar 10 21:32:34 2006 +0000 + + Move the exaDrawableDirty in exaPrepareAccess to exaFinishAccess, which is + after the drawing is done. Previously, a failed PrepareAccess could + have migrated and cleared the dirty flag before the damage was ever + done. + +commit ffdbb547becc71f1cfdd035d0d6c71539f185fb1 +Author: Eric Anholt +Date: Fri Mar 10 08:06:42 2006 +0000 + + Coverity #1011: Remove a useless NULL check on a pVbe that had been + dereferenced many times before. + +commit 1bc72dce5f8bc40e369e69b684816fdaaa07da43 +Author: Eric Anholt +Date: Fri Mar 10 08:03:24 2006 +0000 + + Coverity #857: Fix resource leak in error path by freeing earlier. + +commit 55f677d600370b19d62ef821025481f2be6f5edb +Author: Eric Anholt +Date: Fri Mar 10 07:58:27 2006 +0000 + + Coverity #813, #814, #815, #816: Fix resource leaks in error paths of + config parsing code. + +commit 2bd41105496b729395fbcf97f09581eb0efb3510 +Author: Eric Anholt +Date: Fri Mar 10 07:45:25 2006 +0000 + + Document the restriction on PrepareAccess() failure, from discussion with + benh. + +commit 21dcd0304879f38ea8ea01ba88e7cc7783771adf +Author: Jeremy C. Reed +Date: Fri Mar 10 01:34:45 2006 +0000 + + Just like FreeBSD, let DragonFly's default mouse Device be /dev/sysmouse + (since /dev/mouse don't even exist by default). + +commit 9a99afdfb292f303f914039952fdd772eed9e03a +Author: Jeremy C. Reed +Date: Fri Mar 10 01:22:26 2006 +0000 + + Add DragonFly support. (It is like FreeBSD.) + This patch is from DragonFly developer Joerg Sonnenberger and the pkgsrc + collection. + I tested using /dev/sysmouse with moused using my serial /dev/cuaa0. + +commit 7a0f7f739804bc7d9c5562701abee8d134878977 +Author: Eric Anholt +Date: Thu Mar 9 23:29:44 2006 +0000 + + Coverity #349: Fall back to software early if pSrc->pDrawable is NULL, or + pMask is non-NULL but pMask->pDrawable is NULL. This prevents NULL + dereferences on gradients and other Pictures which have no pDrawable. + +commit 8a3ff42abb726d1604af39b4653ede5f760b7e69 +Author: Eric Anholt +Date: Thu Mar 9 23:25:35 2006 +0000 + + Commit changes missed in last commit (mis-typed path and didn't notice): Do + a first pass of doxygen documentation of EXA. This removes the + corresponding pieces of exa-driver.txt, which were becoming stale. + Hopefully the documentation will stay much more up-to-date this way. + Many thanks to jbarnes for writing exa-driver.txt which was used a lot + in writing this documentation. + +commit ab35c3fbc135bafdfc5057ef5d6227ca3534ed26 +Author: Eric Anholt +Date: Thu Mar 9 23:18:15 2006 +0000 + + Do a first pass of doxygen documentation of EXA. This removes the + corresponding pieces of exa-driver.txt, which were becoming stale. + Hopefully the documentation will stay much more up-to-date this way. + Many thanks to jbarnes for writing exa-driver.txt which was used a lot + in writing this documentation. + +commit d8f8bfeccef0750d79f852b9ae7152e841227d5a +Author: Matthias Hopf +Date: Thu Mar 9 14:23:57 2006 +0000 + + Do Xorg configure checks for Xgl only as well + +commit 2822cbc1fb2271844e7ae10c3629aaa940ae4042 +Author: Eric Anholt +Date: Thu Mar 9 06:04:07 2006 +0000 + + Rearrange EXA driver structures so that there's a hope of maintaining ABI + when extending the driver interface. The card and accel structures are + merged into the ExaDriverRec, which is to be allocated using + exaDriverAlloc(). The driver structure also grows exa_major and + exa_minor, which drivers fill in and have checked by EXA + (double-checking that the driver really did check that the EXA version + was correct). Removes exaInitCard(), which is replaced by the driver + filling in the rec by hand, and the exaGetVersion() and related + EXA_*VERSION which are replaced by always using the XFree86 loadable + module versioning. + +commit 65aa33f9173b1554924437685698f7c5f645a3c4 +Author: Lars Knoll +Date: Wed Mar 8 06:19:37 2006 +0000 + + render/picture.c Initialize the format of a source picture to + PICT_a8r8g8b8. Fixes a failure in the gradients test of rendercheck. In + the long term we could do better by setting the format to something + without alpha whenever the gradient doesn't contain colors with alpha. + This triggers a reduction of the over operation to a pure source + operation. + +commit cb5090e8d60f4e9780c859faeea5c24587f6bee7 +Author: Eric Anholt +Date: Wed Mar 8 03:32:07 2006 +0000 + + Bug #6150: Do the obvious fix of an insane sanity check in + xf86InitFBManager. (Julio M. Merino Vidal) + +commit 2e6f801fe1a749f6a4db2cfd8a43abec5caceae0 +Author: Ian Romanick +Date: Tue Mar 7 23:58:22 2006 +0000 + + Numerous amounts refactoring and comment adding (see ChangeLog for file by + file details). The primary intention for these changes is to pave the + way for the new device probing and PCI configuration code that I'm + working on. + +commit b7d2dfc1e5e07051732303731ff3e4e76852dd94 +Author: Eric Anholt +Date: Tue Mar 7 20:06:15 2006 +0000 + + Add appropriate MIT license. Oops. + +commit 9d8c0e4bcbb111e860b7c3c33c224c22589006b1 +Author: Eric Anholt +Date: Tue Mar 7 19:57:46 2006 +0000 + + Add a new flag to ephyr, "-fakexa", which turns on an EXA acceleration + implementation that calls fb to get its work done. The purpose is to + have a trusted EXA driver for use with testing changes to the core of + EXA. However, fakexa has not received much testing yet, lacks offscreen + pixmaps support, and doesn't reliably provide garbage when EXA doesn't + get its syncing right. All of these should be fixed soon. + +commit 0a3d6c739968bf5af81fc0e8ea7211c20d52080b +Author: Eric Anholt +Date: Tue Mar 7 19:49:31 2006 +0000 + + Remove stale EXA files, which failed to get removed during the move to + top-level, somehow. + +commit 68a8963f726cb92624665669813b6d952d53556e +Author: Luc Verhaegen +Date: Tue Mar 7 16:00:57 2006 +0000 + + Fix cvt -r check again. CH7011 TV encoder had 800x600 PAL hit the check. + +commit 0693083335185ce05ee64546151f3fc43ce98575 +Author: Lars Knoll +Date: Mon Mar 6 21:00:09 2006 +0000 + + render/picture.c Correctly initialize devPrivates variable in source only + pictures to 0 + miext/cw/cw.h Don't try to access devPrivates of source only pictures + +commit 448997ebcd2bab02be1059b07b91b63b0d05d268 +Author: Matthieu Herrb +Date: Sun Mar 5 16:43:10 2006 +0000 + + Only output SetClientVersion message if verbosity > 1, like other + extensions do + +commit d921173833cc207380eb08b6675393f5e8139d5f +Author: Matthieu Herrb +Date: Sun Mar 5 16:35:08 2006 +0000 + + define SYS_LIBS to hold system dependant libraries that may needed. and add + it to libraries list where needed. Update ChangeLog for previous + changes too + +commit 82cbd2ee0d20225b9edbb5246c8ed116b4614e1a +Author: Matthieu Herrb +Date: Sun Mar 5 16:33:17 2006 +0000 + + Don't hard-code -DUSE_DEV_IO here. configure generates the proper OS + specific values here. + +commit b56a1513d27f84dcd55f3dc6053f183aa6f7855b +Author: Matthieu Herrb +Date: Sun Mar 5 16:32:40 2006 +0000 + + Definitions for bswapxx() macros on OpenBSD. + +commit 4335868476af7c821c64def52b102b93ae91f8b0 +Author: Matthieu Herrb +Date: Sun Mar 5 16:13:21 2006 +0000 + + Fix build with non GNU make. + +commit b2f8f410c0bb8bc24039b2a593f8a2a483659914 +Author: Alan Hourihane +Date: Fri Mar 3 09:54:54 2006 +0000 + + https://bugs.freedesktop.org/show_bug.cgi?id=4341 Make Xming error messages + more meaningful. + +commit 29237c1977e454511e0d0244c68d34d572b68458 +Author: Alan Hourihane +Date: Fri Mar 3 09:50:55 2006 +0000 + + https://bugs.freedesktop.org/show_bug.cgi?id=4538 Fix mouse button release + on multiwindows scrolling. + +commit 06f01623fde61f1a11c2c1ecfae6a4c346473b05 +Author: Alan Hourihane +Date: Fri Mar 3 09:43:42 2006 +0000 + + https://bugs.freedesktop.org/show_bug.cgi?id=5138 Check for NULL pointer + +commit 054c291b274b238893e408e070aef13a7933400b +Author: Felix Kuehling +Date: Thu Mar 2 18:35:08 2006 +0000 + + Fix build against Mesa CVS HEAD: added s_blit.c to symlink-mesa.sh. + +commit c1a82b9554028640dc4e08f042f1a8faf3372627 +Author: Brian Paul +Date: Thu Mar 2 03:43:26 2006 +0000 + + added s_blit.c file + +commit 5f4d11c8d926cf396e0a8e203e14a8e1e123e011 +Author: Jesse Barnes +Date: Wed Mar 1 16:31:53 2006 +0000 + + fix spelling error, document EXA_TWO_BITBLT_DIRECTIONS device flag + +commit 044a3abb382a4850722c391f04d09d3160790814 +Author: Jesse Barnes +Date: Wed Mar 1 16:28:34 2006 +0000 + + Add accelerated two directional blt support to EXA + +commit 96ca329382141fd50dccb1cc35a71a333d80bce4 +Author: Ian Romanick +Date: Tue Feb 28 23:07:09 2006 +0000 + + Remove redundant definition of struct Inst. Safeguard xf86AddDriver against + future additions to DriverRec. + +commit 1cfa9f647e0241f4b9e56556b128d7bfd987eaca +Author: Daniel Stone +Date: Tue Feb 28 16:55:26 2006 +0000 + + Bug #5216: Allow options to appear with other components. + +commit e3b6b95f29cb2ea00b4290d694c5e202b8d180ad +Author: Adam Jackson +Date: Tue Feb 28 16:26:16 2006 +0000 + + Bug #5627: Fix Xprint font symlinking. (TIlman Sauerbeck) + +commit e7f0b84fa7bd0c40cb456ec4e447103442c8dae3 +Author: Jesse Barnes +Date: Tue Feb 28 05:20:20 2006 +0000 + + fix exaInitCard by making it a real function + +commit 088e5768faa90fe16de41b135b1111b5d25c64ad +Author: Felix Kuehling +Date: Mon Feb 27 18:12:24 2006 +0000 + + Fixing the Mesa build again, sigh. Add slang_execute_x86.c. Add + -I../shader/slang to swrast INCLUDES. + +commit 345d99c972cac67f2cdc38750e4ba2dea1cdb360 +Author: Alan Coopersmith +Date: Mon Feb 27 16:19:39 2006 +0000 + + Typo fixes (Nicholas Joly, XFree86 bugzilla #1658) + +commit 6b08a5013b4e9e350ba461c9a59d30bb41feef8f +Author: Jesse Barnes +Date: Sat Feb 25 20:26:49 2006 +0000 + + EXA driver doc cleanups and additions. + +commit f41ec003f39c575299429897d4287233184583ad +Author: Roland Scheidegger +Date: Sat Feb 25 01:17:10 2006 +0000 + + Add two radeon pci ids (one is used for a radeon mobility X700 XL in a + medion notebook, the other is for a AIW X800 VE) + +commit 01a0bf881ada03ca3c27bdef7423c760c3bc2f9c +Author: Matthieu Herrb +Date: Fri Feb 24 17:01:57 2006 +0000 + + OpenBSD supports PCVT and WSCONS. PCCONS is long gone. + +commit d3e1587c20c155b7873b6646ddf0b96f806f8a7f +Author: Kristian Høgsberg +Date: Fri Feb 24 16:50:42 2006 +0000 + + file glxdri.c was initially added on branch accel_indirect_branch. + +commit 5d9a620726d2b0ad89625574478d2fd4536485b0 +Author: Adam Jackson +Date: Thu Feb 23 19:25:57 2006 +0000 + + Remove redundant composite op reduction, done in Render now. + +commit 028d6903f674fa77617f333b25356710d1682b05 +Author: Alexander Gottwald +Date: Wed Feb 22 16:29:07 2006 +0000 + + Bug #5978: Added missing swap of input variables. Added missing cases for + GL_SECONDARY_COLOR_ARRAY and GL_FOG_COORD_ARRAY (Colin McDonald) + +commit 43324132afcbb6b231efcc24ec72ee44678d5771 +Author: Alexander Gottwald +Date: Wed Feb 22 16:08:56 2006 +0000 + + Added Mesa include directory + +commit 43fbcc28c960ce5abe1d3223441c3dc5a10cde27 +Author: Jeremy C. Reed +Date: Wed Feb 22 02:47:00 2006 +0000 + + Update to build against Mesa HEAD. (Thank you Felix for feedback on xorg + list.) + +commit cfdacab33a62b47f22bb54683e3ca20ec9824864 +Author: Ian Romanick +Date: Tue Feb 21 00:02:08 2006 +0000 + + Eliminate unused PCI BIOS reading functionality. The old code used several + function pointers to implement a level of flexability that was never + used. The code also had unused support for extracting a single image + type from a larger expansion ROM. + Fix the spelling of PCI_BIOS_OPEN_FIRMWARE. + Fix a couple errors in #ifdef debug code. + These changes have been tested on x86 and x86-64 Linux. + +commit 5fd0f94006775e2271107c960dfa3314dddd9a5f +Author: Ian Romanick +Date: Mon Feb 20 23:45:50 2006 +0000 + + Eliminate all the code for querying the PCI class from the PCI ID database. + Class information is not, and never has been, stored there. Therefore, + this is just a bunch of elaborate code to read 0x00000000. + This has received testing on x86 and x86-64 Linux. + +commit 6d7083bd69724586338d79784655328f1fcd2ae5 +Author: Adam Jackson +Date: Mon Feb 20 22:16:49 2006 +0000 + + indent fixes (OMG SO UGLY), and nuke old RCS keywords. + +commit 5480c537cee79b324736eac3e438a4713dfa1036 +Author: Adam Jackson +Date: Mon Feb 20 21:50:49 2006 +0000 + + ANSIfy Xi/. Mostly automated via protoize(1). + +commit cc42e153c2437fe9c94b0c20e1b56277474d94d0 +Author: Felix Kuehling +Date: Mon Feb 20 03:00:09 2006 +0000 + + Update to build against Mesa HEAD. + +commit ed3ea887a6b1c9fdc83895c40da34076121f05e9 +Author: Eric Anholt +Date: Thu Feb 16 21:49:51 2006 +0000 + + Fix the encoding of DES's name. + +commit ea0b3f65f77a78df1671b09739c00762a8875607 +Author: Eric Anholt +Date: Thu Feb 16 21:45:12 2006 +0000 + + Fix build of Xorg by putting xf86bigfont back into builtin instead of + module sources list. + +commit d97f29be22e22e6f5bc23229ffa5ef087f992c8c +Author: Eric Anholt +Date: Thu Feb 16 21:35:32 2006 +0000 + + Bug #5453: Don't forget to still do AM_CONDITIONAL for XVMC even if XV is + disabled, and also force XVMC disabled if XV is disabled. (Dag-Erling + Sm�rgrav) + +commit d33c2e0d1079f93f4ba8b28d19950d384a9e7c32 +Author: Keith Packard +Date: Thu Feb 16 19:36:39 2006 +0000 + + Add oscolor.h + +commit 60d4839a2d373cc6d8c0d5004284494d3a994a63 +Author: Keith Packard +Date: Thu Feb 16 19:03:07 2006 +0000 + + Forgot to include this file in previous patch + +commit 8987b2c1efc9a4667e278e6ba411772ba2a4a4e6 +Author: Keith Packard +Date: Thu Feb 16 07:17:31 2006 +0000 + + Make more extensions optional in build (for kdrive). Fix kdrive build for + actual hardware. Fix kdrive pointer signed/unsigned types. Add + kdrive-required YX rotation functions. Replace rgb text file loading + with static rgb color table. + +commit c8acb342695936db062c966029019a458d45459e +Author: Benjamin Herrenschmidt +Date: Thu Feb 16 06:52:12 2006 +0000 + + Fix an occasional crash on VT switches: the server would save a pointer to + the current cursor when disabling FB access and would try to restore + that cursor when re-enabling. However, that cursor might have been + destroyed in between. This fixes it by updating the saved cursor + pointer when a cursor is set and vtSema is FALSE. + +commit c845e152f52b3e8cef579797c5c8834ad2fd2cd5 +Author: Eric Anholt +Date: Thu Feb 16 05:46:08 2006 +0000 + + Bug #5871: Drop special build infrastructure left over from libcwrapper + times. (George Fufutos) + +commit c2f685e64464ccf86ed47ae37f74bf46877e0739 +Author: Dave Airlie +Date: Thu Feb 16 05:18:20 2006 +0000 + + Fix XSERVER64 should be _XSERVER64 + +commit 1bbd5e49b1dcc2e3f9785bd2bb58f946b9998099 +Author: Eric Anholt +Date: Thu Feb 16 04:59:45 2006 +0000 + + Bug #5869: Remove traces of EXTMODULE define, which doesn't appear to be + useful any more. (George Fufutos) + +commit c03b06bdf04fa8500d0f85314c7268848b4d50be +Author: Eric Anholt +Date: Thu Feb 16 04:39:00 2006 +0000 + + Bug #5888: Remove orphaned laymodule.c from miext/layer removal. (George + Fufutos) + +commit 3b32e902c7a12aa2320da27d984029cde28fd8c3 +Author: Eric Anholt +Date: Thu Feb 16 01:49:23 2006 +0000 + + Add entry missed in my last commit. + +commit c4767794ef5b014ae25fe8541e72348ecfb1ee49 +Author: Zephaniah E. Hull +Date: Thu Feb 16 01:03:09 2006 +0000 + + Export xf86ActivateDevice, used by the evdev driver. + +commit dc0354104cb4057dfcc7b2ccb8e2ae8474d70b15 +Author: Eric Anholt +Date: Thu Feb 16 00:14:11 2006 +0000 + + Move EXA implementation up to the top level and remove its XFree86 + dependencies. It was nearly abstract enough already to be used by + multiple DDXes. This will be useful for EXA development through + providing a fake acceleration implementation within Xephyr, so that + testing can be done on new EXA code without worrying about buggy + drivers. + +commit c170aa830d0ce3dbff6b30081e04c3f91bf921be +Author: Eric Anholt +Date: Wed Feb 15 23:27:40 2006 +0000 + + Forced commit to note repocopy from hw/xfree86/exa/ + +commit 6770f1bdb145e7a6c431d0523f10d12155f58273 +Author: Eric Anholt +Date: Wed Feb 15 21:09:14 2006 +0000 + + Define NO_LIBCWRAPPER in dix-config.h, and rely on Mesa including + dix-config.h if DIX_HAVE_CONFIG_H is defined to get it and _XSERVER64, + instead of defining things like this per directory. + +commit 7d7fc927cd90146788780477b8e3379d91c3b910 +Author: Adam Jackson +Date: Wed Feb 15 20:47:44 2006 +0000 + + Remove a few #ifdef vms; whatever problem that was solving should assuredly + be solved some other way. + +commit f105b8da11fcf337512b3c39da3368f98da07a33 +Author: Adam Jackson +Date: Wed Feb 15 20:44:13 2006 +0000 + + Mark everything in dixsym.c as _X_EXPORT. + +commit 010d6effa6fa210251b12459882e88aeee82c2c0 +Author: Adam Jackson +Date: Wed Feb 15 19:15:32 2006 +0000 + + Mark everything in {ext,font}sym.c as _X_EXPORT. + +commit 3fe482c77e7b3e46739d011d8bbdee527d7a42fc +Author: Adam Jackson +Date: Wed Feb 15 19:05:55 2006 +0000 + + Mark everything in misym.c as _X_EXPORT. + +commit 6ad4325b87889e1aada9333d750b7bb586c38b52 +Author: Kristian Høgsberg +Date: Wed Feb 15 18:26:45 2006 +0000 + + Update to build against mesa head. + +commit 50e2ff9a2500078ebbd833fddab0d93f3a50b6a6 +Author: Eric Anholt +Date: Wed Feb 15 03:20:55 2006 +0000 + + Remove the waitSync from KdDisableScreen and push it off to drivers' + disableAccel hook, which is more correct anyway. This makes kdrive.c + not have any knowledge of kaa, opening the way for using exa from + kdrive. + +commit 0446aafa9467f43515fb578d50f45e2c3153c8cf +Author: Eric Anholt +Date: Wed Feb 15 03:07:23 2006 +0000 + + Avoid some more libcwrapper damage that prevented kdrive linking. + +commit 5c9b6f0fb01252d704de1bbdf3015dee7f956593 +Author: Benjamin Herrenschmidt +Date: Tue Feb 14 08:14:42 2006 +0000 + + DRIGetSecs() would call getsecs() when XFree86LOADER is defined, relying on + the wrappers to provide it. Wrapper gone, and getsecs doesn't exist on + linux so it now blows up. Fixes it by just calling gettimeofday() in + all cases instead. + +commit 049dca0f43eb2179d2c61033a17ff1a89f8fb689 +Author: Benjamin Herrenschmidt +Date: Tue Feb 14 08:11:41 2006 +0000 + + Remove useless line of code that contained a bug and triggered a gcc + warning. This variable will be overriden before being used anyway. + (Bugzilla #5595) + +commit 1132d0e6102d4564f70f0e8c98854e3acf25b109 +Author: Dave Airlie +Date: Tue Feb 14 06:27:59 2006 +0000 + + update to latest Mesa CVS HEAD + +commit bb8c36690ab411c11aa8dd3d4520d513eb8f9091 +Author: Alan Hourihane +Date: Tue Feb 14 04:20:37 2006 +0000 + + Bump shadow module version number to 1.1.0 from 1.0.0 + +commit cc9dfab0b31c7956f99d1f1b9c195065b5e18c29 +Author: Adam Jackson +Date: Mon Feb 13 18:57:38 2006 +0000 + + (Reverted) + +commit 83dd6241c8cd81e8d897bd17588ada92a945e647 +Author: Adam Jackson +Date: Mon Feb 13 18:55:44 2006 +0000 + + Reverted, did nothing anyway, I'm not smart today. + +commit 4a7f6f53cad541e8c5042a6472e3b3886fc9b7e6 +Author: Adam Jackson +Date: Mon Feb 13 18:09:51 2006 +0000 + + Further op reduction when both src and dst alpha are absent. + +commit 28ced9f3e0dd4bd81067f590a1d64ba0844edb06 +Author: Eric Anholt +Date: Mon Feb 13 05:29:00 2006 +0000 + + Add missing ChangeLog text for r1.2 of GL/glx/indirect_reqsize.h + +commit 4839e91fcab4c344e672154a447d8c7035fce1f4 +Author: Benjamin Herrenschmidt +Date: Mon Feb 13 05:03:13 2006 +0000 + + HAS_MKSTEMP vs. HAVE_MKSTEMP (From Fredrik Höglund) + +commit 1a4f20541a9f4f41f444d826d743899ea2dee2db +Author: Benjamin Herrenschmidt +Date: Mon Feb 13 04:56:27 2006 +0000 + + Fix linux build without libc wrappers (From Fredrik Höglund) + +commit 2dc7b5e0d96a187bfbb355caa788f0fdcd88eaad +Author: Benjamin Herrenschmidt +Date: Mon Feb 13 04:43:40 2006 +0000 + + Move call to xf86WrapperInit() to OsVendorInit() in xf86Init.c and remove + stubs in other DDX. + +commit 34d0b9228f46c2f87be74dddc9c7d97aab091d03 +Author: Eric Anholt +Date: Sun Feb 12 20:53:35 2006 +0000 + + Simplify ops that would use the alpha channel when an alpha channel is + always 1.0, and short circuit PictOpDst for good measure. + +commit 5f45776ef3b9256bea44842d1c50f269422531a1 +Author: Eric Anholt +Date: Sun Feb 12 10:30:47 2006 +0000 + + Add missing HAVE_DIX_CONFIG_H which caused issues with mismatched screen + structure interpretations, and remove a bunch of unused junk from + kdrive-config.h. Xephyr almost works on my amd64. + +commit 5249416d091d59c248c8dda44529b8aa4910b1a0 +Author: Eric Anholt +Date: Sat Feb 11 22:40:50 2006 +0000 + + Add stub xf86WrapperInits so that the servers will build even if os/ was + built with XFree86LOADER set. + +commit a2a5254675a6b7ef0f7da9caa76c028b7c526502 +Author: Alan Coopersmith +Date: Sat Feb 11 19:16:51 2006 +0000 + + Add , , and to clear undefined function + warnings after the removal of libcwrapper headers. + +commit d6337c83241f0fa4bb03039a9767b58d8a1a7c91 +Author: Alan Coopersmith +Date: Sat Feb 11 17:42:31 2006 +0000 + + -> so we can compile on non-BSD OS'es + +commit 4fafba61d5402d4e4d2c21ba1be3ed8969b99334 +Author: Eric Anholt +Date: Sat Feb 11 03:03:45 2006 +0000 + + Remove libcwrapper damage from GLX (requires fresh Mesa HEAD), and get it + compiling in kdrive. + +commit c3d14036729fd186d4ec7ca1de603e1f2d174e2f +Author: Eric Anholt +Date: Fri Feb 10 22:00:30 2006 +0000 + + Remove libcwrapper usage from xorg server modules. The libcwrapper is only + of (marginal) use in the drivers, and that usage remains. + +commit a8cec1b656f57746758613213de1d6e5acb79451 +Author: Eric Anholt +Date: Fri Feb 10 09:00:02 2006 +0000 + + Merge from kdrive: use RECT_PRIM to avoid tearing in xvideo. + +commit efc3fab7f4b29f56fffd21304c64c03a48aa5b4b +Author: Eric Anholt +Date: Fri Feb 10 07:52:05 2006 +0000 + + Make kdrive (i.e. Xephyr only) buildable on FreeBSD and probably other OSes + without linux VT switching, fbdev, and vm86 support. + +commit fa3a65e33d8c893c7867ea507afc7caa1361aa9c +Author: Eric Anholt +Date: Fri Feb 10 07:47:21 2006 +0000 + + Remove the include of X11/misc.h, which fails to compile and isn't + necessary. + +commit d875bdb2756b082ce93bd86016c369ea85c04d17 +Author: Jeremy C. Reed +Date: Fri Feb 3 02:44:19 2006 +0000 + + hw/xfree86/os-support/xf86_OSlib.h Fix sysmouse handling on DragonFly, + mostly garbage arrived. From Joerg Sonnenberger. + +commit 0946bb9427695a4314e5c43de573b3a75a18e466 +Author: Jeremy C. Reed +Date: Fri Feb 3 02:37:52 2006 +0000 + + Fix sysmouse handling on DragonFly, mostly garbage arrived. From Joerg + Sonnenberger. + +commit 5e2a7af23bd0f46fbddca34098cb297be58b7a55 +Author: Eric Anholt +Date: Thu Feb 2 21:07:06 2006 +0000 + + Move the frequently-repeated code to get the pixmap that backs a drawable + to a new function, exaGetDrawablePixmap(). + +commit ee3c7ccb175752dbeaed6b0113d0819b3fcd2398 +Author: Eric Anholt +Date: Thu Feb 2 20:51:54 2006 +0000 + + Remove more debugging leftovers. + +commit 3366b6836572461209bb2f8aa28d9e662067dc54 +Author: Eric Anholt +Date: Thu Feb 2 20:09:14 2006 +0000 + + Rearrange and rename EXA code to be a bit more logically organized. Also + removes a little bit of debugging leftovers. Summary: + exa.c -> exa.c (miscellaneous code) exa_accel.c (all acceleration code) + exa_migration.c (migration logic) exaasync.c -> exa_unaccel.c (software + fallbacks) exapict.c -> exa_render.c (render extension stuff) + exaoffscreen.c -> exa_offscreen.c exaPriv.h -> exa_priv.h + +commit 25d4ff870d49533d82a77f144722ff7934d52e0b +Author: Eric Anholt +Date: Thu Feb 2 20:04:15 2006 +0000 + + Forced commit to note repocopies: exa.c -> exa_accel.c exa_migration.c + exaasync.c -> exa_unaccel.c exapict.c -> exa_render.c exaoffscreen.c -> + exa_offscreen.c exaPriv.h -> exa_priv.h + +commit 2ab487d4d20e4e34e73cc6d87f41bf0836c7a8af +Author: Alan Hourihane +Date: Wed Feb 1 22:20:05 2006 +0000 + + Add a new function RRGetRotation() which does exactly the same thing as + xf86GetRotation(), but allows for drivers to provide their own RandR + implementation. xf86GetRotation could be obsoleted by this change. + +commit f4898b409376803c9a9dd8475bdd5576ff1cc59d +Author: Luc Verhaegen +Date: Tue Jan 31 14:49:43 2006 +0000 + + Further bug #5386 fixes: Fix some problems with the EDID code: Some + bitoffsets were wrong. Unknown Detailed Sections weren't handled + properly and defaulted to Detailed Timing. + +commit 437b385ce4cc3ff00e14d3d39f4a2f6c8f0c67a0 +Author: Luc Verhaegen +Date: Tue Jan 31 13:55:01 2006 +0000 + + Bring the cvt utility up to date with bug #5386 changes. Fix 2 issues with + the generator routine: the allocated modeline wasn't nulled and + mode->name's \0 wasn't copied over. PrintModeLine was rewritten and + HDisplay gets rounded up to character width instead of refused. + +commit 8f3c69dcf17691f71bca7b0a2cd34f7788a97b8c +Author: Luc Verhaegen +Date: Tue Jan 31 13:04:02 2006 +0000 + + Accept modes with less than 25% horizontal blanking again (you can push old + gtf timing to below 25%), only stop cvt reduced blanking. Users should + be free to blow up their monitors if they so choose. + +commit 701b63cf1dcd3e49602114fb1dde45a74b4e1122 +Author: Donnie Berkholz +Date: Mon Jan 30 20:04:56 2006 +0000 + + Update to build against Mesa trunk. + +commit dd50015b05b901fe0c60717512c854389610aea2 +Author: Eric Anholt +Date: Sat Jan 28 02:20:37 2006 +0000 + + Add libc_wrapper support for random(), which will be used in upcoming EXA + memory manager work. + +commit 3d1667278ff309d7f8e61a6d330f712bae5bcd41 +Author: Eric Anholt +Date: Sat Jan 28 00:37:52 2006 +0000 + + Remove leftover variables for cfb24 build, and finish commenting out Xglx + standalone stuff, which some versions of automake get whiny about. + +commit ab01eb247f9e5d7c9995bf2d6432358cd64bf11d +Author: Alan Hourihane +Date: Fri Jan 27 12:27:34 2006 +0000 + + update pci ids + +commit 261aa4403c77203f8f02b399ddd382c731dda324 +Author: Alan Hourihane +Date: Thu Jan 26 09:04:22 2006 +0000 + + remove that, and will put it in a i810 driver specific Changelog + +commit 94e678fd014c61d12591d7398b6591f24c3d71f1 +Author: Alan Hourihane +Date: Thu Jan 26 08:49:19 2006 +0000 + + add changelog for i810 updates + +commit c5e93182905332383ca3ef5db3f334cec69c8dda +Author: Donnie Berkholz +Date: Thu Jan 26 04:32:45 2006 +0000 + + Really allow linking against Mesa trunk to work. + +commit 0dc0f17f27f99da79c99031b41b0c0e95ef035f5 +Author: Adam Jackson +Date: Thu Jan 26 04:10:43 2006 +0000 + + Speed up checkout and autogen by removing disused iplan2p4 and ilbm. + +commit 023d2b4e3c392eed1f149dc5b13a83429cd052a3 +Author: Daniel Stone +Date: Thu Jan 26 00:23:44 2006 +0000 + + Add forgotten HAVE_BACKTRACE define. + +commit 14fdd81614cdd6ef7e01976a43da8b6a3bf8386e +Author: Adam Jackson +Date: Wed Jan 25 23:05:26 2006 +0000 + + Remove xf8_32wid, it's dead code with no maintainer interest. Also remove + cfb24, since xf8_32wid was the only user. + +commit 2e28f4104ddf94a8f9a70fe6b2a2a6859ffedc8f +Author: Alan Hourihane +Date: Tue Jan 24 22:05:33 2006 +0000 + + Allow current trunk to build against Mesa trunk + +commit 0d9ed2624fe8fb95c57930da523351556ba11351 +Author: Alan Hourihane +Date: Mon Jan 23 22:01:34 2006 +0000 + + Commit #4633 - Initial mouse pointer incorrect with EXA which also fixes + the repaint of the cursor image with randr events. + +commit 9148d8700b7c5afc2644e5820c57c509378f93ce +Author: Alan Hourihane +Date: Mon Jan 23 13:59:14 2006 +0000 + + Commit slight variation of bug #5460 which is the merge of the new shadow + code from kdrive. + +commit cfd3988ed906ab48ca4362256f8dbb8852d7ca0a +Author: Alan Hourihane +Date: Mon Jan 23 13:58:19 2006 +0000 + + wrap with if XORG / endif + +commit f51ecc66e9ad6d2c3541b1dafa7659da5a0a3a86 +Author: Alan Hourihane +Date: Mon Jan 23 13:54:59 2006 +0000 + + #include "gcstruct.h" + +commit 80f45fa4dfa011c2ae7bcb34f87aafb91763f1fe +Author: Alan Hourihane +Date: Mon Jan 23 13:54:34 2006 +0000 + + add damage.h & damagestr.h to SDK headers + +commit af5b3ea4b3df9e9c6dd6993c5e7238a366a3f508 +Author: Alan Hourihane +Date: Thu Jan 19 14:51:09 2006 +0000 + + add randrstr.h to sdk_HEADERS + +commit 03ebd37baba2f5af3ab502ff02ec14c15859dc3f +Author: Daniel Stone +Date: Thu Jan 19 12:25:01 2006 +0000 + + Make error() bomb with exit code 1, not 0. + +commit adce1f16e0d815e5c762407da3544a7d2eff9303 +Author: Eric Anholt +Date: Thu Jan 19 00:06:57 2006 +0000 + + Only try to use byteswap.h on linux. Assume that everyone else (thinking of + BSDs here) has sys/endian.h, and use macros as appropriate for the + names. This should probably be in a gloabl header. + +commit 1c3f8727b2349c9b988eaa744f11366322d42538 +Author: Adam Jackson +Date: Wed Jan 18 19:42:56 2006 +0000 + + More kdrive merge, fast path fbBlt to use memcpy() when possible. Good for + -5% to 60% speedup on XGetImage, and 0% to 10% speedup on copies within + host memory. Based on work by Jaymz Julian. + +commit e70b64b93024d05519014fb1b76fe26bd9f3a496 +Author: Dave Airlie +Date: Wed Jan 18 07:15:55 2006 +0000 + + Updated xgl code drop from Novell + xserver tree changes + +commit b5356e0afaf2b660c8905f63d5fdcb03402b81c5 +Author: Dave Airlie +Date: Wed Jan 18 07:00:50 2006 +0000 + + typo in last change + +commit 506eca5f57b960a6650c3387047a6ae8a22181e9 +Author: Dave Airlie +Date: Wed Jan 18 06:56:52 2006 +0000 + + Wrap sdk_HEADERS in if XORG as otherwise installing non-xorg servers + breaks. + +commit 8ccf4f2b8fdb5e57d2ec5f2d54731fbf83fb9d8c +Author: Dave Airlie +Date: Wed Jan 18 06:49:17 2006 +0000 + + This is a fix from David Reveman from the xserver tree, Make fbPadPixmap + work with negative stride + +commit a1f9262c6acd195c0fcf5f602d5ca0c252993521 +Author: Kristian Høgsberg +Date: Tue Jan 17 21:27:49 2006 +0000 + + file glxvisuals.c was initially added on branch accel_indirect_glx. + +commit c2dedf4d17f8a5b1a8037fd2b4e29122ef78945a +Author: Søren Sandmann Pedersen +Date: Thu Jan 12 22:14:56 2006 +0000 + + Thu Jan 12 17:09:18 2006 Søren Sandmann + Add new functions to enable and disable events on Map and Unmap. + Use them here to make sure Composite redirect doesn't cause Map/UnmapNotify + events that would confuse window managers. + +commit 847d83ec3c90c5b298eaf19ba55251b4a30f4155 +Author: Ian Romanick +Date: Thu Jan 12 00:21:59 2006 +0000 + + Bug #2996: libglx / libGLcore should use a dispatch table + Port all changes from the (monolithic) accelerated_indirect-0-0-1 branch to + the modular trunk. This will break the Darwin and cygwin builds. Other + than the changes to symlink-mesa.sh and the various Makefile.am files, + to code is identical to what's in the branch. + Reviewed by: airlied, krh + +commit c56e9a8849ce8dd5c09732ae1860e409e7886690 +Author: Daniel Stone +Date: Tue Jan 10 03:24:53 2006 +0000 + + Bomb when symlink-mesa.sh continues, instead of silently failing. + +commit 2949c705f11f8710301555c039bcecbe748cabd9 +Author: Daniel Stone +Date: Tue Jan 10 03:23:05 2006 +0000 + + Add all subdirs used to DIST_SUBDIRS, and files to EXTRA_DIST. + Attempt to build xeglmodule.c, not xglxmodule.c. + Add xf86Sbus.h to EXTRA_DIST, as _HEADERS doesn't appear to get the same + treatment as _SOURCES in terms of automatically DISTing. + +commit 4fc9eb592a446ad5711bdaa82c60e9fe010fd76a +Author: Daniel Stone +Date: Tue Jan 10 02:32:20 2006 +0000 + + Bomb out if symlink-mesa.sh failed. + +commit 890ec849479db2510a9b4bc5e5e2f7978ca37b83 +Author: Daniel Stone +Date: Tue Jan 10 02:30:56 2006 +0000 + + Add xgl to DIST_SUBDIRS. + +commit 53dbd00a75313ec5301ca95b2e91d5d02bdaf820 +Author: Adam Jackson +Date: Sun Jan 8 23:43:54 2006 +0000 + + Remove remaining #ifdef DPSEXT stanzas. + +commit 7fc9bc44e099f8f046bf707cb87ef7d736933f80 +Author: Adam Jackson +Date: Sat Jan 7 01:29:05 2006 +0000 + + Compile fix, again, stupid non-clean builds + +commit 9d62d1e6903ccc095f784279a699b3f40a8f0cf8 +Author: Adam Jackson +Date: Sat Jan 7 00:45:17 2006 +0000 + + Bug #5218: Don't crash on unconfigured interfaces. (Andrei Barbu) + +commit 3c58072956c28ebc3ca2eb50c1ff09823e1219d7 +Author: Adam Jackson +Date: Sat Jan 7 00:33:41 2006 +0000 + + One more build fix. + +commit 07303c1b42afd1ada98cbc11d1ba616d366017fb +Author: Adam Jackson +Date: Sat Jan 7 00:05:46 2006 +0000 + + This version will actually compile + +commit 7f46aba35ee482e9b28ecc81d1a99d423fc88a70 +Author: Adam Jackson +Date: Fri Jan 6 23:52:23 2006 +0000 + + Compile fix + +commit 25babf2791ad42101a86ba2a0f14564328256ee2 +Author: Adam Jackson +Date: Fri Jan 6 23:36:53 2006 +0000 + + Missed file. + +commit 13c9e0c094c4e34cd1e43a7cc08b2dca39a32412 +Author: Adam Jackson +Date: Fri Jan 6 23:06:15 2006 +0000 + + Bug #5525: Build a working Xprt. (Drew Parsons) + +commit fe0c838b5d8bc8d9cf5a686bb7d3e90682d2d19a +Author: Adam Jackson +Date: Fri Jan 6 18:06:02 2006 +0000 + + Move drawable lock acquisition into DRIClipNotify from DRIValidateTree, so + we only take it when clipping a DRI drawable instead of on every tree + update. Note drawable lock acquisition per- screen instead of globally, + and drop it in BlockHandler if necessary. + +commit 39ce5f1544029412f4060f3e89ce1d87222ef42b +Author: Adam Jackson +Date: Fri Jan 6 17:05:26 2006 +0000 + + Remove unused X11R4 DDX compatibility function miClipNotify. + +commit 07ecb969d7eb8d4ab0bb0b8a55a5f40f3c8ec5e3 +Author: Eric Anholt +Date: Wed Jan 4 03:29:15 2006 +0000 + + Forced commit to note that glyph privates commit was: + Obtained from: xserver tree (David Reveman) + +commit b6b88d2f62d8c596171f487dd25fbdbc85d0c5a8 +Author: Eric Anholt +Date: Wed Jan 4 00:05:16 2006 +0000 + + Correct rounding in divide-by-255 code. Obtained from xserver. + +commit b9c0ae867e1b52186c26841a77745f7f5a0a76dd +Author: Eric Anholt +Date: Tue Jan 3 22:36:46 2006 +0000 + + Remove the manual AddFilter for convolution, which I'm pretty sure + shouldn't be necessary due to it already happening from + PictureSetDefaultFilters. + +commit 601ab861b46a62b0742ffd3e937c4fab129664f0 +Author: Eric Anholt +Date: Tue Jan 3 22:06:23 2006 +0000 + + Add glyph privates for Xgl, which uses them to implement a glyph cache. EXA + would probably also like to do this. This breaks module ABI for EXA and + XAA, and likely breaks proprietary drivers as well. + +commit 1729fc882ceec392331566c95efd5968fe9e97fd +Author: Eric Anholt +Date: Sat Dec 31 08:06:00 2005 +0000 + + Change REGION_INIT(pScreen, &foo, NullBox, 0) to REGION_NULL(pScreen, + &foo). While it is no longer (or rather, once again not) required as of + regionstr.h r1.4, it matches the style of the rest of the xorg code. + +commit c25536a7937b11a5347bfb8796d5cb6eb0445b51 +Author: Eric Anholt +Date: Sat Dec 31 08:01:31 2005 +0000 + + Initialize the fourcc value in stack-allocated glitz_pixel_format_t + structures. Greatly reduces the number of uninitialized-value accesses + during Xgl startup according to valgrind. Allocating and filling these + in by hand on the stack seems very shady to me. + +commit e6dab3d7c429a2d30d31f188c4554e870011e051 +Author: Eric Anholt +Date: Fri Dec 30 12:05:47 2005 +0000 + + Fix the AC_TRY_RUN for sys/linker.h which had no hope due to lacking a + main() to instead use a nice AC_CHECK_HEADERS that works. Also, fix the + nearby SYSV IPC check which was lacking an argument and giving bogus + results (it's "AC_TRY_LINK(includes, main, yes, no)"). + +commit eef16c36ad6e90fd8eaad4d8bdbc1205bc28a66f +Author: Eric Anholt +Date: Fri Dec 30 05:44:14 2005 +0000 + + Add #undef BSD44SOCKETS, without which the listener socket on FreeBSD would + be created without the port number due to xtrans's define not being + used when xtrans was compiled in the X Server. + +commit 7aa0ea23bc9b8df582fe06f2bc39dcfe34583c7e +Author: Eric Anholt +Date: Fri Dec 30 04:11:42 2005 +0000 + + Add an empty all-local target for FreeBSD make's sake, which doesn't deal + with .PHONY. + +commit 49a9249239b0dd105b83a101db6e32549978f0d5 +Author: Adam Jackson +Date: Thu Dec 29 21:11:41 2005 +0000 + + Make kdInputMachine static const, shrinks .data a bit. + +commit 6d7ee4167d9daeef9b793789a70aa724c4fe6bf4 +Author: Adam Jackson +Date: Thu Dec 29 20:54:08 2005 +0000 + + Style fix, make SCREEN_EPILOGUE two arguments instead of three. + +commit b1efb3810cfea8116d76bae3ff3acfee521f4793 +Author: Adam Jackson +Date: Thu Dec 29 20:42:54 2005 +0000 + + Missed one + +commit 858b4bc14a7adc7314ce5043c7ff8ca1891dd0c9 +Author: Adam Jackson +Date: Thu Dec 29 20:38:29 2005 +0000 + + missed changelog entry: + Enough build fixes to get {sdl,ephyr,fake} to link. + +commit 54922aeadb29df0a1819afd3f616131aa56e140a +Author: Adam Jackson +Date: Thu Dec 29 20:29:26 2005 +0000 + + Disable building LBX by default. + +commit fc69a2e729532ee062af6676fb187a89f7fffe8a +Author: Dave Airlie +Date: Thu Dec 29 08:42:49 2005 +0000 + + Remove PowerMAX_OS define it never worked , it'll never work again, + finishes running joke of OLS2005 + +commit 25d3852b833bc0b61ce8313ce116251a2602b827 +Author: Eric Anholt +Date: Thu Dec 29 00:44:20 2005 +0000 + + Undo spamming of libv's ChangeLog entry. + +commit d6646307f063b938c44d6193a2e8872e178aa90f +Author: Eric Anholt +Date: Thu Dec 29 00:19:33 2005 +0000 + + Add necessary *CONFIG_H declarations and a force-off of XF86* extensions in + miinitext in the XGL case. Prevents mismatched structure sizes on my + _XSERVER64 machine. At this point, with the uncommitted render/ diffs, + Xglx starts up but displays badly. + +commit 3664c3ebf348d07ae3fe301fb8720adf32cf6d64 +Author: Luc Verhaegen +Date: Wed Dec 28 15:22:21 2005 +0000 + + Bug #5153: standalone CVT modeline generator. + - add hw/xfree86/utils/cvt/, cvt.c, cvt.man.pre and Makefile.am. + - Adjust configure.ac and hw/xfree86/utils/Makefile.am for cvt. + - Add MonPtr->reducedblanking and Option "ReducedBlanking" to the Monitor + section. + - Check for reduced blanking in xf86CheckModeForMonitor and disallow modes + with less than 25% blanking otherwise. + - Fix some warnings in hw/xfree86/common/xf86Config.c. + +commit 08708f7d616a7c0a596fb71dd7acd76d45257fec +Author: Eric Anholt +Date: Wed Dec 28 11:48:14 2005 +0000 + + Merge from xserver: Make the existing ChangePictureFilter and + ChangePictureTransform screen hooks get called at appropriate times. + +commit 31d0fdde19598ce9375cc9638ad4e2c8b5af8d9a +Author: Adam Jackson +Date: Wed Dec 28 10:46:56 2005 +0000 + + Remove a debugging printf + +commit 64ac7401ad5022462279dff4dcfb12844c9857ae +Author: Eric Anholt +Date: Wed Dec 28 10:43:02 2005 +0000 + + Fix a copy'n'paste-o that would result in mis-rounding of the results of + several composite operators in A and G channels. + +commit 9ceffb6b92e55f0d74d71489900d43940f14dfd9 +Author: Eric Anholt +Date: Wed Dec 28 10:37:17 2005 +0000 + + Merge from xserver a header for shm's server internal functions, which are + called by DDXes. Desired by XGL, and should be used in other locations, + probably. + +commit b1b40ed6a87f72d07825624730cca193d5a89baf +Author: Eric Anholt +Date: Wed Dec 28 10:31:46 2005 +0000 + + Initial commit of XGL build infrastructure and XGL code changes for + building within the xorg server tree. Requires additional, uncommitted + dix changes to successfully build, and successful running is still yet + to happen. + +commit 36061c75ae42aa733cde9b3fd05e0c8280b31655 +Author: Eric Anholt +Date: Wed Dec 28 10:10:59 2005 +0000 + + Forced commit to note repocopy from xserver CVS as of a few minutes ago. + +commit 05c139d4cdfd11d39c0168d0c80ac1dbdd069b4c +Author: Adam Jackson +Date: Wed Dec 28 10:02:54 2005 +0000 + + Enough build fixes to get {sdl,ephyr,fake} to link. + +commit aeb770f645e2d591b255ec4ab06addcb1beafa5f +Author: Dave Airlie +Date: Wed Dec 28 02:43:50 2005 +0000 + + recommit previous changes to evdev.c + +commit ce7c0c89375ec74f89ae5727998fd75fb768d280 +Author: Dave Airlie +Date: Wed Dec 28 01:57:11 2005 +0000 + + some updates for default colormap install + +commit 022aa1127c7dcd133ce73dbc12a10bfba8b1ed6e +Author: Adam Jackson +Date: Wed Dec 28 01:01:06 2005 +0000 + + Get Xsdl closer to linking. + +commit 27d79ab2bcebb634d0b69c851c72283a7514eb0c +Author: Adam Jackson +Date: Tue Dec 27 23:03:15 2005 +0000 + + s/XSERVER/KDRIVE/ + +commit 72817714a0787536ce8e8ad0d5473dea0f1c1abe +Author: Adam Jackson +Date: Tue Dec 27 23:01:27 2005 +0000 + + Remove Imakefiles. + +commit 9dd0af6cb4e2c8976ada57a4f4ed16faae090a9d +Author: Adam Jackson +Date: Tue Dec 27 08:31:37 2005 +0000 + + Skeletal kdrive build system. Totall non-functional atm. + +commit 7fd73d2953cf9449c15462cf4bf67639db64f997 +Author: Adam Jackson +Date: Tue Dec 27 08:29:50 2005 +0000 + + Build fixes: XSERVER_LIBS -> KDRIVE_LIBS, config.h -> kdrive-config.h + +commit 2f3ac6e5fcbd0e954a094fb6b975d7c8816c44b7 +Author: Adam Jackson +Date: Tue Dec 27 08:26:03 2005 +0000 + + Start importing kdrive. + +commit 6798fd0170f4225ce4e69148978533fcee9bdc34 +Author: Adam Jackson +Date: Mon Dec 26 19:13:52 2005 +0000 + + Bug #4190: Add a rule for 'make relink' since automake sucks. + +commit 8fc4ea8620913776a903ee2b4f22c306d5778623 +Author: Adam Jackson +Date: Mon Dec 26 18:55:09 2005 +0000 + + Nuke unsupported NDBM routines. Shrink the hash table a bit, over + 25% of the buckets were going empty. + +commit ed33c7c98ad0c542e9e2dd6caa3f84879c21dd61 +Author: Daniel Stone +Date: Mon Dec 26 04:23:58 2005 +0000 + + Remove unused -xkbdb and -noloadxkb options. Rename -ar1 and -ar2 to + -ardelay and -arinterval, respectively. Remove XKB banner from help text. + +commit 7e3cb9a09ac422179be89773f7fb14a462d25434 +Author: Adam Jackson +Date: Sun Dec 25 22:25:15 2005 +0000 + + Remove unused layer module. + +commit 9b083369ded2258cbc8ac2058e06ec8a3b171178 +Author: Alan Coopersmith +Date: Fri Dec 23 20:11:12 2005 +0000 + + Change list of X server man pages in "See Also" section to list the ones + actually included and remove the ones that are no longer. + +commit 5fd978b1e7bce9169f87712a4a7c2c36a68ac00a +Author: Daniel Stone +Date: Fri Dec 23 07:40:44 2005 +0000 + + Make LBX configuration default to auto. + +commit 5230e86b1cc841bfb35806618052aa835b7eb7e7 +Author: Dave Airlie +Date: Fri Dec 23 04:13:37 2005 +0000 + + fix up xglglx.c + +commit feb735c5bb0cd391136f1c73476703dff82dc9b0 +Author: Dave Airlie +Date: Fri Dec 23 02:07:58 2005 +0000 + + Well there were a couple of snapshots later than CVS available outside of + Novell, so I've done a crazy merge to try and get them into a workable + CVS, I suspect I may have failed.. there is a pre-xgldrop-merge tag if + I did. + +commit ade104ce5a016623c1ce97b0d52b531185b35baf +Author: Dave Airlie +Date: Fri Dec 23 01:51:40 2005 +0000 + + check drawable is available + +commit 7fb521e80d6e2c05e9475e74fbf80bfbe74cda95 +Author: Dave Airlie +Date: Fri Dec 23 01:50:04 2005 +0000 + + from davidr's tree update some fixes + +commit c88a3145d057ab72466a3ea8b789bf419e4efc33 +Author: Dave Airlie +Date: Fri Dec 23 01:49:21 2005 +0000 + + from davidr's tree if source picture defined return + +commit c59508566f11982aa3f4be383597d0e6178718c2 +Author: Dave Airlie +Date: Fri Dec 23 01:13:28 2005 +0000 + + fix glx up for newest glitz interface + +commit d822bc159672e7327054e572b659ae7dde040e83 +Author: Dave Airlie +Date: Fri Dec 23 00:08:35 2005 +0000 + + make xgl code at least build against latest glitz. + +commit 6e2086395d99081d8d682b90cec650a06e41fc2c +Author: Dave Airlie +Date: Thu Dec 22 23:32:49 2005 +0000 + + fixups for newer glitz API + +commit f3ae42c0fd910b7f9feb9be91ccb056bce0cd999 +Author: Dave Airlie +Date: Thu Dec 22 23:31:15 2005 +0000 + + small fix towards new glitz interface + +commit 2af7e94eab6847159a3439301ecc93c62a12b1a0 +Author: Eric Anholt +Date: Thu Dec 22 13:54:08 2005 +0000 + + Adjust the rules for auto-generating some source files, so that they work + on both GNU make and FreeBSD's make. + +commit 0d7ec5c7d9b451066a079fe56bcc9722341a91ff +Author: Kevin E Martin +Date: Wed Dec 21 02:30:08 2005 +0000 + + Update package version for X11R7 release. + +commit b37e738d5f4e1769bdee98acca788aeeb1556bcc +Author: Adam Jackson +Date: Tue Dec 20 21:40:19 2005 +0000 + + Fix an fb regression on A8 pictures. (Fredrik Höglund) + +commit 03d37eb03864cfc1a2f8d239d5a4c8341bf274f7 +Author: Adam Jackson +Date: Tue Dec 20 21:34:21 2005 +0000 + + Bug #5359: Fix a segfault (Mark Kettenis) + +commit 7b89b643c12fa0f7a662b3ff76e05ece53101312 +Author: Adam Jackson +Date: Mon Dec 19 16:44:21 2005 +0000 + + Bug #5116: Refer DRI section details to dri.fd.o. + +commit 3ef3add90351e3cb7b54dbcedc234bc5d3d65f1c +Author: Adam Jackson +Date: Mon Dec 19 16:34:07 2005 +0000 + + Stub COPYING files + +commit 3566307c8d44f89622ea51169f67c79092cb56d1 +Author: Alan Coopersmith +Date: Mon Dec 19 09:18:29 2005 +0000 + + Fix typos. + +commit 137447c5f3c6f1914ac869297f823ae93ce428ac +Author: Alan Coopersmith +Date: Thu Dec 15 01:54:45 2005 +0000 + + Update to 2005-12-14 snapshot from pciids.sf.net + +commit 2cf86fce41e3fd2ac48c5088da11e19077e42e65 +Author: Kevin E Martin +Date: Thu Dec 15 00:20:27 2005 +0000 + + Update package version number for final X11R7 release candidate. Update + release string to 6.99.99.904. + +commit f1ba3b4f33a928a3a59538799b3863de5c87e70e +Author: Adam Jackson +Date: Wed Dec 14 20:11:16 2005 +0000 + + Bug #4718: Command line flag to disable ACPI. + +commit cf605eb91619a8c0589a08674ffc3e018471b3fc +Author: Adam Jackson +Date: Tue Dec 13 17:35:26 2005 +0000 + + Build libglx correctly when not building the Xorg DDX. + +commit b076dd787ff71c4b385ab4e2e4eb367f3de378f6 +Author: Adam Jackson +Date: Tue Dec 13 17:34:06 2005 +0000 + + Spell it XINERAMA_SRCS, not PANORAMIX_SRCS. + +commit 3666dbb5f3e06fa6a72def64556d64cf73141777 +Author: Alan Coopersmith +Date: Mon Dec 12 23:33:55 2005 +0000 + + Remove unnecessary include of dgaproc.h that broke Solaris builds. + +commit 438a5549f08ab03443d45dd46323579a2f2e4ba2 +Author: Alan Coopersmith +Date: Mon Dec 12 03:06:18 2005 +0000 + + Bugzilla #4715 Files in + xserver/xorg/Xext not included in tarball after make dist + +commit 62f3ef930adc7edd49b27dd1f7b0f51bc8bc0afa +Author: Adam Jackson +Date: Fri Dec 9 18:35:21 2005 +0000 + + Bug #5258: Restore binary compatibility with 6.8.2's PictureRec. (Aaron + Plattner) + +commit b99dea9dcf99f907a3536c0db1c39cc67931a5b1 +Author: Adam Jackson +Date: Fri Dec 9 18:32:46 2005 +0000 + + Bug #4935: Fix includes. (Eric Anholt) + +commit f4957ee94810b471110deebf03d7413399b45db3 +Author: Adam Jackson +Date: Fri Dec 9 18:30:51 2005 +0000 + + Bug #4809: Re-fix that doesn't break distcheck. (Alan Coopersmith) + +commit de22d0c2264bd6dbacbbb4160d09c7e84ad37e70 +Author: Adam Jackson +Date: Fri Dec 9 15:30:05 2005 +0000 + + Fix a thinko so the code matches the comment + +commit 6fcb049cd0d2291da5943176716d1f7bbb85fdc2 +Author: Adam Jackson +Date: Fri Dec 9 06:49:39 2005 +0000 + + Bug #1288: Additional refactor of the driver probe logic to keep ati loaded + before atimisc. + +commit 17ac5e9fec1e07bd18ae1407043c300cb4695ede +Author: Adam Jackson +Date: Fri Dec 9 05:36:41 2005 +0000 + + Push the fallback drivers to the end of the list so driver probe order + stays useful. + +commit 80ea67e37980d07438749f1aa4dfdd7ee1086799 +Author: Adam Jackson +Date: Fri Dec 9 03:59:41 2005 +0000 + + Bug #4361: Change driver probe logic to read the driver list from disk + instead of using a compile-time array. + +commit 7fa2d11d85d43f42aa9c02f8d772c91d1b04df43 +Author: Adam Jackson +Date: Fri Dec 9 03:57:41 2005 +0000 + + Bug #4361: Define XF86CONFIGFILE properly so config file generation works + +commit 26b41ff43959a07a778bc3d6e4db8da036f09de3 +Author: Kevin E Martin +Date: Fri Dec 9 03:02:21 2005 +0000 + + Fix sgml docs build. + +commit d6f98cbdb8fb74c504a92939d3741420eeed7110 +Author: Adam Jackson +Date: Thu Dec 8 19:33:09 2005 +0000 + + Bug #3944: Fix 24bpp packed pixel. (Søren Sandmann Pedersen) + +commit f9ccebe8c5cd674c08fe8ed860d1c456e42c937e +Author: Adam Jackson +Date: Thu Dec 8 19:27:13 2005 +0000 + + Bug #4928: Fix compilation for Alpha. (Stefaan DeRoeck) + +commit 3a6bdf0715b994d6ecaa5b6e448695a8a8ec7d72 +Author: Kevin E Martin +Date: Thu Dec 8 19:21:12 2005 +0000 + + Add configure option to set the top level font dir. + +commit 008c2dd5e4614e6a21123ee3a2ac9c5d3bafa97a +Author: Kevin E Martin +Date: Thu Dec 8 17:55:19 2005 +0000 + + Add configure options to allow hard-coded paths to be changed. + +commit 39189c2b86a4c2ab5f3f161d423eb072356668e5 +Author: Kevin E Martin +Date: Thu Dec 8 17:54:40 2005 +0000 + + Allow hard-coded paths to be configurable. + +commit 20c0ebe7b3feb85abf9bf140b7799aafc6f59513 +Author: Kevin E Martin +Date: Wed Dec 7 16:18:02 2005 +0000 + + Change to use the app-defaults default dir configured in libXt. + +commit 4a39354e14c3c360046b04ea0d4825832b05df05 +Author: Kevin E Martin +Date: Tue Dec 6 22:48:51 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 84faf8dc9747bc4f1db5ebc2f23e17cf1460e2e9 +Author: Adam Jackson +Date: Tue Dec 6 16:22:47 2005 +0000 + + Bug #5230: Fix whitespace bugs. + +commit 9439297b7bc07dcb90f0d01da09eea1bac3d42ff +Author: Alan Coopersmith +Date: Tue Dec 6 15:50:35 2005 +0000 + + Bugzilla #5219 Make + sure all optional sources are included in EXTRA_DIST, even if they + aren't used on the platform the distballs are made on. + +commit f259fd680caccb59546d7788704e46e51a9c6146 +Author: Adam Jackson +Date: Sat Dec 3 22:47:47 2005 +0000 + + Disable the xf8_32wid logic for now, breaks distcheck + +commit 26f9c4305660c2b3dc7fe8d214bcdd3c24e1b198 +Author: Alan Coopersmith +Date: Sat Dec 3 17:04:45 2005 +0000 + + Bugzilla #4809 Patch + #3908 xf8_32wid + and cfb24 only need to be built on sparc + +commit 98231c6b38c98976f4ac2b9417ecfbc37a8cbe9a +Author: Kevin E Martin +Date: Sat Dec 3 05:47:25 2005 +0000 + + Update package version number for X11R7 RC3 release. Update release string + to 6.99.99.903 (i.e., 7.0 RC3). + +commit 7c00afd0ec94e491f1a9ef32d6543ed51ea3319d +Author: Kevin E Martin +Date: Fri Dec 2 06:02:45 2005 +0000 + + Define XFree86Server only where it is required. + +commit 924518605b613eb66aa569877fa9f131e6f2a2fd +Author: Kevin E Martin +Date: Thu Dec 1 23:39:00 2005 +0000 + + Fix GL build when srcdir != builddir (Donnie Berkholz). + +commit 14b9315379fe8c783013906616d868f93fd51c83 +Author: Kevin E Martin +Date: Thu Dec 1 22:06:49 2005 +0000 + + Add missing XvExtension and XvMCExtension defines. + +commit df8fa21d3189e20260328b88cc8a86224a9b1ebf +Author: Kevin E Martin +Date: Thu Dec 1 16:20:09 2005 +0000 + + Fix typo: xorg_bus_linuxbsdpci ==> xorg_bus_linuxpci + +commit ccfaf82367c9d057fd8314ce36b47f0a8eb696b6 +Author: Eric Anholt +Date: Thu Dec 1 05:04:07 2005 +0000 + + Bug #5160: Fix the modular build to try to use the same logic for choosing + the architecture/os-specific bus support as monolithic. + +commit 9c0bd9687fe7d20f2f0793332ae0db06f035eb23 +Author: Adam Jackson +Date: Wed Nov 30 22:59:22 2005 +0000 + + Import libdrm 2.0 + +commit 4ec0b623b6ab5f8a1e5af2cc3d839251acf81ce2 +Author: Adam Jackson +Date: Wed Nov 30 02:36:25 2005 +0000 + + Bug #5093: Fix fb for non-SSE machines. (Xavier Bachelot) + +commit ed826d563cba82c516fd41f6a29ee50aa1fe6c6a +Author: Adam Jackson +Date: Tue Nov 29 23:34:30 2005 +0000 + + Only build dlloader modules by default. + +commit da5d66f2ff27b21fe5c39a4abb4f627edd707f1d +Author: Kevin E Martin +Date: Tue Nov 29 16:39:33 2005 +0000 + + Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable + module builds to reflect this change. + +commit 51a721a6dbb42702347aad3115147e4922fc1a25 +Author: Alan Coopersmith +Date: Mon Nov 28 22:05:09 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit 381931b15b15d0a2ec384b0c22864412c44f9c6e +Author: Kevin E Martin +Date: Wed Nov 23 07:14:46 2005 +0000 + + Add configure option to install libxf86config.a (disabled by default). + +commit 594ca0966e8fd5992ebf95170cc42e19c698fec6 +Author: Eric Anholt +Date: Tue Nov 22 02:11:00 2005 +0000 + + Bug #5118: Use "rm -f" instead of "$(RM)", which isn't always defined. + +commit 1c8c1179c0789e3e134d31a62dbb88bfdb594b26 +Author: Felix Kuehling +Date: Mon Nov 21 04:24:07 2005 +0000 + + Fix Xprt library dependencies in the case that Xprint is auto-detected by + configure. + +commit a1f110bda80bb3b8e4f602385ca5ccd96cf3f786 +Author: Alan Coopersmith +Date: Sun Nov 20 23:01:02 2005 +0000 + + Make sure XKM_OUTPUT_DIR (used in code) ends in / (so paths don't get hosed + when appending file names) but XKB_COMPILED_DIR (used in Makefiles) + does not so install-sh -d doesn't get confused when the directory + already exists. + +commit 385730d23944c24dd9af45b27f62c1161abc48b2 +Author: Alan Coopersmith +Date: Sun Nov 20 04:15:15 2005 +0000 + + Add xext to list of modules xorgcfg depends on. + +commit 63aa96c08a8390621b017ea498c88cf88152024b +Author: Kevin E Martin +Date: Sat Nov 19 07:15:50 2005 +0000 + + Update pkgconfig files to separate library build-time dependencies from + application build-time dependencies, and update package deps to work + with separate build roots. + +commit d3b6653a2892e8c929c79fe3ace19ac9d8366fc4 +Author: Adam Jackson +Date: Sat Nov 19 03:53:04 2005 +0000 + + Bug #4824: Build XTrap support by default, matching monolith. + +commit 627ac1fe1dbcbc070575da7bee9e686a7dce5262 +Author: Eric Anholt +Date: Fri Nov 18 23:34:04 2005 +0000 + + Bug #5060: Fix non-Linux DRI on 64 bit post Linux 32/64 changes. + +commit e3ec048ff2fe0ee0862472e9b147b7ce488ea898 +Author: Adam Jackson +Date: Fri Nov 18 22:43:50 2005 +0000 + + Bug #4928: Unbreak Makefile.am for Alpha chips. (Stefan DeRoeck) + +commit de95d8ee197a0bb738037195997d754a20e10254 +Author: Adam Jackson +Date: Fri Nov 18 18:02:24 2005 +0000 + + Bug #4859: Don't segfault on bad DDC read. (Tony Houghton) + +commit 21f7d03dbc347f6bf97a40671275ac75df15bd10 +Author: Adam Jackson +Date: Wed Nov 16 07:28:19 2005 +0000 + + Fix builds when not building the Xorg DDX. + +commit fb2d9df869af0c96f1488ef7cf364e01a9d28f3f +Author: Adam Jackson +Date: Tue Nov 15 00:29:23 2005 +0000 + + Make fb build on darwin/ppc without addition #define hacks + +commit 16b315affa30e34b9bab81778978484137a5d9bb +Author: Kevin E Martin +Date: Mon Nov 14 21:04:12 2005 +0000 + + Use glcontextmodes.[ch] from Mesa. + +commit 0c110c80e7afbef50bb354cf1df30123ed048250 +Author: Kevin E Martin +Date: Mon Nov 14 20:18:03 2005 +0000 + + Add GL_CFLAGS so that GLX can find its proto headers when using separate + build dirs. + +commit fc81c13e4dafb0eb818879454ee7ae3fa3dae6d0 +Author: Kean Johnson +Date: Mon Nov 14 18:49:30 2005 +0000 + + Dont prevent SCO platforms for using the default ZAxisMapping now that the + OS layer correctly sends z-axis events when the wheel button is used. + +commit bd9fb533b31c2427d854199fa59dccd357cf874b +Author: Alan Coopersmith +Date: Mon Nov 14 00:01:34 2005 +0000 + + Default xkb-output directory needs trailing slash. + +commit 267cbffa41fffff69c692911d128462f5bab2a69 +Author: Alan Coopersmith +Date: Sun Nov 13 20:53:24 2005 +0000 + + Bug #5019 xserver + installs manpages into 'man1' instead of 'man1x' + +commit 3179d29b8212c197634d81fbeb8dd2e8df995735 +Author: Alan Coopersmith +Date: Sat Nov 12 18:03:34 2005 +0000 + + use RGB_DB not RGB_PATH as that's what configure defines (Jürg Billeter + ) + +commit 0e7e4c7064df64c29b1a0ccd84fba1be7c748f18 +Author: Kevin E Martin +Date: Thu Nov 10 04:59:21 2005 +0000 + + Fix typo to enable DGA support. + EXTMODULE is required to build DGA support into extmod. + +commit e4554db8f87c6a39a3087186395972000bd2085c +Author: Kean Johnson +Date: Thu Nov 10 02:41:20 2005 +0000 + + Dont pass wheel mouse buttons as real buttons, map them as Z-Axis movement + on SCO and USL. Re-instate the ZAxisMapping default for the mouse + driver. + +commit 1b26fe6d2092c202141a0371f47ef1cd7c66ec00 +Author: Kevin E Martin +Date: Wed Nov 9 21:28:54 2005 +0000 + + Update package version number for X11R7 RC2 release. Update release string + to 6.99.99.902 (i.e., 7.0 RC2). + +commit f886e632b8dab1bfa0de42b9759a8284ecd9b94f +Author: Matthias Hopf +Date: Wed Nov 9 17:05:41 2005 +0000 + + Bug #4915: ButtonMapping option which allows to define arbitrary button + mappings (including left-handed mouse etc.). Fixed incorrect usage of + non-reversed, but ZAxisMapped buttons for state detection. Nuked unused + part of reverseMap. + +commit a25871ae52dd5ce094ba8c1b2021dd027d3e71bd +Author: Kevin E Martin +Date: Wed Nov 9 01:00:46 2005 +0000 + + DRM 1.0.5 import + +commit c9709c0a38af46368726857f7261cbeb84e53911 +Author: Kevin E Martin +Date: Tue Nov 8 22:47:57 2005 +0000 + + Add newly checked in files to Xorg server build. + Fix release date. Enable DGA extension by default. + +commit f8430a1b8651f4b52d9d3b54694a60d929b48925 +Author: Kristian Høgsberg +Date: Tue Nov 8 19:04:56 2005 +0000 + + Bug #2880, add functions for byte and word level access to pci config + space. + Fix broken utf8 again. + +commit 5390c7ab05d23f64e6d9afaa558be246a6d6e1b4 +Author: Kean Johnson +Date: Tue Nov 8 06:33:30 2005 +0000 + + See ChangeLog entry 2005-11-07 for details. + +commit f5814bf3fff5352ed6edef4c58aadf2d4593f094 +Author: Alan Coopersmith +Date: Tue Nov 8 03:12:43 2005 +0000 + + Don't reference noXkbExtension when building without XKB. (Bob Terek - Sun + Microsystems) + +commit e73cdba865f36ebf78c2dc4ff674b4d9bfe85013 +Author: Kevin E Martin +Date: Mon Nov 7 21:03:49 2005 +0000 + + Fix Xvfb to work properly in depth 15 mode. Fixes XTS5 XCloseDisplay-3 + server crash. + +commit 890ed0e082e048fa8daf48229b40558381bd131d +Author: Thomas Hellstrom +Date: Sun Nov 6 16:40:59 2005 +0000 + + Fix a bug where a system memory pixmap got a wrong address if memcpy() + fallback was used for downloading from screen. + +commit 70aedcf32a0c924fd073f5b36d20813e8323026b +Author: Alan Coopersmith +Date: Sat Nov 5 18:56:50 2005 +0000 + + Bug #4948: Incorrect + URL in log file for Xorg CVS. Also fixed wording of statement to not + refer to monolithic CVS since modular uses the same code, so it was + appearing in modular builds too. + +commit 89c661d61f1b9c70a08237476fa1f7f42c1783ab +Author: Kevin E Martin +Date: Fri Nov 4 21:37:32 2005 +0000 + + Only use fbCopyAreammx if planemask is FB_ALLONES (fixes XTS5 XCopyArea + tests 22 and 23). + +commit 0b150a05e6fadca7ee8240697d6cbeadea0c53b3 +Author: Ian Romanick +Date: Thu Nov 3 17:12:53 2005 +0000 + + Whitespace change just to make sure I created the branch correctly. + +commit 90cf8e339b71c2f8f2d7a362e6e1ca8078d7f4fd +Author: Kevin E Martin +Date: Thu Nov 3 17:08:06 2005 +0000 + + Fix vendor string and release version reported by the servers. Enable + security, lbx and xevie extensions to give us parity with monolithic + tree. + +commit f23defeef285b4a5bb58405589294bd557c9bb01 +Author: Alan Coopersmith +Date: Thu Nov 3 16:57:01 2005 +0000 + + Use APP_MAN_SUFFIX for Xserver man page instead of hardcoding section 1 + +commit f5daec674aeb4fe6ccbc95ead8a319bbeb368d9f +Author: Kevin E Martin +Date: Wed Nov 2 15:56:40 2005 +0000 + + Add support for enabling/disabling DBE (part of generic enable/disable + extension support in the server). + +commit a311bfa73afa1af76f81958d23bc8e0c631d6828 +Author: Kevin E Martin +Date: Wed Nov 2 15:53:57 2005 +0000 + + Fix support for enabling/disabling extensions loaded from modules. + +commit 462a2407d540eac831c9be4dcee8a16aa1cea6ac +Author: Kevin E Martin +Date: Tue Nov 1 15:01:51 2005 +0000 + + Add xorg-server.m4 for driver dependency checking. + Update pkgcheck depedencies to work with separate build roots. + +commit 56101c9d6ec3585a0a8550da4b83dd399e3bcce6 +Author: Kevin E Martin +Date: Mon Oct 31 05:45:40 2005 +0000 + + Fix fd leak by closing them in the ACPI code instead of just using + shutdown. + +commit 7993486e80711bd6f6f5b6c2b1f2ac32bfba735b +Author: Thomas Winischhofer +Date: Sun Oct 30 17:38:49 2005 +0000 + + RandR: Add a driver func to let the driver determine the physical size of a + screen size (display mode). Useful for faked widescreen modes, modes + which are scaled by the driver, etc. This really helps fixing RandR's + sometimes dumb DPI assumptions. + +commit c818d3a1a5439c54fc687927a99d69712602ed5e +Author: Thomas Winischhofer +Date: Sun Oct 30 09:27:06 2005 +0000 + + Add xf86RandRSetNewVirtualAndDimensions to loader symlist + +commit fdbb3ea60949a12eb2f4805d16e8acc2348e39c7 +Author: Thomas Winischhofer +Date: Sat Oct 29 21:31:23 2005 +0000 + + Add function for drivers to change RandR's idea of the virtual screen size. + (This allows drivers to reserve a larger virtual size at start and + change it later) + +commit e921eec1c6d6ce32630977bd876c529a7c694459 +Author: Alan Coopersmith +Date: Sat Oct 29 00:12:33 2005 +0000 + + Make X -> Xorg symlink at install time. + +commit f842c229d4c4dbd5c01364f9e99709bedfd32be6 +Author: Alan Hourihane +Date: Fri Oct 28 16:01:17 2005 +0000 + + build fix on alpha + +commit 7416fd61a17a70a2c27c4b1d19796955c296dc7a +Author: Alan Coopersmith +Date: Thu Oct 27 21:03:27 2005 +0000 + + Improved stack trace dump code for Solaris - try fork & exec of pstack + first so we can see the names of non-exported symbols that aren't + visible to walkcontext/dladdr1 code. + +commit b588bdfe2ac3758d7188706078d79fa276a303e3 +Author: Dave Airlie +Date: Sat Oct 22 04:38:50 2005 +0000 + + programs/Xserver/GL/mesa/X/xf86glx.c: Missing initializer in xf86glx.c + spotted while debugging something else. + +commit 59279da49806b032027bb54410bc2513d21e3d9e +Author: Adam Jackson +Date: Fri Oct 21 19:06:13 2005 +0000 + + Bug #1429: Report input device type correctly. (Stéphane VOLTZ) + +commit 4a8072011895e6f472e429af7503fc07e0561144 +Author: Adam Jackson +Date: Fri Oct 21 18:50:09 2005 +0000 + + Bug #4730: Byte-swap the pixmap ID correctly. (Neil Campbell) + +commit 81e913d3106066de73792f59f3e50e2b5458c567 +Author: Adam Jackson +Date: Fri Oct 21 18:23:33 2005 +0000 + + Bug #4840: Typo, x$xRES -> x$RES. (George Fufutos) + +commit f5a58178347878e0409b592330a07867bea02bef +Author: Ian Romanick +Date: Thu Oct 20 23:24:47 2005 +0000 + + Make sure that the __gl*_size prototypes are seen in all the places that + they need to be seen. + +commit 279cf9f79da5778b6e14ecc437379d73e3bec5b0 +Author: Donnie Berkholz +Date: Thu Oct 20 22:41:28 2005 +0000 + + Bug #4817 Restore '=' + to '==' in test for mmx_capable. + +commit 1f43d218cc24358a0379535ed517c23011633c31 +Author: Thomas Winischhofer +Date: Thu Oct 20 21:45:40 2005 +0000 + + EXA: The "optimization" for using a fill operation instead of 1x1 copies + checked the destination drawable's dimensions (!) instead of the + tile's. Really.... + +commit 15f56b203dbc14ea59885d40fd4bed3da9e8e190 +Author: Adam Jackson +Date: Thu Oct 20 18:52:51 2005 +0000 + + Move xf86XTrapModule.c to dixmods, guess at a build system. + +commit da43c778f4a831061ad2c8b8a312b7a54c9cd79e +Author: Adam Jackson +Date: Wed Oct 19 22:45:54 2005 +0000 + + Bug #3224: Degrade XKB fallback message to X_WARNING. + +commit 4ebd26f04b32f1b09e0759f1a83437d0b1c4d646 +Author: Adam Jackson +Date: Wed Oct 19 22:36:22 2005 +0000 + + Bug #3196: Fix Load foo.so syntax. + +commit af211a9bc1bcab0aa631558e5d6ce013095f9802 +Author: Adam Jackson +Date: Wed Oct 19 22:30:09 2005 +0000 + + Fix PCI bus scan on ia64 E8870 chipsets. + +commit 5744308e2957781449bfe6fee9b465617a88384d +Author: Kevin E Martin +Date: Tue Oct 18 22:06:54 2005 +0000 + + Update package version number for RC1 release. Update release string to + 6.99.99.901 (i.e., 7.0 RC1). + +commit 2769c3e72c470b472dae013e256a7ee73c3e53f2 +Author: Adam Jackson +Date: Tue Oct 18 19:43:48 2005 +0000 + + Fix distcheck by forcing Xorg to be installed before chmod/chown. + +commit dd0d010e9c34278f968be486a6c5c91e021b6609 +Author: Adam Jackson +Date: Tue Oct 18 19:14:08 2005 +0000 + + Fix parallel builds my ensuring libdmxconfig builds first. + +commit 79e6ac79f983b6cbd88a868dfd2235d9cbe75e8b +Author: Alan Coopersmith +Date: Tue Oct 18 07:18:21 2005 +0000 + + Don't use $< in explicit rules since neither BSD nor Solaris make allow + that. + +commit fb282ef43a1936dcdefa57f16a8363b2adaf983b +Author: Aaron Plattner +Date: Tue Oct 18 04:03:01 2005 +0000 + + Add miext/damage so misym.c can export DamageDamageRegion. + +commit 959db6028d232dc76396cb658aa48d3b4e605aed +Author: Aaron Plattner +Date: Tue Oct 18 04:02:31 2005 +0000 + + Export DamageDamageRegion. Not bumping the ABI version since we did that + already for this release. + +commit b61c828b0455ec1d4a7ffb54b5ac9b65764a458b +Author: Kevin E Martin +Date: Tue Oct 18 02:23:58 2005 +0000 + + DRM 20051017 import + +commit d6a40bcd4a745b5d6d1070deb696b21d128ca0fe +Author: Alan Coopersmith +Date: Tue Oct 18 00:32:55 2005 +0000 + + Change default install dir for app-default files from + $(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match + the monolith & allow localization + +commit e7007f7d51c9e1d39118865fefb1716c579a70bd +Author: Adam Jackson +Date: Mon Oct 17 22:42:03 2005 +0000 + + More automake 1.7 braindamage: use mkdir -p, not . + +commit 151ba8b67fd88a721f9f72d3019212b22f5cd3e2 +Author: Adam Jackson +Date: Mon Oct 17 22:25:58 2005 +0000 + + Work around automake-1.7 braindamage by providing an explicit rule for + XOrgCfg. + +commit eec3df1503e561aff6656e15c73b25a0bba1b06b +Author: Kristian Høgsberg +Date: Mon Oct 17 17:11:12 2005 +0000 + + Fix whitespace in AS_HELP_STRING uses, convert all help strings to use + AS_HELP_STRING. + +commit 1859c62607d567aa05334df1662f7249c983f793 +Author: Kevin E Martin +Date: Mon Oct 17 07:18:59 2005 +0000 + + include/dix-config.h.in Add support for more extensions + Add missing files to EXTRA_DIST + +commit ccfe9e7e9b49cbbf7c50fbf1a5c33178f27f79eb +Author: Alan Coopersmith +Date: Sun Oct 16 21:57:34 2005 +0000 + + Link Xprint config directories in $(C_LOCALE) list to C locale dir, not + en_US + +commit a7d6a4fb321415b8aaad72760ff8a1ca3fd077f9 +Author: Donnie Berkholz +Date: Sun Oct 16 03:02:53 2005 +0000 + + Change '==' to portable '='. + +commit c2e461c7e970830ea430de3e5f352d144e9f0239 +Author: Kevin E Martin +Date: Sat Oct 15 20:44:44 2005 +0000 + + Fix typo and add new Makefiles to AC_OUTPUT + Fix typos + Add xorg.conf.man to CLEANFILES + Add missing files to EXTRA_DIST + +commit 34b7b57b3c80507f63a542c6adb4b5c8ed80b642 +Author: Kristian Høgsberg +Date: Sat Oct 15 19:34:28 2005 +0000 + + Doh, remember to add this file. + +commit 744aa34ca5228ea176cc56a7bdd48bbf5f29b0b5 +Author: Eric Anholt +Date: Sat Oct 15 02:19:09 2005 +0000 + + Add an additional meaning to the "dirty" flag. Now, if !dirty && !area, the + pixmaps's contents are undefined, so we won't need to upload the + undefined contents in MoveIn. Use the ExaCheck* for async ops as well, + so that dirty is always tracked. While the performance impact for my ls + -lR test was not significant (though the avoiding-upload path was being + hit), it's likely to be important for the upcoming Get/PutImage + acceleration from ajax. + +commit 21e7339c1eead1148eea462bc99cf8faf02c8d39 +Author: Kristian Høgsberg +Date: Fri Oct 14 22:44:56 2005 +0000 + + Hook up lbx. + +commit d62943c040fd3d45079c9918c57f74f993b585d4 +Author: Alan Coopersmith +Date: Fri Oct 14 22:19:51 2005 +0000 + + Set default font path to match the default in the monolith so fonts are + actually found. + +commit 0ee70f53ef9b05052ee079560df107d05a9c5407 +Author: Alan Coopersmith +Date: Fri Oct 14 22:01:46 2005 +0000 + + Install Xorg & xorg.conf man pages even when not building docs + +commit 0676a2874a62a3661a718cdf21e75ffc77197ad9 +Author: Kristian Høgsberg +Date: Fri Oct 14 20:01:36 2005 +0000 + + Add sysv and sco os-support subdirs and add simple EXTRA_DIST Makefile.am + in those dirs. Remove unsupported os-support subdirs (bsdi, dgux, hurd, + nto, os2, pmax, qnx4) that have no maintainer and we don't dist. + Add Options. + +commit 57abb5b171b2fe88252aeb788463e533106d66b9 +Author: Alan Hourihane +Date: Fri Oct 14 08:29:16 2005 +0000 + + remove reference to non-existent agpgart.h + +commit 7e3e9ed97ba25bb84286f97fe6882a37c9aa7e25 +Author: Donnie Berkholz +Date: Fri Oct 14 06:10:06 2005 +0000 + + Add XTRAP_LIB to XPRINT_EXTENSIONS to fix xprint build when xtrap is + enabled. + +commit 821584fcd3bf83f3aaacd35e54323f71d976db44 +Author: Donnie Berkholz +Date: Fri Oct 14 05:36:39 2005 +0000 + + Require glproto >= 1.4.1 if building DRI with GLX. This fixes a build + failure on a number of hyperpipe functions. + +commit 8df7628a2ad93edf8271f13e0b43c0fa8f766668 +Author: Alan Coopersmith +Date: Fri Oct 14 00:41:51 2005 +0000 + + Remove reference to XF86config-4. Add xorgcfg(1) to See Also list. + +commit b54c8154ca19edce00b9c6379d5daf94268bade1 +Author: Alan Coopersmith +Date: Fri Oct 14 00:34:49 2005 +0000 + + Set substitutions needed in xorgconfig man page. + +commit 1df705e465a103c94ffbb9fe97bdbe6b0aefc746 +Author: Alan Coopersmith +Date: Thu Oct 13 20:30:38 2005 +0000 + + AC_SUBST VENDOR_STRING & VENDOR_RELEASE for xorgcfg's app-defaults file + +commit b349b20d783252d5126451142419aae554f9b776 +Author: Kristian Høgsberg +Date: Thu Oct 13 18:08:24 2005 +0000 + + Dist NOTES. + Dist helper shell scripts. + Dist XAA.HOWTO and a few more unused C files. + Dist xorgconf.cpp. + Fix DIST_EXTRA typo. + Clean yacc and lex generated files only during make maintainer-clean as we + don't expect users to have those tools installed. + +commit 35a767590e481b15ae66dccc2dd91098992b2751 +Author: Benjamin Herrenschmidt +Date: Thu Oct 13 01:13:58 2005 +0000 + + Fix stupid mistake in yesterday's allocator commit, would cause exa to + consider a random available memory size + +commit a16dabd05ee7ec97877f07bd40ed83c01e72fc22 +Author: Eric Anholt +Date: Wed Oct 12 11:15:44 2005 +0000 + + Remove an RM line that appears unnecessary and was breaking the build at + xf86DefModeSet.c with FreeBSD make, where RM was undefined. While here, + make the build of xf86DefModeSet.c depend on its sources, so it'll + rebuild properly, and make it a normal CLEANFILE rather than a + DISTCLEANFILE, since the intention seems to be to build it at the + user's build time. + +commit b819c8378fbf29f185332e8435a80eb35991cd1f +Author: Alan Hourihane +Date: Wed Oct 12 08:22:31 2005 +0000 + + remove unneeded line of code + +commit e573b272bf2b06fb62d0306ddc966f3230ead967 +Author: Benjamin Herrenschmidt +Date: Wed Oct 12 07:46:36 2005 +0000 + + Use proper access size when reading pixel based on bpp of the source pixmap + +commit 55efb41f6cc064763cbfd3ee2a1239dc46cb109a +Author: Eric Anholt +Date: Wed Oct 12 07:35:20 2005 +0000 + + If a window background is a 1x1 pixmap, read the value out and go to + exaFillRegionSolid rather than sending piles and piles of Copies to the + hardware. + +commit fce11fdf03acc1f3f1dafb79fc8fff0251cf5473 +Author: Kevin E Martin +Date: Wed Oct 12 02:11:06 2005 +0000 + + Fix typo (DIST_EXTRA -> EXTRA_DIST) + +commit 12994b9afbc18bfb7209f677abf673415c9ddf15 +Author: Benjamin Herrenschmidt +Date: Tue Oct 11 23:11:37 2005 +0000 + + Fix a couple of bugs in the offscreen allocator. One mostly harmless was + causing our search loop for evictable blocks to possibly skip a good + candiate, and another was the allocator would occasionally use + area->offset as if it was the base of the pixmap, while for a pixmap + that is not in available state, it is not. This caused some funny + miscalculation leading to overlapping pixmaps and accesses beyond the + end of the framebuffer. To make things cleared, I renamed save_offset + to base_offset, made sure it's the one used everywhere in the + allocator, and only align "offset" for the client at the end of + exaOffscreenAlloc(). + +commit 8444a1f3918b0433f89cae31673ab63628b4543d +Author: Alan Hourihane +Date: Tue Oct 11 21:01:04 2005 +0000 + + missed commit + +commit 3b683b63eed603ae58a8cddab48eb81f7ba0dbdf +Author: Alan Coopersmith +Date: Tue Oct 11 20:12:24 2005 +0000 + + missed ChangeLog entry for previous commit + +commit b4450f3242ab408e80bc3d6d5d1cf6765f3e5339 +Author: Thomas Winischhofer +Date: Tue Oct 11 19:03:02 2005 +0000 + + Add DGAReInitModes, Part 2 + +commit d91d18e1d6d663244288748ab86a35a6c151a535 +Author: Thomas Winischhofer +Date: Tue Oct 11 19:02:18 2005 +0000 + + Add DGAReInitModes in order to allow the driver to change the list of + supported DGA modes. (Part 1) + +commit c1a2abadfbb862cbaac3e23d0c1317ce5473ebdd +Author: Alan Hourihane +Date: Tue Oct 11 14:50:47 2005 +0000 + + fix a typo + +commit 697f64a22ac5a7742a0022605a1074351296d4f8 +Author: Alan Hourihane +Date: Tue Oct 11 14:50:03 2005 +0000 + + check randrp has been initialized + +commit 2828d92c6ca400b603b6a20a221d9c858732292f +Author: Alan Hourihane +Date: Tue Oct 11 14:45:01 2005 +0000 + + programs/Xserver/hw/xfree86/common/xf86RandR.c + programs/Xserver/hw/xfree86/loader/xf86sym.c Add a new function + xf86GetRotation to allow third party modules to obtain the current + rotation. + +commit cad18ec979e38ef80a606f0e4abf2142b9d0d2b1 +Author: Alan Hourihane +Date: Mon Oct 10 10:07:47 2005 +0000 + + don't move x or y depending on the screen size change + +commit 7f72f94aa4f0655b8aab6c67eef2a5f5ac4b418f +Author: Alan Hourihane +Date: Mon Oct 10 09:31:49 2005 +0000 + + rework that again + +commit 7c1d9a31a36552467d194e7d009c17dc526256c2 +Author: Alan Hourihane +Date: Mon Oct 10 09:24:28 2005 +0000 + + a furthur tweak to the randr cursor position fix + +commit 13f958fbe8420e406f24c01d320f29002ee860b7 +Author: Benjamin Herrenschmidt +Date: Mon Oct 10 05:58:41 2005 +0000 + + Add missing {Prepare,Finish}Access() wrappers for the tile pixmap in the + fallback case + +commit d82aeb55ca3b6abe4cafa7b9c39777a5f67308e5 +Author: Alan Coopersmith +Date: Sun Oct 9 23:47:52 2005 +0000 + + Bug #3254 Make sure + screensaver & DPMS timeouts don't overflow when multiplied by + MILLI_PER_MIN. (Reported by Zachary J. Slater) + +commit 29b5f846d261976f466d2c7181d6a75de670066b +Author: Alan Coopersmith +Date: Sun Oct 9 17:47:34 2005 +0000 + + Bug #4715 Add + SecurityPolicy to EXTRA_DIST (Bill Crawford) + +commit 046234b3ebdfe221de9e87d70d287f69a6f59d6e +Author: Eric Anholt +Date: Sun Oct 9 02:03:22 2005 +0000 + + Don't try the accelerated glyphs path for component-alpha text (which I + don't expect drivers to be able to accelerate without exa assistance). + Instead, drop back to plain old miGlyphs for a 62.5% +/- 1.5% reduction + in runtime of my ls -lR test (n=5) with component alpha. While a + reasonable approach would seem to be making a better test to see + whether the entire path would be accelerated and force migration + appropriately, my attempt at this made the situation much worse. + +commit 526d1502df8db6799c9d1155b86ce79cef90872b +Author: Alan Hourihane +Date: Fri Oct 7 21:29:39 2005 +0000 + + another update to the RandR fix (thanks Aaron) + +commit 5a71a5667eb5b01e0f65f9310f4af1f6c5711ab7 +Author: Kristian Høgsberg +Date: Fri Oct 7 19:01:10 2005 +0000 + + Add Xprint init scrips to EXTRA_DIST. + +commit 470213753b158225b44a39a872599344acbc7101 +Author: Alan Hourihane +Date: Fri Oct 7 18:15:08 2005 +0000 + + update the last RandR fix + +commit 348242f35aeb2869ef390241035b5f3266fc0288 +Author: Alan Hourihane +Date: Fri Oct 7 15:39:52 2005 +0000 + + programs/Xserver/hw/xfree86/common/xf86RandR.c Use PointerMoved instead of + SetCursorPosition, as PointerMoved will call AdjustFrame to reposition + the window if necessary and avoid the cursor ending up offscreen. + +commit 578e18d11b3d61449c1dd7eba04e1748f19c68f3 +Author: Kevin E Martin +Date: Fri Oct 7 14:27:47 2005 +0000 + + Add darwin to dist + Include missing docs in EXTRA_DIST + Include headers and other files in dist + +commit 148df64a05d69adaac4b0f3684b846eb1da60219 +Author: Kevin E Martin +Date: Fri Oct 7 04:11:02 2005 +0000 + + Add README.compiled to dist tarball + +commit ff258ac2783203ed2a7698894d951391d1aecebc +Author: Benjamin Herrenschmidt +Date: Thu Oct 6 23:45:29 2005 +0000 + + Clients tend to set picture->repeat when not necessary. Most HW cannot + accelerate repeat NPOT thus triggering software fallback (this is the + case with gnome desktop for example). This adds a simple optimisation + to exa that removes "repeat" when it's obviously useless, that is, the + single picture instance covers the entire rectangle beeing used + +commit e4ed43c3a6c248ba2b82b8bbf29da537a68407e6 +Author: Søren Sandmann Pedersen +Date: Thu Oct 6 22:25:35 2005 +0000 + + symlink.sh: + New files linked: + xorgconf.cpp Options + usb.3 usb_hid_usages + lynx_ppc.S + BUSmemcpy.S IODelay.S PortIO.S SlowBcopy.S + sun_inout.s + xaaTEGlyphBlt.S + xkbcomp/compiled/README + New files excluded: + All of lib/GL/apple + xlibi18n/*/*.mapfile + xxserver/xorg/configure.ac, xkb/Makefile.am: + Install README.compiled in the xkb output dir + +commit 1614a31a9dad9482ae4526c194c2bae1c4993f8f +Author: Eric Anholt +Date: Thu Oct 6 21:55:41 2005 +0000 + + Bug #4699: Correct some memory leaks in EXA and damage related to region + handling. + +commit cd9ff6aec81e04bbfe14364407ccb28df05fc063 +Author: Alan Coopersmith +Date: Thu Oct 6 20:16:13 2005 +0000 + + cpp processing for Xvfb man page + +commit 370b8c8f1cb1a3531d52ea3b430852a0d76b2a4c +Author: Alan Coopersmith +Date: Thu Oct 6 20:14:43 2005 +0000 + + App-defaults file not supposed to have .ad suffix when installed Fix cpp + rules to set needed flags for app-defaults file + +commit 2770233069d3845c681bea8eccff22e92254487e +Author: Alan Coopersmith +Date: Thu Oct 6 19:59:26 2005 +0000 + + Don't build "ev" example on systems without + +commit 460145a5d52b5325fa5e920cee3699fcf7dd9afe +Author: Kristian Høgsberg +Date: Thu Oct 6 19:37:39 2005 +0000 + + Add cpconfig.c to EXTRA_DIST. + Add CURSOR.NOTES to EXTRA_DIST. + Add extrapci.ids to EXTRA_DIST and fix xf86PciIds.h rule. + +commit e63f76caa1b1342422567fdcb9f8af24792c8ca1 +Author: Alan Coopersmith +Date: Thu Oct 6 17:55:54 2005 +0000 + + Sun bug #6326551: xkbSetDetectableAutoRepeat broken when using XEvIE + + (Derek Wang, Sun Microsystems) + +commit 5f30a7b10286b4f55821acd4eb5580a8f5a3c56a +Author: Benjamin Herrenschmidt +Date: Thu Oct 6 08:08:04 2005 +0000 + + Bug #4689: Treat DirectColor as TrueColor in Render. It fixes some crashes + with xcompmgr when using apps that use a DirectColor visual for their + windows + +commit 9000c0321baf1e25e1796e6a333aad0e5a22cbe2 +Author: Kevin E Martin +Date: Thu Oct 6 04:05:30 2005 +0000 + + Install correct man page and add to dist + +commit 9b894df44b575f768a2400d044d8c1eb6ef2ec97 +Author: Kevin E Martin +Date: Thu Oct 6 02:40:41 2005 +0000 + + Include dmx-config.h for modular build + Use intead of "dmxext.h" + +commit 30c1369bf5816ffd7bd52d9a9dbcb72500684e2f +Author: Kevin E Martin +Date: Thu Oct 6 02:35:22 2005 +0000 + + Add support for building DMX config and examples programs Add missing files + to EXTRA_DIST Install Xdmx man page + +commit 1f9b6dc1ccd999c90ba825cf5fbdfa29770224a6 +Author: Kevin E Martin +Date: Thu Oct 6 00:34:29 2005 +0000 + + Clean up generated files to pass distcheck + Clean up generated files to pass distcheck Distribute getconfig.man.pre, + not getconfig.man + +commit 61cd478b545de0313271cf6852e2df770e8f5914 +Author: Adam Jackson +Date: Wed Oct 5 22:39:41 2005 +0000 + + Bug #3652: Server-side GLX support for GLX_SGIX_swap_barrier and + GLX_SGIX_hyperpipe extensions. (Eric Kunze, SGI) + +commit e891d9c078bd31447ae3e1fc7f8c15953b0bb916 +Author: Alan Coopersmith +Date: Wed Oct 5 22:19:09 2005 +0000 + + Update to 2005-10-05 snapshot from pciids.sf.net (includes a couple new + Radeon id's). + +commit dc6ac8e46f80157960a24a1be1fb83f22dff45a0 +Author: Kristian Høgsberg +Date: Wed Oct 5 21:38:40 2005 +0000 + + Add DGA configure option and add various files that we should be dist'ing. + Simplify xf86DefModeSet.c rule a bit. + +commit 8391eaa4aa1ae3744ad8c45f5d148ba362d2c9dd +Author: Adam Jackson +Date: Wed Oct 5 21:13:49 2005 +0000 + + Preprocess and install XOrgCfg.ad as in the monolith. + +commit a9df169f108b15d312421e498675cd2e48206660 +Author: Alan Coopersmith +Date: Wed Oct 5 17:27:58 2005 +0000 + + Add missing $(DESTDIR) to custom install target + +commit a6cbe0776fcc8fb19a2bf2ecef41559eed6e5cef +Author: Alan Coopersmith +Date: Wed Oct 5 16:39:09 2005 +0000 + + Fix the rest of the XFree86 DDX options that require an argument to say so + instead of reporting "unrecognized option" when the argument is + missing. Also give correct error instead of "unrecognized option" for + options only available to root. + +commit 8c524f9966d2a167ea71dd81e235140e0db31471 +Author: Alan Coopersmith +Date: Wed Oct 5 15:33:40 2005 +0000 + + Xdmx & Xprint also need xau & xdmcp module dependencies + +commit 9f3ad65251832631630f7e587b409b750a144bd3 +Author: Luc Verhaegen +Date: Wed Oct 5 07:27:52 2005 +0000 + + Fix lnx_pci.c's xf86GetOSOffsetFromPCI return value. Clears up the resource + ranges awkwardness and the "INVALID MEM ALLOCATION" warning. + +commit da989e988cc96c0ec4f07fceb4c36b30c2e37f4a +Author: Alan Coopersmith +Date: Wed Oct 5 02:18:10 2005 +0000 + + Xnest depends on xdmcp & xau modules too + +commit 9e8b5f3d478ca18a9ff9c26745de77c91a5d36d9 +Author: Alan Coopersmith +Date: Wed Oct 5 01:38:50 2005 +0000 + + Make Xorg -config stop lying to people and claiming it doesn't exist when + you fail to specify a file name. Also, include it in the list of + available options for non-root users when listing all available flags. + +commit 34a8411ede185553f1387ee0bf534cf77b0fc004 +Author: Adam Jackson +Date: Wed Oct 5 00:55:08 2005 +0000 + + Bug #4038: Unbreak the SYSVIPC check for cross builds. (Detlef Vollman) + +commit f47f00ab747563678c8625de5e5b2a588660064e +Author: Eric Anholt +Date: Tue Oct 4 11:24:09 2005 +0000 + + Mark the temporary pixmap dirty if UploadToScreen succeeds. Failure to do + so resulted in a solid black glyph if the font rendering actually + resulted in a fallback (subpixel AA, for example) and the temporary got + migrated after 10 or so glyphs. + +commit 89a1a91b88b94b341075bc208941337ce11465b7 +Author: Aaron Plattner +Date: Tue Oct 4 07:42:21 2005 +0000 + + Add miext/cw to the module loader include path so that misym.c can export + miDisableCompositeWrapper. + +commit 43625a47063c246e7bf9d687caded0b7e2ea0dc6 +Author: Aaron Plattner +Date: Tue Oct 4 07:31:53 2005 +0000 + + Bump the video driver module ABI minor version to 8 so modules statically + linked against miDisableCompositeWrapper won't load on older servers. + #include "cw.h" instead of #include "cw/cw.h" + +commit ca57db6fc1e6100c47ad935d626fdd490ed6116e +Author: Aaron Plattner +Date: Tue Oct 4 04:30:33 2005 +0000 + + Export miDisableCompositeWrapper. + +commit b2e451b93c20efc49a6cc565239432b2c705fe37 +Author: Eric Anholt +Date: Tue Oct 4 03:44:14 2005 +0000 + + Correct the test for whether projective transform is necessary. Also, use + "affine" to describe the variable (universally) on suggestion from + vektor. Corrects a rendercheck failure. + +commit cdded97a0ad717f4f9120b37d2687fa661696c9b +Author: Alan Coopersmith +Date: Tue Oct 4 00:45:42 2005 +0000 + + Add #include for modular build + +commit 4ae4fc7d51aeb0f27bed52f7e6a346745f3ea453 +Author: Alan Coopersmith +Date: Tue Oct 4 00:43:16 2005 +0000 + + Add gtf to xserver/xorg/hw/xfree86/utils + +commit d51962378ef6371456e034d6d7f6780e05bc1207 +Author: Adam Jackson +Date: Mon Oct 3 19:31:50 2005 +0000 + + Bug #3781: Only use fbCopyAreammx when alu == GXcopy. Originally Gentoo bug + #96053, patch by bartron@gmx.net. + +commit 6d4b350dee9495e54e6e5492815885f1d8455ac9 +Author: Alan Coopersmith +Date: Mon Oct 3 16:46:14 2005 +0000 + + Bug #3815 Patch #3463 + GNU/kFreeBSD + Xserver support (Robert Millan) + +commit 22b4200b01310e7b4743ef0b3541c3053a2d8279 +Author: Alan Coopersmith +Date: Mon Oct 3 15:41:10 2005 +0000 + + Whoops, need to be in DIST_SUBDIRS too. + +commit 14a2bd33307fd937804a9fbb03787ec30858a05c +Author: Alan Coopersmith +Date: Mon Oct 3 15:37:57 2005 +0000 + + Add missing ] (Dawid Gajownik) + Add getconfig (Dawid Gajownik) + +commit 84141fc299b03b5552be093f9b698a85bc670d65 +Author: Eric Anholt +Date: Mon Oct 3 11:43:55 2005 +0000 + + Merge r1.36 of fbcompose.c from xserver CVS: Special case projective + transforms so we can avoid doing the expensive + 64-bit math. Unroll the bilinear interpolation loops for an extra boost. I + tested this with the up/downscaling cairo-benchmarks with Xvfb and saw + a 12% +/- 4% decrease in time taken to run them. + +commit c024262eae4e00567ccb66a59b4d572621233cbc +Author: Eric Anholt +Date: Mon Oct 3 10:20:29 2005 +0000 + + Merge r1.2 of fbedge.c from xserver CVS: Optimize spans where the same + value is being added to multiple pixels. This improves the speed of + rendering wide trapezoids. I tested this with a small set of xlibs + cairo-benchmarks with Xvfb and saw a 4% decrease in time taken to run + them. + +commit a7e3c6fa8ceb6a3a423377aa32ab0da5a6ab9286 +Author: Adam Jackson +Date: Mon Oct 3 06:31:48 2005 +0000 + + Real configure check for execinfo.h (Yuri Vasilevski) + +commit e3d2a7d57bc57453d66aa63ca7fe4d910b64737c +Author: Adam Jackson +Date: Mon Oct 3 06:29:14 2005 +0000 + + Bug #4393: uClibc lies and defines __GLIBC__ even though it's not source + compatible with glibc, so the backtrace support check fails. Work + around this by wrapping the code in a configure check for execinfo.h, + and emulate detection for the monolith. (Yuri Vasilevski) + +commit 5037d3441d65f1fb6493c3b55137ef1b5eddd6b0 +Author: Alan Coopersmith +Date: Sun Oct 2 22:17:38 2005 +0000 + + Bug #1465 + /etc/init.d/Xprint should use PROJECTROOT from build (Grzegorz + DÄ?browski) + +commit b05e78dd40e1fe915096362f32c3af8aee0ed36a +Author: Alan Coopersmith +Date: Sun Oct 2 19:30:57 2005 +0000 + + Fix typo in MAN_SRCS (Dawid Gajownik) + +commit 8814896da83b19be01beedd0b2b3380298778328 +Author: Eric Anholt +Date: Sun Oct 2 08:53:18 2005 +0000 + + Fix include path for commit of bug #4616. + +commit ecaa46380ed0a920186407b9294c5c60f75f1a13 +Author: Eric Anholt +Date: Sun Oct 2 08:28:27 2005 +0000 + + Bugzilla #4616: + - Merge various fb/ bits of COMPOSITE support from xserver, which weren't + necessary before due to cw hiding the issues. Fixes offset calculations + for a number of operations, and may pull some fixes that cairo has + wanted for XAA as well. + - Add a new call, miDisableCompositeWrapper(), which a DDX can call to keep + cw from getting initialized from the damage code. While it would be + cleaner to have each DDX initialize it if it needs it, we don't have + control over all of them (e.g. nvidia). + - Use the miDisableCompositeWrapper() to keep cw from getting set up for + screens using EXA, because EXA is already aware of composite. Avoiding + cw improved performance 0-35% on operations tested by ajax in x11perf. + +commit 2c82429f8957ed0268c0e4e4fe5aed9093f33960 +Author: Ian Romanick +Date: Sat Oct 1 22:25:13 2005 +0000 + + Refactors __glXImageSize and __glXImage3DSize into a single function. It + replaces all calls to the old functions with calls to __glXImageSize + with the new parameter list. + I have also added 'target' as a parameter. This is a stepping stone to the + code in patch #2410. Basically, if the texture target is one of + GL_PROXY_*, the image size is always zero. This gathers all the checks + for that into a single place. I have *not* modified the existing + callers to take this into account. They still do their own checks for + GL_PROXY_*. However, when the generated versions of those functions are + added to the tree, they *will* rely on that. + The code growth is mainly due to the new 40 line comment before + __glXImageSize. + I have tested this with a few of the texture using demos and tests from + Mesa, including tunnel, texdown, and drawpix. + Reviewed by: Adam Jackson, Eric Anholt, and Brian Paul. + +commit e27b3e4ea1ddf9b2e9c2d63a0e60400b523a8a94 +Author: Ian Romanick +Date: Sat Oct 1 22:19:04 2005 +0000 + + Remove some more incorrect prototypes for the __gl*_size functions. + +commit e270e6394b623b48d416feeef0c3856f2e303c8d +Author: Matthieu Herrb +Date: Sat Oct 1 17:53:38 2005 +0000 + + Bug #3822: out of bound reads in fbbltone and fbblt (Mark Kettenis, Thierry + Deval). + +commit 54b2a14f0fa4397f3e9ae75dd63d5cacfdd778eb +Author: Matthieu Herrb +Date: Sat Oct 1 17:30:58 2005 +0000 + + Bug #3411: fix handling of keyboard Autorepeat rate in xorg.conf. + +commit a07dd03748c8fa2633e294ee4d9ab38265970e5e +Author: Alan Coopersmith +Date: Sat Oct 1 07:17:55 2005 +0000 + + Add hw/xfree86/getconfig + +commit abc6aa50fb52fa4fa9b9436dbc3a70f86e62dc27 +Author: Alan Coopersmith +Date: Sat Oct 1 06:27:12 2005 +0000 + + Oops - fix build/install of fbdevhw.man + +commit 13e0db19d8c0b1df636f218bcbfbb2c54fa7576f +Author: Alan Coopersmith +Date: Sat Oct 1 06:19:02 2005 +0000 + + Adding more doc files & fbdevhw man page + +commit b5ce065a5e91e2ad3213ea8c711cfe7ed9060c16 +Author: Thomas Winischhofer +Date: Fri Sep 30 08:54:44 2005 +0000 + + RandR: Fix failure handling (Closes #4635; Thomas Winischhofer) + +commit 4608a2b654be84b2e345bcada63422d18c74a06e +Author: Alan Coopersmith +Date: Fri Sep 30 02:37:57 2005 +0000 + + Man page processing/installation and other doc file updates + +commit aa74468aa59b95424cd0000179b8985b267d639b +Author: Adam Jackson +Date: Fri Sep 30 02:03:45 2005 +0000 + + sparse cleanups. s/0/NULL/ and mark a few things static. + +commit c65fde5343719d3e9ebc76cc371c6f5f7948de8c +Author: Søren Sandmann Pedersen +Date: Wed Sep 28 20:38:42 2005 +0000 + + Make the server distcheck: + - Fix up the XpConfig directory to remove the stuff it installs + - Add a few files to CLEANFILES here and there + +commit 58abce3f90504dd48838a2f7ae7bb5db6a6cff70 +Author: Eric Anholt +Date: Wed Sep 28 20:01:37 2005 +0000 + + - Use the dirty flag (which should be set correctly all the time, + particularly thanks to Prepare/FinishAccess) to avoid DFS/memcpy on + pixmap move-out if it's unnecessary. This was disabled in KAA because + cache misuse on ATI made me guess that this code was wrong. + - Unwrap Glyphs on closescreen. + +commit f53404bdbba23fd46420564565ab815f7c20b101 +Author: Alan Coopersmith +Date: Wed Sep 28 16:55:25 2005 +0000 + + Add kbd_mode build system + +commit 940158a6f2e98069a47293d713df674e16ad8a11 +Author: Ian Romanick +Date: Wed Sep 28 03:37:22 2005 +0000 + + Replace all uses of __glEvalComputeK (and the doubly redundant + EvalComputeK) with calls to one of __glMap[12][df]_size. This was + tested with progs/samples/eval (from Mesa). + +commit 806d74bc0640f4f3dcc034b36a36aea289b01685 +Author: Alan Coopersmith +Date: Wed Sep 28 01:57:47 2005 +0000 + + Add __SVR4 #ifdefs to work in non-Imake builds. + +commit 88957862b812b3e1e19d5e11365a22dc249cf4d2 +Author: Kevin E Martin +Date: Tue Sep 27 23:28:46 2005 +0000 + + Fix distcheck build and install errors. + +commit 003655c02ad3a031031bb4ac859966a513f63e10 +Author: Søren Sandmann Pedersen +Date: Tue Sep 27 18:36:14 2005 +0000 + + Make XpConfig build system call mkfont{scale,dir} + +commit 156b2cf3f76ae53cc37b6f5910b446c776ccc9ba +Author: Søren Sandmann Pedersen +Date: Tue Sep 27 17:49:35 2005 +0000 + + Add forgotten Makefile.am + +commit f3d0cb4a5722e0512bbdcd179215532795cba38f +Author: Søren Sandmann Pedersen +Date: Tue Sep 27 16:15:55 2005 +0000 + + Get XpConfig build system in pretty much working state + +commit 1c2e8b1ecc8b7b8c8562461eed7892ff22d17e71 +Author: Kevin E Martin +Date: Tue Sep 27 15:11:56 2005 +0000 + + Fix make dist to include only sgml files. + +commit ca64aab609c3585234410cd8d908f8e1efe5c788 +Author: Kevin E Martin +Date: Tue Sep 27 14:09:31 2005 +0000 + + Add build system for building docs and fix setuid issues. + Add build system for sgml docs. + +commit 1a4e30d508e62ab304722c3525748ff0e3c2899d +Author: Kevin E Martin +Date: Tue Sep 27 13:47:26 2005 +0000 + + Include xorg-config.h so the generated file will also include it. + +commit 30ff9e26196bdba8435e0dcdb96864e81c8cb136 +Author: Ian Romanick +Date: Tue Sep 27 00:04:40 2005 +0000 + + Fix some problems that caused incorrectly annotated prototypes for + __gl*_size functions to be used. The result was that, on x86, the code + would be compiled with FASTCALL semantics, but the callers would not. + This should fix GLX protocol errors that people are seeing. There + doesn't appear to be a bugzilla associated with this problem. + +commit 6c5c54b9a2872f1bb7de36a8d2d4efcef70b14c6 +Author: Søren Sandmann Pedersen +Date: Mon Sep 26 23:07:44 2005 +0000 + + Various small fixups to get XpConfig to 'build' + +commit 604f7c64efb57a48ec667c2ed62d3b4bad0c302b +Author: Søren Sandmann Pedersen +Date: Mon Sep 26 22:45:43 2005 +0000 + + Check in skeleton Makefile.am's for the rest of XpConfig + +commit 8907195d784ff2c72a00b64edab6a8ac3b31dec5 +Author: Alan Coopersmith +Date: Mon Sep 26 20:58:26 2005 +0000 + + Take care of more files from monolith's Xserver/hw/xfree86/etc dir: + hw/xfree86/utils/ioport/Makefile.am + Add ioport and pcitweak utils from monolith hw/xfree86/etc dir. + Generate xf86DefModeSet.c from vesamodes & extramodes + Add apSolaris.shar to EXTRA_DIST + +commit 9abccb5e65628c938c6f01b685ab8fbffae7bc3b +Author: Søren Sandmann Pedersen +Date: Mon Sep 26 19:33:06 2005 +0000 + + Add initial build system for XpConfig + +commit 0531c4be2f1a30082cfec5e411ab34d17978d66e +Author: Alan Coopersmith +Date: Mon Sep 26 02:41:38 2005 +0000 + + alanc@alf:/export/alanc/X.org/head/cvs-rw/xc [7:40pm - 628] head -14 + ChangeLog + include xorg-config.h for modular build + Adjust XF86CONFIG defines for modular build + Fixes for modular build: + - include modular server config headers + - change default XCONFIGFILE to xorg.conf + - define XKB_RULES_DIR if not defined by Imake + +commit 256fa24945bcaa6e5a68a48c1b757f8084e88a38 +Author: Alan Coopersmith +Date: Sun Sep 25 17:48:09 2005 +0000 + + Add SecurityPolicy file for XCSECURITY extension. + Add README to EXTRA_DIST + +commit 54639964cc344f1086196729fde37515f11e7972 +Author: Bogdan Diaconescu +Date: Sat Sep 24 21:56:00 2005 +0000 + + Changed the license to a X/MIT one + +commit 3192f400c72b3b606fcc1798d577737502897b43 +Author: Adam Jackson +Date: Sat Sep 24 18:45:45 2005 +0000 + + Disable the {Open,Close}FullScreen DRI protocol. Remove empty FullScreen + stubs from drivers, comment the non-empty ones. + +commit a5477ae7ac9a56c1a586950db1dee6661bff149d +Author: Alan Coopersmith +Date: Sat Sep 24 02:40:51 2005 +0000 + + Add scanpci, xorgcfg, & xorgconfig utilities. + +commit 2ba865b3f57340fd1d75f7614c17f615cc127b89 +Author: Søren Sandmann Pedersen +Date: Fri Sep 23 23:04:04 2005 +0000 + + Fri Sep 23 19:00:06 2005 Søren Sandmann + Apply patch from Ronald Wahl to make sure that the stack pointer is not + modified at points where we access external variables. (Bug 4269). + +commit 7554e1bf29e5aef8e76f88bac2994ea45a924f2b +Author: Alan Coopersmith +Date: Fri Sep 23 00:27:07 2005 +0000 + + Sun bug #6321613 + + xorgcfg dumps core when it reads a configuration file that has a + Monitor Section, but does not have a "VendorName" entry inside it. + (Henry Zhao, Sun Microsystems) + +commit 99793543c0fcfd4d699549fcc2bf0ed12aed6a19 +Author: Alan Hourihane +Date: Thu Sep 22 12:40:41 2005 +0000 + + put back some agp related allocation messages + +commit 02566dff4abbda6888f719727c169b966617a83d +Author: Alan Hourihane +Date: Thu Sep 22 12:33:36 2005 +0000 + + fix typo + +commit 56e7766c775385b0c6e09e6a65a1c8e10dba786e +Author: Eric Anholt +Date: Wed Sep 21 22:26:07 2005 +0000 + + Bug #4541: Fix text drawing in the case where a list contains no + non-zero-sized glyphs. Several variables weren't updated, resulting in + rendering simply stopping when this case was hit. (Anders Kaseorg) + +commit 32497ff479d0c34c05eb5acfcd5f7e186bac3227 +Author: Kristian Høgsberg +Date: Wed Sep 21 18:14:32 2005 +0000 + + Accept --with-xkb-output argument to specify output dir for compiled xkb + keymaps. Define XKM_OUTPUT_DIR and XKB_BIN_DIRECTORY. + Add XKM_OUTPUT_DIR and XKB_BIN_DIRECTORY. + Add XKB_CFLAGS. + +commit 361a9eb953aaa38f8ebc057185de29e50f9eef26 +Author: Eric Anholt +Date: Wed Sep 21 10:27:53 2005 +0000 + + - Change migration-in rule slightly: previously, if your score was less + than the max, it was bumped, and then if you were above the threshhold + you got moved in. Instead, do the above-threshhold check separate from + score starting out less than max. While this will likely make thrashing + cases worse, I hope it will fix some issues with long term performance + (think of an xcompmgr with a backbuffer it's doing only accelerated + operations to. If some new pixmap comes in and bumps it out, even once, + it will never get a chance to re-migrate because its score will be + maxed). Change migration-out to be the same way for symmetry, though it + shouldn't ever affect anything. + - Fix a lot of debugging output, both in terms of printing quality, and + completeness. The fallback debugging covers a lot more now, pointing + out new areas for improvement. Debugging toggles are now centralized in + exaPriv.h. + +commit 6a29c4cec156a135d1d9cdb65995f7a84de7cb56 +Author: Eric Anholt +Date: Wed Sep 21 07:43:01 2005 +0000 + + Add support for hardware accelerating tiled background painting. One + example of this is the root weave, which paints slightly slower on SiS + now in my testing. However, according to keithp some apps use this + feature for a sort of cheap backing store, which this could help with + significantly. While I haven't done much performance testing with it, + it will at least rule out one possible source of terrible performance. + +commit 1115ff4c008dea6d6cafcb39e4ce6d0b3ed4fcc0 +Author: Adam Jackson +Date: Wed Sep 21 00:38:05 2005 +0000 + + Bug #4487: Add the bsd subdir to DIST_SUBDIRS. (Joshua Baergen) + +commit 00bd8968b264c1f69487dd99c212e0ce889b11db +Author: Adam Jackson +Date: Wed Sep 21 00:24:10 2005 +0000 + + Bug #4257: Move cfbcmap.c to cfb_common_sources. + +commit b7e723ed6f23cc8d85f1f1eced9d8ccbc2a6b38c +Author: Adam Jackson +Date: Tue Sep 20 23:32:21 2005 +0000 + + Missing backslash + +commit 15b2f94de5e2cc7e4df8d897d562dffeda31c82c +Author: Alan Coopersmith +Date: Tue Sep 20 18:26:24 2005 +0000 + + Update CVS project tag & notice about pci.ids license in output .h. + Update to match recent changes to pci.ids, extrapci.ids, & pciid2c.pl for + people building on systems without perl. + +commit 7d0f47c43c5c177cae0f375ceaeef892e4c9663a +Author: Alan Coopersmith +Date: Tue Sep 20 15:50:31 2005 +0000 + + Add --disable-install-setuid option so you can build as non-root and + chown/chmod later. Also disable by default on platforms that don't need + setuid root X servers (Darwin & SPARC's, according to + InstallXserverSetUID settings in the old Imake config files). + +commit b623c60745ca486667657fa39ad517d1f7a72794 +Author: Alan Coopersmith +Date: Mon Sep 19 22:44:49 2005 +0000 + + Linux/Alpha support (Stefaan De Roeck) + +commit bd906c6bb803b286c39eca80e437a21c14e808a3 +Author: Alan Coopersmith +Date: Mon Sep 19 18:54:05 2005 +0000 + + Update to latest version from pciids.sf.net + Sync with updates to pci.ids & PCI id list in nv driver + +commit 535cd292c809314efe4730a27b0271adfa842775 +Author: Alan Coopersmith +Date: Mon Sep 19 18:38:26 2005 +0000 + + #include "xf86Axp.h" -> "shared/xf86Axp.h" for modular build. (Stefaan De + Roeck) + +commit a1bcf25a1f819768672ac837cb0a3d0c66937656 +Author: Eric Anholt +Date: Sun Sep 18 02:32:23 2005 +0000 + + Break EXA ABI while we still can. Add coordinates to the UploadToScreen + hook so we can upload a subset of a pixmap, and convert the current + drivers to respect that. Use this support to directly UploadToScreen in + exaGlyphs, providing a 47.4% +/-2.4% decrease in wall time for ls -lR + programs/Xserver in an antialiased gnome-terminal on an M6 (n=3, caches + hot). I would have bumped major version, only I can't tell what the + EXA_VERSION_* is supposed to be doing as opposed to the module version. + +commit 074913c8a9c1f66c8752387db2c81ad669e91878 +Author: Eric Anholt +Date: Sat Sep 17 20:02:02 2005 +0000 + + - Don't try to upload 0 byte-per-pixel (PICT_a1) data using + RADEONHostDataBlit. + - Disable the shortcut for switching from 3d to 3d in radeon_exa.c. It + appears that we do need the cache flush here, thought it's not clear + why. Disable the 2d to 2d shortcut while here, since I'm unsure of what + we're doing. Exposed by the following bit: + - Bug #4485: Add a new routine, exaGlyphs, to handle font drawing. Glyphs + were being accumulated in from non-migratable scratch pixmaps, causing + the destination pixmap to move towards screen but the migration + necessary for source never to happen, leading to abysmal performance. + Instead, copy the scratch glyph data into a real pixmap first, then + composite from that into the destination, allowing for migration. time + ls -lR from programs/Xserver showed 26.9% (+/- 6.3%) decrease in wall + time (n=3). + - Create exaDrawableUse* wrapping exaPixmapUse*, but which are aware of + windows needing backing store. Makes migration code prettier, and + ensures that composited windows will be migrated as normal when we turn + off cw for EXA. (issue brought up by keithp) + +commit be2bdab4339e493bb0ac3d0e36508b7aa1cd6e92 +Author: Eric Anholt +Date: Thu Sep 15 06:46:05 2005 +0000 + + Bug #3990: Require glproto in the cases that it's necessary (DRI or DMX + with GLX). (spyderous) + +commit ef7eef0f68af6bfbb4ee56115ac2f3c1b7425755 +Author: Eric Anholt +Date: Thu Sep 15 05:55:21 2005 +0000 + + Bug #4046: Install the X.Org server setuid root. (David Schleef) + +commit 88d7eb1f7ed6afc85c07797838714f2601356018 +Author: Eric Anholt +Date: Thu Sep 15 05:06:54 2005 +0000 + + Bug #3889: Create the log dir on install, and allow configuring + specifically that directory. Failure to have the directory keeps the + xorg server from starting. + +commit 25a0ecdc1868f4b53225b92e8ccd222814e2da2a +Author: Eric Anholt +Date: Thu Sep 15 04:07:19 2005 +0000 + + Don't put a version number on the module filename. + +commit 0888ad3874414e32535fecdb717ee7ab86f9d4cc +Author: Eric Anholt +Date: Wed Sep 14 07:49:22 2005 +0000 + + Build xf8_32bpp, which is wanted by the mga driver, and export elf.h, which + is wanted by the rendition driver. + +commit dfb5da93bc16b2fd2b00e939dbe101a04bdeab4f +Author: Eric Anholt +Date: Tue Sep 13 20:59:05 2005 +0000 + + Turn on DRI by default on Linux, NetBSD, FreeBSD, and fix the build of the + module for FreeBSD by setting some missing defines (XFree86Module, + IN_MODULE) in the dri directory. Note that those missing defines should + be somewhere generic, since there are other consumers of them, but I + haven't figured out where. + +commit 12fbcfefe672ec226bdbc7597bf2fd2cb0ee1e19 +Author: Eric Anholt +Date: Tue Sep 13 18:37:35 2005 +0000 + + Add some initial BSD support for the xorg server. Incomplete on NetBSD, + OpenBSD, and non-i386/amd64 FreeBSD for sure. Plus I haven't actually + run it yet. + +commit 51eb6c83a3b2721703ca50758853bbf9f99fc4d2 +Author: Søren Sandmann Pedersen +Date: Tue Sep 13 15:28:29 2005 +0000 + + Tue Sep 13 11:27:05 2005 S%Gï¿¿%@ren Sandmann + * programs/Xserver/miext/shadow/shadow.c (shadowDamageBox): Add + missing REGION_UNINIT. + +commit 133edff1b499b2c794fcc9a1860c1b5526b58869 +Author: Eric Anholt +Date: Tue Sep 13 05:44:47 2005 +0000 + + Don't define POSIX_SOURCE on any BSDs, since it breaks things. + Define NO_SYS_HEADERS, as the monolithic build does. Helps FreeBSD. + Don't include validate.c in the library, since it seems to be a userland + test program. + +commit c3d6799cee7ff8411b3a05a7ab7e2a9e80c95059 +Author: Daniel Stone +Date: Tue Sep 13 01:33:19 2005 +0000 + + Bug #594: CAN-2005-2495: Fix exploitable integer overflow in pixmap + creation, where we could create a far smaller pixmap than we thought, + allowing changes to arbitrary chunks of memory. (Søren Sandmann + Pedersen) + +commit b290884719e18646326f0c2412c2494a07fe3cfd +Author: Adam Jackson +Date: Tue Sep 13 00:44:52 2005 +0000 + + Bug #3284: Make the DRI lock reference count per-screen. + +commit 846f797f37c1ae57a8dad981113b1139359d8c94 +Author: Daniel Stone +Date: Mon Sep 12 08:24:48 2005 +0000 + + Add missing fontsproto and fontenc to REQUIRED_MODULES. + +commit 5b218617fa8ba52bf65aef35da39e06c662495e6 +Author: Daniel Stone +Date: Mon Sep 12 07:53:16 2005 +0000 + + Add missing resourceproto to REQUIRED_MODULES. + +commit ade158d238475ce923fbc5c49275c78cf3864223 +Author: Daniel Stone +Date: Mon Sep 12 07:07:59 2005 +0000 + + Define WITH_VGAHW, since we always build it; add to Xorg headers. + +commit 34dc481a16c0c1cbd69a9ec7172331b59b85e9a7 +Author: Daniel Stone +Date: Mon Sep 12 07:02:46 2005 +0000 + + Put DMX AC_CONDITIONALS at the top level, since they must always be called. + +commit b0f6fe1f38b448b5f1a280e86b01353865866c70 +Author: Eric Anholt +Date: Sun Sep 11 21:38:41 2005 +0000 + + Add some optional (disabled) fallback debugging code to the async code, for + better tracking of when we're hitting software. + +commit 1c003ccf5d68baaae6fafdc75eff964f2a62fc35 +Author: Eric Anholt +Date: Sun Sep 11 19:08:10 2005 +0000 + + Add a pair of hooks, PrepareAccess() and FinishAccess(), which get called + around CPU access to the framebuffer. This allows the hardware to set + up swappers to deal with endianness, or to tell EXA to move the pixmap + out to framebuffer if insufficient swappers are available (note: must + not fail on front buffer!). + Submitted by: benh + +commit ca210830bd361e3d91b6bc741c495b61c424d1d2 +Author: Adam Jackson +Date: Sun Sep 11 18:43:55 2005 +0000 + + Simplify life for EXA drivers by reducing some {Con,Dis}joint ops. + +commit 04f81cacb9fd0944879b2c23a99fa3a1ae979b12 +Author: Matthieu Herrb +Date: Sun Sep 11 18:33:31 2005 +0000 + + OpenBSD also doesn't like defining POSIX_SOURCE: it limits available + functionnality in headers beyond what's used by Xorg. + +commit 089b4272cf32fc9429c1a0e666c2ffb34fda0b93 +Author: Daniel Stone +Date: Sun Sep 11 01:16:14 2005 +0000 + + use RGB_DB not RGB_PATH as that's what it's looking for + define HAVE_XKB_CONFIG_H so setting xkb-path works (Jürg Billeter) + +commit 2f9d01c9681d80235a70263e2e087dc6c181cdc8 +Author: Eric Anholt +Date: Thu Sep 8 01:15:47 2005 +0000 + + Remove some references to mfb/cfb support that is no longer there. + +commit b5d42012f9be87f3b45a089c596ce6dba8845794 +Author: Daniel Stone +Date: Wed Sep 7 01:30:23 2005 +0000 + + Fix typo resulting in failure to swap between RGB/BGR properly. (Stephen P. + Becker) + +commit c8de8c23fbccb3296747f429a02c0c0682b74bf5 +Author: Daniel Stone +Date: Mon Sep 5 07:43:51 2005 +0000 + + Fix tests for maximum number of colours when creating a colourmap, so a + 32-bit visual (e.g. ARGB) doesn't overflow an int when attempting to do + 1 << 32. (Benjamin Herrenschmidt) + +commit 5c5c51fa6da03f19831632a092761a1e4bcf653b +Author: Daniel Stone +Date: Mon Sep 5 07:40:50 2005 +0000 + + Initialise private arrays with calloc, rather than standard malloc. + (Benjamin Herrenschmidt) + +commit 691669c0121494df90c8523f7d17e01ba0b14a57 +Author: Daniel Stone +Date: Sat Sep 3 07:08:58 2005 +0000 + + xorg-server.h -> dix-config.h (thinko). + +commit 4b2f5ba1b5d59fd6bd7f82da5730f72e8df04858 +Author: Alan Coopersmith +Date: Sat Sep 3 03:27:55 2005 +0000 + + Use macros from xtrans.m4, issue error if not found. + +commit 733a6d7a268945d149bcea159253408bedc69b12 +Author: Jesse Barnes +Date: Sat Sep 3 02:21:36 2005 +0000 + + Add EXA driver writer documentation for the benefit of future generations + of X hackers. + +commit 854010d71dc0f1e9b73cdc764c9d2cf36f1da625 +Author: Daniel Stone +Date: Fri Sep 2 03:22:01 2005 +0000 + + Add -include dix-config.h to GL/mesa/X to catch _XSERVER64, et al. + +commit 287336f3c9e5023acbfba6508b05a68ccca9ddf0 +Author: Kristian Høgsberg +Date: Thu Sep 1 19:56:14 2005 +0000 + + Teach xkb how to optionally run xkbcomp from $bindir instead of + $datadir/xkb. + +commit 94fbdb5c6d2cdc7b70ecdabe22a9de8b9aabeced +Author: Daniel Stone +Date: Thu Sep 1 14:56:35 2005 +0000 + + Make RGB_PATH configurable. + Move I2C modules back to $(moduledir)/multimedia. + +commit a65c5796133d126b1810749b5206607e7c42d787 +Author: Kristian Høgsberg +Date: Wed Aug 31 14:58:09 2005 +0000 + + Include xkb-config.h if we have it so we pick up the paths defined there. + +commit 9d3b5e89d691b79ea3361e6dc82938c22d70d0e3 +Author: Alan Coopersmith +Date: Tue Aug 30 22:34:14 2005 +0000 + + Save keyboard LED state on startup and restore on exit so text console mode + LEDs match text console mode state. Move push of streams module earlier + so it's loaded before we start using kbd ioctls provided by the streams + module. + +commit fa6fbd018da939fda7cc2b9a9aa2717b9675a178 +Author: Kristian Høgsberg +Date: Tue Aug 30 22:31:52 2005 +0000 + + Use the $(moduledir) makefile variable instead of @moduledir@ so it can be + overridden at make install time. + Remove driverdir and inputdir from pkg-config file. The directory layout of + moduledir is fixed and well known by drivers. + +commit b4f4bf028a88ee709f4536373de2d40b6445006e +Author: Alan Hourihane +Date: Tue Aug 30 19:51:59 2005 +0000 + + programs/Xserver/hw/xwin/winmultiwindowshape.c Fix off by one error (Colin + Harrison) + +commit 0e50af8b7f459aafd1d1d52414629e926167a751 +Author: Adam Jackson +Date: Tue Aug 30 19:35:06 2005 +0000 + + typo fix + +commit 0c74799af4f924ba64ebd6052802b73547f55c72 +Author: Eric Anholt +Date: Tue Aug 30 04:41:04 2005 +0000 + + Remove existing broken maxX/maxY code for composite (results in infinite + loops, doesn't deal with failure, doesn't present the interface to + drivers that I expected) and instead replace it with a simple fallback + to software when coordinate limits could be violated. Act similarly in + other acceleration cases as well. + The solution I want to see (and intend to do soon) is to (when necessary) + create temporary pictures/pixmaps pointing towards the real ones' bits, + with the offsets adjusted, then render from/to those using adjusted + coordinates. + +commit f20e845b04dee5fc0780811f565180e322b60b73 +Author: Eric Anholt +Date: Tue Aug 30 03:42:07 2005 +0000 + + More 0 -> NULL for pointers missed in previous commit to this file. + +commit 7777d325a3d049cc233c004cba288ed5d10539c2 +Author: Eric Anholt +Date: Tue Aug 30 03:05:21 2005 +0000 + + Apply an xserver patch from cworth: Avoid buffer ovverrun when a + trapezoid's right edge is on a pixel boundary. + +commit e321f9e7ff7de9aa702e33a22743b55c8bb66953 +Author: Eric Anholt +Date: Tue Aug 30 03:01:38 2005 +0000 + + Apply the xserver patch from vektor for bug #4208: Use NULL for pointers + instead of 0. + +commit 20813d3af065f9b719b39d2e7a3382b8fa278a48 +Author: Adam Jackson +Date: Sun Aug 28 19:47:39 2005 +0000 + + Bug #3974: Fix unaligned memory access on LP64. (Matthieu Herrb) + +commit 0926cf79c030f29dce32a9dc944734960ec93d19 +Author: Adam Jackson +Date: Fri Aug 26 20:21:57 2005 +0000 + + Add diagnostic messages for exaDriverInit failure cases. + +commit 5ffff7cb868a768307ff6faf164210020e6b94a2 +Author: Adam Jackson +Date: Fri Aug 26 20:08:09 2005 +0000 + + Bug #4160: Fix Altix kernel version check. + +commit 6b0cdc5dd9e451021c562ac4b6b2101d50187a30 +Author: Daniel Stone +Date: Fri Aug 26 16:46:41 2005 +0000 + + Change use of dix-config.h to xorg-config.h. + +commit 9d1b349b3765fb587b353c78cca9aa083f5d0eee +Author: Daniel Stone +Date: Fri Aug 26 16:34:55 2005 +0000 + + Back out previous change until I figure out something smarter. + +commit 3075df24e7931901c6f0526e10a89631fd73c4d0 +Author: Daniel Stone +Date: Fri Aug 26 07:35:55 2005 +0000 + + Subvert SIGUSR2 to reload all input devices. (Ubuntu #020) + +commit 89c84575ea905c7598d6b6029c9209abe1cfb074 +Author: Daniel Stone +Date: Fri Aug 26 07:24:21 2005 +0000 + + Undo rate/period change after function body, so the damage doesn't leak + into other functions. (Debian #050) + +commit bb5e934df7f23fb365ed673a12d283ff52af79c0 +Author: Daniel Stone +Date: Fri Aug 26 07:15:04 2005 +0000 + + Only open /proc/bus/pci/devices once. (Ubuntu #029) + +commit c937faadd0a0a5f2598b84286ac1ed8996a512e5 +Author: Daniel Stone +Date: Fri Aug 26 06:48:24 2005 +0000 + + Better error message on failure to set iopl. (Debian #021) + +commit 6d34a2ac8a33bd6c9083106b38fab6062e033e39 +Author: Daniel Stone +Date: Fri Aug 26 06:35:00 2005 +0000 + + Add Xv symbol from Xext. + +commit b8f0d4c3ebee363279f9dc7318de3e3c854ca5ef +Author: Daniel Stone +Date: Fri Aug 26 06:29:15 2005 +0000 + + Spit out an error when there is no valid FB device, instead of just failing + silently. (Debian #070) + +commit b48a24e7969d99a0116bc780c70d3e1c18b34769 +Author: Daniel Stone +Date: Fri Aug 26 06:23:41 2005 +0000 + + Don't assume that all sun4m CPUs support muldiv; the Cypress CPU, which + implements the 4m MMU but only v7 instructions, does not. (Debian + #100). + +commit fd158d3d5215b0a013f5305a76097b0b8fa14cf6 +Author: Daniel Stone +Date: Fri Aug 26 05:49:44 2005 +0000 + + Get prototype for ntohl from SuSv3-compliant location, fixing it for + systems which define ntohl as a macro only, not both macro and + function. (Debian #076) + +commit 53e489c0e39b89f41213a726fe1b611d7d9a18db +Author: Daniel Stone +Date: Fri Aug 26 05:47:36 2005 +0000 + + Work around ATI expansion ROM problem on IA64 caused by prototype HP + McKinley systems. (Bdale Garbee) + +commit 40374d1149d6dcf0b4521faae8bdfecc8a3af077 +Author: Daniel Stone +Date: Fri Aug 26 05:00:07 2005 +0000 + + Accept 'Enabled' and 'Disabled' for Extensions section (Ubuntu #990) + +commit ea80b5db257f4c22cf5a152084aef5fe05079db0 +Author: Eric Anholt +Date: Thu Aug 25 22:11:04 2005 +0000 + + Fix a use-after-free of cursor data by refcounting for the sprite.current + reference. The particular path seen was XFixes' ReplaceCursor() + resulting in the sprite.current being freed, but then it getting + accessed during the ChangeToCursor() that happens as a result of + WindowHasNewCursor(). + +commit 54cc45b09bc6c860b3de2012b57c4b35ca18ffd2 +Author: Søren Sandmann Pedersen +Date: Thu Aug 25 21:22:41 2005 +0000 + + Thu Aug 25 17:15:01 2005 Søren Sandmann + Add all the drivers to the module_LTLIBRARIES instead of having separate + variables for them. Pointed out by Kristian Høgsberg. + +commit ff22adc09763b2bd860e7f780a5d0855cab0ab30 +Author: Kristian Høgsberg +Date: Thu Aug 25 14:19:43 2005 +0000 + + Remove sun_inout.s so make dist works (discussed with Alan Coopersmith). + +commit 344a24b6229f477c892dd855546391bc1e091bd7 +Author: Alan Coopersmith +Date: Thu Aug 25 04:09:45 2005 +0000 + + Use system curses library on Solaris for xorgcfg text mode. + +commit 0711502f1847ed461672b9842218b9afa9d349ed +Author: Eric Anholt +Date: Wed Aug 24 23:48:11 2005 +0000 + + Bugzilla #4226: Change the pixmap migration strategy for the CopyNtoN case. + Now, if either source or dest were in framebuffer, try to get both + there, but prefer system memory for both otherwise. Required making + exaasync.c go through the try-acceleration path. This significantly + improves window resizing under composite, because previously the + pattern of creating a new pixmap and copying default contents from the + screen caused a fallback every time due to the new destination pixmap + being in system memory. + +commit 2261710fe0dffd60433e3362ac12adf4db570fe5 +Author: Eric Anholt +Date: Wed Aug 24 23:38:25 2005 +0000 + + Fix a bug where NULL could be dereferenced during the pixmap kick-out + process by referencing the correct offscreen area. Also drive-by the + comments related to these for clarity. + +commit 55c5c6953a3a661758a42b147f9542950a62fc4d +Author: Eric Anholt +Date: Wed Aug 24 22:43:27 2005 +0000 + + Bugzilla #4090: Introduce getters for pixmap pitch and offset, to + simplify/clarify it for driver writers who probably don't want to know + what pPixmap->devPrivate.ptr or pPixmap->devKind mean. Converts the sis + driver to use them, and bumps the EXA module minor version. + +commit 079ad773e09ed0c5baf01de3d4f02a5568da5634 +Author: Alan Coopersmith +Date: Wed Aug 24 22:37:15 2005 +0000 + + Fill in xf86DeallocateGARTMemory stub based on lnx_agp.c version. Add + include of xorg-config.h for modular builds + +commit 8fd250e5e4c2016614b82e2d653b7fbf8a3a5b99 +Author: Eric Anholt +Date: Wed Aug 24 21:51:28 2005 +0000 + + Bugzilla #4089: Fix crashes in !EXA_OFFSCREEN_PIXMAPS case by not trying to + do migration when the EXA pixmap private is NULL. + +commit 79dc5f3d5fe5a66f5fa53af9afc30d27d1af0bce +Author: Kristian Høgsberg +Date: Wed Aug 24 21:28:40 2005 +0000 + + Don't export non-standard symbols generated GCCs stack protection feature + (__guard, __stack_smash_handler). + +commit d2952de6e3d9197529695bb88d8c3af679ad71af +Author: Søren Sandmann Pedersen +Date: Wed Aug 24 19:41:43 2005 +0000 + + Wed Aug 24 15:39:07 2005 Søren Sandmann + Add GLX_{INC,LIBS} for xprint. + Add @DIX_FLAGS@ to AM_CFLAGS + +commit 81e708440ced309adc62ebf43d00becd32338db5 +Author: Søren Sandmann Pedersen +Date: Wed Aug 24 19:35:51 2005 +0000 + + Wed Aug 24 15:29:50 2005 Søren Sandmann + Conditionally include dix-config.h + Conditionally include dix-config.h + +commit 9657e0e9def47dba5b0bfa7461874362712a07bb +Author: Alan Coopersmith +Date: Wed Aug 24 15:18:06 2005 +0000 + + Don't try to build dmx/input/lnx-*.c if isn't found + Don't try to build dmx/input/usb-*.c if isn't found + Replace -rdynamic with $(LD_EXPORT_SYMBOLS_FLAG) for compatibility with + compilers other than gcc + +commit 825a95a1fab69f84c99ae132888fced22e28be33 +Author: Daniel Stone +Date: Wed Aug 24 11:18:35 2005 +0000 + + Remove use of dix-config and xorg-config.h from public headers. + +commit 1fb4a5a4ea993a7913a7bcc362315d31b2907836 +Author: Daniel Stone +Date: Wed Aug 24 09:12:50 2005 +0000 + + Add xcmiscproto and bigreqsproto to REQUIRED_MODULES, since Xext uses them. + +commit b47535bd661743946851099f226f9e6aa4cc8c90 +Author: Alan Hourihane +Date: Wed Aug 24 08:49:31 2005 +0000 + + programs/Xserver/GL/windows/glwrap.c Wrap PointParameteriNV & + PointParameterivNV for Windows builds. + +commit 9f498a37dd3d8456d2a97be9c039b63abc81a5fe +Author: Alan Coopersmith +Date: Tue Aug 23 20:58:29 2005 +0000 + + Display more friendly mouse protocol names. Enable mouse wheel mapping by + default. + +commit cff4b1c2166aa2e75618c8df09554a602c3a68c5 +Author: Alan Coopersmith +Date: Tue Aug 23 20:12:26 2005 +0000 + + Check for getconfig in GETCONFIG_DIR if it's not found in module dir. + +commit bfd13645867aab831b7a0f2b1757cb80837c07d9 +Author: Daniel Stone +Date: Tue Aug 23 09:20:49 2005 +0000 + + Add missing saver, evie, video, trap proto pkg-config checks. (Georgi + Georgiev) + +commit 27afac2ce6a77bc68669c1af6a61c589aa9ef384 +Author: Daniel Stone +Date: Tue Aug 23 08:59:30 2005 +0000 + + Fix test for Xnest presence. (Donnie Berkholz) + +commit fed61462be281c568df6407f94ea519748f0b720 +Author: Daniel Stone +Date: Tue Aug 23 08:58:40 2005 +0000 + + Fix up warning on debugging. + +commit e848eb289c9251742a88e76017603952394f4262 +Author: Alan Coopersmith +Date: Tue Aug 23 01:14:35 2005 +0000 + + Rename app-defaults entries from xf86cfg to xorgcfg to match name passed to + XtAppInitialize. (Henry Zhao, Sun Microsystems) Also, display vendor + version instead of 4.0 for server version. + +commit 6076fca82528da8d50b0ed6be8da6f811321474d +Author: Alan Coopersmith +Date: Tue Aug 23 00:32:27 2005 +0000 + + User message cleanups/updates for modern configurations. + +commit b07602014061cb41540f6a7e74e4132e67aa1117 +Author: Alan Coopersmith +Date: Mon Aug 22 21:47:59 2005 +0000 + + If MAKE_XKM_OUTPUT_DIR is defined, call trans_mkdir to create directory if + it doesn't already exist. (ported from Solaris Xsun bug #5039004) + When BuildLikeSun is set, define MAKE_XKM_OUTPUT_DIR and set the xkb output + directory to /var/run/xkb. + +commit 4a19a33db6d04b5835830a665daa679ee2fcafe7 +Author: Kevin E Martin +Date: Mon Aug 22 21:29:18 2005 +0000 + + bugzilla #2880 (https://bugs.freedesktop.org/show_bug.cgi?id=2880) + attachment #2987 (https://bugs.freedesktop.org/attachment.cgi?id=2987) + Use system method to access PCI config space for inb and inw in + addition to inl (Olivier Baudron and Kevin Martin). + +commit 5557a40a022b0ede36edd3370a60f5fc3d147796 +Author: Kevin E Martin +Date: Mon Aug 22 19:52:26 2005 +0000 + + Fix linking errors for xprint. + +commit 7693f668efd206a6c259166665bc36d3c6335e8d +Author: Alan Hourihane +Date: Mon Aug 22 12:05:18 2005 +0000 + + programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c + programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c + programs/Xserver/hw/xfree86/os-support/linux/Imakefile Add basic ACPI Linux + support so that events can be passed to the driver. (Alan Hourihane) + +commit 02c834f198eab4c4686d8156b88508fe102099c1 +Author: Daniel Stone +Date: Mon Aug 22 09:15:31 2005 +0000 + + Include Xv and XvMC headers in the SDK. + +commit 3c4d605c7e8a9f6d296086a5b03b4f11b90590db +Author: Daniel Stone +Date: Mon Aug 22 09:15:20 2005 +0000 + + Fix linkage for Xnest, Xvfb, Xdmx and Xorg DDXes; include all libs. + +commit 79be1f6d4d1ab48841d31d5553dd36b1b3632650 +Author: Daniel Stone +Date: Sun Aug 21 19:29:55 2005 +0000 + + Fix inclusion order of dix-config.h, so _XSERVER64 gets defined before X.h + or Xdefs.h get included. (Jürg Billeter) + +commit 8d6e743bc4e6854ee0bb0fa4f197acd6d7683ccd +Author: Daniel Stone +Date: Sun Aug 21 19:23:17 2005 +0000 + + Add _XSERVER64 definition to config headers. + +commit 588105173840355717d7b2f7f652289a41166c3f +Author: Daniel Stone +Date: Sun Aug 21 19:15:11 2005 +0000 + + Huge cleanup. Group into sections: hardware feature detection, extension + detection/configuration, DDX options. Make building of Xorg DDX fully + optional. Clarify and correct some help texts. Change all comments to + use dnl instead of #. Quote all tests correctly, and guard + pure-variable tests with 'x' (e.g. test $DMX = yes -> test "x$DMX" = + xyes). Since the DDXes seem to have pretty divergent extension support + these days, get rid of EXTENSION_LIBS, DMX_EXTENSIONS and + XPRINT_EXTENSIONS, and go back to building extension lists by hand in + the DDX-specific sections. Use portable POSIX constructs everywhere + (e.g. test foo && test bar, instead of test foo -a bar). + Clean up old cruft. + Set _XSERVER64 on 64-bit architectures, and use x86_64 for host_cpu instead + of amd64 (Jürg Billeter). + +commit 367f45073953f8f99a2d9dd054f479e1070f856e +Author: Daniel Stone +Date: Sun Aug 21 08:43:46 2005 +0000 + + Change xorg_bus_sbus to xorg_bus_sparc; build sparcPci.c on all SPARCs. + +commit 71b3fea94e8845f35e47503636ca1fe78d2d48ca +Author: Daniel Stone +Date: Sun Aug 21 08:24:52 2005 +0000 + + Typo fix (SOURCE -> SOURCES). + +commit db2909ce76b178663de301c09fb97f2936b1997e +Author: Daniel Stone +Date: Sun Aug 21 06:56:19 2005 +0000 + + Add test for SPARC. Build SparcMulDiv.S on all SPARCs. + Make the default font path configurable. + +commit d96e6666862553d59fc1f9fdd14fb65f36d589af +Author: Adam Jackson +Date: Sat Aug 20 18:52:07 2005 +0000 + + Add sparcPci.c to EXTRA_DIST. + +commit a402c876a465904ac71ebf39af67ea451b2457dc +Author: Daniel Stone +Date: Sat Aug 20 18:11:17 2005 +0000 + + Make DRI/GLcore builds srcdir != builddir safe, and invoke symlink-mesa.sh + in our builddir, not our srcdir. + +commit 238d45d2f148e1e0af4b1619cc1d5e8cc4bf9661 +Author: Daniel Stone +Date: Sat Aug 20 18:10:03 2005 +0000 + + Make Xprint build optional. + +commit abab3fd628c2d1096e8534192f33c1068a573c12 +Author: Daniel Stone +Date: Sat Aug 20 18:09:21 2005 +0000 + + Make Xext linkage srcdir != builddir safe. + +commit bb1d99ee72cc560e95010ea1008d5e796177ae62 +Author: Daniel Stone +Date: Sat Aug 20 18:07:59 2005 +0000 + + Build libxkbstubs.la to stub XKB DDX functions (e.g. VT switches), and + build libxorggxkb.la from within the Xorg DDX to replace the previous + xf86VT.o, et al, hacks. + +commit 8a32ed46480d78b69f289c90098f5ed4a830851f +Author: Daniel Stone +Date: Fri Aug 19 15:48:18 2005 +0000 + + Really hopefully the last xorg-commit test. + +commit 2fd951434507d2a2c0266a052bdca6e223d31bfa +Author: Daniel Stone +Date: Fri Aug 19 15:45:55 2005 +0000 + + Another test commit for xorg-commit. + +commit 39630b301f769118959b20d962404555714a5812 +Author: Daniel Stone +Date: Fri Aug 19 15:25:19 2005 +0000 + + Testing xorg-commit, nothing else. + +commit b13d3382de0027e897532926983b79caaa1eb655 +Author: Daniel Stone +Date: Fri Aug 19 15:21:54 2005 +0000 + + Fix dates on Søren's entries. + +commit 8ec79e05feacd61562b53ebf36a8b30967affc1e +Author: Daniel Stone +Date: Fri Aug 19 15:15:51 2005 +0000 + + Make symlink-mesa.sh call srcdir != objdir safe. Remove requirement for + XF86Rush protocol headers, which we don't even use. + +commit 057a8709a116feb0fd0004141bbac20d2766f3db +Author: Alan Coopersmith +Date: Fri Aug 19 00:13:46 2005 +0000 + + More updates for Panoramix -> Xinerama rename + +commit bed3235d222fd6e2207f6c0d551c67d5a53322cd +Author: Søren Sandmann Pedersen +Date: Thu Aug 18 21:28:09 2005 +0000 + + Thu Aug 18 17:27:09 2005 Søren Sandmann + Move fbmmx to a convenience library since the mmx flags may be harmful when + applied to non-mmx code. + +commit a0366ddb8cb1c57b85a5806eb348abc19c7f92d6 +Author: Alan Coopersmith +Date: Thu Aug 18 17:14:11 2005 +0000 + + Replace gnu-makeism with portable rules + +commit ea5c49cb17ac956d6dea6bf563e392e61c39da2b +Author: Alan Coopersmith +Date: Thu Aug 18 01:40:33 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=2901> Patch #2331 + Lines ending in + break with cpp from gcc >= 3.3 (Peter Breitenlohner) + +commit 22694500e0dd8752b4c01e340f587ecba1ff7fb7 +Author: Alan Coopersmith +Date: Wed Aug 17 23:20:27 2005 +0000 + + Add xf86Sbus.h to EXTRA_DIST files (bugzilla #4128) + +commit df938987d6c19fbdfff8d3334bb497f4814ae384 +Author: Søren Sandmann Pedersen +Date: Wed Aug 17 19:03:18 2005 +0000 + + Add buildsystem for Xprint, and: + Wed Aug 17 14:50:58 2005 Soren Sandmann + Include instead of "Print{,str}.h" + Include isntead of "fonts/fontstruct.h" + Wed Aug 17 14:54:49 2005 Søren Sandmann + Conditionally compile in xprint.c + Add Xprint + +commit f2f6820c3f01810a4da5a8bb4e43119ef2a3fcb6 +Author: Søren Sandmann Pedersen +Date: Wed Aug 17 17:20:13 2005 +0000 + + Wed Aug 17 13:13:00 2005 Søren Sandmann + Make asm labels local. Bug 4073, patch from Diego Pettenò. + +commit ad7f2fc67376f4fbfe81047273de12f7926f0b17 +Author: Søren Sandmann Pedersen +Date: Tue Aug 16 16:21:09 2005 +0000 + + symlink.sh: Temporarily disable xkbdata, add type1mod.c + Tue Aug 16 12:09:09 2005 Søren Sandmann + Add ft and type1 modules. + +commit 24597a1ee2c567ec6bc2f2208457f2778937a034 +Author: Alan Coopersmith +Date: Tue Aug 16 00:40:25 2005 +0000 + + 2005-08-15 Alan Coopersmith m + Convert sunPostKbdEvent to use xf86ProcessAction like xf86PostKbdEvent. + +commit b86282b764387ef8315fc4045d4e1ca1bb74fee1 +Author: Alan Coopersmith +Date: Mon Aug 15 23:48:35 2005 +0000 + + Set ZAxisMapping default to "4 5 6 7". + +commit a6c8d0d71eef7cb964797f7595be36ee0ac10a1a +Author: Søren Sandmann Pedersen +Date: Mon Aug 15 19:42:48 2005 +0000 + + Mon Aug 15 15:41:26 2005 Søren Sandmann + Link this module with libXext.la. + Mon Aug 15 14:56:57 2005 Søren Sandmann + Remove the xkb* files. + Add xkbVT.o and friends as the last things on the link line so they will + override the symbols in libxkb.a. Add a comment on how this situation + might not be considered ideal. + +commit 46aede552aa43cd59f81980303826b5c3d889c02 +Author: Søren Sandmann Pedersen +Date: Mon Aug 15 18:59:16 2005 +0000 + + Mon Aug 15 14:56:57 2005 Søren Sandmann + Remove the xkb* files. + Add xkbVT.o and friends as the last things on the link line so they will + override the symbols in libxkb.a. Add a comment on how this situation + might not be considered ideal. + +commit bcc95c83406a4498227ffd8384bc272fd8cdc49c +Author: Alan Coopersmith +Date: Mon Aug 15 18:32:08 2005 +0000 + + Add AC_SYS_LARGEFILE to match flags used in monolith + +commit 809906a754a1289b7e88489241a2065aa0bf27a2 +Author: Dave Airlie +Date: Mon Aug 15 08:24:45 2005 +0000 + + make mouse support work - note you need to change the evdev devices in the + source.. hacky... + +commit fe5abff38e65c1a49886924efdf0242ab8048008 +Author: Alan Hourihane +Date: Mon Aug 15 07:30:05 2005 +0000 + + Egbert's 64bit fixes for mixed 32/64bit clients + +commit ebedc8bbb54b9b4e1814bc2758216af2bab93540 +Author: Eric Anholt +Date: Sun Aug 14 19:46:55 2005 +0000 + + - Fix the exa pixmap offset/pitch alignment to deal with non-POT alignment + requirements. MGA, notably, uses a multiple of 3 in some cases. + - Rename the pixmap offset/pitch alignment fields to more clearly state + their meaning. + +commit e3509c940fa1fc3988d23f884ca8bffc87d091e5 +Author: Daniel Stone +Date: Sun Aug 14 16:24:30 2005 +0000 + + Don't link libXext, as it is linked in to the server also. + +commit 05071ae0fb847c211b1f20770d3b57fc2172738c +Author: Daniel Stone +Date: Sat Aug 13 07:41:33 2005 +0000 + + Don't link in libx86emu.a as this a) fails badly on non-x86 systems, and b) + is done via x86emu.c including all the source files anyway. + +commit 1ffe9ceb2f6a7261fb62c90dfea861f9dadd27ce +Author: Alan Coopersmith +Date: Sat Aug 13 06:15:35 2005 +0000 + + Oops, forgot a file in earlier Solaris kbd commit + +commit c29051f9d108fe49c23d9cf36fd08cc64c87262a +Author: Alan Coopersmith +Date: Sat Aug 13 00:11:28 2005 +0000 + + Add LintTarget() + Bugzilla #1068 Port + Solaris keyboard code to work with kbd driver. + Also incorporated "audio bell" feature from Xsun keyboard DDX to play bell + tones via /dev/audio (specified via Option "BellDevice" "/dev/audio" in + keyboard device options). + +commit 616a65c4cc528278168db1414776f3a867cd463e +Author: Søren Sandmann Pedersen +Date: Fri Aug 12 18:50:33 2005 +0000 + + Fri Aug 12 14:49:24 2005 Søren Sandmann + Apply another patch from Billy Biggs to fix precision issues. + +commit 1eed84f227311730ce1f9ffab190e95de967c7da +Author: Søren Sandmann Pedersen +Date: Fri Aug 12 18:47:17 2005 +0000 + + Fri Aug 12 14:45:54 2005 Søren Sandmann + Fix up multiplications based on patch by Billy Biggs. Part of bug 3945. + +commit 8bfffb96b552a3facb77ff9e81658e80becbf2f4 +Author: Søren Sandmann Pedersen +Date: Fri Aug 12 18:31:07 2005 +0000 + + Fri Aug 12 14:29:09 2005 Søren Sandmann + Apply patch from Billy Biggs that fixes rounding problems with division. + Part of bug 3945. + +commit 812ed2e17bfe8e232313cf9ab78000a564cb6b3c +Author: Søren Sandmann Pedersen +Date: Fri Aug 12 17:43:38 2005 +0000 + + Fri Aug 12 10:45:01 2005 S%Gï¿¿%@ren Sandmann + Make this function compute the same results as the fbByteMul macro. + +commit 370b111f4882a95248bcc4727438c95a065c174d +Author: Ian Romanick +Date: Fri Aug 12 16:30:57 2005 +0000 + + Use '$(DRMSRCDIR)/shared-core' instead of '$(DRMSRCDIR)/shared' for DRM + includes. This matches the way drivers are built in the Mesa tree and + fixes a build problem in the Savage driver. + Convert uses of __glPointParameterfvARB_size to + __glPointParameterfvEXT_size and uses of __glPointParameteriv_size to + __glPointParameterivNV_size. This eliminates the need to hand-edit + indirect_size.c after it is generated. + +commit 5f5117729de3a8a4eb6e17dc0979e4b1c1ef9918 +Author: Alan Coopersmith +Date: Fri Aug 12 01:17:58 2005 +0000 + + Fix segfault when "kbd" fails to load and "keyboard" driver is not + configured. + +commit 13e16ee93a328a55494c2933143c66559fe7ba98 +Author: Søren Sandmann Pedersen +Date: Thu Aug 11 15:46:42 2005 +0000 + + Thu Aug 11 11:43:32 2005 Søren Sandmann + Make sure we don't crash on glyphs with NULL bits. Bug 659. + +commit 3e471ddf1dbf58ed021d6f31bdaf438872f03ca8 +Author: Søren Sandmann Pedersen +Date: Thu Aug 11 14:36:29 2005 +0000 + + Add check for whether the platform is MMX capable and add the relevant + flags if so. + +commit 130fffc0cdbfdc29f33f1ee97c09e744c19e243a +Author: Søren Sandmann Pedersen +Date: Wed Aug 10 20:22:57 2005 +0000 + + Wed Aug 10 16:17:38 2005 Søren Sandmann + Add back non-SSE implementations. Define USE_SSE if the CPU is amd64/x86-64 + +commit ef50bba5694ef276a239882fae3502638b4ec784 +Author: Søren Sandmann Pedersen +Date: Wed Aug 10 19:42:36 2005 +0000 + + Revert previous patch as it causes build failures + +commit b99360e264c9531593ce8eb67bd006275ca5e5a0 +Author: Søren Sandmann Pedersen +Date: Wed Aug 10 19:15:44 2005 +0000 + + Add XF86DDXACTIONS to AM_CFLAGS + +commit 73a335a926e50afde36816ab47dae689202df319 +Author: Jon Smirl +Date: Tue Aug 9 16:51:05 2005 +0000 + + Point xegl at the DRI driver + +commit 29d0ba9f06d90a1c7f619db87d681ca53fa1bf38 +Author: Jon Smirl +Date: Tue Aug 9 15:58:20 2005 +0000 + + Touchup xgl for modular tree + +commit 435e2a09de7c9dd843b05f4a0484371a67940515 +Author: Alan Coopersmith +Date: Tue Aug 9 01:18:04 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=3950> Xorg prints version numbers in + wrong format for modules compiled for Xorg 6.99 & later (Adam Jackson & + Alan Coopersmith) + +commit 5849c69db80b2320bddb7fafb519300cc0435c84 +Author: Søren Sandmann Pedersen +Date: Mon Aug 8 18:02:08 2005 +0000 + + Mon Aug 8 13:39:45 2005 Søren Sandmann + Conditionally include xorg-config.h + +commit 5e6e5e6d8c6add3aac5c3aebc984d3afb842edc1 +Author: Søren Sandmann Pedersen +Date: Mon Aug 8 17:38:37 2005 +0000 + + Mon Aug 8 13:36:23 2005 Søren Sandmann + #undef PIXPRIV here. + +commit a11ce76b0625501a202fa34e18777b7bd42b2713 +Author: Keith Packard +Date: Mon Aug 8 06:25:21 2005 +0000 + + Build with modular X.org libraries and headers. + composite/compwindow.c Don't damage unmoved windows. Let border clip reset + leave damage alone, pending actual damage for painting. + +commit 129e812c339879b68bb162331ac9b7e0f86a7474 +Author: Keith Packard +Date: Mon Aug 8 02:30:31 2005 +0000 + + Re-add _XOPEN_SOURCE as it's needed *sometimes*. Place it in #ifndef to + avoid whinging. + +commit 4dfc3357a78a52ef70750608138dfeef0371cbc4 +Author: Keith Packard +Date: Mon Aug 8 00:38:41 2005 +0000 + + Add autogenerated source files and other various non-CVS material to + .cvsignore files + Use XORG_CFLAGS. Ensure that all exa files are in SOURCES + remove _XOPEN_SOURCE as it's always in xtrans.pc these days and gcc whines + libdamage.la needs libcw.la when COMPOSITE is defined, but that + libdamage.la must be after libcomposite.la, so add libcw.la to + DAMAGE_LIB instead of EXTENSION_LIBS. Regularize library link order + across all X servers + +commit 7d2b08aa4786eb4d181c88f7dc6b7eb059cc9dad +Author: Adam Jackson +Date: Sun Aug 7 20:42:50 2005 +0000 + + Invert the sense of the composite configure flag to match reality. + +commit fcaa6f30c489578589af19ef798ab31150e696a2 +Author: Adam Jackson +Date: Sun Aug 7 19:02:32 2005 +0000 + + Bug #3989: Fix Composite builds, enable Composite build by default. (Olli + Helenius) + +commit 3639fb243450ae447e9901de9f909e975a919514 +Author: Chris Lee +Date: Sat Aug 6 23:56:18 2005 +0000 + + Enabling EXA by default in the modular build. + +commit a16357ebc9344fbf3e393da9e7b28164ad5b9dc8 +Author: Chris Lee +Date: Sat Aug 6 23:46:38 2005 +0000 + + Last bits of changes to make exa build properly in the modular server. + +commit cc67bd187f06bfade0d2fe1b4cca92805458b210 +Author: Chris Lee +Date: Sat Aug 6 23:34:09 2005 +0000 + + EXA support in the modular build. + +commit 33326f4ee884aa677e4568c3eaed4311a8ed0f2a +Author: Chris Lee +Date: Sat Aug 6 23:27:33 2005 +0000 + + Adding exa support to the modular server. + +commit b90a88e80310e5650e2abed4c151889d9c0bd316 +Author: Alan Coopersmith +Date: Sat Aug 6 19:48:12 2005 +0000 + + Add checks for functions used in os/access.c & os/connection.c: + getdtablesize(), getifaddrs(), getpeereid(), getpeerucred() + +commit 2304c14fe5d3796c557a86d0ece1f0fb92591469 +Author: Alan Coopersmith +Date: Sat Aug 6 19:14:24 2005 +0000 + + Fix endian test to work on big-endian platforms correctly + +commit fc29d014aa586229cdc976aa1bfe38bd949f7cde +Author: Alan Coopersmith +Date: Sat Aug 6 16:29:20 2005 +0000 + + Merge in patch release RC handling code from 6.8.2 (Kevin Martin) + +commit 9828a38ed695fed9788ace8bba575e521fa354b7 +Author: Alan Coopersmith +Date: Sat Aug 6 03:14:50 2005 +0000 + + Solaris build fixes needed for modular builds + +commit f51047c0b6749ae8f04925eb62706b4743328383 +Author: Alan Coopersmith +Date: Fri Aug 5 15:43:31 2005 +0000 + + Fix 32-bit vs. 64-bit test for Solaris + +commit 4220a0c4ccd0672460d31db239829384aee69f9a +Author: Matthew Allum +Date: Fri Aug 5 09:08:32 2005 +0000 + + Make Xephyr work without shadow fb + +commit fedbce2186bbe3bd8d23a4d74c35f10286930a7d +Author: Adam Jackson +Date: Fri Aug 5 00:13:31 2005 +0000 + + EXTRA_DIST hacks to get all the OS support files into the tarball. + +commit 39a80312e0c6e9f3b260d2f8279c71aef0a60d12 +Author: Adam Jackson +Date: Thu Aug 4 22:31:20 2005 +0000 + + - Bug #3960: Add remaining GLX and pci.ids stuff to DIST (Cha Young-Ho, + Olli Helenius) + - Fix some distcheck problems for non-solaris systems + - Change server version number from the Xorg rev to an independent one + - _POSIX_SOURCE and _XOPEN_SOURCE defined to the right values + +commit ed4d77a16a226a7bc88d0d4f5c595d16cdf46360 +Author: Søren Sandmann Pedersen +Date: Thu Aug 4 21:05:12 2005 +0000 + + Thu Aug 4 16:08:00 2005 Søren Sandmann + Make the fbCompose paths use the existing inline functions instead of + macros. Various other cleanups. + Remove macro definitions, move typedef to fbmmx.c + +commit e62be6d2721e7f43c7bba6b8da4e5ec8c364697d +Author: Adam Jackson +Date: Thu Aug 4 18:45:46 2005 +0000 + + - Check for vsnprintf + - Don't build the Xorg DDX on darwin + - Workaround for gcc defining __ppc__ but not __powerpc__ + +commit 13bec87f45509452c643e20745e12878584d606a +Author: Alan Coopersmith +Date: Thu Aug 4 02:39:56 2005 +0000 + + Fix inline assembly versions of in*/out* for Sun compilers Add check for + ancient USL console code on Solaris to allow building on old Solaris + x86 versions + +commit 9802106864a6b2c24df8e9fcb3c3471033abd5c6 +Author: Adam Jackson +Date: Wed Aug 3 01:41:34 2005 +0000 + + dist fixes for cw and GL (Donnie Berkholz, me) + +commit d7c246f35b1ba7ecbbc086dd1229b298faddec96 +Author: Alan Coopersmith +Date: Tue Aug 2 23:57:52 2005 +0000 + + Only build ix86Pci.c on x86 & amd64 platforms Set DEFAULT_INT10 to x86emu + on everything but Linux/x86 Fix Sbus.c inclusion on sparc platforms + +commit 3d0d95004c65cd3a29c94fec99e13ab7fdc19c7c +Author: Alan Coopersmith +Date: Tue Aug 2 20:47:47 2005 +0000 + + Add check for walkcontext() to enable stack trace dumper on Solaris + +commit bb5258a21d9efbb7d8b4226a44bd5738eb46d32a +Author: Keith Packard +Date: Tue Aug 2 17:57:36 2005 +0000 + + Mark generated files as BUILT_SOURCES and CLEANFILES to ensure they are + regenerated after 'make clean' and to make parallel builds work right. + +commit 0c608a690e85064345d7ebdf6b03e2f3bd861708 +Author: Keith Packard +Date: Tue Aug 2 06:48:20 2005 +0000 + + Note yacc and lex generated files as BUILT_SOURCES so they are created + before anything is compiled; required for parallel builds + +commit d31de217e6e9bfb0e1cc99141d80def9382de9a9 +Author: Adam Jackson +Date: Tue Aug 2 03:36:09 2005 +0000 + + distcheck fixes + +commit c83772fef7ea0379db9bab1120f064b80b74f377 +Author: Alan Coopersmith +Date: Tue Aug 2 01:50:48 2005 +0000 + + Set OSNAME for "Build Operating System" line in Xorg log + +commit 005a9cf1f5fe688f303b954870afd35635fc33bf +Author: Alan Coopersmith +Date: Tue Aug 2 01:03:25 2005 +0000 + + Fix Solaris assembly source to work with libtool + +commit 48b130285ad1309a1ff5b2148b3bae5f5b642488 +Author: Adam Jackson +Date: Tue Aug 2 00:47:08 2005 +0000 + + Move AM_CONDITIONAL for ia64 to global scope + +commit 03379474e0fd9c21ac058e2319618934359b3262 +Author: Adam Jackson +Date: Tue Aug 2 00:45:30 2005 +0000 + + only do the AS_HELP_STRING workaround once, d'oh + +commit 2d7b1893befb84850f3221cbe70b3bce4e621d63 +Author: Adam Jackson +Date: Tue Aug 2 00:41:07 2005 +0000 + + - Workaround for AS_HELP_STRING compatibility with older autoconf. + - New intermediate build target for Xorg server + - ia64 fixes + +commit 7c84189ea1dc236bc979bb4bf158ecb1a6b45137 +Author: Alan Coopersmith +Date: Mon Aug 1 22:22:16 2005 +0000 + + Bugzilla #3566 Patch + #2906 Fix for + RENDER, repeating pictures and offscreen memory (Owen Taylor) + +commit 2acd29c93fd3b3d438887f0ca9be6713db81c1e8 +Author: Adam Jackson +Date: Mon Aug 1 22:13:20 2005 +0000 + + Bump autoconf dependency to 2.57 from 2.53. Add 2.57 compatibility hack for + the new AS_HELP_STRING syntax from 2.58+. + +commit b7a43fa0f112d92cce71642142e07276da4de681 +Author: Adam Jackson +Date: Mon Aug 1 19:00:21 2005 +0000 + + Bug #3739: Fail soft on unknown extension string. + +commit 0285804811bd24ad7de8894f8188b87e821e54cc +Author: Adam Jackson +Date: Mon Aug 1 18:41:54 2005 +0000 + + GLX fix for loadable servers: indirect_size.c goes in libglx, not libGLcore + +commit 78d51253e229bcb428039911d80a5d89d4bf4491 +Author: Søren Sandmann Pedersen +Date: Mon Aug 1 16:07:14 2005 +0000 + + Fri Jul 29 17:20:53 2005 Søren Sandmann + Fix rounding bug. + +commit fd84b3b56280ef88a8c848c4338f0bea906ce6d8 +Author: Alan Coopersmith +Date: Sat Jul 30 18:56:32 2005 +0000 + + Clear compiler warnings. (Stefan Dirsch) + +commit 9e9f9cb4878d597b3fa6de7732d2866e24c32f54 +Author: Alan Coopersmith +Date: Fri Jul 29 21:55:57 2005 +0000 + + Need to define SVR4 on SVR4-ish systems since many headers and source files + check for it, expecting Imake to have defined it already. (Should be + replaced with more specific checks & defines, but there's too many to + get them all right now.) + +commit 14ade55b83aa72240a555b3b9def9f40a6a38cd9 +Author: Kevin E Martin +Date: Fri Jul 29 21:22:58 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit 2654f88cee86fae9db169dc8668492857fbbad98 +Author: Kevin E Martin +Date: Fri Jul 29 18:40:54 2005 +0000 + + Fix code to handle printing 7.0 release candidates properly. + +commit d5d669b04ecbd91bb2db9ddc6238acabbeaabbe0 +Author: Alan Coopersmith +Date: Thu Jul 28 23:33:57 2005 +0000 + + If neither --enable-dmx or --disable-dmx are specified, default to "yes" on + Linux, "no" on everything else (matches defaults in monolith Imake) + +commit 86529c07d6ff69ef936ee370be07b373e2961360 +Author: Kevin E Martin +Date: Thu Jul 28 23:28:34 2005 +0000 + + Fix distcheck for server + +commit 3e4bf8a8f46e14078c64c56ad303c80cd9d8d5be +Author: Alan Coopersmith +Date: Thu Jul 28 02:38:23 2005 +0000 + + Rework wrapping of common mouse driver to not require mousePriv.h, so that + modular tree xserver can be built on Solaris. Wrap more ioctls in + SYSCALL() to restart on signals. + +commit cfd6c74067de7fdb2aeddee6780c29231a56acdc +Author: Søren Sandmann Pedersen +Date: Wed Jul 27 17:50:13 2005 +0000 + + Add dbestruct.h to sdk_HEADERS + +commit 5ced854186b851ba2c9ac84eb6d7f141fdee487b +Author: Søren Sandmann Pedersen +Date: Wed Jul 27 17:35:25 2005 +0000 + + Add miwideline.h mistruct.h mifpoly.h to sdk_HEADERS + +commit 7bd6b0640e69552ed4c9daac26e41410dd7338b4 +Author: Kevin E Martin +Date: Wed Jul 27 08:16:35 2005 +0000 + + Add #include for building dmx/glxProxy in the modular tree. + +commit b9ccd89918e1c79d6013fe563c7fa933c1274837 +Author: Kevin E Martin +Date: Wed Jul 27 08:11:26 2005 +0000 + + Fix dmx/glxProxy build + +commit 8f6664fcff319ee155e7864ce25fa11c1fa5594b +Author: Søren Sandmann Pedersen +Date: Tue Jul 26 23:40:45 2005 +0000 + + Add these files to the sdk: + cbf32.h cfb16.h cfbmap.h cfbunmap.h cfbunmap.h cfbmskbits.h xf86sbusBus.h + mifillarch.h mispans.h + +commit 3cbb55f309b8eaba246d1d948b59883f9ed28bf4 +Author: Søren Sandmann Pedersen +Date: Tue Jul 26 22:17:27 2005 +0000 + + Install xorgVersion.h + +commit df5d47560c19b01f2998806c4b62f459a6b5fc02 +Author: Søren Sandmann Pedersen +Date: Tue Jul 26 18:56:45 2005 +0000 + + xserver/xorg/fb/Makefile.am: install fboverlay.h + +commit b25e6f82a1189a67208a2a4980d732ab77e64a35 +Author: Søren Sandmann Pedersen +Date: Tue Jul 26 18:21:22 2005 +0000 + + fb/Makefile.am: add fbpseudocolor.h to sdk_HEADERS + hw/xfree86/xaa/Makefile.am: add xaaWrapper.h to sdk_HEADERS + +commit e7502158d6922a149d0aaf1de209f0b58fa444bf +Author: Alan Coopersmith +Date: Sun Jul 24 16:24:17 2005 +0000 + + Add xf86DeallocateGARTMemory stub so that Xorg can be built on Solaris + again. + +commit 7c1148c0fbc00716bb7ec621a1b968b4127cbb00 +Author: Adam Jackson +Date: Sat Jul 23 19:32:57 2005 +0000 + + Fire the Mesa symlink script from the configure stage. + +commit f331a325447449982efba8adc5bc079371dfb77a +Author: Adam Jackson +Date: Sat Jul 23 19:29:58 2005 +0000 + + Add the symlink script for the Mesa source. + +commit a5532e456d763718036e84891ff57c6f7417615a +Author: Stuart R. Anderson +Date: Sat Jul 23 18:16:06 2005 +0000 + + Change the default depth back to 8 like it was originally. Disable the + addition of depth 12 & 30. It causes more than MAXFORMATS depths to be + added to the screen which causes an array in the Screen structure to + overflow and crash on server reset. + +commit d8a1241a24d75c258548875350bff4d0acc795ab +Author: Stuart R. Anderson +Date: Sat Jul 23 17:49:45 2005 +0000 + + Add a safety check to catch when numDepths GCperDepthexceeps MAXFORMATS + +commit 93d29b4554d26b22ca43311264f85ea8e14804c2 +Author: Adam Jackson +Date: Sat Jul 23 02:04:39 2005 +0000 + + Emit makefiles for glapi, slang, and grammar. Conditionally define GLX_LIBS + if GLX support is requested. Add GLX_LIBS to the link deps for Xvfb and + Xnest. All GLX support should work now for the vfb, xnest, and xfree86 + DDXes. + +commit 525d663ec5a8a181a1e36f3787b24cdb77290c17 +Author: Adam Jackson +Date: Sat Jul 23 02:02:18 2005 +0000 + + glapi build (forgot this one somehow) + +commit 6aaceef3231818682dccf1969b211f1dc798da1f +Author: Adam Jackson +Date: Sat Jul 23 02:00:52 2005 +0000 + + Fix the build system to reflect the rest of the Mesa core. Almost links, + needs a code fix to Mesa though. + +commit d7e2cadb13ef0e77d864c8282489f544b0e1dede +Author: Adam Jackson +Date: Thu Jul 21 02:29:05 2005 +0000 + + GLX needs gl.h from Mesa too + +commit bf32f4739c6ef7f41cde6cc409d42e00462402fb +Author: Alan Hourihane +Date: Tue Jul 19 20:51:46 2005 +0000 + + programs/Xserver/hw/xfree86/os-support/shared/agp_noop.c + programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c + programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h + //bugs.freedesktop.org/show_bug.cgi?id=3164> Add xf86DeallocateGARTMemory() + function call (Austin Yuan) + +commit 931abdba8410bf1188d69d54c57543a21ea36968 +Author: Alan Coopersmith +Date: Tue Jul 19 02:50:00 2005 +0000 + + Change #include "X.h" to + +commit 4f2e731aba0c5694abb65a877395cc5f9869c556 +Author: Daniel Stone +Date: Sun Jul 17 07:34:31 2005 +0000 + + objdir != srcdir fixes. + +commit a6bd7ad985e138874bb0e1f33f545651dfde32a9 +Author: Alan Coopersmith +Date: Sun Jul 17 01:52:33 2005 +0000 + + Set GLX automake conditional after we've tested for mesa source and set GLX + to "no" if it's --with-mesa-source wasn't set. + +commit ead37b08699f665a856c7ba29578c27c27db4100 +Author: Alan Coopersmith +Date: Sat Jul 16 20:52:25 2005 +0000 + + Mark variables modified in signal handlers as volatile (part of Sun bug id + 4496504) + +commit bbb49449cbc0815fd9c4faf9b6ee32be99a8aa3d +Author: Adam Jackson +Date: Sat Jul 16 16:30:40 2005 +0000 + + Fix --with-mesa-source parsing, and turn GLX off if no path to Mesa given. + +commit d69e9872ae91c9c17a33e1ed763f98453d950b39 +Author: Adam Jackson +Date: Sat Jul 16 16:29:30 2005 +0000 + + Typo fix, and re-add GLcore to the dixmods build + +commit 8bc883c48c8f99502707998a8257c0563cae7d3a +Author: Alan Coopersmith +Date: Sat Jul 16 09:00:44 2005 +0000 + + Update build instructions. Add details about how the expat, fontconfig, + libpng, freetype, and xterm builds are now handled. + Update text docs from SGML masters. + +commit 8e600b87643f7f4e19923dd6a0f2eec83303363a +Author: Alan Coopersmith +Date: Sat Jul 16 07:39:48 2005 +0000 + + Only pass -rdynamic when using gcc + +commit 4f04e26c69747929243f176feaa90f3042481f53 +Author: Adam Jackson +Date: Sat Jul 16 04:30:33 2005 +0000 + + Say --with-mesa-source to get GLcore built. + +commit 4913316f25e76381844cf15aa64eff620c2807a1 +Author: Adam Jackson +Date: Sat Jul 16 04:29:28 2005 +0000 + + Switch to MESA_SOURCE which we're already AC_SUBSTing + +commit 7facb209a705ca406b05272c233ea0cfd6a5b266 +Author: Adam Jackson +Date: Sat Jul 16 04:24:21 2005 +0000 + + Hook in the GLcore build + +commit 2f9a7c6ee1012b2c7664c53f405affaf82bd0953 +Author: Adam Jackson +Date: Sat Jul 16 04:13:33 2005 +0000 + + Hey look, GLcore links + +commit 5f81eb1d89f623dd9281e686a4d4d4f403e459c6 +Author: Kevin E Martin +Date: Sat Jul 16 03:49:59 2005 +0000 + + Fix the *-config.h includes so that it is possible to build modules without + having to use -include in the Makefile. + +commit 0635acab08bade9bfd9d2abd3ea5a3fe525bc647 +Author: Kevin E Martin +Date: Sat Jul 16 03:46:01 2005 +0000 + + Add record module building support Change module building to not use + -include Fix xnest, dmx and vfb builds to -DXFree86Server for fbcmap + compilation + +commit 92b23ff426936909e1ff5e063b75e5f112b93ca1 +Author: Alan Coopersmith +Date: Sat Jul 16 01:17:52 2005 +0000 + + Update to match recent changes to pci.ids & extrapci.ids for people + building on systems without perl. + +commit 6ce3743948a7151c721194594091a7e1183e2f32 +Author: Adam Jackson +Date: Sat Jul 16 00:51:14 2005 +0000 + + start the GLcore build system + +commit 2f0487521da3da6784dd964c915071b82d749108 +Author: Kevin E Martin +Date: Fri Jul 15 23:08:31 2005 +0000 + + Fix the *-config.h includes for the files that have moved in the modular + tree. + +commit a407fa373bb72f29050e3f027042011075b3bdf0 +Author: Kevin E Martin +Date: Fri Jul 15 22:51:05 2005 +0000 + + Move drm up to os-support since the files are shared by multiple platforms. + Fix the dri and drm build. Fix server-side DMX extension build. Make + xf4bpp use the correct version of mfbline.c for mfbseg.c. Add #ifndef + _HEADERNAME_H_/#define _HEADERNAME_H_/.../#endif to the headers. + +commit eb6fa0dc15516a0a436090efc6d85f22baeec015 +Author: Adam Jackson +Date: Fri Jul 15 22:14:28 2005 +0000 + + Enable GLX build by default + +commit 0e352a8b2b4c78c291074b9531ed7afa7a20ac17 +Author: Adam Jackson +Date: Fri Jul 15 21:59:39 2005 +0000 + + disable GLcore momentarily until a build system exists. --enable-glx should + work now. + +commit 4bf453086418e93e81b24d3d2a0f49a9357acff3 +Author: Kevin E Martin +Date: Fri Jul 15 05:48:29 2005 +0000 + + Fix keyboard state when XEVIE is not enabled (Keith Packard). + +commit 562acf2e69dcf08f8db8f8eeaa162949d45f70b2 +Author: Søren Sandmann Pedersen +Date: Thu Jul 14 23:41:15 2005 +0000 + + Add -I$(top_builddir)/hw/xfree86/dixmods/extmod to Xext/Makefile.am Patch + from Stefan Dirsch + +commit defeb56fc9559661fa632935a4c76c500c7edcf4 +Author: Kevin E Martin +Date: Thu Jul 14 22:20:16 2005 +0000 + + Fix the build when DRI is enabled + +commit 6b546d0ec07e493b501e82300b3e6c143cd4d0ac +Author: Kevin E Martin +Date: Thu Jul 14 03:36:44 2005 +0000 + + Add #include to the Xnest source files for modularization. + +commit 7375f4d13626bbba4204e2f08f41c212b2eed992 +Author: Kevin E Martin +Date: Thu Jul 14 03:32:09 2005 +0000 + + Add support for Xnest + +commit c582560c62fd8181b7521e470f118a59c418a95f +Author: Alan Coopersmith +Date: Thu Jul 14 02:59:34 2005 +0000 + + Add partial in*/out* assembly support for Sun compilers on x86 + +commit 64bf3a81a3212dc2c0f55aebdc74a618ca6a32c0 +Author: Adam Jackson +Date: Thu Jul 14 02:53:31 2005 +0000 + + loadable extmod build system. + +commit 6c96e0c9e4b3f1e8dfa5dcf7366bb838dc0724ec +Author: Adam Jackson +Date: Thu Jul 14 01:36:58 2005 +0000 + + loader support for extmod + +commit 8ea4a1b759eae0279ce619c663f2cd2f6dee8d71 +Author: Alan Coopersmith +Date: Thu Jul 14 01:00:39 2005 +0000 + + First pass at Solaris os-support + +commit f07e905553783dc0133015bcbf94d3b6be68b19c +Author: Søren Sandmann Pedersen +Date: Thu Jul 14 00:28:47 2005 +0000 + + - Add build system for xf86-video-ati + - Add build system for xserver/xorg/hw/xfree86/dri + - Add glcore.h to symlink.sh + - Symlink.sh: add some more DRI files, symlink glcore.h from + extras/Mesa/include/GL/internal to proto/GL + - proto/GL/Makefile.am: install glcore.h + - xf86-video-ark: s/module-dir/xorg-module-dir/ + +commit 939b7720f17ec5ac5edcc6cfe70453160ecb0161 +Author: Alan Coopersmith +Date: Thu Jul 14 00:02:05 2005 +0000 + + Merge SVR4/pre-Solaris 8 and Solaris 8+ sections for greater consistency, + easier maintenance, and to fix some missing headers when building the + modular Xorg on Solaris. + +commit 23d25a656d7fdbafa1c78be2950fb405f0a1b87b +Author: Adam Jackson +Date: Wed Jul 13 23:41:21 2005 +0000 + + Remove references to DDX-specific extensions + +commit f4626bb72b9955846abee018ae31c1aeb51b8dbf +Author: Adam Jackson +Date: Wed Jul 13 22:59:39 2005 +0000 + + dlloader is the default in 6.9, but the loader doesn't get told to prefer + dlloader modules unless you -DDLOPEN_HACK. + +commit 4f38526566dbcc296d124bb852adfa30ac4d927e +Author: Alan Coopersmith +Date: Wed Jul 13 22:54:02 2005 +0000 + + - Use fbdevhwstub.c if is not found + - Use x86emu on Solaris instead of vm86 + - Better per-OS control over which xf86Kbd*.c and *Pci.c files to build + - Set various #defines to be defined or not on Solaris as needed + +commit db8aa17f15f62f243400b0267bf281dd27738644 +Author: Adam Jackson +Date: Wed Jul 13 22:19:36 2005 +0000 + + updated comment for libbitmap + +commit 4f9e76ed6a61b414ffc94550727a138c3f73996f +Author: Adam Jackson +Date: Wed Jul 13 22:09:52 2005 +0000 + + Dear libtool: Loadable modules do not need version numbers. kthnxbye. + +commit 40ad7321f5d8d216523d575c4414736d8cfe9e88 +Author: Adam Jackson +Date: Wed Jul 13 21:52:51 2005 +0000 + + Generate useful loadable modules by actually linking in the blobs from the + DIX + +commit 0e08818d3951c324e5953bd23a8a9457b3fec78f +Author: Adam Jackson +Date: Wed Jul 13 21:41:02 2005 +0000 + + Hook dbe into the build + +commit 2d4ddb5606b7328c591a7bffafbb49bdaf2adcf9 +Author: Adam Jackson +Date: Wed Jul 13 21:36:27 2005 +0000 + + double-buffering extension + +commit c2ec9fbb15c776b9c64451cf32927b1b8d1c560c +Author: Kevin E Martin +Date: Wed Jul 13 21:17:53 2005 +0000 + + Only build Xi/stubs.c on DDXs that don't support the Xinput extension + +commit 74a534f63c1ed016f24dbc3ca31f05b81076e8f0 +Author: Søren Sandmann Pedersen +Date: Wed Jul 13 20:19:38 2005 +0000 + + xc/programs/Xserver/hw/xfree86/drivers/i2c/*.c: include xorg-config.h + instead of config.h xserver/xorg/hw/xfree86/i2c/Makefile.am: Add i2c + drivers + +commit 1dc3e96e4077a912dd3aa13fa80099f5864b641f +Author: Torrey Lyons +Date: Wed Jul 13 16:30:53 2005 +0000 + + Fix compilation where uint is not defined. + +commit 19e20c1470c1f8d15f2a78fb29545bde06a65516 +Author: Lars Knoll +Date: Wed Jul 13 08:58:37 2005 +0000 + + don't clobber %ebx in the assembler. + +commit bfb10bd2dcca65ba5d346c9d7da594a81c35c101 +Author: Lars Knoll +Date: Wed Jul 13 07:28:17 2005 +0000 + + Fix potential buffer overflow and a smaller bug in the convolution filter + +commit 778a2703b233641e298fa81ef9c477943c496305 +Author: Lars Knoll +Date: Wed Jul 13 07:12:33 2005 +0000 + + fix compilation + +commit 66bc36473c238fdee7e6c1d31e6e5f6813a7541a +Author: Daniel Stone +Date: Tue Jul 12 23:36:27 2005 +0000 + + Use builddir, not srcdir, for built files. + +commit d6808a48d2dffd72f618fa372fba993736638799 +Author: Alan Coopersmith +Date: Tue Jul 12 18:16:03 2005 +0000 + + Fix scanpci -v core dump when subsys vendor/device id's are NOVENDOR & + NODEVICE. Bug #3763 + Patch #3074 + +commit cda9c7b2678ea08ac6176a9eee72e6e511134b8e +Author: Lars Knoll +Date: Tue Jul 12 14:50:10 2005 +0000 + + add x86emu. + +commit 41002623f314444bd416fd5f445a0425c5b59df0 +Author: Lars Knoll +Date: Tue Jul 12 10:02:10 2005 +0000 + + Add MMX Code paths for the basic composition operations in + fbComposeGeneral. + +commit 697cf74fb50a550b8f7e124dc8f463a55519795f +Author: Keith Packard +Date: Tue Jul 12 03:09:20 2005 +0000 + + Make Xprt run when linked against Xlib for Xrm + +commit 419448ea7b0d7f672e568cb1d8b4e190a1f54825 +Author: Adam Jackson +Date: Tue Jul 12 03:03:16 2005 +0000 + + Pull libdri out of the build for now until I get something better worked + out + +commit f054bf2ff6b94e285e7f2d174163c01b07b07143 +Author: Adam Jackson +Date: Tue Jul 12 01:29:41 2005 +0000 + + build fix + +commit 02427d4d04f70109a499578c6762654463ebdae4 +Author: Kevin E Martin +Date: Tue Jul 12 01:20:36 2005 +0000 + + Add support for building Xdmx and Xvfb + +commit 3fe6b5bb30e8e1b9017a9cf818fcceb279a28e65 +Author: Adam Jackson +Date: Tue Jul 12 01:17:39 2005 +0000 + + GLX server support + +commit 377e3bddd4d73154520a9582d75de2b20ae532a5 +Author: Adam Jackson +Date: Tue Jul 12 00:55:43 2005 +0000 + + Forgot to add these for some reason + +commit e348ac4b4dfb1112c19fe5fe5441182e66716087 +Author: Kevin E Martin +Date: Tue Jul 12 00:52:48 2005 +0000 + + Prepare Xdmx and Xvfb for modularization by adding appropriate #include + <{dix,dmx}-config.h> to the source files. + +commit b7a9a6a03560bdf6584c71bf0b546301bba9ab89 +Author: Kevin E Martin +Date: Mon Jul 11 17:52:00 2005 +0000 + + Remove unneeded xf86drm.h includes to fix modular build. + +commit cf4dfd650dbc2bb65eae4eea2acfb4a4c5295548 +Author: Adam Jackson +Date: Mon Jul 11 02:29:50 2005 +0000 + + Prep for modular builds by adding guarded #include "config.h" everywhere. + +commit c5548086f3864c828f0cad65d2708cefd2025947 +Author: Adam Jackson +Date: Mon Jul 11 00:42:52 2005 +0000 + + Start filling in glx build. Add xf86Version.h and a few DRI headers to the + sdk (needed for modular driver builds). + +commit 955fe17133d841758a18072a9acabedc81dc4562 +Author: Adam Jackson +Date: Sun Jul 10 21:45:55 2005 +0000 + + add some convenience variables for the drivers + +commit 78fab90230c61241af29f0c94f401ce0bc749b6b +Author: Alan Coopersmith +Date: Sat Jul 9 16:51:58 2005 +0000 + + Bug #3740 Patch #3058 + + 08-Jul-2005 nv driver updates from Mark Vojkovich: + Change some console restore code for NV11. Hopefully, we can more reliably + restore the console for desktop systems using DVI. This may correct a + recent regression on NV11. + Also, new PCI IDs. + Add new nVidia PCI ids to match nv_driver.c changes. + +commit 3c92389185f0c9fa3b8c299a084b10c12bcab52c +Author: Zack Rusin +Date: Sat Jul 9 14:15:35 2005 +0000 + + Patch from Thomas Winischhofer to kick out all pixmaps to system ram upon a + VT switch and vice versa when returning. + +commit 327741486e807c068383a771c04c9042b0589c37 +Author: Adam Jackson +Date: Sat Jul 9 02:22:29 2005 +0000 + + Don't try to link fb, shadow, or vgahw into the loadable Xorg server, as + they're only supposed to be loadable modules. + +commit 2b8e4db9ac4b4c8f8fd73c00436d6abec2faa535 +Author: Adam Jackson +Date: Fri Jul 8 20:27:30 2005 +0000 + + -lXfont isn't enough for libbitmap, you need to get the -L from pkg-config + +commit e84648df7d7eb700b7c2d35fdef0be1f463853fa +Author: Zack Rusin +Date: Fri Jul 8 17:07:52 2005 +0000 + + mark drawable as dirty on copying/painting windows + +commit 4ab73a73f4aa1f02cc8dada185b5dcbddfe43878 +Author: Zack Rusin +Date: Fri Jul 8 07:43:00 2005 +0000 + + heh, oops (thanks Thomas) + +commit 0a28516a6e641b41e674f69fc228b0babbe1743b +Author: Alan Coopersmith +Date: Thu Jul 7 19:07:28 2005 +0000 + + More compiler warning fixes for missing prototypes: + Add prototype for XkbSetExtension() + Add #include for isspace() & isdigit() + Add #include (for initgroups()) and remove extra * + Add prototype for xorgGetVersion() + +commit 2c3c4060fd2a52f147eda01b11222c341c6e3dee +Author: Alan Coopersmith +Date: Thu Jul 7 16:18:52 2005 +0000 + + Bug #2901 Add prototype + for XdmAuthenticationInit() (Peter Breitenlohner) + +commit d0dc574adb79ffacf90b786d4ccfcd1cd8598728 +Author: Zack Rusin +Date: Thu Jul 7 15:05:02 2005 +0000 + + Check vtSema before accelerating primitives and sync in fallbacks only if + we got vtSema + +commit 6cba5f1260c20b3bc072fdcc5f3e49fa28ba6414 +Author: Alan Coopersmith +Date: Thu Jul 7 14:59:48 2005 +0000 + + Bug #2901 Patch #2332 + This patch avoids + 79 gcc-3.4.3 warnings 'xxx' declared `static' but never defined mostly + due to including "ftfuncs.h" with the declaration of static functions + defined in "ftfuncs.c". (Peter Breitenlohner) + +commit 7da3f4a786d9b61f4129c7dbbef80c84abbfde68 +Author: Alan Coopersmith +Date: Thu Jul 7 03:12:40 2005 +0000 + + Bug #2901 Fix warnings + about redefined macros (Peter Breitenlohner) + +commit f86562540d1c945bfd96d4b89259d81e4ed25255 +Author: Alan Coopersmith +Date: Thu Jul 7 02:47:06 2005 +0000 + + Bug #2901 Patch #2325 + Avoid 38 + gcc-3.4.2 warnings: suggest parentheses around assignment used as truth + value suggest explicit braces to avoid ambiguous `else' suggest + parentheses around && within || suggest parentheses around arithmetic + in operand of ^ "/*" within comment (Peter Breitenlohner) + Bug #2901 Patch #2326 + This patch + removes these 2 gcc-3.4.3 warnings: missing braces around initializer + implicit declaration of function `XpOidTrayMediumListHasTray' (Peter + Breitenlohner) + +commit 4047191124c237518110e698bde6dab445644449 +Author: Damien Ciabrini +Date: Wed Jul 6 15:34:22 2005 +0000 + + Added hardware support for transformation matrix (zoom, rotation, etc...). + Fixed the composition function for RGB and A8 format. Avoid syncing + hardware after HW fills or copies. + +commit 4073f24c90d4aff3f7d83af4c0e733eed082b53b +Author: Alan Hourihane +Date: Wed Jul 6 15:14:30 2005 +0000 + + add missing PictureTransformPoint3d call + +commit c48f631cdb6a279ab1a24a486b05956cfa9ca3da +Author: Damien Ciabrini +Date: Wed Jul 6 13:57:41 2005 +0000 + + Fix offset alignment code in the offscreen memory allocator to prevent + textures from being allocated in the next free memory area. + +commit baa99be190c51b533bf8748c6c6a9bce62594e96 +Author: Ian Romanick +Date: Wed Jul 6 07:16:19 2005 +0000 + + Put the correct value in the length field of the reply. Previously, the + number of tag/date pairs was specified. This was incorrect. The correct + value is the number of values (one for the tag and one for the value). + Xorg bug: #3210 + +commit 6ba4a2e78a73858648b5b6a39306446d519c3a75 +Author: Alexander Gottwald +Date: Tue Jul 5 23:01:51 2005 +0000 + + Add more defines for XWin DDX Make building of cfb*, afb and mfb + conditional Set FD_SETSIZE=256 on cygwin + +commit 71ed3ae0c696152e82a98ce2ac0fa67ce6f23464 +Author: Alexander Gottwald +Date: Tue Jul 5 22:58:29 2005 +0000 + + wrap fInternalWM with XWIN_MULTIWINDOWEXTWM + +commit 456844a613240ce56181f6f3ec7873be9b2dc85d +Author: Alan Coopersmith +Date: Tue Jul 5 18:42:32 2005 +0000 + + Remove Speedo font module documentation. + Remove Speedo from list of font directories + Update default font path to remove Speedo, add TTF. + +commit 20c15003f9648de0c03f7d4fa4508afd896b19f5 +Author: Alexander Gottwald +Date: Tue Jul 5 18:25:44 2005 +0000 + + Fix crash on server shutdown + +commit d72fef26d44e649f39a56730830148d48d77ee9e +Author: Alexander Gottwald +Date: Tue Jul 5 17:52:35 2005 +0000 + + Fix simultanious presses of Left and Right Control and Shift keys. + https://bugs.freedesktop.org/show_bug.cgi?id=3677 + +commit 0f2c8221c938ce8eebd9f0e111a6b87223c18f9e +Author: Alexander Gottwald +Date: Tue Jul 5 16:35:42 2005 +0000 + + Fix typo which broke window titles + +commit 0bb2eb8eaaf4054fefbc45bf3cb47bbcf10b7cfd +Author: Alexander Gottwald +Date: Tue Jul 5 15:43:20 2005 +0000 + + Fix problem with fake Control press on Alt-Gr + https://bugs.freedesktop.org/show_bug.cgi?id=3680 + https://bugs.freedesktop.org/show_bug.cgi?id=3497 + Fix static declaration of winGetBaseDir + +commit 3af77ad3e754c4d419a1996ca73a9fd01f92388a +Author: Alexander Gottwald +Date: Tue Jul 5 14:09:48 2005 +0000 + + External windowmanagers could connect in multiwindow mode which lead to + strange results with the internal windowmanager. + +commit 426282268bcdd0e0ca973fa79b414e9065fbfd9d +Author: Alexander Gottwald +Date: Mon Jul 4 23:40:09 2005 +0000 + + Build miinitext.c and fbcmap.c as DDX specific files + Do not define _POSIX_SOURCE on cygwin. + +commit 845a0ac68b02148db6f2cca81debf20b2331607b +Author: Alexander Gottwald +Date: Mon Jul 4 23:11:20 2005 +0000 + + Revert last changes. They have to be addressed in a different way + +commit 048045a9e714fc85c26028c4de36dff47644b826 +Author: Alexander Gottwald +Date: Mon Jul 4 22:18:40 2005 +0000 + + Add XWin DDX, make Xorg DDX conditional Make XF86VidMode and XF86Misc + conditional + Add XWin DDX + Added DDXTIME, DDXOSFATALERROR, DDXOSVERRORF and DDXBEFORERESET + Added fbcmap.c + Added miinitext.c + Added -I$(top_srcdir)/Xext/extmod to INCLUDES + +commit 508cdb5cb01a91b1bf3ef31da80b6b1d36286bf0 +Author: Alexander Gottwald +Date: Mon Jul 4 22:10:43 2005 +0000 + + Include xwin-config.h if HAVE_XWIN_CONFIG is defined Cleanup X11 includes + handling Warning fixes + +commit 5e50ae22bf206d6c2cc05e772e05fa5a363acb81 +Author: Zack Rusin +Date: Mon Jul 4 18:55:53 2005 +0000 + + remove the temporary debugging output + +commit 7586ac6edea64b30d6187f9ec4d867521c1e769c +Author: Adam Jackson +Date: Mon Jul 4 18:41:04 2005 +0000 + + Bug #2216: Multiseat support. From various Debian and Ubuntu patches by + Aivils Stoss, Andreas Schuldei, Branden Robinson, and Daniel Stone. + +commit ba011dc77dcfaea2843481fbba45a76d8cb9aa83 +Author: Lars Knoll +Date: Mon Jul 4 14:47:03 2005 +0000 + + don't be too smart and try to replace PictOpOver by PictOpSrc when we have + an external alpha map. + Make fbmmx.c compile on gcc 4.0.1. + +commit a4df8ad75579d9c183f110d79d87cfb9aaf23acd +Author: Lars Knoll +Date: Mon Jul 4 14:23:59 2005 +0000 + + Fix handling of "super luminescent" colors Fix off by one error in the + transformation handling. + +commit e34f31762e0454930f30547a9407cc8b941c70f2 +Author: Zack Rusin +Date: Mon Jul 4 14:15:57 2005 +0000 + + This fixes the close screen mess (crash reported by Thomas). Also hide the + private Exa screen definition. Properly cleanup on screen close and do + not delete the private screen in the DriverFini call. + +commit 4ef813961dc8dea8924a79e0954d5b6da12e77c0 +Author: Alexander Gottwald +Date: Mon Jul 4 09:01:43 2005 +0000 + + provide the uint datatype on WIN32 + +commit 7dc547252af3b23652b1d496957645726c7125a4 +Author: Alan Coopersmith +Date: Mon Jul 4 00:16:23 2005 +0000 + + Fix builds on non-GLIBC systems (missing __GLIBC_PREREQ). Add Solaris stack + backtrace dumper. + +commit d010de6979a6c51a628f2f8e6d7f479a542d1e8b +Author: Daniel Stone +Date: Sun Jul 3 15:51:23 2005 +0000 + + Abandon the nostdinc experiment. + +commit b0d80e76d28dbc1ee14453950db000bb4d7f377f +Author: Daniel Stone +Date: Sun Jul 3 12:17:04 2005 +0000 + + Add missing include paths. + +commit 461eb6ebd9273dc3dcd601ee0a0491981a98acd9 +Author: Daniel Stone +Date: Sun Jul 3 12:16:29 2005 +0000 + + Change HAVE_CONFIG_H to HAVE_DIX_CONFIG_H. + +commit c1e69798ad14fb706f5f6de67e3f53df56f524c6 +Author: Daniel Stone +Date: Sun Jul 3 12:15:16 2005 +0000 + + Add explicit PSZ defines, remove unnecessary dix-config.h include. + Add -DXF86PM, forgotten from last commit. + +commit 4e501d35e260775a43f340b3e1a9aa092570aba4 +Author: Daniel Stone +Date: Sun Jul 3 10:51:16 2005 +0000 + + Remove needless usage of DECkeysym.h. + +commit a107f599518a175dd689417b48788a746303966a +Author: Daniel Stone +Date: Sun Jul 3 09:39:54 2005 +0000 + + Predicate usage of xf86OSPM functions on #ifdef XF86PM. + Remove needless include of ../input/mouse/mouse.h. + +commit 0bb669638f032e61471007b2fa88285aa5d63903 +Author: Daniel Stone +Date: Sun Jul 3 08:53:54 2005 +0000 + + Change and to "misc.h" and "os.h". + +commit 401e4580d6dd9867a691045688680ce410f84cb5 +Author: Daniel Stone +Date: Sun Jul 3 07:55:00 2005 +0000 + + Move misc.h and os.h from proto/X11 to xserver/xorg/include. + +commit 46b64bd5c66abb1bb9f3538c887d10867607bfff +Author: Daniel Stone +Date: Sun Jul 3 07:37:35 2005 +0000 + + Fix more include paths; add dix-config.h to XKB code. + +commit e03198972ca78b03ad13cb49112c03a052bb763b +Author: Daniel Stone +Date: Sun Jul 3 07:02:09 2005 +0000 + + Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings. + Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings. + Add #include or , as appropriate, to all + source files in the xserver/xorg tree, predicated on defines of + HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to + . + +commit b8aef6c474ffc6d637bec178674898ea95ccde47 +Author: Kevin E Martin +Date: Sun Jul 3 03:28:27 2005 +0000 + + Fix build issues. + +commit 826a6f029faeabaa783a93dfdccca846f9326b58 +Author: Daniel Stone +Date: Sat Jul 2 18:59:44 2005 +0000 + + Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere. + +commit e58c09d31bdf90210e2ec1ef976cea0459cdc02a +Author: Adam Jackson +Date: Sat Jul 2 18:06:05 2005 +0000 + + Bug #3687: Print backtraces on fatal signal on glibc systems. + +commit e6602b041fe489d51a1d7fac55cbbb12b1826ba1 +Author: Adam Jackson +Date: Sat Jul 2 17:02:23 2005 +0000 + + Bug #3546: Use MAP_LENGTH instead of a magic number. (Mark McLoughlin) Bug + #3664: Further fixes to Xnest modifier state handling. (Mark + McLoughlin) + +commit 9b1debcdb6c7df956c06350a6525afb8e6d691fa +Author: Daniel Stone +Date: Fri Jul 1 22:43:43 2005 +0000 + + Change all misc.h and os.h references to . + +commit 657b4cb8aa0076acae85997c4f0c353b4d86b632 +Author: Daniel Stone +Date: Fri Jul 1 22:32:34 2005 +0000 + + Change all misc.h and os.h references to . + +commit 303c281f956d55e35b05ef8521d0b60d24aa7a10 +Author: Daniel Stone +Date: Fri Jul 1 21:15:20 2005 +0000 + + Add auto-generated header files. + +commit 9a6ec34d2545a23586f11ad51c81f41a940d73d0 +Author: Daniel Stone +Date: Fri Jul 1 21:13:36 2005 +0000 + + Use canonical autogen.sh, which supports srcdir != objdir autogen. + +commit 7ecc2d526c4ea5db2589644a2fec0daf71df36da +Author: Daniel Stone +Date: Fri Jul 1 21:12:24 2005 +0000 + + Remove fbcmap.c hacks from the DIX. + +commit 6251f9c00a866f64207d23b0a06306ead15298e8 +Author: Daniel Stone +Date: Fri Jul 1 21:11:16 2005 +0000 + + Minor build system tweaks. + +commit 641f32c4368db07831d9d703161a9d4699307621 +Author: Daniel Stone +Date: Fri Jul 1 20:54:30 2005 +0000 + + Adding initial build system. + +commit 507d30546f56bfd172fc43857459c78c1026e97c +Author: Daniel Stone +Date: Fri Jul 1 20:54:01 2005 +0000 + + Adding initial build system. + +commit a822df1cc16d150614dead70fd00750095a05c35 +Author: Daniel Stone +Date: Fri Jul 1 20:49:35 2005 +0000 + + Adding initial build system. + +commit ded56b1a74e6b3e4c48054b7e142d924b19e6104 +Author: Daniel Stone +Date: Fri Jul 1 20:29:53 2005 +0000 + + Adding initial build system. + +commit aabb868920658c9d3979dc194c6bd9702171f101 +Author: Zack Rusin +Date: Fri Jul 1 13:30:29 2005 +0000 + + removing all debugging output from the default build :) + +commit 0fa9d1fb4886c418e3d8e0886ad815513eda0633 +Author: Zack Rusin +Date: Fri Jul 1 12:24:30 2005 +0000 + + Leave debugging output for only the interested parties. + +commit 0df446ab8875430508ff51d3548955a215475084 +Author: Zack Rusin +Date: Fri Jul 1 10:39:21 2005 +0000 + + Missed this. Spotted by Thomas. + +commit b5b2a0522efd61bd99b5d5d75cdd27960cd1c7e1 +Author: Lars Knoll +Date: Fri Jul 1 10:05:43 2005 +0000 + + Add support for gradients and solid fills to Render. + Changed the semantics of the Convolution filter a bit. It now doesn't try + to normalize the filter values but leaves this to the client. This + gives more reasonable behaviour in the limit where the filter + parameters sum up to 0. + +commit 30c019e847adef6f7f3963df8ef1f3f994669a54 +Author: Zack Rusin +Date: Fri Jul 1 08:56:12 2005 +0000 + + Adding the new acceleration architecture: Exa. It's meant to replace XAA in + the coming months. + +commit 276821605ee50e71f30dd52f2c12237fc61f288f +Author: David Reveman +Date: Fri Jul 1 03:14:54 2005 +0000 + + Fix return values in Xgl render texture implementation + +commit 5e381441fff411316ea202a9f85aceb0e0dcf46b +Author: Alex Deucher +Date: Fri Jul 1 02:56:04 2005 +0000 + + - Fix Support for Philips FM1236/F tuner on ATI AIW 9600 XT (Jeff Smith) + Bug 3401 + +commit c4d1b4e0424d53cd0470e0e3f57c10ee8fe3d8c2 +Author: Alexander Gottwald +Date: Thu Jun 30 21:33:46 2005 +0000 + + Added another test of checkForInput for WIN32 Windows keyboard and mouse + events are added to the input queue in Block- and WakupHandlers. There + is no device to check if input is ready. + +commit 1230c55ac3f75f4902b51b223d40354a54d0d0ab +Author: Alexander Gottwald +Date: Thu Jun 30 18:50:20 2005 +0000 + + Pass serverClient instead of NULL to ConfigureWindow. This should fix a + crash reported by Øyvind Harboe + +commit 0929f79c1baa5b65808ab034591510906623e841 +Author: Matthew Allum +Date: Thu Jun 30 13:39:00 2005 +0000 + + Another Xephyr focus/modifier fix + +commit b6c7afe0b9faed7025c70334d464fd75ce5c84c4 +Author: Lars Knoll +Date: Wed Jun 29 15:19:14 2005 +0000 + + compile + +commit d8a98454e305973dd7fec76db2ef80705cf7c298 +Author: Lars Knoll +Date: Wed Jun 29 11:57:16 2005 +0000 + + Add support for gradients and solid fills to Render. + Changed the semantics of the Convolution filter a bit. It now doesn't try + to normalize the filter values but leaves this to the client. This + gives more reasonable behaviour in the limit where the filter + parameters sum up to 0. + +commit ce0e11aeac76119b96b463605bc1f5318e3d2bde +Author: Adam Jackson +Date: Tue Jun 28 21:05:31 2005 +0000 + + Bug #2447: Fix argument order to xf86DrvMsgVerb. (Luc Verhaegen) + +commit 5ef5aec9bb5ee85295c0913afca891572d1315a4 +Author: Alan Coopersmith +Date: Tue Jun 28 02:04:54 2005 +0000 + + Update to latest snapshot (27-May-2005) from http://pciids.sf.net/ + +commit b262a18aad36b2de729f6d00d144ac7277687f19 +Author: Adam Jackson +Date: Sun Jun 26 02:48:36 2005 +0000 + + Cosmetic correctness fixes: miEmptyBox and miEmptyData are variables, and + miGlyphExtents is a function. + +commit aa7fb99bc76e62036c73ff50f58337558859b814 +Author: Adam Jackson +Date: Sat Jun 25 21:28:48 2005 +0000 + + Bug #3030: Fix Xnest keyboard state handling. (Mark McLoughlin) + +commit 8562f800b879ae461317da9640961f753e107250 +Author: Adam Jackson +Date: Sat Jun 25 21:16:54 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit 582a9f0d2ec01f1a3c5625e2f45a4599be7a11d5 +Author: Zack Rusin +Date: Sat Jun 25 12:39:58 2005 +0000 + + Correctly handle empty rects on region initialization. + +commit 56201222067e793a3542bcdcd39bb257b4fad2a6 +Author: Matthew Allum +Date: Thu Jun 23 16:50:07 2005 +0000 + + Fix issues with focus in and modifiers from host confusing Xephr + +commit a668b6c11a2d6b4800407ad918481d90be87a732 +Author: Matthew Allum +Date: Thu Jun 23 16:34:07 2005 +0000 + + redo tslib + +commit 5e863851a61207ade1ac807bc8cff7d9cf02dbbe +Author: Adam Jackson +Date: Sun Jun 19 01:30:29 2005 +0000 + + Build workaround. Add glcontextmodes.[ch] from Mesa. + +commit 9743adbe94f29417818b90e18aebb96a72f332f0 +Author: Søren Sandmann Pedersen +Date: Thu Jun 16 20:50:12 2005 +0000 + + Add Type1 subdirectory to lib/Xfonts, update build system accordingly. + +commit 68e856ff5b1842ba10421714b5f6b21d528f6071 +Author: Ian Romanick +Date: Wed Jun 15 18:31:52 2005 +0000 + + DRM 20050615 import + +commit 6e301a8e97e99d58eaed25453f66c6d73bafd460 +Author: Ian Romanick +Date: Wed Jun 15 18:31:52 2005 +0000 + + Initial revision + +commit f0c76610b72a5b54bae5a5eb51ff4c420a27320e +Author: Daniel Stone +Date: Wed Jun 15 16:46:59 2005 +0000 + + Conditionalise another use of XEvIE. + +commit 28ee3dd955302a1e99ffdc66cf0f512c6234d043 +Author: Daniel Stone +Date: Wed Jun 15 16:27:16 2005 +0000 + + Conditionalise building of XEvIE code with #ifdef XEVIE. + +commit c6166ee74137084775c7550b708c5f71f16e7d3f +Author: Lars Knoll +Date: Wed Jun 15 14:51:12 2005 +0000 + + Fix projective transformations in fbcompose.c Bugfix for convolution + filters + +commit bd54b96034e640f202821eac0a2c40e66c1ddfd0 +Author: David Reveman +Date: Wed Jun 15 05:50:15 2005 +0000 + + Shut up compiler + +commit 7fa782dfd548498474830c7268032ffc5fb406a5 +Author: Søren Sandmann Pedersen +Date: Mon Jun 13 21:51:46 2005 +0000 + + Add xkbfile to symlink.sh, conditionally include "config.h" in + xc/lib/xkbfile + +commit 0802a2824c06d294ea42f0f6256644da5c0038c2 +Author: Eric Anholt +Date: Mon Jun 13 18:14:53 2005 +0000 + + Correct the CHIPSET lines for the 3dfx cards so the tdfx driver will + recognize them. I'm not sure if this file is supposed to be maintained + still, but I'd like to close FreeBSD ports/32121 which has been around + for far too long. + +commit 2eab094816726542c4de6c9db5efa102ab1e1593 +Author: David Reveman +Date: Mon Jun 13 16:38:06 2005 +0000 + + Build fixes + +commit 49476ca73c86a599a1bc49cba1117d42f59996a8 +Author: Lars Knoll +Date: Mon Jun 13 14:40:25 2005 +0000 + + add the convolution filter from xserver to xorg + +commit f0ab6d57df66da5de1a8182f8250cc2c8e1450ad +Author: David Reveman +Date: Mon Jun 13 06:00:35 2005 +0000 + + Remove xgloffscreen.c + +commit f5aeaa7710de5ba4aad125bc8472bad1f17e23c6 +Author: Adam Jackson +Date: Mon Jun 13 00:09:23 2005 +0000 + + Bug #3513: Silence unhandled event messages from Xnest when running with + -parent. (Mark McLoughlin) + +commit 521916d0074901db58ab6b9edab52373da28bdb3 +Author: David Reveman +Date: Fri Jun 10 12:30:39 2005 +0000 + + New implementation of GLX_MESA_render_texture + +commit bdb3eb86f02e233b6aeef0995ea9afeaa7b035ac +Author: Kean Johnson +Date: Fri Jun 10 06:54:07 2005 +0000 + + file usl_xqueue.c was initially added on branch sco_port_update. + +commit 988ffddfe082fb27fadf9aa60ab22dce6855508c +Author: Adam Jackson +Date: Fri Jun 10 04:01:14 2005 +0000 + + Bug #2799: Input shape. (Keith Packard) + +commit d24ed90547122832d4168ad761f68e107bb1a2db +Author: Eric Anholt +Date: Fri Jun 10 02:14:44 2005 +0000 + + Axe a few dead fields from the port priv struct and add my name to the + "Copyright" line of the license to ati_video.c that already has my name + in the text. + +commit 75065f3a54ec760bbe81160fa233810f14d8aaa2 +Author: Eric Anholt +Date: Thu Jun 9 23:22:55 2005 +0000 + + Perform a warnings sweep on hw/kdrive. A number of these were my fault, but + some come from others. + +commit e11e60b361d63ae02918dd6b43038a5c92b73a49 +Author: Eric Anholt +Date: Thu Jun 9 21:59:26 2005 +0000 + + Greatly improve the correctness and performance of the MGA render + implementation. Includes cache flushing to prevent bad first reads of + the framebuffer, fixing blending of many formats, falling back on many + unsupported operations, and falling back early to prevent migration. + Passes all of rendercheck except some of the blend (!) tests. + +commit 9f81ce945680515e6db7da6c87458bee7c0f053d +Author: Ian Romanick +Date: Thu Jun 9 21:48:45 2005 +0000 + + Re-enable GL_HP_occlusion_test. The problems in Mesa that caused this bug + were fixed by Brian Paul in Mesa version 6.1. The current Mesa version + in the X.org tree is 6.2.1. + Xorg bug: 762 + +commit 92b3775ae8bdd4a84d7e101b36b306fbd3ac17a2 +Author: Matthew Allum +Date: Thu Jun 9 16:22:27 2005 +0000 + + TSLib fixes. Add fullscreen support to ephyr + +commit 545c082cf9c86f2a809ea6b4dca33643afb0c3d3 +Author: Eric Anholt +Date: Thu Jun 9 10:44:45 2005 +0000 + + - Replace the syncAccel hook in the kdrive structure with a pair of hooks + in the kaa structure: markSync and waitMarker. The first, if set, + returns a hardware-dependent marker number which can then be waited for + with waitMarker. If markSync is absent (which is the case on all + drivers currently), waitMarker must wait for idle on any given marker + number. The intention is to allow for more parallelism when we get + downloading from framebuffer, or more fine-grained idling. + - Replace the KdMarkSync/KdCheckSync functions with kaaMarkSync and + kaaWaitSync. These will need to be refined when KAA starts being smart + about using them. Merge kpict.c into kasync.c since kasyn.c has all the + rest of these fallback funcs. + - Restructure all drivers to initialize a KaaInfo structure by hand rather + than statically in dubious order. + - Whack the i810 driver into shape in hopes that it'll work after this + change (it certainly wouldn't have before this). Doesn't support my + i845 though. + - Make a new KXV helper to avoid duplicated code to fill the region with + the necessary color key. Use it in i810 and mach64 (tested). + +commit 72ca8e1b5432db57401e66af8a07fcd8cbbbb9f1 +Author: Alan Coopersmith +Date: Thu Jun 9 03:11:58 2005 +0000 + + Add agpgart support for Solaris x86/x64. [Requires Solaris "Nevada" build + 16 or later to get kernel side for now.] (Sophia Li - Sun Microsystems) + +commit ca37d5755259ca03c61cf0567be3dea99d0c79f6 +Author: Adam Jackson +Date: Thu Jun 9 03:01:57 2005 +0000 + + Bug #2469: More accurate damage reports. (Jonathan Lennox) + +commit cdc15e2294a9bffc570e33bc31170081abfc55fb +Author: Adam Jackson +Date: Thu Jun 9 02:29:42 2005 +0000 + + Bug #1846: Add intentionally undocumented -disablexineramaextension flag to + the server to work around ignorant clients on large display walls. + (Kevin E. Martin) + +commit e3cdec7cdcd76f6294ba1f296e4bcdee43b1eb3c +Author: Adam Jackson +Date: Thu Jun 9 02:19:10 2005 +0000 + + Bug #1880: Remove unused xnestConfineWindow. (Mark McLoughlin) + +commit 0f7136191b54e587b66958985e14d8b0687c5ee1 +Author: Adam Jackson +Date: Thu Jun 9 02:03:50 2005 +0000 + + Bug #3434: Don't define fbAddTraps twice. (Mike A. Harris) + +commit e7fec996eb43a0bea94a37d329e3902299e6e895 +Author: Alexander Gottwald +Date: Wed Jun 8 16:13:11 2005 +0000 + + Merge from CYGWIN Added layout "French (Canada)" as ca_enhanced Added Czech + (QWERTY) layout + Merge from CYGWIN Print error code if winStoreColorsShadowDDNL fails + +commit d0d164e6daf6c1d8afe8099fb6187d8a74ff652b +Author: Alexander Gottwald +Date: Wed Jun 8 09:01:41 2005 +0000 + + Fix crash reported by Øyvind Harboe + +commit d146c41882e50dd1ed6022f8a5866514067ba9d2 +Author: David Reveman +Date: Tue Jun 7 08:53:40 2005 +0000 + + GLX improvements and remove use of pbuffers for offscreen rendering in Xgl + +commit 8237b31f60245a8e67735d6c231dfb7dd0bbc388 +Author: Jon Smirl +Date: Mon Jun 6 04:06:38 2005 +0000 + + Keyboard sort of works now with evdev + +commit c5026577cbc70c7365a9c81b2775136b45c850d2 +Author: Jon Smirl +Date: Sun Jun 5 17:32:41 2005 +0000 + + Create a default colormap + +commit 021a5cd170051aae25cf61651d07b47a4df31ab4 +Author: Jon Smirl +Date: Sun Jun 5 01:58:41 2005 +0000 + + Enable egl server in automake + --enable-xeglserver + +commit aa959672863aad71c807d6c09938bb296c347bcf +Author: Jon Smirl +Date: Sat Jun 4 23:33:03 2005 +0000 + + Initial Xegl check-in. Works on EGL fbdev driver Input is totally broken. + +commit 88d49bed008264092245c4f6c53174f93f6ab387 +Author: Alan Coopersmith +Date: Fri Jun 3 21:49:11 2005 +0000 + + Need to set initial screen size at device open time too. + +commit 0d206e177f46eedfffd8f88e985efdfaf117021c +Author: Alexander Gottwald +Date: Fri Jun 3 08:12:22 2005 +0000 + + Backout last winRaiseWindow patch which caused stacking problems + +commit 2fc290f646eb48f3c20ccff98355c2d082569160 +Author: Alan Coopersmith +Date: Wed Jun 1 17:45:17 2005 +0000 + + Solaris VUID mouse protocol updates: + - support for mouse-like devices that report absolute coordinates + - support for mouse-like devices that need to know screen size so they can + scale absolute coordinates to screen size + - fix 3-button emulation + +commit 8537146e3662cdc66ef4692bfd3886a676096fb8 +Author: Adam Jackson +Date: Mon May 30 18:44:55 2005 +0000 + + Bug #3368: Cosmetic cleanup to DIX export list. + +commit 547c47aaea9f31f7c873376b0db859c1c1d3d918 +Author: Adam Jackson +Date: Mon May 30 18:36:19 2005 +0000 + + Bug #3407: Clean out ancient #ifdef X11R5 conditionals. + +commit cebd7348d271591b7ebeebe3b332f835cfa8a068 +Author: Alan Coopersmith +Date: Sat May 28 00:08:03 2005 +0000 + + Change hardcoded /usr/X11R6 to PROJECTROOT. Change hardcoded XF86Config to + XCONFIGFILE. + +commit 1cb18a4bad565d1f783a4cefb3ed467699051068 +Author: Alexander Gottwald +Date: Wed May 25 12:14:29 2005 +0000 + + Workaround bug in pthread.h + +commit 62343f5162066f19ca6e62d1c85a4a40d45b3295 +Author: Alan Coopersmith +Date: Sun May 22 01:12:49 2005 +0000 + + Bugzilla #2800 Xevie + extension crash with signal 11 on keyboard Bugzilla #1205 + Xevie client + receives two KeyPress events on consumed keys when XKB is enabled + Patch #2223 Fixes for + both of these and some other Xevie bugs (Derek Wang - Sun Microsystems) + +commit a8a61bbe22361b12d4a2dd511894987a338e3eef +Author: Alan Coopersmith +Date: Sat May 21 07:46:38 2005 +0000 + + Initial experimental support for AMD64 builds on Solaris 10 x86. Improved + support for 64-bit SPARC builds on Solaris as well. + +commit ef4401ff8a8c4d7c22ef6af7bf47ccb24f83967f +Author: Adam Jackson +Date: Thu May 19 18:53:51 2005 +0000 + + Bug #3334: Clean up remnants from the PEX, XIE, and BEZIER extensions. + +commit 1e51e18382de61a67027759eccee9ccbb0924304 +Author: Søren Sandmann Pedersen +Date: Thu May 19 01:25:02 2005 +0000 + + Wed May 18 21:20:35 2005 Søren Sandmann + s/dst/src that I missed in the previous patch. Pointed out by Owen Taylor. + +commit be3875994d7778ffad0cd957a4bd1500bf58ac2c +Author: Søren Sandmann Pedersen +Date: Wed May 18 20:49:31 2005 +0000 + + Wed May 18 16:47:44 2005 Søren Sandmann + Actually assign the computed results. (Reported by Michael Dänzer, patch + by Owen Taylor). + +commit 07d1e9ae5f0da65427ac52f065b173d340d70d6d +Author: Adam Jackson +Date: Wed May 18 19:44:35 2005 +0000 + + Bug #3066: Promote frameBufferPhysicalAddress to pointer from CARD32; bump + DRIINFO version to match. Fix various pointer printfs in libdri to be + 64-bit aware. Silence a warning about redefining noXFree86DRIExtension. + (Jesse Barnes) + +commit b87a32fb0eafa6d5f12a6faa634662c71fdc97fa +Author: Adam Jackson +Date: Wed May 18 17:47:35 2005 +0000 + + Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the version + number of the DRIInfoRec, disambiguating it from the XF86DRI protocol + version number. Modify DRIQueryVersion to return the libdri version + number, which all DDXes were requesting implicitly. Fix the DDXes to + check for the DRIINFO version they were compiled against. + +commit fddcde777f50611099d8888456d93be7e566c84e +Author: Egbert Eich +Date: Wed May 18 15:38:50 2005 +0000 + + VBESetVBEMode() calls int10 0x4f02 to set a VBE video mode. This can be a + standard mode solely determined by the mode ID or it may be a detailed + mode with almost arbitrary mode parameters. The mode parameters are + passed to the BIOS in a memory area pointed to by es:di. If bit 11 in + the video mode is set this memory area is evaluated. When we don't have + such an area (passed to VBESetVBEMode() this function should unset this + bit for sanity reasons. (Bugzilla #3329) + +commit f28d644d9fb1feeab1bbb3d5e68255bfa20905d8 +Author: Zack Rusin +Date: Wed May 18 14:24:14 2005 +0000 + + rewrite the rootless compositing code (1) compiles which is already a huge + improvement ;) , 2) matches the new render composition semantics) + +commit bbbb0a3a84bf21f5120c73ef387d6190154c0f65 +Author: Egbert Eich +Date: Wed May 18 10:31:53 2005 +0000 + + Avoid segfaults if the number of user supplied monitor ranges exceed the + number of preallocated slots. We should really make this dynamic - but + I don't think this ever caused a problem so it's more or less academic. + A. Avoid that *SyncStart starts before *BlankStart. If *BlankStart > + *SyncStart it is made = *SyncStart and its width is made maximal but such + that the blank does not exceed *Total. Since the Sync width has the + same restrictions as the Blank width monitors should still be able to + clamp after the sync pulse. B. Over time mode validation has become + inconsistent when people started to add additional features to the mode + validation. One such feature is that the mode->Crtc* values have been + (ab)used to allow the driver ValidMode() function to pass driver + normalized timing values back to the validation function. The + introduction of these features made the code less readable and created + numerous possibly unintended side effects in the validation semantics. + I've attempted to consolidate these changes making the code more + consistent and eliminating a number of side effects. This should not + cause problems for the majority of drivers, still it should receive + testing - especially with ATi Mach64 and Radeon code. (Bugzilla #3325). + +commit a90af4a2e6e38cbe20af13aaa7822836c01290ae +Author: Thomas Hellstrom +Date: Sun May 15 17:45:47 2005 +0000 + + Bug 2750: Prevent mtrr_remove_offending from ending up in an endless loop + if the offending region refuses to be removed. + +commit f58a54668b96884ece6ecbff732e880677d5d19e +Author: Alan Coopersmith +Date: Sat May 14 20:13:45 2005 +0000 + + Change return statements to fix compiler errors: "fbcompose.c", line 2815: + void function cannot return value "fbcompose.c", line 2861: void + function cannot return value + +commit a9d820b454bbb418d04e1d3c3d5d4dd10d7bb3af +Author: Søren Sandmann Pedersen +Date: Fri May 13 22:53:44 2005 +0000 + + - For now put xtrans in X11/Xtrans/X11, since libX11 is looking for it in + + - For Xcomposite and Xdamage, don't link the build system out of the xc + tree + - Link the public X11 headers into their own directory + - Add links to XKeysymDB and XErrorDB + - Add links to all the Xlib man pages + - Add links to the lcUniConv subdirectory + - Conditionally include config.h in Xlib source + +commit 8993e70d8da89e130455369ccb504b3adea5344f +Author: Eric Anholt +Date: Tue May 10 00:12:17 2005 +0000 + + Bugzilla #2561: Disable some keycode translations on PC98, which had + various bad effects including modifier keys not working. + +commit e78abf3bdfbf5fc13fbc5b1d3ec00e9484297b89 +Author: Eric Anholt +Date: Mon May 9 23:42:26 2005 +0000 + + Bugzilla #2429: Correct the sysarch prototype for FreeBSD/alpha. + +commit 3f1a1551df2a9f45b3b8821f3f168d4dc8b8b438 +Author: Eric Anholt +Date: Mon May 9 23:26:02 2005 +0000 + + Increase the maximum number of buttons from 12 to 24. Helps with + button-happy mice like the Logitech MediaPlay. (Bugzilla #2390) + +commit eca5dff173d5af0a31bbf84579909b88a86e4c92 +Author: Adam Jackson +Date: Mon May 9 12:46:53 2005 +0000 + + Render performance improvements. (Lars Knoll, Zack Rusin) + +commit 2de24db63eb65974ac547facf2a99aa4709d54b3 +Author: Adam Jackson +Date: Sun May 8 23:34:15 2005 +0000 + + Render performance improvements. (Lars Knoll, Zack Rusin) + +commit 2c9b1e337b2e82e10909f62e8cd8c2c7a402fdd8 +Author: Alexander Gottwald +Date: Sun May 8 21:14:55 2005 +0000 + + Only call ConfigureWindow from winRaiseWindow if the windows message + dispatch loop is running. + +commit 78e4cb67d0f595f4fba5e98a9fa46de044556905 +Author: Torrey Lyons +Date: Fri May 6 00:45:30 2005 +0000 + + Fix build issues on Mac OS X 10.4.0. + +commit d5739efd2c266081ed6b844767dcdd0a3331bfd3 +Author: Eric Anholt +Date: Wed May 4 04:14:58 2005 +0000 + + Port X.Org to FreeBSD/powerpc. This makes a bit of math for sysmouse in + mouse.c explicitly signed, avoiding the need for -fsigned-chars. (Peter + Grehan, grehan at FreeBSD dot org) + +commit 6700847458427cbdbaf837ab06bfea9b80d92df2 +Author: Harold L Hunt II +Date: Mon May 2 22:01:08 2005 +0000 + + Fix comments for pointers in parameter lists to work with fussy compilers + +commit e50ab8feade400efd8e88ee0b2deeb924f169034 +Author: Harold L Hunt II +Date: Mon May 2 21:57:32 2005 +0000 + + Fix message type (respose->response) and fix */*comment*/ blocks to work + with fussy compilers. + +commit baa0cfc15442287557e44fa2614d89ab0b5c2539 +Author: Alexander Gottwald +Date: Mon May 2 14:07:31 2005 +0000 + + Print correct logfile in FatalError message + +commit bc977945a53206d70ef9817d6ede4137eb5f7e3c +Author: David Reveman +Date: Mon May 2 00:33:52 2005 +0000 + + Set stencil size for Xgl GLX visuals + +commit 5b4462ed9bbb17212dd57617cb7e837142b6270a +Author: David Reveman +Date: Sun May 1 22:55:25 2005 +0000 + + New algorithm for calculating glyph extents in Xgl + +commit e4b33f4e91a5379c99ecf78ffb6a3e836cb42491 +Author: Egbert Eich +Date: Wed Apr 27 15:42:15 2005 +0000 + + Catch SIGCHLD in OsBlockSignals() too to make sure this signal doesn't + intercept reading the authority file (Fabian Franz, Bugzilla #3137). + +commit 246b14cb29250517912d9c661ab037a953f4bbf4 +Author: David Reveman +Date: Wed Apr 27 10:34:33 2005 +0000 + + Minor optimization + +commit 28a2d841cee596c0242b1649587d6b180529c0ef +Author: David Reveman +Date: Wed Apr 27 09:29:33 2005 +0000 + + Line drawing improvements to Xgl + +commit abcc8c352e5fe6dd3b7ce5c6a25f435f877264c3 +Author: David Reveman +Date: Wed Apr 27 08:45:16 2005 +0000 + + Fix typo + +commit 8bc5a387c365d6367813eac374150440d0edbf6e +Author: David Reveman +Date: Tue Apr 26 11:04:23 2005 +0000 + + Add glCopy operation and glPushAttrib/glPopAttrib support to Xgl GLX + +commit f010131a1964b5ec35f3b333ffa7459c38f8ce45 +Author: Roland Mainz +Date: Tue Apr 26 06:12:07 2005 +0000 + + xc/programs/Xserver/Xprint/Init.c + //bugs.freedesktop.org/show_bug.cgi?id=2879) attachment #2556 + (https://bugs.freedesktop.org/attachment.cgi?id=2556) Refix for bug + 2879 - downgrade 15bit PseudoColor to 14bit - the current datatype for + the |ColormapEntries| is a |signed short| which is too small for + |32768| colors (=integer overflow). + +commit ba24ae89d33fbf3aacb8bbaf920d7436b77fda46 +Author: David Reveman +Date: Mon Apr 25 17:18:01 2005 +0000 + + Add scissor based clipping to Xgl GLX + +commit 07cc29cf69ff1e079efe3c9bfc55e8ac0f9bac93 +Author: Adam Jackson +Date: Mon Apr 25 00:25:39 2005 +0000 + + Bug #2138: When the server is built with MakeDllModules YES, prefer + dlloader modules to elfloader modules, and vice versa when + MakeDllModules is NO. Based on 028_loader_speed_hack.diff from Ubuntu + (Daniel Stone). + +commit 6c37648754c9bd901adecf8d38f9bb46db65efad +Author: Adam Jackson +Date: Mon Apr 25 00:11:21 2005 +0000 + + Bug #2141: Rework misleading warning message when APM support is + unavailable. (Previous patch on 2005-04-14 changed the wrong message.) + +commit a369d390a87ab0189c465be6cfd914e4b9329691 +Author: Roland Mainz +Date: Sun Apr 24 01:10:12 2005 +0000 + + xc/config/cf/X11.tmpl + xc/programs/Xserver/Xext/Imakefile + xc/programs/Xserver/dix/Imakefile + xc/programs/Xserver/dix/main.c + xc/programs/Xserver/dix/xpstubs.c + xc/programs/Xserver/mi/miinitext.c + //bugs.freedesktop.org/show_bug.cgi?id=2792) attachment #2526 + (https://bugs.freedesktop.org/attachment.cgi?id=2526) bug 2792 part II: + Make Xprint headers in dix/, mi/, os/ and Xext/ conditional on whether + the Xprint extension is build or not. Patch by Egbert Eich + and Roland Mainz . + +commit 13fcfee37305f46e95ff81d7d5eec4d88a63a63b +Author: Roland Mainz +Date: Sat Apr 23 22:55:40 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=3118) attachment #2525 + (https://bugs.freedesktop.org/attachment.cgi?id=2525) Get Xprint server + working again which was broken by the + 05/04/20 05:49:46 commit commit (the CPP symbol |XPRINT| is not universally + available when building the Xserver and should be used with care). + +commit 39eb2797183bf871a2dd01bff63dd35c146471f5 +Author: Adam Jackson +Date: Sat Apr 23 19:16:10 2005 +0000 + + Bug #3016: Don't complain as loudly about failing to load a module that's + already loaded. + +commit 139f900c56a6f44df2b411fe4bbc025a147e3abe +Author: Adam Jackson +Date: Sat Apr 23 19:01:13 2005 +0000 + + Bug #3109: Handle R_ALPHA_BRSGP relocations in elfloader. (Sergey Tikhonov) + +commit 0e80fe0e607cc73856332563becd70ef92d1aa75 +Author: Alan Coopersmith +Date: Fri Apr 22 22:11:26 2005 +0000 + + Clean up formatting, projectroot substutition, and grammatical nits. + +commit dcfb97204b021738c0ee9f1f8f40243dfa0b2ce0 +Author: Alan Coopersmith +Date: Fri Apr 22 22:04:37 2005 +0000 + + Work around clash between Solaris headers and module loader headers over + definition of FILE. + +commit 07bd7df6a6a07834277b4bf505db6727841e1153 +Author: Adam Jackson +Date: Fri Apr 22 20:49:50 2005 +0000 + + Bug #3069: Drop the BuildLowMem hack, it doesn't compile and isn't useful. + +commit d450a70e00b50427ecb2065d3cc44f43d102cade +Author: Adam Jackson +Date: Fri Apr 22 17:45:14 2005 +0000 + + Bug #2373: SGI Altix platform support. (Shrijeet Mukherjee, Jesse Barnes, + Bjorn Helgaas, Egbert Eich.) + +commit 16c2499b8f5c2405e36c7d5a922bb0b150df1762 +Author: Adam Jackson +Date: Fri Apr 22 16:49:22 2005 +0000 + + Bug #2373: SGI Altix platform support. (Shrijeet Mukherjee, Jesse Barnes, + Bjorn Helgaas, Egbert Eich.) + +commit 8565b6c0e2851cc3f194ba72d3db02a4e2976528 +Author: Daniel Stone +Date: Thu Apr 21 00:31:31 2005 +0000 + + Change xf86bigfont.h include to X11/extensions/xf86bigfont.h. + +commit b241c703a2c4164420dd26ee11f583bbf9cfe0f3 +Author: Daniel Stone +Date: Thu Apr 21 00:31:13 2005 +0000 + + Change keymap.h includes to X11/keymap.h + +commit 44528218d5ca75b842e4cefd8fdc58be2f35f0f4 +Author: Daniel Stone +Date: Wed Apr 20 23:33:53 2005 +0000 + + Change dmxext.h and dmxproto.h to . + +commit efa9d5f4757bfc0588cee361bcc78dd8a09efa62 +Author: Daniel Stone +Date: Wed Apr 20 23:11:12 2005 +0000 + + Change "eviestr.h" to . + +commit db5bd04097fd815ab6523f187679682a5e5047fa +Author: Alexander Gottwald +Date: Wed Apr 20 16:40:52 2005 +0000 + + Fix includes right throughout the Xserver tree: + apply changes to windows specific includes + Fix includes right throughout the Xserver tree: + apply changes to Xdmcp.h + +commit 8963a220f36cf0ae2a8a653fd39c983140e29736 +Author: Alexander Gottwald +Date: Wed Apr 20 16:34:46 2005 +0000 + + warning fix for Win32 + +commit e6a0820d1b479058bddef66018d321940e79260c +Author: Daniel Stone +Date: Wed Apr 20 15:16:36 2005 +0000 + + Change "xf86bigfstr.h" to for includes. + +commit 025724f9f5874159c20ebd705288ec60b960caac +Author: Alexander Gottwald +Date: Wed Apr 20 14:17:35 2005 +0000 + + Add missing space after -query hostname + +commit 35cd1684622f4528c68e07eea798c33bc4b93667 +Author: Daniel Stone +Date: Wed Apr 20 14:16:37 2005 +0000 + + Change xf86bigfstr.h to X11/extensions/xf86bigfstr.h for includes. + +commit c7c27e61870b42de044b183c854a960582d98dbf +Author: Daniel Stone +Date: Wed Apr 20 13:33:54 2005 +0000 + + Change xf86bigfont.h to X11/extensions/xf86bigfont.h for includes. + +commit abd246c6c272a2c6f9c37404b2ed439911880e75 +Author: Daniel Stone +Date: Wed Apr 20 13:01:55 2005 +0000 + + Add glyphstr.h to includes. + +commit 956dfa22f6076969776546fb1151e900d8d773a1 +Author: Daniel Stone +Date: Wed Apr 20 12:49:46 2005 +0000 + + Conditionalise usage of Xprint functions and headers. + +commit 2cdfab0ed7eb33a6a50f9b7ec212b498dd8318b5 +Author: Daniel Stone +Date: Wed Apr 20 12:42:02 2005 +0000 + + Change keysymdef.h to X11/keysymdef.h for include statement. + +commit fa5539247d3b246db9ff1469d08167178c85d7ad +Author: Daniel Stone +Date: Wed Apr 20 12:39:28 2005 +0000 + + Change Xalloca.h to X11/Xalloca.h for include. + +commit 292c4cff26687e6ef86c285b97813ab587daf009 +Author: Daniel Stone +Date: Wed Apr 20 12:25:48 2005 +0000 + + Fix includes right throughout the Xserver tree: + change "foo.h" to for core headers, e.g. X.h, Xpoll.h; + change "foo.h", "extensions/foo.h" and "X11/foo.h" to + for extension headers, e.g. Xv.h; + change "foo.[ch]" to for Xtrans files. + +commit c062d7f96f47bdd31640be1fbce682d0774db3d9 +Author: Alexander Gottwald +Date: Tue Apr 19 18:21:01 2005 +0000 + + Prevent recursive calls to winRaiseWindow. + +commit 4e914c5ed7679a1102f3e25af0c087380f834865 +Author: David Reveman +Date: Tue Apr 19 14:51:29 2005 +0000 + + Hash texture objects and display lists in Xgl + +commit 6bde764de102a56d2c71b971eaa36535e9760b52 +Author: Bogdan Diaconescu +Date: Sun Apr 17 23:02:25 2005 +0000 + + Added a log pring for the parameters + +commit 8594b8f2893e58ae824e140334c18ba3d7467217 +Author: Bogdan Diaconescu +Date: Sun Apr 17 23:00:58 2005 +0000 + + Added new tuner FM1236MK3 PAL version + +commit 7f74e3aebdf79fbca4141e6ffcdad39812df9335 +Author: Bogdan Diaconescu +Date: Sun Apr 17 22:58:03 2005 +0000 + + This is the UDA1380 sound coder-decoder module + +commit 7a4e5f4006319e025e3ff561eccc3f1ad6c661a0 +Author: Torrey Lyons +Date: Sat Apr 16 00:21:21 2005 +0000 + + Fix cases in Darwin build where a variable is declared static and later as + extern (XFree86 Bug #1576, Jordan Frank). + +commit 4f686f158b00478a3d074128f9e4cb6dc0d928cd +Author: Roland Mainz +Date: Fri Apr 15 23:34:39 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=2885) attachment #2434 + (https://bugs.freedesktop.org/attachment.cgi?id=2434) Fix Solaris build + bustage caused by namespace collision between symbols defined in + and those in "xf86_OSlib.h". Patch by Alan Coopersmith + . + +commit 7472fcfdd40e29cd2847e45d4bd2dd11ccc41ff5 +Author: Adam Jackson +Date: Fri Apr 15 00:18:58 2005 +0000 + + Bug #2141: Rework misleading warning message when APM support is + unavailable. + +commit 504067819a4f1a8564dcacc278933f533618b666 +Author: Adam Jackson +Date: Thu Apr 14 17:51:51 2005 +0000 + + Bug #3025: gcc4 build fix. + +commit e40db7f26af39a8b1f3675a2c87ce90c4fd59d85 +Author: David Reveman +Date: Wed Apr 13 14:27:47 2005 +0000 + + Add GLX code to Xgl + +commit ddfa6f00da7c80b246b57c592361baa4bc5a8e9d +Author: Roland Mainz +Date: Wed Apr 13 00:05:37 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=3001) attachment #2404 + (https://bugs.freedesktop.org/attachment.cgi?id=2404) Improve rendering + performance when glXSwapBuffers()| or |XPutImage()| are called for the + PostScript DDX via optimizing the codepath around + |PsOut_OutImageBytes()|. Patch by Simon Toedt + and Roland Mainz . + +commit f45208a7e9c39345ac431c2e7da8777d6c466dcc +Author: Alan Hourihane +Date: Mon Apr 11 11:06:21 2005 +0000 + + update static file from pci.ids + +commit b47f39b417cbe220690155a08c6bc18cd7cfa388 +Author: Alan Hourihane +Date: Mon Apr 11 10:57:33 2005 +0000 + + import latest pci.ids file + +commit 00a551393ce7aa9d2b23634737ced5071e3cdd35 +Author: Egbert Eich +Date: Mon Apr 11 10:54:13 2005 +0000 + + Reenable BackingStore in Xvfb. + +commit 1fbd38f3b46df62561f8be74cbc05fcf8ad88a21 +Author: Alexander Gottwald +Date: Mon Apr 11 10:16:25 2005 +0000 + + Added wizard page for clipboard selection and additional server parameters + +commit 6848b0353897a6a5d1218b266c22fb87a7c6d730 +Author: Egbert Eich +Date: Mon Apr 11 10:05:38 2005 +0000 + + Correct the mask bits when checking for a 64bit memory base in PCI config + space (bugzilla #2963). + +commit adac7011965ed75ea399b93dae917cb48180c77a +Author: Egbert Eich +Date: Mon Apr 11 09:33:43 2005 +0000 + + Preventing hight for drawing from becoming negative when face->dy < 0. The + height value is used in miFillPolyHelper() to calculate the size of + memory to be allocated. A negative value will lead to a crash (Bugzilla + #2690, Keith Packard, Egbert Eich). + +commit 5e2080ef93a598c6d68e1b2f446f251ab025b702 +Author: Roland Mainz +Date: Mon Apr 11 01:06:15 2005 +0000 + + xc/programs/Xserver/Xprint/attributes.c + xc/programs/glxgears/glxgears.c + xc/programs/xdbedizzy/xdbedizzy.c + xc/programs/xedit/Imakefile + xc/programs/xedit/Xedit-xprint.ad + xc/programs/xedit/util.c + xc/programs/xedit/xedit.h + xc/programs/xlogo/print.c + xc/programs/xlogo/xlogo.c + xc/programs/xlogo/xlogo.h + xc/programs/xman/Imakefile + xc/programs/xman/print.h + xc/programs/xmore/Imakefile + xc/programs/xmore/print.c + xc/programs/xmore/print.h + xc/programs/xmore/printdialog.c + xc/programs/xphelloworld/xpawhelloworld/xpawhelloworld.c + xc/programs/xphelloworld/xphelloworld/xphelloworld.c + xc/programs/xphelloworld/xpsimplehelloworld/xpsimplehelloworld.c + xc/programs/xphelloworld/xpxmhelloworld/xpxmhelloworld.c + //bugs.freedesktop.org/show_bug.cgi?id=790) attachment #2379 + (https://bugs.freedesktop.org/attachment.cgi?id=2379) Implement support + client+Xserver support for passing output (stdout+stderr) of the + spooler command started by the Xprint server back to the application + using the "xp-spooler-command-results" XPJobAttr attribute + (applications can fetch the attribute value after the XPEndJobNotify + event was received; more details can be found in + http://xprint.mozdev.org/docs/dtprint_fspec.ps). + +commit 9af443f5976ab3987e4ee9d397391e82206676b4 +Author: Alexander Gottwald +Date: Sat Apr 9 19:20:03 2005 +0000 + + Fix passing of non-RGB visuals. The old code did not initialize the + structure properly which lead to a crash in 8bpp mode + +commit f02440dfa3439ab493c7918b472c23bb22e29707 +Author: Alexander Gottwald +Date: Wed Apr 6 15:18:59 2005 +0000 + + First import of xlaunch frontend for Xming + +commit de5d24a200e4426e458fc447884d1a5b0257faaa +Author: Egbert Eich +Date: Mon Apr 4 10:17:06 2005 +0000 + + Fixed sentinels in Xt, editres and xedit to reduce number of warnings with + gcc4 (Andreas Schwab). + +commit 277ff06e9999f2efe0f082a3565f6279219c13e4 +Author: Egbert Eich +Date: Mon Apr 4 10:11:51 2005 +0000 + + Fix typo leading to bogus code in xorgcfg (Andreas Schwab). + +commit 7eb6b69ebd945c753ee0988e1a85dffde982446e +Author: Egbert Eich +Date: Mon Apr 4 09:55:25 2005 +0000 + + Support for HP's IPF ZX1 systems (Alex Williamson). + +commit 231c00e8fba91b580ec3e2703dd1ceacf13a6624 +Author: Egbert Eich +Date: Mon Apr 4 09:47:07 2005 +0000 + + When not using dlopen ia64 needs an extra cache flush to ensure the icache + is coherent when modules are loaded (Alex Williamson). + +commit 55dc930a180553c08d8546cc2078451c20e34934 +Author: Torrey Lyons +Date: Sat Apr 2 02:29:24 2005 +0000 + + Fix XDarwin's handling of Wacom tablet mouse buttons (Based on patch + suggested by Daphne Pfister). + +commit 03d126081e5ba57ea2304753289528a896f3baaf +Author: Roland Mainz +Date: Fri Apr 1 21:45:20 2005 +0000 + + xc/programs/Xserver/Xprint/Init.c + xc/programs/Xserver/Xprint/ps/Imakefile + xc/programs/Xserver/Xprint/ps/Ps.h + xc/programs/Xserver/Xprint/ps/PsArea.c + xc/programs/Xserver/Xprint/ps/PsColor.c + xc/programs/Xserver/Xprint/ps/PsImageUtil.c + xc/programs/Xserver/Xprint/ps/PsInit.c + //bugs.freedesktop.org/show_bug.cgi?id=2879) attachment #2287 + (https://bugs.freedesktop.org/attachment.cgi?id=2287) Follow-up to + bugzilla #1299: Add new visuals in the Postscript DDX (including + TrueColor 16bit, PseudoColor 15bit/12bpg(12 bits per R-, G-, B-channel + as in PostScript Level 2 (and above) colors can have 12 bits per + component (36 bit for RGB)), PseudoColor+GrayScale+StaticGray + 12bit/12bpg) and switch the default visual from PseudoColor 8bit/8bpg to + PseudoColor 12bit/12bpg. + +commit fe37cc7e7b3036e538930c16bbdb39a7915b1685 +Author: Matthieu Herrb +Date: Fri Apr 1 21:28:50 2005 +0000 + + programs/Xserver/hw/xfree86/loader/xf86sym.c + programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c Fix setjump0 + declaration for DllLoader. + +commit ef60998a828951e61f1480e29c2fec62e7454bbc +Author: Kevin E Martin +Date: Fri Apr 1 20:21:38 2005 +0000 + + bugzilla #2880 (https://bugs.freedesktop.org/show_bug.cgi?id=2880) + attachment #2285 (https://bugs.freedesktop.org/attachment.cgi?id=2285) + Use system method to access PCI config space. + +commit 33ab2a2abc8c1e4ca9c7139454c60f5ad8a61a94 +Author: Adam Jackson +Date: Fri Apr 1 20:05:11 2005 +0000 + + Bug #2835: Add symbol exports to support the ReadDisplay extension. + +commit cbccac448a1466ab098e8fe5dbfff98264c7260a +Author: Alex Deucher +Date: Thu Mar 31 23:18:10 2005 +0000 + + - Add new Radeon pci ids (ATI devrel), bug 2827 + +commit 59d7222b13775efb2159159cc897e7789bdf10b2 +Author: Søren Sandmann Pedersen +Date: Sun Mar 27 00:17:12 2005 +0000 + + Sat Mar 26 19:00:30 2005 Søren Sandmann + Remove accidentally committed prototype. + +commit 476ae15640d2b97cb0ebccab8255ccf728596c62 +Author: Søren Sandmann Pedersen +Date: Sat Mar 26 23:50:24 2005 +0000 + + Sat Mar 26 18:49:21 2005 Soeren Sandmann + programs/Xserver/fb/fbmmx.h + New function. + Hook it up here + +commit 0d33b588376a4d86d50ed8b7e06eaf0dbd8c5ba5 +Author: Roland Mainz +Date: Fri Mar 25 23:11:14 2005 +0000 + + xc/programs/Xserver/Xprint/ps/Imakefile + //bugs.freedesktop.org/show_bug.cgi?id=2821) attachment #xxx + (https://bugs.freedesktop.org/attachment.cgi?id=xxx) Remove the cfb + dependicy from the PostScript DDX as this is not needed in a vector DDX + (mfb is still needed to fill the |BitmapToRegion()| callback with + |mfbPixmapToRegion()|). + +commit 5f320335c3a8148ae98f82a00ff44954197f4251 +Author: Matthieu Herrb +Date: Wed Mar 23 21:09:48 2005 +0000 + + bugzilla #2194: fix an alignement problem on 64 bit architectures. + +commit f4e9f522fe8bec3dd6294d062c2244a06623add3 +Author: Thomas Hellstrom +Date: Wed Mar 23 21:03:41 2005 +0000 + + Bugzilla #2750 (https://bugs.freedesktop.org/show_bug.cgi?id=2750) + Linux-only fixes: Fix case where a smaller write-combining region + blocks write-combining setting of the whole frame buffer. Fix bug in wc + setting code when regions are first splitted and setting of + write-combining then fails. + +commit 1be6e2388bcc5835ab62f0855d443fb508697deb +Author: Roland Mainz +Date: Wed Mar 23 20:49:52 2005 +0000 + + xc/programs/Xserver/hw/vfb/InitOutput.c + //bugs.freedesktop.org/show_bug.cgi?id=2791) attachment #2197 + (https://bugs.freedesktop.org/attachment.cgi?id=2197) Add support for + 12bit PseudoColor and 30bit TrueColor to Xvfb. + +commit 26aec10adad51deb35a8398abb884d90be077a6b +Author: Roland Mainz +Date: Wed Mar 23 19:58:45 2005 +0000 + + xc/programs/Xserver/Imakefile + xc/programs/Xserver/Xprint/DiPrint.h + xc/programs/Xserver/Xprint/Imakefile + xc/programs/Xserver/Xprint/Init.c + xc/programs/Xserver/Xprint/ddxInit.c + xc/programs/Xserver/dix/Imakefile + xc/programs/Xserver/dix/main.c + xc/programs/Xserver/dix/xpstubs.c + xc/programs/Xserver/os/Imakefile + //bugs.freedesktop.org/show_bug.cgi?id=2792) attachment #2193 + (https://bugs.freedesktop.org/attachment.cgi?id=2193) Fix build bustage + when |PrintOnlyServer| is set to |NO|. Patch by Roland Mainz + and Julien Lafon . + +commit ac18f8e308221af368fd4153b4eee7b89f8dd4bc +Author: Roland Mainz +Date: Wed Mar 23 00:32:49 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=2789) attachment #2187 + (https://bugs.freedesktop.org/attachment.cgi?id=2187) Fix Xvfb to honor + the "-dpi" option (instead of using a hardcoded value of 100DPI). + +commit 45bcb8e22ad949c456368b7d4f4226110f8b5cfc +Author: Adam Jackson +Date: Tue Mar 22 21:30:43 2005 +0000 + + Bug #1821: Typo fix in xorg.conf man page (Jens Schweikhardt) + +commit cc95e597b51f06e835c6a9def1bc6681029bf41e +Author: Søren Sandmann Pedersen +Date: Tue Mar 22 17:49:14 2005 +0000 + + Tue Mar 22 12:47:16 2005 Søren Sandmann + Only validate the source if it is a viewable window. Stops the cursor + flickering when it is above an unviewable window. + +commit 1d68ede0eed62b48354a954a62fca98aa2ce9d2d +Author: Roland Mainz +Date: Sat Mar 19 20:51:34 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=2771) attachment #2148 + (https://bugs.freedesktop.org/attachment.cgi?id=2148) Remove RENDER + extension from exclusion list for the standalone print server (Xprt) to + get this extension enabled if the print DDX support it. + +commit 64f1b3fe7e85245865666607d7b32ef7807df08f +Author: Michel Daenzer +Date: Fri Mar 18 22:36:47 2005 +0000 + + Add support for production version of ATI RN50/ES1000. (ATI Technologies + Inc.) + +commit 36dcc9bb1d51fb8c0d67c7e15700e3473a06e47b +Author: Torrey Lyons +Date: Thu Mar 17 01:12:07 2005 +0000 + + Fix build on stock Mac OS X: Out of the box, Mac OS X does not include + Freetype2, Expat, or PNG. Also global variables should be initalized in + the Xserver. + +commit 82f5a127522e48ff7ff78400eadbce0a5a362064 +Author: Søren Sandmann Pedersen +Date: Wed Mar 16 21:25:43 2005 +0000 + + Wed Mar 16 16:17:43 2005 Søren Sandmann + Only validate the source if it is a viewable window. Stops the cursor + flickering when it is above an unviewable window. + +commit 226c0907d4327a440fb0ac5380a19538ffdc6fa0 +Author: David Reveman +Date: Wed Mar 16 21:05:51 2005 +0000 + + Add cursor support to Xglx + +commit 7109ae147c3a9d243d11f386cfbcfbf7b4ea7918 +Author: David Reveman +Date: Wed Mar 16 20:05:19 2005 +0000 + + Fix a few problems in Xgl + +commit 04ccba4d40bef6cee902b118598272f26eebb1df +Author: Egbert Eich +Date: Wed Mar 16 12:16:06 2005 +0000 + + Don't fail calling function when DriverFunc() for RandR fails as + DriverFunc() also returns FALSE when the specific sub function isn't + supported. In the case of xf86RandRGetInfo() we simply rely on what has + been set before and return TRUE. In the case of xf86RandRSetConfig() we + only bail with FALSE if we have to do a rotation and the call fails. We + presently cannot do rotation on the fly without the help of a driver + function (Bugzilla #2745). + +commit 1011762254b41db5ce67cb652a2d4965efd7ec20 +Author: Egbert Eich +Date: Wed Mar 16 11:54:54 2005 +0000 + + Make message that gets printed when loader encounters a .o with no symbols + less conspicuous. + +commit 816606b9eabee334ce6e0b79e8aa67544f428c19 +Author: David Reveman +Date: Fri Mar 11 12:26:20 2005 +0000 + + Return early from xglFillRect when no rectangles should be filled + +commit 4de5aa428514f2cacc60d4708dad996dedee1092 +Author: David Reveman +Date: Fri Mar 11 00:58:49 2005 +0000 + + Use negative stride and PBOs in Xgl + +commit 8653db5d57199d53c9b2b993c35a7b70c8949989 +Author: Alexander Gottwald +Date: Thu Mar 10 20:05:46 2005 +0000 + + Force rebuilding of window stack if a window changes it's state from + minimized. + +commit 522628f25b4a075c8daf547991ea5b80c5efe9c7 +Author: Egbert Eich +Date: Tue Mar 8 10:26:59 2005 +0000 + + Adding more errnos to the libc wrapper (Bugzilla #2672). + +commit db7c9d349b86216ed00888181c64ab707fbe18d4 +Author: David Reveman +Date: Tue Mar 8 09:27:09 2005 +0000 + + Return early from xglCopy if fall-back is more efficient + +commit e09d1d2ae3ccd59408b1dc6f264897ae12dfa2b8 +Author: David Reveman +Date: Tue Mar 8 09:12:17 2005 +0000 + + Better ShmPutImage support in Xgl + +commit 5d9885c5b95286c8d7f777c7232283e8b1e81d1b +Author: David Reveman +Date: Tue Mar 8 09:03:38 2005 +0000 + + Minor improvement to CopyArea in Xgl + +commit 51155ca68bf7539bd3ace2ac068a2be1fbcf400c +Author: David Reveman +Date: Tue Mar 8 08:48:22 2005 +0000 + + Improve Xgl offscreen memory manager + +commit e26a096cb662700387c7b43289d1f6f7ab4a0aac +Author: David Reveman +Date: Tue Mar 8 08:30:47 2005 +0000 + + Fix Xgl glyph caching + +commit 8d0e520721ab7697d2d4f639425499b79c61b43f +Author: Roland Mainz +Date: Mon Mar 7 23:02:59 2005 +0000 + + xc/programs/Xserver/dix/atom.c + xc/programs/Xserver/dix/colormap.c + xc/programs/Xserver/dix/cursor.c + xc/programs/Xserver/dix/devices.c + xc/programs/Xserver/dix/dispatch.c + xc/programs/Xserver/dix/dixfonts.c + xc/programs/Xserver/dix/dixutils.c + xc/programs/Xserver/dix/events.c + xc/programs/Xserver/dix/extension.c + xc/programs/Xserver/dix/gc.c + xc/programs/Xserver/dix/glyphcurs.c + xc/programs/Xserver/dix/grabs.c + xc/programs/Xserver/dix/main.c + xc/programs/Xserver/dix/pixmap.c + xc/programs/Xserver/dix/privates.c + xc/programs/Xserver/dix/property.c + xc/programs/Xserver/dix/resource.c + xc/programs/Xserver/dix/swaprep.c + xc/programs/Xserver/dix/swapreq.c + //bugs.freedesktop.org/show_bug.cgi?id=2560) attachment #2037 + (https://bugs.freedesktop.org/attachment.cgi?id=2037) ANSI-fy + Xserver/dix code. The conversion preserves the comments which annotate + variables. These have been moved into doxygen(esque?) "stubs" above + each function. Patch by Mike Owens . + +commit cb0aa2b4d8875f1ea66e720ca7c6cc2f403be26a +Author: Alexander Gottwald +Date: Mon Mar 7 22:26:59 2005 +0000 + + Prevent winRaiseWindow from calling ConfigureWindow if the message was sent + from within winDestroyWindowsWindow + DestroyWindow send a WM_WINDOWPOSCHANGED to another window causing a + restacking of all windows, even of the window which is just about to + destroyed and whose structures may not be intact anymore. + +commit 978f3b496b9951ee8120a0efcc5cd12503e26770 +Author: Roland Mainz +Date: Sat Mar 5 21:38:29 2005 +0000 + + xc/programs/Xserver/Imakefile + xc/programs/Xserver/hw/xnest/Imakefile + //bugs.freedesktop.org/show_bug.cgi?id=2653) attachment #2020 + (https://bugs.freedesktop.org/attachment.cgi?id=2020): Cleanup Xnest + usage of the DPMS dummy stub functions from dpmsstubs.c instead of + using it's own copy of these functions. + +commit 602209990dbbc96b4c5a96e2221a418cf29e613d +Author: Roland Mainz +Date: Sat Mar 5 20:47:12 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=2543) attachment #2019 + (https://bugs.freedesktop.org/attachment.cgi?id=2019): Fix + |xf86SignalHandler()| which resets the signal handler before setting + the flag indicating a signal has been caught, theoretically allowing + the possibility of infinite recursion. Patch by Andrew Church + . + +commit d995fe631a5706de93a05fda498333442af3d207 +Author: Roland Mainz +Date: Wed Mar 2 14:21:40 2005 +0000 + + xc/programs/Xserver/hw/xnest/Screen.c + xc/programs/Xserver/hw/xnest/Window.c + //bugs.freedesktop.org/show_bug.cgi?id=2546) attachment #2005 + (https://bugs.freedesktop.org/attachment.cgi?id=2005): Fix Xnest to + update the shape regions in the backend server whenever a client + changes them in Xnest (the fix is to add a new wrapper which calls + |xnestShapeWindow()| before calling |miSetShape()|). Patch by Mark + McLoughlin + +commit 3f79c5eefc0d62d3a9b095472cd75b446ba2a56e +Author: Roland Mainz +Date: Wed Mar 2 11:20:30 2005 +0000 + + xc/config/cf/DragonFly.cf + xc/config/cf/Imake.cf + xc/config/cf/Imakefile + xc/config/imake/imake.c + xc/config/imake/imakemdep.h + xc/extras/drm/shared/drm.h + xc/include/Xos_r.h + xc/lib/xtrans/Xtranssock.c + xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h + xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h + xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c + //bugs.freedesktop.org/show_bug.cgi?id=1712) attachment #2004 + (https://bugs.freedesktop.org/attachment.cgi?id=2004): Add support for + DragonFly/BSD platform. Patch by Jeroen Ruigrok + and Mike Verona . + +commit 6c6151b2339a05c60ec58e013f915f79a3f9d756 +Author: Alexander Gottwald +Date: Tue Mar 1 18:58:17 2005 +0000 + + If a context is already attached copy it instead of reattaching to keep + displaylists and share displaylists Enable tracing of often called + functions with GLWIN_ENABLE_TRACE ForceCurrent is a no-op now + +commit d323c4f59a653f364164d2a57fbbd102306a6ee9 +Author: David Reveman +Date: Tue Mar 1 16:57:54 2005 +0000 + + Minor improvement to pixel transfers in Xgl + +commit 2d2c1732620a83215983ee7a7dd469a1a85fcc12 +Author: David Reveman +Date: Tue Mar 1 16:34:31 2005 +0000 + + Add dither support to Xgl + +commit b4b27e9eaa43401ae70e5d03823012bf8c78848f +Author: Keith Packard +Date: Mon Feb 28 20:45:15 2005 +0000 + + Force DPMS normal on screen enable + Add placeholder for bit used to redirect input + Add macrovision register defines + +commit 409c0618bced6df02eed7af77107ff74508c0f3f +Author: Alexander Gottwald +Date: Thu Feb 24 22:53:17 2005 +0000 + + on WM_WINDOWPOSCHANGED raise window directly and in sync without utilizing + the async windowmanager thread. Fixes some restacking problems occuring + which were timing dependent Do not raise the window on WM_ACTIVATE + Removed unused code for WM_WINDOWPOSCHANGING ESC is debug key. Print + status but do not abort processing the message + +commit 775efdbd79448040b822fcc0556e98d3968ba8c3 +Author: Alexander Gottwald +Date: Wed Feb 23 19:17:10 2005 +0000 + + Bugzilla #2599 (https://bugs.freedesktop.org/show_bug.cgi?id=2599) + attachment #1964 (https://bugs.freedesktop.org/attachment.cgi?id=1964): + move miScreenInit in front of pScreen->function initializations to + prevent it from resetting ClipNotify. + +commit c4b3fcda98a92c204534f04bd386ace5d3620d86 +Author: Eric Anholt +Date: Mon Feb 21 03:44:10 2005 +0000 + + Move the draw tracing supplies into ati_draw.h, and do some touchups on it. + (When tracing drawing, I want to know what I'm drawing to, at a + minimum). + +commit de34b0eefc9f8a29147659454398cabb187c7cb6 +Author: Eric Anholt +Date: Mon Feb 21 03:05:55 2005 +0000 + + Extend the filter support to R200, and do the check for filter settings in + Check rather than Prepare, to avoid migration of things we won't be + able to accelerate. + +commit 535c178286f94cc593b6cda753bbeb9b7cf6df4c +Author: Michel Daenzer +Date: Fri Feb 18 19:55:35 2005 +0000 + + Bug #2576: Add support for ATI RN50/ES1000. (ATI Technologies Inc.) + +commit 2f07222106358a02f56bf1e344d1fbf7ead14cbd +Author: Adam Jackson +Date: Fri Feb 18 17:52:48 2005 +0000 + + Bug #2455: Make x86emu handle JNL correctly. (David Wong) + +commit 01b156240ce66703b38a67ee3cfbb475352cdf68 +Author: Alexander Gottwald +Date: Sat Feb 12 14:55:24 2005 +0000 + + winmultiwindowwindow.c + winmultiwindowwndproc.c + Cleanup some message debugging + +commit 8df7126f09d6d7cb35a5912a71531cad28ba2545 +Author: Alexander Gottwald +Date: Sat Feb 12 14:47:17 2005 +0000 + + win.h + winfont.c + winmultiwindowshape.c + winmultiwindowwindow.c + winpfbdd.c + winshaddd.c + winshadddnl.c + winshadgdi.c + Fix incorrect wrapping of functions. Ensure the pointers from pScreen point + to the called function even if wrapped functions changed it + Set the window properties to NULL to avoid referencing freed memory because + of timing problems after deleting a window + Do not wrap ChangeWindowAttributes. All functions are noops currently + +commit 676fdb03f3fb27ac24834aeb895df7d6d6e83f78 +Author: Alexander Gottwald +Date: Sat Feb 12 14:43:07 2005 +0000 + + print window handle in message outout + +commit 046bdb17169ecb1361a42ab52043da699590d39a +Author: David Reveman +Date: Fri Feb 11 20:19:20 2005 +0000 + + Fixes a few problems in Xgl + +commit 35bd81dfec62402f9d6c68d98e651e8cd87a8758 +Author: Søren Sandmann Pedersen +Date: Fri Feb 11 19:38:04 2005 +0000 + + Fri Feb 11 14:28:22 2005 Søren Sandmann + When COMPOSITE is enabled, call CopyWindow even when the pixels "don't + move" on screen. + Don't reject modes that are not supported by the unused monitor. + +commit e5ccccfbd45c78c1be5e311b2cb4135a9a27540b +Author: Adam Jackson +Date: Fri Feb 11 06:37:38 2005 +0000 + + Bug #826: Make xorgconfig respect font installation outside $PROJECTROOT. + (Donnie Berkholz) + +commit e7369daba58bb4fad5cef37fefbd851e59446045 +Author: Egbert Eich +Date: Wed Feb 9 11:12:54 2005 +0000 + + Added PCI2Host bus translations for linux PPC and fixed fixed bugs in + macros that apply these functions (Bill Randle Bugzilla #325 and #327). + +commit aab9a8dd99e52297ed9b40c936600429f38fe9ad +Author: Keith Packard +Date: Wed Feb 9 03:56:35 2005 +0000 + + Add initial evdev framework + +commit a85c33b52c40fbae544c7dd40df8c8968e0cf7e9 +Author: Keith Packard +Date: Tue Feb 8 22:45:21 2005 +0000 + + update Xgl to changes in damage API. Remove some flags to support software + mesa + +commit db2c83551cd3516800b88784c461fb33ee15aacf +Author: Keith Packard +Date: Tue Feb 8 22:43:54 2005 +0000 + + hw/kdrive/ati/radeon_composite.c Support linear filtering + Change how touch screens work -- make them just another 'mouse' device. Add + unfinished (and unused) code to accelerate tiled fills. + +commit 70d3a9192feefd54be93ea71231574c3ed815bf2 +Author: Alexander Gottwald +Date: Tue Feb 8 15:20:01 2005 +0000 + + Updated fix for ABNT2 and HK_Toggle keys. + +commit 384099457e9d938871019ba2e5afc20280328884 +Author: Alexander Gottwald +Date: Tue Feb 8 10:15:49 2005 +0000 + + Backout ABNT2 and HK_Toggle fix since it broke keys F1 and F4. + +commit ea5b09f95d6f25d8b0f8858c36b680055edd0da9 +Author: Egbert Eich +Date: Mon Feb 7 18:16:05 2005 +0000 + + Save gs register before calling the vm86_old syscall thru int 0x80. This is + required for linuxthreads as the TLS uses this register to keep track + of local thread storage (Bugzilla #2431, J. Scott Berg). + +commit 4d55065b35baa7e13f6e726cb9d6675562648000 +Author: Alexander Gottwald +Date: Mon Feb 7 15:08:31 2005 +0000 + + Moved keyboard layout table to external file. + +commit e132cb7590b5518ef1b7fce5f9151beed916fafc +Author: Alexander Gottwald +Date: Mon Feb 7 15:05:39 2005 +0000 + + file winlayouts.h was initially added on branch CYGWIN. + +commit c12ef1b34a55544f54401a5a66a36cd728e2f944 +Author: Egbert Eich +Date: Mon Feb 7 11:56:31 2005 +0000 + + Check the pixel clock choosen for a specific refresh rate against the + maximally allowed pixel clock when choosing mode lines for + VBESetVBEMode() and VESA BIOS version >= 3.0 (Bugzilla #2486). + +commit 859be7a52b778df8acb676683351a6562a6d4400 +Author: Felix Kuehling +Date: Fri Feb 4 01:14:49 2005 +0000 + + Applied patch (id=1354) by Mike A. Harris from bug #1901: The attached + patch updates a couple of PCI IDs for the Savage driver -- + Debian/Ubuntu/Red Hat/Fedora. + +commit 5feca068d740b165d3c36a690f5a68b7588b6625 +Author: Alexander Gottwald +Date: Thu Feb 3 09:58:47 2005 +0000 + + Bugzilla #1865 (https://bugs.freedesktop.org/show_bug.cgi?id=1865) + attachment #1827 (https://bugs.freedesktop.org/attachment.cgi?id=1827): + check for va_copy not being defined and use __va_copy if available + +commit 3dda2fe0e2e7e4d2c058d32fa8691d12386b978d +Author: Alexander Gottwald +Date: Wed Feb 2 18:06:14 2005 +0000 + + Force ShowWindow if XWin was started via run.exe. Fixes mainwindow not + showing bug + +commit e8d3da3c753677cc1ae86bc5a79f2b7eba181d74 +Author: Alexander Gottwald +Date: Wed Feb 2 17:17:56 2005 +0000 + + Bugzilla #1866 (https://bugs.freedesktop.org/show_bug.cgi?id=1866) + attachment #1819 (https://bugs.freedesktop.org/attachment.cgi?id=1819): + Define APIENTRY on windows to prevent from loading + removed leftovers from attachment #1818 + +commit 81b862509c87281705f8a8641c28ae2f45f15751 +Author: Alexander Gottwald +Date: Wed Feb 2 15:03:44 2005 +0000 + + Bugzilla #1866 (https://bugs.freedesktop.org/show_bug.cgi?id=1866) + attachment #1818 (https://bugs.freedesktop.org/attachment.cgi?id=1818): + Include Xwindows.h before GL/gl.h on windows to prevent loading + windows.h which pollutes our namespace with some symbols. + +commit b532bfb483cc8ea87c28302e3d676234cab7c3f0 +Author: Adam Jackson +Date: Wed Feb 2 04:07:04 2005 +0000 + + Bug #1294: Make sure RenderAccel hooks get wrapped in XAA init. + +commit 44e2d9167943182fea530dfd7ec16aa53db20f4c +Author: Roland Mainz +Date: Wed Feb 2 00:55:21 2005 +0000 + + xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h + xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c + //bugs.freedesktop.org/show_bug.cgi?id=825) attachment #956 + (https://bugs.freedesktop.org/attachment.cgi?id=956): Fix build + problems on Linux/SPARC. Patch by Jeremy Huddleston + . Approved in the 2005-01-31 Xorg + release-wranglers phone call. + +commit 15c555a25df76e0e95bc8eaa2ca7ec80a7695a6c +Author: David Reveman +Date: Tue Feb 1 21:22:02 2005 +0000 + + Use negative stride for trapezoid masks in Xgl + +commit 2f0bdf77dd37d1763c4f4f409d55a6aad6031b9f +Author: Alexander Gottwald +Date: Tue Feb 1 18:14:01 2005 +0000 + + xc/programs/Xserver/xkb/ddxLoad.c + Bugzilla #2245 (https://bugs.freedesktop.org/show_bug.cgi?id=2245) + attachment #1649 (https://bugs.freedesktop.org/attachment.cgi?id=1649): + cleanup the generation of xkbcomp command lines. Allocate them + dynamicly and remove unmaintainable length calculation. + +commit d3ca132061a861cb9292b5a95dbcb2f67695883b +Author: Alexander Gottwald +Date: Mon Jan 31 10:49:30 2005 +0000 + + winmultiwindowwindow.c + Create windows with SWP_NOACTIVATE flag (updated) (Kensuke Matsuzaki) + Fixes for window ordering problem (updated) (Kensuke Matsuzaki) + +commit 374b9aa8ce14cd20a6768519eee63948c83488d6 +Author: Alexander Gottwald +Date: Mon Jan 31 10:47:32 2005 +0000 + + Added hungarian keyboard layout. + +commit 8d277ceb22929fcb44f2d4def8c5b70535eb087f +Author: Alexander Gottwald +Date: Mon Jan 31 10:43:37 2005 +0000 + + winmessages.h + winmsg.h + winmsg.c + winmultiwindowwndproc.c + winwin32rootlesswndproc.c + Make logging of messages configurable with environment variables + +commit 2982d173cad762b801869b7ceacc237afdad88d6 +Author: Alexander Gottwald +Date: Mon Jan 31 10:32:19 2005 +0000 + + resolve SHGetFolderPath dynamicly since it is not available on all Windows + systems. + +commit 8ac3be3f6c4bcaa8c3f6080cbfe72db4967feff8 +Author: Alan Coopersmith +Date: Sun Jan 30 21:18:46 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=1692> Remove reference to + nonexistent Monitors file from xorgconfig (Report & patch from Dejan + Lesjak ) + +commit 206072c475408b8d4cfd75d897854d8478fe0905 +Author: Matthieu Herrb +Date: Sun Jan 30 20:12:07 2005 +0000 + + programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c Fix option + dontVTSwitch under *BSD, when XKB is disabled. Bugzilla #2252. + +commit 327922f006dcc2e30ec0391d7fa786560fcd1599 +Author: Alan Coopersmith +Date: Sat Jan 29 01:01:03 2005 +0000 + + Update to latest rev from http://pciids.sf.net/ + Remove entries that now duplicate pci.ids Add entries for new Nvidia boards + added in recent nv driver update + +commit d23c46dd3e2cbf84012055bad43b1bb15809a244 +Author: Egbert Eich +Date: Fri Jan 28 16:13:00 2005 +0000 + + Modifying X.Org Xserver DDX to allow to run X with ordinary user + permissions when no access to HW registers is required. For API changes + which mostly involve the modifications to make the RRFunc (introduced + with 6.8) more flexible please check Bugzilla #2407. NOTE: This patch + applies changes to OS specific files for other OSes which I cannot + test. + +commit 1562ec5cc3706acfac1db04366f78e4949ef5502 +Author: Alexander Gottwald +Date: Thu Jan 27 20:33:34 2005 +0000 + + Functions like glGenTextures and glBindTexture are in OpenGL 1.1 and can be + resolved at linktime. Fixes tuxkart (at least with wine) + +commit 5ca5fe71119f35f1f24aeb49e2608684024d450a +Author: Eric Anholt +Date: Thu Jan 27 05:25:57 2005 +0000 + + Add an OUT_RING_REG macro for use with DMA_PACKET0, which is like OUT_RING + but includes debugging to ensure that the reg being submitted is the + one that follows in the packet. Convert most uses of OUT_RING to it, + and convert a couple of OUT_REG sets to DMA_PACKET0/OUT_RING_REG. Also, + add checking to see if more registers are submitted to a DMA_PACKET0 + than should be, to avoid hangs during stupid mistakes (checking for + less isn't done). + +commit 0bd459488bf88084d703d801bfd5e79ea6d2b5a5 +Author: Eric Anholt +Date: Thu Jan 27 03:52:49 2005 +0000 + + Move the bailing out due to ATIUploadToScreen() being unfinished up + farther, so that the traces aren't as confusing. + +commit a973af4a9ade68b271d0695898d72aea50d8953b +Author: Eric Anholt +Date: Thu Jan 27 03:50:48 2005 +0000 + + Remove an unused field. + +commit 59c7005bb155393c44792d457d98d72e34bb1b51 +Author: Egbert Eich +Date: Wed Jan 26 15:50:17 2005 +0000 + + When we tested if a PCI base address was unassigned we didn't take into + account that this bar could have been the upper part of a 64bit base + address. This fix makes this code 64bit bar aware (Bugzilla #2382). + +commit 7c3dd0a5a76bea2c64972ae19d99775b5a992513 +Author: Egbert Eich +Date: Wed Jan 26 15:45:49 2005 +0000 + + Rewrite of RemoveOverlaps() to make the code more readable. It was + virtually impossible to determine if the old code did what it was + supposed to do. Also changed paradigm: Trust the based address more + than the (guessed) size. (Bugzilla #2383) + +commit 9817582328cdafee59de616136172c2ce361a4b3 +Author: David Reveman +Date: Wed Jan 26 10:58:52 2005 +0000 + + Xgl improvements + +commit 13b5a93b70839053b9165b5087872164f0612536 +Author: Egbert Eich +Date: Tue Jan 25 10:08:18 2005 +0000 + + Fix interpretation of 64bit PCI bases: read hi long word from the right bar + (Michael Yaroslavtsev, Bugzilla #2322). + +commit 8813898ef6b9eb470e079bcdcffa89d1243b63b9 +Author: Keith Packard +Date: Tue Jan 25 06:04:21 2005 +0000 + + Fix R100 text by forcing the 3d engine to idle before executing more 3d + commands. Add docs for the ISYNC_CNTL register, which doesn't quite do + what we want. + +commit 33155b4fd3ce025d555f07833f96b760d5cdfbd3 +Author: Eric Anholt +Date: Tue Jan 25 03:37:05 2005 +0000 + + Finish converting RB2D_DSTCACHE to RB3D_DSTCACHE. Remove an extra pixel + cache flush in the idle function. Init an extra reg for r200, and + annotate the TCL_BYPASS better. Also, clean up some style nits from the + last commit. + +commit 3b1f1508b13520626839d45185dec09a42b9ff71 +Author: Keith Packard +Date: Tue Jan 25 02:39:48 2005 +0000 + + Add tracing. Hack Radeon cache registers to use 3D addresses. Works on M6 + +commit 6eaca06dac037851ae5c9575048faf932ad5ffc8 +Author: Eric Anholt +Date: Tue Jan 25 01:40:18 2005 +0000 + + Fix a leak of a region when the driver's CheckComposite fails. + +commit 8a1bee8ea9a028eef65b8884f73a79fbe84a9f3a +Author: Eric Anholt +Date: Tue Jan 25 01:38:26 2005 +0000 + + Silence a warning about uninitialized variable (though it would be). + +commit 67eeede4e16324990e1a6afc237a3f51b8edea39 +Author: Adam Jackson +Date: Mon Jan 24 20:44:49 2005 +0000 + + Bug #2004: Make DDC delay slightly longer. (Thomas J. Moore) + +commit 55736aa8c17f762b15e9bcd7b3f68f8680b7cb33 +Author: Egbert Eich +Date: Fri Jan 21 14:25:26 2005 +0000 + + Alan Cox requested that we check the kernel version before we use kernel + VGA font save/restore as the required features have been added to Linux + 2.6.11 (Bugzilla #2277). + +commit d7263b11f043c8c0f83d6e05095143c70177926b +Author: Keith Packard +Date: Thu Jan 20 20:51:27 2005 +0000 + + Reinitialize offscreen memory before enabling cursor on VT switch-to + +commit 13c6b2f0b6c464ce11f6c332b2fa1a529bdbab01 +Author: Eric Anholt +Date: Thu Jan 20 16:22:04 2005 +0000 + + Add a set of macros for dealing with the repeated code to wait for a while + reading a register/attempting DMA. Now it'll wait for a certain number + of seconds rather than a certain number of times through the loop + before deciding that it's timed out and resetting the hardware. Also, + add more timeout handling, and reset the draw state after resetting the + engine. + +commit dbe45c71590ac319250d04a2bf37ec07cd79e42a +Author: Eric Anholt +Date: Thu Jan 20 07:28:02 2005 +0000 + + Use RadeonSwitchTo3D() instead of doing the WAIT_UNTIL ourselves (RST3D() + also does DC_FLUSH, which may be important). + +commit fc43c154943fb1d277a9cffa9a4db7e76db461bc +Author: Eric Anholt +Date: Thu Jan 20 07:09:00 2005 +0000 + + Add R200 XV support, and make R100 (hopefully) use linear filtering instead + of nearest. Also, use RadeonSwitchTo3D instead of doing the WAIT_UNTIL + ourselves. + +commit 77755065345eb71c997c1ff74dcfd2b2bbbf1305 +Author: Eric Anholt +Date: Thu Jan 20 01:09:48 2005 +0000 + + Make R200 PDMA work -- primary queue sizes are now 9 bits, not 8. + +commit 9bd876768b2165ec3903ad0848ae2ae950330290 +Author: Alan Coopersmith +Date: Wed Jan 19 22:23:20 2005 +0000 + + Fix debugging ErrorF() so it compiles when DEBUG is true. + +commit ff433adba3a643512fdd44e41cd08965fab9c9cb +Author: Keith Packard +Date: Wed Jan 19 06:35:28 2005 +0000 + + Prefer 32bpp to 24bpp. Fix 16 color planar mode (!) + +commit cbcdae5a3f7c4009121f86de52bba6c657f20fff +Author: Adam Jackson +Date: Mon Jan 17 17:17:45 2005 +0000 + + more static server build fixes + +commit 79a7120983eff6fa114d4250fe01b62d4a99a612 +Author: Adam Jackson +Date: Sun Jan 16 01:59:23 2005 +0000 + + Bug #1895: Fix fbComposeGetSolid for BGR. (David S. Miller) + +commit 24cdd188dc3c10b56d6a7b46dafefb16c6d13efc +Author: Søren Sandmann Pedersen +Date: Fri Jan 14 22:07:59 2005 +0000 + + Fri Jan 14 17:03:40 2005 Søren Sandmann + Fix from Keith Packard for bitgravity bugs in the Composite extension, + reported by Amir Bukhari. + +commit 7db2e666e2dc9a1dba468e35e9d382e76ed8be54 +Author: Søren Sandmann Pedersen +Date: Fri Jan 14 21:56:51 2005 +0000 + + Fri Jan 14 11:12:46 2005 Søren Sandmann + Use mmx CopyArea in a few more places. + +commit 761f937fdee9ccd10ad54c1f06e12f2f102547a6 +Author: Egbert Eich +Date: Fri Jan 14 19:29:18 2005 +0000 + + - Don't suspend Xserver on APM standby request as this seems to cause + problems on may systems which don't support APM standby and might not + be required as according to the APM specs the chips should receive + enough power to retain its state. + - Print out power state change requests to log file in all verbosity + levels. + - Don't change server state if no driver PM function is registered. + (Bugzilla #2279) + +commit 16f9d2d72a2378470e9c5b31c59fa6c9a00892d6 +Author: Egbert Eich +Date: Fri Jan 14 18:42:26 2005 +0000 + + Let the OS instead of X save/restore text console fonts on Linux. So far we + relied on the generic VGA layer to restore text console fonts for us + when shutting down the server or VT switching back to the text console. + This has worked rather well but it has some downsides on Linux: a. Many + people use fbdev as console text mode. In this case it is not necessary + to save/restore console fonts as the console is running in graphics + mode anyway. b. Some architectures don't have a fbdev console but + require a full POST of even the primary card (ie. IA64). This posting + has to take place before we even have a chance to save anything. + Therefore the fonts we save are the once written to the chip by POST, + not what has been programmed by the user. c. Certain chipsets utilize + the BIOS to perform mode setting. This may interfer with the vga + save/restore font function in a strange way. It would therefore be + preferrable to let the OS - which has been used to set up the font in + the first place - take care of saving/restoring the data. I will attach + a patch which will do so for Linux. To make this fully functional a + small patch needs to be applied to the Linux kernel. To disable this + feature add: #define DoOSFontRestore NO to your host.def. (Bugzilla + #2277) + +commit 6c0b03a2362f33ae24a2f6845ed1418c9af4b8bc +Author: Adam Jackson +Date: Fri Jan 14 17:14:08 2005 +0000 + + Build fixes for static server. + +commit df4a1fa9c5cc5d54a9347a2bf4843cae87a942f1 +Author: Alexander Gottwald +Date: Fri Jan 14 12:17:10 2005 +0000 + + Added copyright notice. + +commit 2137bc6eb9f36f4ba999023d83c637024f3a6e4c +Author: Roland Mainz +Date: Fri Jan 14 08:37:30 2005 +0000 + + xc/programs/Xserver/afb/afbbres.c + xc/programs/Xserver/afb/afbbresd.c + xc/programs/Xserver/afb/afbclip.c + xc/programs/Xserver/afb/afbhrzvert.c + xc/programs/Xserver/afb/afbline.c + xc/programs/Xserver/afb/afbmodule.c + xc/programs/Xserver/afb/afbpixmap.c + xc/programs/Xserver/afb/afbpolypnt.c + xc/programs/Xserver/afb/afbpushpxl.c + xc/programs/Xserver/afb/afbtegblt.c + xc/programs/Xserver/cfb/Imakefile.inc + xc/programs/Xserver/cfb/cfballpriv.c + xc/programs/Xserver/cfb/cfbbitblt.c + xc/programs/Xserver/cfb/cfbcppl.c + xc/programs/Xserver/cfb/cfbgc.c + xc/programs/Xserver/cfb/cfbglblt8.c + xc/programs/Xserver/cfb/cfbmap.h + xc/programs/Xserver/cfb/cfbpixmap.c + xc/programs/Xserver/cfb/cfbscrinit.c + xc/programs/Xserver/cfb/cfbtab.h + xc/programs/Xserver/cfb/cfbteblt8.c + xc/programs/Xserver/cfb/cfbunmap.h + xc/programs/Xserver/mfb/maskbits.c + xc/programs/Xserver/mfb/maskbits.h + xc/programs/Xserver/mfb/mergerop.h + xc/programs/Xserver/mfb/mfb.h + xc/programs/Xserver/mfb/mfbclip.c + xc/programs/Xserver/mfb/mfbfont.c + xc/programs/Xserver/mfb/mfbgc.c + xc/programs/Xserver/mfb/mfbmisc.c + xc/programs/Xserver/mfb/mfbpushpxl.c + //bugs.freedesktop.org/show_bug.cgi?id=1114) attachment #667 + (https://bugs.freedesktop.org/attachment.cgi?id=667): Convert afb and + cfb{,16,24,32} to be dlloader-friendly. Patch by Adam Jackson + . + +commit 61b3c3aef5437f14d413a60da792257b01e9f8fa +Author: Søren Sandmann Pedersen +Date: Thu Jan 13 23:07:41 2005 +0000 + + Thu Jan 13 17:45:13 2005 Søren Sandmann + Make sure the pixmap is a valid new resource + Make sure the context is a legal new resource. + Handle null attrib_list. + Handle null attrib_list; copy attrib_list to data; actually allocate the + new GLXDrawable. + +commit 433c38f22fa96486a43dc0c9871cc09875251b34 +Author: Søren Sandmann Pedersen +Date: Thu Jan 13 20:49:21 2005 +0000 + + Thu Jan 13 15:40:29 2005 Søren Sandmann + Add MMX implementation of non-repeating source IN repeating mask, aka + "translucent window". + Add MMX implementation of CopyArea. + Use MMX implementation of CopyArea. + Use the new implementations. + +commit a303670107f205c6ca76919ca6cd6af6013073f1 +Author: Adam Jackson +Date: Thu Jan 13 01:22:53 2005 +0000 + + Bug #2114: PPC64 Linux build fix: use system definition of eieio(). + Originally Gentoo bug #66223. (Tim Yamin, Donnie Berkholz) + +commit 15895b411779aa3c14ffb92fb58cd8ec24845ea7 +Author: Alexander Gottwald +Date: Wed Jan 12 16:10:00 2005 +0000 + + winmsg.c + Introduce function winTrace which prints log message with verbosity 10 + Use winTrace for 3 heavily called functions + +commit 8aabc94596dae0fd4ce2c975de75946685faf2cd +Author: Alexander Gottwald +Date: Tue Jan 11 17:33:03 2005 +0000 + + Document the -silent-dup-error switch + +commit b6301dc41090899b20003eab1356bc09fc5eed1a +Author: Egbert Eich +Date: Tue Jan 11 14:59:02 2005 +0000 + + Minor format fix. + Added explanatory comment and debug code. + Added comment. + +commit 27fc6874b34d70a7ddae5ed8f516f6cfaab518b8 +Author: Alexander Gottwald +Date: Tue Jan 11 12:03:34 2005 +0000 + + Do not grab ALT-TAB when window is in multiwindow mode + +commit d365664c58919edb5e121a7c884384438df79776 +Author: Alexander Gottwald +Date: Tue Jan 11 11:58:12 2005 +0000 + + Fix crash with not matching definitions of PATH_MAX + +commit 65b893a707ad8b3e4d0971825c05a965dca36d10 +Author: Roland Mainz +Date: Mon Jan 10 23:38:50 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=2167) attachment #1641 + (https://bugs.freedesktop.org/attachment.cgi?id=1641): Fix broken + Solaris print queue enumeration. + +commit c6b5a9431178ac7eb90ec498e6830366865d1268 +Author: Roland Mainz +Date: Mon Jan 10 18:47:55 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=2254) attachment #1659 + (https://bugs.freedesktop.org/attachment.cgi?id=1659): Refix for gcc4.0 + build failure. It seems that the |ExecCommand()| function has no + consumer and can safely be removed. + +commit eb701e9b4481f984fdcfece181126f7424e2bf45 +Author: Alexander Gottwald +Date: Mon Jan 10 17:54:31 2005 +0000 + + winkeybd.h + Adjust keysyms for Hiragana_Katakana toggle and backslash/underscore on + Japanese and ABNT2 keyboards + +commit 2ef9d01c4d3b03f0a5d829304f2a7e2cc1327f3b +Author: Roland Mainz +Date: Mon Jan 10 14:16:29 2005 +0000 + + xc/programs/Xserver/Xprint/Util.c + xc/programs/Xserver/Xprint/attributes.h + //bugs.freedesktop.org/show_bug.cgi?id=2254) attachment #1654 + (https://bugs.freedesktop.org/attachment.cgi?id=1654): Fix gcc4.0 build + failure. Patch by Egbert Eich and Roland Mainz + + +commit 57387e115caf5a4b9501cc8f6ddeb1946b0e6547 +Author: Alexander Gottwald +Date: Mon Jan 10 13:13:08 2005 +0000 + + winkeybd.h + winkeyhook.c + Make keyhook feature work in multiwindowmode too Hook windows keys + +commit f417159e51afe22de7d4e6ba9f154313c6af59bc +Author: Egbert Eich +Date: Mon Jan 10 12:20:33 2005 +0000 + + Make option 'DontVTSwitch' work again with kbd driver under Linux. The kbd + driver now calls the OS layer to handle special keys. Possibly other + special keys and other OSes need to be looked at also. (Helmut + Fahrion). + +commit fe4e74241f6791cb1cefdddeb492ed0f56ce99b4 +Author: Alexander Gottwald +Date: Sun Jan 9 17:35:47 2005 +0000 + + xc/programs/Xserver/xkb/ddxList.c + //bugs.freedesktop.org/show_bug.cgi?id=2245) attachment #1647 + (https://bugs.freedesktop.org/attachment.cgi?id=1647): export + Win32System and Win32TempDir remove #ifdef WIN32 block for building + xkbcomp commandline create win32 tempfile in system tempdir use + PATH_MAX*4 for commandline buffer unlink tmpfile again + +commit ba25f7e8dcaa2690ce3eab839904fac034002e0b +Author: Alexander Gottwald +Date: Sun Jan 9 15:29:45 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=2245) attachment #1645 + (https://bugs.freedesktop.org/attachment.cgi?id=1645): cleanup some + #ifdef __UNIXOS2__ and WIN32 blocks. make OutputDirectory check the + size of the buffer quote all file and pathnames in the xkbcomp + commandline use PATH_MAX*4 for commandline buffer + +commit 2410b61f430c3ac4be79043f8b00defe6d53148c +Author: Roland Mainz +Date: Sun Jan 9 00:38:08 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=2240) attachment #1642 + (https://bugs.freedesktop.org/attachment.cgi?id=1642): Fix incorrect + usage of /usr/bin/tr in startup script (the used "[\n]" is neither + correct or portable, using "\n" seems to be sufficient (this fixes + various "random" issues, including including Debian bug #258419 and + Debian bug #264983). Patch by Drew Parsons . + +commit 709a2343a8c12ea7e158c63a9737b11744b50994 +Author: Alexander Gottwald +Date: Sat Jan 8 13:01:03 2005 +0000 + + Fix a possible null-pointer dereference (Keishi Suenaga) + +commit d332a909f8b8741af75047d78a62a3d19e0776e1 +Author: Alexander Gottwald +Date: Thu Jan 6 21:29:09 2005 +0000 + + Imakefile + InitOutput.c + XWin.rc + winerror.c + wintrayicon.c + winvideo.c + winshaddd.c + Set PROJECT_NAME in Imakefile to create alternative window titles for + Cygwin/X and Xming + +commit d6a74f2c4aec9c914ec0837bd0bf0d212019093f +Author: Alexander Gottwald +Date: Thu Jan 6 16:02:47 2005 +0000 + + Imakefile + InitOutput.c + XWin.rc + winerror.c + wintrayicon.c + winvideo.c + Set PROJECT_NAME in Imakefile to create alternative window titles for + Cygwin/X and Xming + +commit 3165236483de936b4ca22f8b6d2d2b8b1a1a4909 +Author: Alexander Gottwald +Date: Thu Jan 6 13:24:57 2005 +0000 + + Fix crash with non-nullterminated strings (reported by Øyvind Harboe) + +commit 591ac9c811de0871d3bdcc19cada0ff6715bf67c +Author: Alan Coopersmith +Date: Tue Jan 4 00:16:20 2005 +0000 + + Bugzilla #2211 (https://bugs.freedesktop.org/show_bug.cgi?id=2211) + attachment #1627 (https://bugs.freedesktop.org/attachment.cgi?id=1627): + xorgconfig default keyboard model outdated (should be pc105, not + pc101/pc102) + +commit af8bd7161724b6709ffe582dfd830c05d9bf4f26 +Author: Søren Sandmann Pedersen +Date: Mon Jan 3 21:32:22 2005 +0000 + + Mon Jan 3 12:45:10 2005 Søren Sandmann + Clean-ups and support for AMD64. Bug 1067. Patch by Nicholas Miell + (nmiell@comcast.net) + Add support for AMD64 + Many cleanups using instead of __builin_ia32_*, and intrinsics + instead of inline assembly. Also unconditionally use pshufw on AMD64. + s/USE_GCC34_MMX/USE_MMX/g + +commit 5f39eff85109a73d006832ad35d9d5b58f93ef0c +Author: Egbert Eich +Date: Mon Jan 3 15:43:55 2005 +0000 + + Added missing return value (Bugzilla #2205) Problem found by Stefan Kulow. + +commit ae6d52092bca6068a7847b3944148336ab489869 +Author: Egbert Eich +Date: Mon Jan 3 15:39:35 2005 +0000 + + Added missing return value (Bugzilla #2206) Problem found by Stefan Kulow. + +commit 83e13e21c8d9a3b54cae2ecc2943be3316659870 +Author: Alexander Gottwald +Date: Fri Dec 24 14:40:28 2004 +0000 + + Print error message if CreateProcess fails Simplify popen simulation code + for WIN32 Remove temporary file after executing xkbcomp + +commit 106703edf67139fa52f6810f9ced0ce5ba86a3cd +Author: Eric Anholt +Date: Wed Dec 22 18:39:41 2004 +0000 + + Back out the previous day's broken R200 "fix" -- the same number of coords + are always emitted. Fix the real problem, which was not enough regs + being initialized in ati_draw.c. Fix a typo that was resulting in alpha + coming out as 0 * src or 0 * broken instead of src * 1 or src * mask. + Assign the blending results to R0, as appears to be necessary. Unbreak + the dst-alpha-blend-with-no-dst-alpha code. Yow. And set the right DMA + count for the r200 traps code. + +commit 3035739e5b7d5a9042292d64455feb4b38788fe4 +Author: Alan Coopersmith +Date: Wed Dec 22 08:28:16 2004 +0000 + + Bug #2123 Attachment + #1587 Call to + uname should not check for return == 0, but for >= 0 instead + +commit fa0677ab43722462042f87c4636a7d59d1cb873f +Author: Eric Anholt +Date: Tue Dec 21 09:51:47 2004 +0000 + + Fix r200 render (for real this time?) by setting tex1_comp_cnt right for + non-mask rendering. Reenable it. Also, R200TexFormats was used instead + of R100 in one place. Harmless so far, because the formats were in the + same order. + +commit 4b0247b9e0a6b7f40cd2738fb29d2ed1acba99e7 +Author: Eric Anholt +Date: Tue Dec 21 09:49:30 2004 +0000 + + Whitespace nit. + +commit 894431412613265fd315cf7a707ffa741f93cf47 +Author: Matthieu Herrb +Date: Wed Dec 15 20:51:25 2004 +0000 + + Use snprintf. + +commit eea11301fd9247a28b1daeb340a018c7ea309c41 +Author: Thomas Winischhofer +Date: Wed Dec 15 15:05:35 2004 +0000 + + Another fix for MiscPassMessage(): Initialize returned "status". + +commit 264c3eefe6c0cdee1ff0a5de914f051ab23026b7 +Author: Alexander Gottwald +Date: Wed Dec 15 12:22:39 2004 +0000 + + latest changes from CYGWIN + +commit c7fec26b50f8a64360d1252cdf48370935fb2f76 +Author: Thomas Winischhofer +Date: Wed Dec 15 00:32:56 2004 +0000 + + Make MISC extention's PassMessage() actually work and fix memory leaks + +commit d0b17bda4dc469e2ce72f4f8965916b316e1deb7 +Author: Egbert Eich +Date: Tue Dec 14 08:59:20 2004 +0000 + + Removed #ifdef'ed out code together with the comment explaining why it was + #ifdef'ed out. + Fixed typo. + Added comment to a changed that's been committed with one of the previous + commits. + +commit 0e6a122316a94c96051f1d832990032a386097bc +Author: Roland Mainz +Date: Mon Dec 13 03:42:32 2004 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=1695) attachment #1230 + (https://bugs.freedesktop.org/attachment.cgi?id=1230): Fix crash in + Xscreensaver code which allowed any authentificated X client to crash + the Xserver using |XScreenSaverUnsetAttributes()|. Patch by + ajax@nwnk.net + +commit 159e443a2209eb3ea305e84b847b76ef1637d005 +Author: Roland Mainz +Date: Mon Dec 13 02:13:32 2004 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=1688) attachment #1530 + (https://bugs.freedesktop.org/attachment.cgi?id=1530): Fix the current + implementation to make it possible to slow down the mouse pointer or + use arbitrary fractions (without running into rounding error issues). + The change is using the same method of preserving rounding errors that + the exponential method is already using. Patch by Jan Brunner + . + +commit f1768677f73150c686cf5678f5f5d63c0cfa8e56 +Author: Kristian Høgsberg +Date: Sun Dec 12 23:29:20 2004 +0000 + + Reduce vidmode logging. + +commit 9286a5d032ea6bed102db39281c3d2537da4dccc +Author: Kristian Høgsberg +Date: Sun Dec 12 22:58:37 2004 +0000 + + Add fix for 460gx pci scan code. + +commit 8266a2581d21a1a2880a0e8babb8b0305c435ec0 +Author: Torrey Lyons +Date: Thu Dec 9 22:40:35 2004 +0000 + + Fix crash with more than one screen reported by John Davidorff Pell. + +commit 081b33d73f73572cfefba7e5489408a7117b6e9f +Author: Alexander Gottwald +Date: Wed Dec 8 15:48:15 2004 +0000 + + import changes from CYGWIN branch + +commit 6c317c1c1323bd11292f8f9f179d75c96a18e616 +Author: Roland Mainz +Date: Wed Dec 8 05:52:20 2004 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=1361) attachment #1287 + (https://bugs.freedesktop.org/attachment.cgi?id=1287): Avoid DRI + initalisation when the Xfree86-DRI extension was turned off. Patch by + Kristian Høgsberg . + +commit b9476cd96faf19153c11e3370e9fced8045600f4 +Author: Roland Mainz +Date: Wed Dec 8 05:48:16 2004 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=1361) attachment #938 + (https://bugs.freedesktop.org/attachment.cgi?id=938): Allow more + extensions to be enabled/disabled. + +commit 47935dd7f010f2f77768774ceb6f85667efe4264 +Author: Matthew Allum +Date: Mon Dec 6 22:29:31 2004 +0000 + + Xephyr on Xorg fix + +commit 8091b301c941473ab99626a6e66f72acdb6750f7 +Author: Matthieu Herrb +Date: Mon Dec 6 21:54:19 2004 +0000 + + xf86Config.c references USE_DEPRECATED_KEYBOARD_DRIVER so define it if + needed when building this file + - bug fix: pointerMsg -> keyboardMsg in auto-configuration code. + - make the 'kbd' driver the default for autoconfiguration everywhere. + +commit cde3a175005104e061c1ff133f07c598868bdc4e +Author: Alexander Gottwald +Date: Mon Dec 6 18:28:12 2004 +0000 + + include windows.h + +commit 9c94971617db11861aed82e16804fc14a9ca1260 +Author: Egbert Eich +Date: Mon Dec 6 15:53:00 2004 +0000 + + Use the same method of finding the screen pixmap of COMPOSITE extension is + compiled in or not. + Removed stale make variable. + Updated xaaWrapper.c: Under certain circumstances the accel path was not + used when possible. Removed some debugging stuff and stale code that + had been commented out. + Check if maps are really installed before attempting to list them. + +commit 4945034792b28d1a222a615404bfceaf48a130c5 +Author: Alexander Gottwald +Date: Mon Dec 6 12:26:50 2004 +0000 + + problem with max() macro. this one slipped though again + +commit 531776becf95f66e6e435aad0dc21ead436ff5aa +Author: Alexander Gottwald +Date: Sun Dec 5 21:33:23 2004 +0000 + + missed another wBOOL issue + +commit 9bd1328c49aafae67a6a6d9fd17063c75d8547a2 +Author: Alexander Gottwald +Date: Sun Dec 5 21:24:48 2004 +0000 + + redone ddraw.h to be able to mix it with w32api style COM header files. + obj_base.h is not needed anymore. Using instead. + Use Xwindows.h instead of windows.h + do not include win_ms.h + remove extra definition of sleep() + Set HOME to Documents and Settings/username if not set + Use Xming basedir instead of ProjectRoot for system.XWinrc + Fix callback functions to use wBOOL instead of BOOL + Fix compiler warnings. Added debug output. + Fix warning about undefined macro max + +commit bf0a760331e2fe4dbc00e78f87022c7464d9ca4f +Author: Roland Mainz +Date: Sun Dec 5 04:39:34 2004 +0000 + + //freedesktop.org/bugzilla/show_bug.cgi?id=1800): Fix Postscript DDX's 1bit + StaticGray visual to report only 1bit of significant bits in color + specification (instead of 8bits). Patch by Julien Lafon + + +commit 44f4713a056b7a6a076b2f65fbed43e0cfe9ff06 +Author: Markus Kuhn +Date: Sat Dec 4 00:43:13 2004 +0000 + + Encoding of numerous files changed to UTF-8 + +commit f264a7ea741f57fbc3bb900cfbb9e0cc23f46e90 +Author: Alexander Gottwald +Date: Fri Dec 3 12:04:15 2004 +0000 + + Removed scprintf, aprintf and snprintf stuff and use newXprintf + +commit 16a683f4d164899ecfdafb853f48cff10fd13fd4 +Author: Alexander Gottwald +Date: Fri Dec 3 11:57:42 2004 +0000 + + Bugzilla #1865, https://bugs.freedesktop.org/show_bug.cgi?id=1865 Added + X(NF)printf and X(NF)vprintf functions which allocate the buffer with + X(NF)alloc + Bugzilla #1865, https://bugs.freedesktop.org/show_bug.cgi?id=1865 extend + snprintf to work on NULL. + +commit fe2a2213d1db8700f6078379f86ebe8827793c20 +Author: Roland Mainz +Date: Thu Dec 2 23:47:39 2004 +0000 + + //freedesktop.org/bugzilla/show_bug.cgi?id=1998): Fix Xserver standalone + build when RENDER extension includes are not availabe. + +commit 30a4202f3d59a32fd6f93dfd257d93ee21b68ed9 +Author: Kristian Høgsberg +Date: Thu Dec 2 21:58:58 2004 +0000 + + Use __printf__ in gcc function attributes to avoid clash with libc wrapper + define, and remove the last bits of the old workaround. + +commit e62d85baa31fc853aefdef49962ad4cb86ae8245 +Author: Alexander Gottwald +Date: Thu Dec 2 21:49:54 2004 +0000 + + Remove some of the ifdef WIN32 checks from WaitForSomething + +commit 2782b8871196ef28f9a6c84bf6c8b5086d00d5d4 +Author: Alexander Gottwald +Date: Thu Dec 2 14:19:01 2004 +0000 + + Adjust the width of the rootless backbuffer to match 32 bit alignment + Make multiplemonitors default for -internalwm + +commit 3b3e24dc4d89b471d80428dd9ad122f259b1fc81 +Author: Alexander Gottwald +Date: Thu Dec 2 13:38:30 2004 +0000 + + Set HasFfs to NO + Fix link order problems with mingw. Add libdix.a after libmi.a. + Pass -DHAS_FFS to compiler + remove inline code for ffs(). It will link to dix/ffs.c instead added + declaration for ffs() + +commit 2620676306d1eccd24a6bf0637a60842656e6f7c +Author: Phil Blundell +Date: Wed Dec 1 19:43:29 2004 +0000 + + Patch from Florian Boor : + Check return value from ts_config. (TslibInit): Likewise. + +commit 96545d038837bbc7dc435ed7c1f631454e86cecb +Author: Alexander Gottwald +Date: Wed Dec 1 14:57:45 2004 +0000 + + Remove code which sneaked in recently. It is not proven to be correct, just + a workaround and disabled by default + +commit 3f063fc49cc2d456359a1b0b9f36f27befdb09b0 +Author: Alexander Gottwald +Date: Wed Dec 1 14:16:07 2004 +0000 + + Set XERRORDB environment variable to relocate the XErrorDB file + +commit 908442301478b21febab17e31aa55918eaaa5101 +Author: Roland Mainz +Date: Tue Nov 30 23:43:33 2004 +0000 + + //freedesktop.org/bugzilla/show_bug.cgi?id=811): Updating generated + Xprt.html which was forgotten during the previous work. + +commit af717ae57dd6c5e6ad41b4142d62cdbb55f13777 +Author: Egbert Eich +Date: Tue Nov 30 08:38:44 2004 +0000 + + Make Xorg the default server to install. + Avoid PIO access on IA64. Some IA64 machine check if legacy ports outside + the VGA range are accessed. The ATi driver however does this to probe + for ISA Mach8/32/64. Since no IA64 has ISA slots this restriction + should not be relevant to the user. + Avoid recursive calls of xf86scanpci(). This function normally detects that + it has been called before by checking if the PCI structure is filled + out. So far if this was not the case (because PCI probing has failed + for some reason) the function is traversed again. With the chipset + specific PCI bus probing this can lead to an endless recursive loop as + the post-probing code calls xf86scanpci() from within this function. + The OS specific PCI code for Linux worked only if bus 0 was populated as it + checked for the presence of /proc/bus/pci/00. Fixed to check for + /proc/bus/pci/ instead. + +commit 59ccc6465ca15e046ad11362ae5fbb3c71d2c148 +Author: Alexander Gottwald +Date: Mon Nov 29 12:34:55 2004 +0000 + + Fixed windows.h include for cygwin. + Bugzilla #1945: Stop unnecessary reordering. + +commit df2f2ff5a4ebf6c5289da64bf3f572341a0f7656 +Author: Phil Blundell +Date: Sun Nov 28 23:20:17 2004 +0000 + + Re-read "fix" structure from kernel after mode selection, in case line + pitch has changed. + +commit 6062f6a6e7b3c444a35e3f11b2541df2aa0066a2 +Author: Roland Mainz +Date: Thu Nov 25 22:42:51 2004 +0000 + + xc/programs/Xserver/Xprint/Imakefile + xc/programs/Xserver/Xprint/Xprt.html + xc/programs/Xserver/Xprint/Xprt.man + //freedesktop.org/bugzilla/show_bug.cgi?id=811): Add missing manual page + for "Xprt" (DocBook master file (Xprt.sgml) and the generated files + (Xprt.html, Xprt.man). + +commit cbce4cf96dfa2eeecb253d73d7d9acecbc52ad67 +Author: Alexander Gottwald +Date: Thu Nov 25 12:48:21 2004 +0000 + + Bugzilla #1914: fix size limit for -fp argument + +commit 2b75c19ea2bb76512d51e99c5c9ecb073fdb9163 +Author: Matthew Allum +Date: Wed Nov 24 17:50:50 2004 +0000 + + minor Xephyr fix + +commit a96254234fc9410944406f6ae878815cd3cfcee3 +Author: Matthew Allum +Date: Wed Nov 24 17:08:06 2004 +0000 + + XEphyr -parent switch fixes + +commit a7a07d0c71aa3f2e224cceea7e8d8348523136ee +Author: Alexander Gottwald +Date: Wed Nov 24 16:56:03 2004 +0000 + + Finally the multiwindow mode defines a default cursor + +commit ca4da62478a3ad86ab087245bf8eb7d7fadf31de +Author: Eric Anholt +Date: Wed Nov 24 09:07:58 2004 +0000 + + Add include to unbreak build on FreeBSD. + +commit da3df7522d15855fa871c45f3b8db23e7c639a44 +Author: Kristian Høgsberg +Date: Wed Nov 24 02:45:33 2004 +0000 + + Remove this file and all references to the binary expiry code. + Remove old obsolete include/extensions/damage.h. + Include srvrv_ctrl(xfree86) in macintosh US XKB symbol file so VT switching + works again on mac (#1872). + Remove out of place #define's of printf to xf86printf. This definition + should only be in xfree86/os-support/xf86_libc.h + +commit 9a26d6f39e199bad287d4e538ef75700a0102788 +Author: Thomas Hellstrom +Date: Tue Nov 23 17:29:47 2004 +0000 + + Bugzilla #1883 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1883): Fix + insufficient SHM detection in XvMC local test. Removed reference to + getpagesize() which caused linking problems on s390. Reported by Stefan + Dirsch + +commit fec868bf0f67a8f62fc69d55e2ff72b6cacea6f8 +Author: Roland Mainz +Date: Tue Nov 23 17:10:55 2004 +0000 + + //freedesktop.org/bugzilla/show_bug.cgi?id=1204): Fix X11 test suite + (caused by DAMAGE layer) failure with Xvfb when rendering text using + |XDrawText*()| (XDrawText() tests 1, 3, 4, 27, 28, + 29, 30, 34, 37, 39, 41, 43 and XDrawText16() tests 1, 3, 9, 10, 11, 12, + 13, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 34, + 37, 39, 41, 43). Patch by Hong Bo Peng and Stefan + Dirsch . + +commit b09f2a0495071a068c2b6b36084c974acf7aab9b +Author: Alexander Gottwald +Date: Mon Nov 22 16:04:04 2004 +0000 + + Windows does not have ffs() implementation. added one + Enable RootlessSafeAlpha and RootlessAcceleration for the Windows port too + +commit bb43f234c5d418e064c89b928b81b53987f14e92 +Author: Alexander Gottwald +Date: Mon Nov 22 15:00:04 2004 +0000 + + Use GetTempPath for finding a place where to store temporary files on + Windows + +commit bc7493801d1f5177d9ba3fe09accc2a2d72cfe3d +Author: Alexander Gottwald +Date: Mon Nov 22 14:28:25 2004 +0000 + + Fixes for building multiwindow and internalwm on mingw + Changed some debugging output + +commit 255c3c0e8ca0f402b2c327d70c8a254ba65eda03 +Author: Alexander Gottwald +Date: Mon Nov 22 14:12:33 2004 +0000 + + Xming: Place logfile in users tempdir + +commit 0f7874cbfc01da339cc6be221351ddffdb37805d +Author: Alexander Gottwald +Date: Mon Nov 22 13:23:25 2004 +0000 + + Use a simple hashtable as ConnectionTranslation instead of a plain array on + Windows because socket fds are not sequential and do not start at 0 + +commit e6bc551e3451efe4fcbb55475d6d0ff53fcc9807 +Author: Alexander Gottwald +Date: Mon Nov 15 18:13:41 2004 +0000 + + Use CreateProcess instead of system() to spawn xkbcomp on windows. system() + can not handle spaces in the path component. Quoted all filenames on + the commandline. + +commit 6618567311f41f5e237f12b4204aa32ce174a514 +Author: Alexander Gottwald +Date: Mon Nov 15 15:58:51 2004 +0000 + + Remove override of HasSnprintf + +commit 9826b83826190e514ed115e15691ca015780f9bc +Author: Alexander Gottwald +Date: Mon Nov 15 15:06:51 2004 +0000 + + Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added + mingw (Win32) port + +commit cecb668149e1956fb29bc89855182349122e2f4e +Author: David Reveman +Date: Sun Nov 14 23:21:29 2004 +0000 + + Add xglPixmapToRegion + +commit 343f965749af0a985573c525dc6084c2519b6ffe +Author: Alan Coopersmith +Date: Sun Nov 14 17:29:56 2004 +0000 + + Fix typos in output file. (Bugzilla #1849, reported by Yi Ren-Chen) + +commit 636a9e786881dd42cd6fd579e13b7895cf9f10eb +Author: Phil Blundell +Date: Sat Nov 13 18:03:16 2004 +0000 + + Don't leave stale pointers hanging around after ts_close(). (TslibFini): + Likewise. + +commit 36d9e01c0d36eaf0d9cb1e77dd2908b09d55a35d +Author: Phil Blundell +Date: Sat Nov 13 16:41:00 2004 +0000 + + New global variable. (KdProcessArgument): Set it to TRUE on -nozap switch. + (KdUseMsg): Add help for -nozap and -rgba switches. + Declare. + Honour dontZap flag. + +commit 3b0dce3620e4cce74c3a2c7f9077cc28be11740d +Author: Thomas Hellstrom +Date: Sat Nov 13 11:09:23 2004 +0000 + + lib/XvMC/Imake + Added support for automatic loading of the correct hardware XvMC driver. + This involves a protocol extension of the XvMC protocol. The XvMC + revision number was bumped. + +commit a97548b1c9bb69b5824609c1da1ad66c3a9c5065 +Author: Kristian Høgsberg +Date: Thu Nov 11 20:10:28 2004 +0000 + + Cosmetic fix to make xf86pciBus.c use standard min() macro. + +commit e5040e24f03a2fe770139e6f37acef3da48aa0f9 +Author: Matthieu Herrb +Date: Thu Nov 11 16:09:58 2004 +0000 + + oops commited wrong version previously + +commit e380fd548ed5452d08184723145dd992ad72288c +Author: Matthieu Herrb +Date: Thu Nov 11 15:44:31 2004 +0000 + + update shared lib revisions on OpenBSD (Bug #1828). + update references to xf86site.def in comments (Bug #1827). + fix kbd driver for wskbd protocol and pure wscons console driver (Bug + #1825). + don't add '-4' to generated default file name (bug #1826). + typo in resource name (XFree86 bug #1300, X.org bug #1825) + +commit d7f46f71d892768ea85552a0d5458b69b561fe21 +Author: Matthew Allum +Date: Thu Nov 11 14:55:30 2004 +0000 + + Xephyr grab fix + +commit 2854fa438ff721637f2e53fbafa141b3db8a9082 +Author: Adam Jackson +Date: Tue Nov 9 17:06:15 2004 +0000 + + Bug #557: Don't use "bool" as a variable name in xf86cfg, to avoid compiler + bugs. (Donnie Berkholz) + +commit 367b963b6333ee58e197845f1389a95ff26f108e +Author: Adam Jackson +Date: Tue Nov 9 15:58:41 2004 +0000 + + Bug #1765: Add support for R_ALPHA_SREL32 relocations in elfloader. + Originally Debian patch + 202_alpha_elfloader_support_R_ALPHA_SREL32.diff. (Falk Hueffner) + +commit 50cdff7ee2a1b448da24e85efae02237cff9b6b7 +Author: Matthew Allum +Date: Tue Nov 9 11:36:49 2004 +0000 + + Xephyr improvements + +commit 81a3b6fe27567b4f91033ece69996aa6bf8d01a3 +Author: Matthew Allum +Date: Mon Nov 8 22:39:47 2004 +0000 + + Add support to Xephyr for lower depths than hosts + +commit e494e24c508b34b144355cb380aac16abf2fb891 +Author: Alexander Gottwald +Date: Sat Nov 6 11:56:57 2004 +0000 + + Wrap all mwextwm and internalwm code with XWIN_MULTIWINDOWEXTWM + +commit 16ee24cd994fa3f8d479c972f18c8207a5116cb7 +Author: Torrey Lyons +Date: Fri Nov 5 19:51:38 2004 +0000 + + Use ROOTLESS instead of platform specific defines. + +commit 64c7f8e667eef955b266c359291206c7188ce20c +Author: David Reveman +Date: Fri Nov 5 13:26:07 2004 +0000 + + Use UTF-8 encoding in Xgl sources + +commit 1d994e1d14225c1dec5251edeae40e24923a31c6 +Author: David Reveman +Date: Fri Nov 5 12:46:29 2004 +0000 + + Use negative strides in Xgl if pixel data have bottom-top scanline order + +commit 2dd76d646c517e1988897692e9ff8b6194d25c87 +Author: David Reveman +Date: Thu Nov 4 23:19:13 2004 +0000 + + Add working Xgl server code + +commit 1aef1060647d22b676a29f6dcf1ac54f9fe7ff5d +Author: Kensuke Matsuzaki +Date: Thu Nov 4 11:52:22 2004 +0000 + + Add InternalWM mode. + +commit 522c878fca3bfe97cd408e37065f827c004faa04 +Author: Egbert Eich +Date: Tue Nov 2 08:54:53 2004 +0000 + + Removing unneeded private FreeType2 symbol. + Updating to EDID 1.3. (Bugzilla# 1490, Jay Cotton, Egbert Eich). + Removing unneeded code. + Fixed KGA handling for i810. KGA handling for chips derived from C&T chips + is slightly different. The changes make the code consistent with the + C&T (chips) and i740 drivers. + +commit 1074992c285835ca9d96d11e8352bbe2cdbc2a28 +Author: Egbert Eich +Date: Mon Nov 1 16:05:27 2004 +0000 + + Fixed sig11 which occured when calling a CloseDisplay() after + XScreenSaverSetAttributes() followed by XScreenSaverUnsetAttributes(). + Caused by missing FreeResource() in XScreenSaverUnsetAttributes(). + Removing unused DDC sections that caused misinterpretation of DDC data due + to a missing break statement in a switch. + Fixed typo: #if <-> #ifdef. + +commit 7e588ba9abdcc2078b6c361c81806337b8ff0827 +Author: Alan Coopersmith +Date: Sat Oct 30 20:33:43 2004 +0000 + + Add -d flag for compilers like the Sun C compilers that produce dependency + lists themselves. To use with the Sun compilers, add to host.def: # + define UseCCMakeDepend YES # define DependFlags -cc $(CC) -d -xM (Sun + bug id #4245688 - fix by Alan Coopersmith) + Add Solaris to the platforms on which mprotect is run to set execute + permissions when necessary. (Sun bug id #6175128 - fix by Alan + Coopersmith) + Internationalize digital output (Sun bug id #4119396 - fix by Steve + Swales), add -bgpixmap option to set XPM file as background (originally + from STSF project version of xclock by Alan Coopersmith) + xc/programs/xmodmap/handle.c,pf.c xmodmap was printing line numbers which + are one too low in error messages (Xorg bugzilla #1739, Sun bug id + 4637857 - fix by Sam Lau) + +commit 612bd1c27322a69a98b59193e7d31501688359bd +Author: Thomas Winischhofer +Date: Fri Oct 29 02:07:15 2004 +0000 + + Add facility for catching signal 4 from driver. This can be used to check + for OS SSE support. (Part 2) + +commit 09fdfaa28d2afe33dfadd4293b39a34da268fbdb +Author: Thomas Winischhofer +Date: Fri Oct 29 02:06:17 2004 +0000 + + Add facility to catch sig 4 from driver. This can be used to check for OS + SSE support. (Part 1) + +commit b0185a4bf77a668e65e94197bdb13331680521c7 +Author: Thomas Winischhofer +Date: Thu Oct 28 22:12:23 2004 +0000 + + Add xf86[GetGammaRamp|ChangeGammaRamp|GetGammaRampSize] to symlist in order + to allow drivers to use them + +commit 9d4823adc8319a20d2ace3d0944ca32e300f6eeb +Author: Alexander Gottwald +Date: Thu Oct 28 14:23:08 2004 +0000 + + Import recent changes from CYGWIN branch + +commit db65fce04ddec1dac0d92ad3abc95ab4996bd206 +Author: Torrey Lyons +Date: Mon Oct 25 19:09:11 2004 +0000 + + Fix rootless Cygwin crash due to acceleration code illegally modifying a + const structure (Reported by Kensuke Matsuzaki). + +commit a57e85b52357f15f52e81c8d9b310a76e0c62b3f +Author: Roland Mainz +Date: Mon Oct 25 07:12:21 2004 +0000 + + Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1664 - RFE: Add + support for the DOUBLE-BUFFER extension to the Xprint server and DDX. + Additionally a "pixmap-scrubber" optimisation is added to the + PostScript DDX to remove all content from a vector pixmap when a + |PolyFillRect()| call covers the whole pixmap surface with a solid fill + (this avoids that a backbuffer vector pixmap gets constantly filled + even when the content is not visible anymore after |XdbeSwapBuffers()| + has cleared the hidden buffer with the background color). + +commit e0cc4871491ab7a8c52749ff2c077d8f11516b15 +Author: Phil Blundell +Date: Wed Oct 20 18:06:58 2004 +0000 + + Add epson. + Build Makefile in hw/kdrive/epson. + +commit 258c9016a0c966187a81f9d956766791d6e8c505 +Author: Phil Blundell +Date: Wed Oct 20 18:02:32 2004 +0000 + + Block SIGIO before disabling input fds. (KdEnableInput): Unblock it after + enabling them again. + +commit cbd5fbcb7e5b802cbcff317fdc2f848043207690 +Author: Phil Blundell +Date: Wed Oct 20 08:20:51 2004 +0000 + + Import Epson 13806 driver from Costas Stylianou: + New files. + +commit 0584d92b36910d42e4fba96cee5f3380eeb3b493 +Author: Egbert Eich +Date: Mon Oct 18 14:21:46 2004 +0000 + + Made handling of DevelDrivers for x86-64 more conformant to other + platforms. + Compress all font encodings (Stefan Dirsch). + Fixed warnings. + Turn on forwarding XNSpotLocation event to XIM server in OffTheSpot and + Root mode (bugzilla #1580, James Su). + Added another compose key combination for the Euro symbol (Stefan Dirsch). + Added support for UTF-8 in ja_JP, ko_KR and zh_TW locales (Mike Fabian). + Changed default encoding for ru from KOI8-R to ISO8859-5 (Mike Fabian). + This is the encoding that is also used by glibc. We may break other + libcs - lets see who complains. + Added explanation for DESTDIR to install to a different directory than /. + Added some early bailouts to atiprobe if PCI structure pointer is NULL to + prevent sig11. + XV support doesn't depend on 2D acceleration any more. This patch removes + this limitation from the NSC driver. This is a patch that I have + committed to XFree86 a while ago but never ported over to X.Org. + Matthieu Herrb contributed some build fixes. + Fixing SetDPMSTimers() so that DPMS*Time == 0 disables the appropriate + timer. This takes advantage of the fact that TimerSet() with a timeout + argument 0 behaves like TimerCanel(). + Use /dev/xconsole (named pipe) or devpts for system logger (Werner Fink). + Create missing links for backward compatibility to XFree86 (Stefan Dirsch). + Changed comment to mention xorg. + Changed cursor for the 'kill' action from XC_draped_box to XC_Pirate. If + you don't like it we can change it back (original author unkown). + Added 'pic' to the man page rendering command pipeline (Werner Fink). + Added missing return value (Stefan Dirsch, Roland Mainz) + +commit 77dab254402073bf96234a6b1056b2277578a976 +Author: Alex Deucher +Date: Sun Oct 17 20:29:35 2004 +0000 + + - Add interlaced support to S3 driver (bug 332, Leo Savernik) + - EmulateWheelTimeout (bug 323, Mathias Fröhlich) + - single button double-click (bug 322, Rob Brown) + +commit 9a0cf1eb43878308c0a83e4f935933b647edc6d5 +Author: Matthieu Herrb +Date: Sun Oct 17 10:46:14 2004 +0000 + + Remove some remaining AMOEBA specific code. + +commit 5505555c15bfa2de1f596ae0997335fdbf07eb5a +Author: Roland Mainz +Date: Fri Oct 15 22:29:40 2004 +0000 + + Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1647 - Fix the + problem that |XpSubmitJob()| returns a random value (patch by Stefan + Dirsch/SuSE). + +commit 60caca718d23012c4c85ce70547610fe05168342 +Author: Roland Mainz +Date: Fri Oct 15 22:08:38 2004 +0000 + + Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1646 - Fix the + problem that |PsCreateColormap()| returns a random value (patch by + Stefan Dirsch/SuSE). + +commit 4782b2f7c10708f9662d9fc743c692d0bec85743 +Author: Roland Mainz +Date: Fri Oct 15 21:43:31 2004 +0000 + + Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1637 - Fix + problems in oid code which may cause the usage of an invalid string + pointer (original patch by Egbert Eich). + +commit 881b5756dc96dc33f6966ec6fccd324f63559dc2 +Author: Adam Jackson +Date: Thu Oct 14 23:10:30 2004 +0000 + + Bug #1628: Convert xf86{BusToMem,MemToBus} to PIC code, eliminating a text + relocation and enabling the server to be built as a + position-independent executable. (PaX Team) + +commit a0251ee285e1f1e28d06927d8ab7d35d59fda607 +Author: Roland Mainz +Date: Thu Oct 14 02:20:52 2004 +0000 + + Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1629 - Fix crash + on AMD64, regression caused by bug 1496 ("Xorg Xprt does not support + "*xp-listfonts-mode: xp-list-internal-printer-fonts" to toggle the + usage of printer-builtin fonts"). + +commit 3a055ea35b687e381da4d729dbdd0ebac47f673b +Author: Vladimir Dergachev +Date: Wed Oct 13 23:02:42 2004 +0000 + + Modified: + xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c + xc/programs/Xserver/hw/xfree86/drivers/i2c/fi1236.h Squash annoying warning + about fi1236_dump_status + +commit 3364e7fbd44537b98212820fb2b1941abf0d5ef3 +Author: Egbert Eich +Date: Tue Oct 12 19:13:43 2004 +0000 + + Set fbdev mode as the default mode on PPC (Olaf Hering). + Added support for IBM space saver keyboard (Stefan Dirsch). Added support + for Cherry CyMotion Master XPress (Marcus Schaefer). + Change order of SetDisplayDevice(), HWRestore(), UnbindGART() and + RestoreBIOSMemSize() to be exactly opposite to the Save procedure in + EnterVT() (Matthias Hopf, Alan Hourihane). + Fix text mode restauration by removing the assumption that the register + which determines which head is programmed is set. to the active head by + the BIOS (Mark Vojkovich). + When I wrote the resource code 5 years ago I made some assumptions which + turned out to be false: I've assumed that the bus number of the PCI + hostbridge would be the PCI bus the bridge links to. This is not + correct. Fixing this assumption is not easy. However I hope that the + attached patch will make the system work regardless as it 'ignores' + host bridges from which the target bus is not known. This should not + matter at all as we really don't care about host bridges (unless we + have bridge specific code which retrieves information about the + bridge). + Fixed server crash on reset when a structure allocated in PreInit() was + freed on CloseScreen(). + Fixed ring buffer lock ups that happened because the structure that + contained ringbuffer data was not zeroed after allocation. + Fixed numerous warnings due to signed unsigned comparisons. + programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c: + (NVBacklightEnable): Changed the order in which the sequencer registers + and the backlight control registers are written. The sequencer control + register need to be written first otherwise DPMS screen blanking + produces vertical bars on a mobile device. lib/Xau/Imakefile: Build + libXau static library PIC so it can be linked into toolkits that would + like to wrap its functionality. + +commit 4ab7d316eceb23c81c1b208f9291750cf6b37513 +Author: Egbert Eich +Date: Mon Oct 11 09:58:04 2004 +0000 + + Improving DPMS handling on VT swich and server termination/abort: previous + version called the driver directly and too late. + Unblank secondary screen explicitely. Don't rely on the value read during + register save as the BIOS have blanked the secondary head. + Checking if server isn't switched away before calling sync. Sanity check + for possible bugs in aother areas of the code. + Fixing default amount of of allocated video memory from AGP for i810: Use + 16MB if less than 192MB are installed else use 24MB (Matthias Hopf). + +commit ca1fda2a3f674a6d59de236612c7077387738ec3 +Author: Matthieu Herrb +Date: Sun Oct 10 17:48:43 2004 +0000 + + programs/Xserver/Xext/saver.c Fix for XFree86 bugzilla #1224. + +commit fa9847aeb9094aafc3798aee1fc8379e77a18d6a +Author: Torrey Lyons +Date: Fri Oct 8 00:35:08 2004 +0000 + + Allow rootless implementations to override frame reordering. This is used + on Mac OS X when genie-restoring from the Dock to ensure that the + animation completes before drawing the frame. + +commit d737bc3300cf1847bcea08ca781f37ee3ee62692 +Author: Alan Coopersmith +Date: Tue Oct 5 17:28:15 2004 +0000 + + Make xorgconfig ask again instead of giving up and throwing away all your + answers when you give a bad file name or bad amount of video RAM. (Sun + bug id 5070654 - Derek Wang) + +commit 75217be88ccb87a54c84e31697ffb98b5f9b8e0a +Author: Roland Mainz +Date: Mon Oct 4 05:34:32 2004 +0000 + + Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=661 - Xprt + producing spurious characters in PS output when using the bitmap cache + (Originally reported against Solaris Xprt as Sun bug id #4369307, and + fixed in Solaris by Jay Hobson. + +commit 658b4ed81f777df2d8b9f47904de90bde1897113 +Author: Roland Mainz +Date: Mon Oct 4 05:04:14 2004 +0000 + + Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1299 - Add more + visuals to the Postscript DDX (8bit GrayScale/StaticGray, 1bit + StaticGray and the basic infratructure for "deep" visuals with more + than 8bits per RGB gun). + +commit e622b346113f65788110777d7d1b5fc436600a4d +Author: Roland Mainz +Date: Sun Oct 3 23:29:21 2004 +0000 + + Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1496 : Fixed Xprt + font handling which did not support "*xp-listfonts-modes: + xp-list-internal-printer-fonts" or "*xp-listfonts-modes: + xp-list-glyph-fonts" to toggle the usage of printer-builtin and glyph + fonts in XListFonts*(), XLoad*Font(), etc. Additionally the Xprint DDX + now explicitly list "xp-listfonts-modes" in + "document-attributes-supported" (for document-level) or + "xp-page-attributes-supported" (for page-level) when the DDX implements + this feature (as described in the CDE DtPrint specification). + +commit 8b2f127ea0db2c7fee223b69f4fceee0427fb2e4 +Author: Roland Mainz +Date: Sun Oct 3 15:34:33 2004 +0000 + + Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1416 - Fix Xprt + PostScript DDX crashes when copying offscreen pixmap content to the + same pixmap. + +commit 7b27bf869dcf02bccf730706fc451c6f4c72b1f0 +Author: Vladimir Dergachev +Date: Sun Oct 3 15:01:31 2004 +0000 + + Modified: + xc/programs/Xserver/hw/xfree86/drivers/i2c/fi1236.c Make sure formatting + style is consistent within a single function. MT2032 functions are best + be in separate file anyway. + +commit 4046653cb63f4cd752212e7cf65fad5408d8f5b8 +Author: Vladimir Dergachev +Date: Sun Oct 3 14:38:31 2004 +0000 + + Modified: + xc/programs/Xserver/hw/xfree86/drivers/i2c/fi1236.c Fix compilation with + gcc 3.4.x Cleanup xf86DrvMsg noise. + +commit ebe7b3fe160259b6f19fe760d6ff4f5bb1dd4b72 +Author: Vladimir Dergachev +Date: Sat Oct 2 01:35:33 2004 +0000 + + xc/programs/Xserver/hw/xfree86/drivers/i2c/*_module.c Change version + strings to XORG. + +commit 0d474149f1cb68a60927529f6eac611a12acf5e6 +Author: Vladimir Dergachev +Date: Thu Sep 30 22:58:07 2004 +0000 + + Initial code from GATOS. This needs to be cleaned up, for example the bt829 + code is practically untouched since xatitv (which was a standalone test + program). However, it all worked and was debugged over long period of + time, so I prefer to to mess with these for now. + New drivers: fi12xx (including MT2032 - this would be be split off later). + tdaXXX msp34xx bt8xx + +commit 1dfafe2aeec864a9bdfd6da3324243b2be8e3a62 +Author: Roland Mainz +Date: Wed Sep 29 04:17:44 2004 +0000 + + Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1489 - Use |long| + instead of |int| for BIGREQUESTS commandline option. + +commit de89181444a2f2258a446fe20a25e37fd225a568 +Author: Roland Mainz +Date: Fri Sep 24 02:11:14 2004 +0000 + + Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1453 - Fix spaces + in usage output for BIGREQUESTS extension (option "-maxbigreqsize"). + +commit 884cb060eea2b914191c269a0c9955ed83d07ff9 +Author: Torrey Lyons +Date: Wed Sep 22 23:52:39 2004 +0000 + + Update XDarwin project to Xcode 1.5 format and remove unused + QUARTZ_SAFETY_DELAY code. + +commit 35a3bf13a8be96bb29dce32399c3684c6baa527d +Author: Torrey Lyons +Date: Wed Sep 22 23:38:33 2004 +0000 + + Add option for XDarwin to track system keyboard layout changes as they + occur (John Harper and Torrey T. Lyons). + +commit 1b3fa4d53b287cbe9d38c5f8c9fbbc2298690959 +Author: Torrey Lyons +Date: Wed Sep 22 22:52:03 2004 +0000 + + Warning fixes. + +commit de68a3339b9f19630e29a17773cad060b1f65300 +Author: Alan Coopersmith +Date: Wed Sep 22 17:20:56 2004 +0000 + + Allow overriding DPMS defaults (timeouts & default for on/off) from + #defines/-D options. + programs/Xserver/hw/xfree86/common/xf86DPMS.c Use defaultDPMSEnabled global + for the default state of DPMS if not set in any config files. + programs/Xserver/hw/xfree86/os-support/sunos/solaris-sparcv8plus.S Add + support for required assembly inline functions for Sun compilers on + Solaris/sparc. + Add support for Solaris/sparc libraries. + +commit d7514b9162648f894211884b199ef2edc458aa86 +Author: Adam Jackson +Date: Wed Sep 22 04:38:03 2004 +0000 + + Bug #1252, #1253, #1255, #1256: Various typo fixes from Dave Jones. + +commit 269012e6014d7c23bf6805ba14ca0b598cdd6313 +Author: Torrey Lyons +Date: Tue Sep 21 22:01:14 2004 +0000 + + Add offscreen GLX direct rendering with XDarwin's xpr backend (John + Harper). + +commit 0514f8b65616d8878000764485e71384b71e3860 +Author: Egbert Eich +Date: Tue Sep 21 17:57:36 2004 +0000 + + Merged over libXpm security fix provided by Chris Evans, Matthieu Herrb and + Alan Coopersmith from release 6.8.1. + Fail during initialization with error if font/fontset is not set for + widget. This prevents a sig11 later when the non-existent font/fontset + structs are referenced. + Check if xf86Info.kbdProc pointer is really set before calling it on abort + as this pointer won't be set if the new modular keyboard driver is used + (Matthias Hopf). + Added new libs to the bindist control files. + Removed inclusion of unnecessary kernel header on Linux. This may fail in + an -ansi environment. + +commit 814b74662103710665c0b5659a93974ad609276c +Author: Alexander Gottwald +Date: Mon Sep 20 08:44:54 2004 +0000 + + Bugzilla #1402: The last patch was broken on linux. Take definition of + badSysCall out of the OS specific block. + +commit b600fcda38f4ab4796b5536cbedc5dee1abd25b1 +Author: Eric Anholt +Date: Mon Sep 20 03:12:00 2004 +0000 + + Fix the R200 Render code. Composite and Trapezoids are now supported just + as well as on R100. + +commit 908287addaff10a0f5f6f14bf06a9b85870737ec +Author: Alexander Gottwald +Date: Sun Sep 19 12:59:52 2004 +0000 + + Bugzilla #1402: fix BigFont extension if SHM is compiled in but not + working. Does not access SHM and privates if the SHM syscall failed + during extension initialization. + +commit 90ff3688cdc0c2c1b5ccdbd9cc0659b9a355e85f +Author: Eric Anholt +Date: Sun Sep 19 10:57:31 2004 +0000 + + Unbreak the AGP DRI case. That was quite a pile of broken code. + +commit 9297c6149f83de22395503c484a2ca65dbffaf6b +Author: Roland Mainz +Date: Sat Sep 18 23:18:35 2004 +0000 + + Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1404 - Fixing + random crashes (like in DAMAGE code etc.) in Xnest due uninitalised + GetWindowPixmap. Original patch by Alexander Gottwald + + +commit 6344bb51e2a97d9678cec2ec1dab19abfe9d9e8d +Author: Torrey Lyons +Date: Sat Sep 18 00:38:30 2004 +0000 + + Bugzilla #1032: Make rootless acceleration functions compatible with + Damage. + +commit cedb9a8d62df3391fd89a8b05a2dd64bd098a7df +Author: Torrey Lyons +Date: Fri Sep 17 21:57:26 2004 +0000 + + Update Apple's list and hash utility routines to latest versions (John + Harper). + +commit b56f4532d1a5febb8df45da0e3d3ad7bf8838e5f +Author: Alexander Gottwald +Date: Thu Sep 16 13:22:52 2004 +0000 + + Remove code which prevented the use from specifying the window size in + nodecoration mode. + +commit c4083511acd1d0f20a242b8cd3ed62629629ce8f +Author: Alexander Gottwald +Date: Wed Sep 15 17:58:50 2004 +0000 + + add support for mice with more than 3 buttons and one scroll wheel (Chris + B) + +commit 516f452e78170bc643117a71bd2246a83b071316 +Author: Egbert Eich +Date: Wed Sep 15 09:23:59 2004 +0000 + + Adding support for OS dependent probing of IA64 chipsets. Not all IA64 + chipsets can be probed without OS support as probing them is only + possible using ACPI. One example of this are the HP ZX1/2 chipsets: + previously the code assumed that these chips were present when no other + of the known chipsets could be probed. This assumption brought SGI + Altrix machines with 64 CPUs to a grinding halt. + +commit a3aa6a2d865239c5b8f29cbd849ae3288e36b8a9 +Author: Egbert Eich +Date: Wed Sep 15 09:05:22 2004 +0000 + + Unregistering events in XSelectInput() when unregistering IM filter + callbacks may be a bad idea as others may be interested in this event. + Removed the call to XSelectInput() altogether as we are in root window + anyway (Lubos Lunak). + Fix size of a variable that gets assigned the value of SmartScheduleTime + (long) to long. This should help to prevent smart scheduler lockup on + 64 bit systems due to overruns (Andreas Schwab). + +commit f642fc729b481c55073c75beca301b2f17881179 +Author: Roland Mainz +Date: Tue Sep 14 23:21:22 2004 +0000 + + Refix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1361 - RFE: Allow + enabling/disabling of more extensions (fixing duplicate symbols caused + by previous checkin; attachment #899) + +commit 0d95bdfbabf4c526f6f54d6f1de8811f4e6d5d5f +Author: Phil Blundell +Date: Tue Sep 14 23:08:10 2004 +0000 + + Only set screen parameters if resolution has changed from current values. + Patch from scoony@noos.fr. + +commit ba3b6fd23be5f1f900fcff57bc586e08bc524e99 +Author: Eric Anholt +Date: Tue Sep 14 06:26:54 2004 +0000 + + Add proper PCI/AGP detection, based on Mike Harris's code for Radeon, but + using the MMIO mirror of the bits instead of config space. + +commit d9df39ee2b5b462be87718046b16d30c231563ec +Author: Roland Mainz +Date: Tue Sep 14 00:51:25 2004 +0000 + + Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1361 - RFE: Allow + enabling/disabling of more extensions + +commit 80dc84d067c5af29e33a0c7ac62eecc8ba4e0871 +Author: Eric Anholt +Date: Sun Sep 12 23:22:31 2004 +0000 + + - Fix a segfault on VT switch with DRI. Still dies due to cursor allocation + troubles. + - Move the RemoveBlockAndWakeupHandlers to match + RegisterBlockAndWakeupHandlers. + - Enable R100 trapezoid "acceleration" when DRI is working, so that it can + be exposed and worked on. + +commit ab50679aabdda9e6197568f745d02fe1e65c7a24 +Author: Eric Anholt +Date: Sun Sep 12 23:01:24 2004 +0000 + + Fix a bad argument missed in the previous commit for ATIDRIDMA* functions. + +commit 2d069b1d1950b5f6f9140e5573e349e6559251e6 +Author: Eric Anholt +Date: Sun Sep 12 22:21:12 2004 +0000 + + Move the RegisterBlockAndWakeupHandlers to before DRI initialization. The + change to use that instead of manual wrapping made the DMA dispatch + come after the lock had been dropped, causing lots of pain. + +commit 27b5a65f05c78a0b6de0d0ace4f4275d990cc3a4 +Author: Eric Anholt +Date: Sun Sep 12 20:31:39 2004 +0000 + + Reset the CCE/CP on engine reset, and make the ATIDRIDMA functions take a + more useful argument. + +commit fcd52d276f0276490ef08af2f0d6c52ed631f130 +Author: Eric Anholt +Date: Sun Sep 12 20:19:15 2004 +0000 + + Add missing kaa.h include for kaaInitTrapOffsets. + +commit b5d406e8c84d8aba2b45e985e43d02c2e6770019 +Author: Eric Anholt +Date: Sun Sep 12 20:02:10 2004 +0000 + + Fix handling of is_agp. is_agp is whether the card is actually AGP, while + using_agp should say whether AGP is being used as part of DMA/DRI. + +commit 7cab70d1cb7298035429dd8953e521a31fc6770d +Author: Eric Anholt +Date: Sun Sep 12 19:52:51 2004 +0000 + + Improve error handling, especially in the DRI case. Do some FatalErrors + instead of ErrorFs for things that are really bad, and put limits on + some loops. Now, sometimes instead of hanging the entire system, we + (mostly-) cleanly drop to console when the card has hung. + +commit 0cd662ea80579c317d706ebe04971bb29d0f9b4f +Author: Eric Anholt +Date: Sat Sep 11 09:28:19 2004 +0000 + + - Add disabled WIP trapezoid code for R128 and R100. The R128 rendering is + not doing an add of 1 per triangle like I hoped, and instead seems to + be saturating all the pixels or something. The R100 acceleration + renders pretty well, with some gaps. Note that both are slower than + software due to lack of DMA to submit vertices. + - Mostly fix R128 and Radeon transform support, including supporting + bilinear filtering on R128. Subpixel offsets are still probably an + issue (reported by rendercheck), but I want to make 100% sure about my + understanding of the protocol before changing everybody, including fb. + - Add support for dst formats without alpha to R128 Composite. + - Remove the R128 Blend code, which has long outlived its usefulness. (I + kept it around for one reason: It could be useful for the w/h > 1024 + case with no mask and a non-src op. That seems pretty infrequent and + not worth the trouble). + +commit 396100dd235105a0e2c9013f1e07e4dae0cc3404 +Author: Eric Anholt +Date: Sat Sep 11 09:23:12 2004 +0000 + + - Don't require Imrecise mode for Trapezoid acceleration. It looks like we + might be able to do Precise in hardware, so leave it up to the driver. + - Add a helper function for computing a set of offsets for smooth trapezoid + rasterizing using many sharp trapezoids. + +commit 501dcf37aac4ec9298e8c79ca65c048c362bce31 +Author: Matthew Allum +Date: Wed Sep 8 11:31:49 2004 +0000 + + cursor fixes + +commit 20918ab480c8c8285a68e9f974b0208a18acec94 +Author: Matthew Allum +Date: Tue Sep 7 19:00:04 2004 +0000 + + avoid ephyr breakage when tslib enabled + +commit 8bf6ea903be4c052c747e3e81fc977155072299d +Author: Matthew Allum +Date: Tue Sep 7 12:44:19 2004 +0000 + + fixes to Xephyr debug mode + +commit b3322257815ec4550e1634453167535b02c1bfbd +Author: Kevin E Martin +Date: Fri Sep 3 23:41:21 2004 +0000 + + Update formatted docs. + +commit b2135e589baeb2ea26da50b9167feaea23bcce3c +Author: Kevin E Martin +Date: Fri Sep 3 16:18:23 2004 +0000 + + First set of documentation updates. + Include more correct fix for rootless interaction with damage (Bug #1168, + Keith Packard). + +commit d7fef52254126aa5897a5c58faeda1f61d5b13d8 +Author: Kevin E Martin +Date: Thu Sep 2 04:04:47 2004 +0000 + + Workaround for servers using rootless layer with damage (Bug #1168, Torrey + T. Lyons). + +commit 0e56515aa3ebc5ee8cc33213fb22b69bb4b3a0da +Author: Kevin E Martin +Date: Thu Sep 2 01:38:17 2004 +0000 + + Fix AGL display problems (Bug #1210, Torrey T. Lyons). + +commit 2753c8e2c84cc1fb6d73a05258ab7200068e7830 +Author: Matthew Allum +Date: Wed Sep 1 15:30:58 2004 +0000 + + see changelog + +commit 7c0aaa53bf8dcf3d0a8c9e78d31cf62b1766fb35 +Author: Matthew Allum +Date: Wed Sep 1 11:13:36 2004 +0000 + + '-dpi' fixes for Xephyr + +commit 16ff3a872731633b6f1f4920f793153722026189 +Author: Matthew Allum +Date: Wed Sep 1 08:31:20 2004 +0000 + + Actuall select events for -parent option + +commit 2d065c4c33b9ec17c4c791070cf8189cb57bbb9c +Author: Matthew Allum +Date: Tue Aug 31 16:33:05 2004 +0000 + + Added ephyr server sources + +commit 6ec9ecd591fba9e9b69b8ebbd2fa08c0a2beac08 +Author: Eric Anholt +Date: Mon Aug 30 22:16:46 2004 +0000 + + Add a set of three hooks for accelerating trapezoids, and use it for the + RasterizeTrapezoid screen function. These hooks will be called for + imprecise, non-sharp trapezoids with A8 destinations. + Note that the current main consumer of trapezoids, cairo, is requesting + precise, sharp trapezoids by not changing the default Picture + attributes, but gets non-sharp effects in software because fb bases its + choice of sharp/non-sharp on the mask format being A8 vs A1, and cairo + asks for A8. Follow fb's (poor?) example by ignoring the sharp setting + and basing the choice off of the mask being A8. + +commit ccaf332ce3a9393715317edd3b92420c27fc94eb +Author: Eric Anholt +Date: Mon Aug 30 16:43:10 2004 +0000 + + Rather than initially place pixmaps in framebuffer based on a size + heuristic, delay the decision until the first + kaaPixmapUse{Screen|Memory}, and put it in framebuffer if UseScreen was + called. Provides a significant improvement in cairo speeds (100% + speedup in cairogears here) and is likely to improve text performance + as well. + +commit 14b2db63e7ae0c0d356062cd15811484038f97d9 +Author: Kevin E Martin +Date: Sun Aug 29 21:06:00 2004 +0000 + + Fix make install when BuildServersOnly is YES (Bug #1213). + Fix build failures when UseDeprecatedKeyboardDriver is YES and + DoLoadableServer is NO (Bug #1229, Kristian Høgsberg). + Fix failure when using DLL loader and LD_BIND_NOW is set (Bug #1212, Adam + Jackson). + +commit ac038e9cc6f7708fdd9f36494861d2f611d5a90a +Author: Alan Coopersmith +Date: Sun Aug 29 00:48:17 2004 +0000 + + Don't define _XOPEN_SOURCE before including math.h on Solaris - it's not + needed on older releases, and breaks builds on Solaris 10. (Same as + bugzilla #189). + +commit 89d702763875831604751bac396c3d2400ec59b6 +Author: Egbert Eich +Date: Fri Aug 27 21:44:54 2004 +0000 + + Fix for XV memory allocation: Also use tiled area for allocation even if it + hasn't been used before. + +commit 971755765d6ef9cadf11127478af59189034d356 +Author: Eric Anholt +Date: Fri Aug 27 21:09:23 2004 +0000 + + Bug #1101: Fix PaintWindow in the pixmap case when the window's origin is + not at the backing pixmap's origin. Resulted in incorrect rendering in + at least aisleriot, fluxbox, and KDE apps, and probably many more. + While here, move the ParentRelative loop above the drawable grab -- may + improve correctness with ParentRelative background origins as well. + Note that the border code doesn't handle ParentRelative yet. + +commit 1840a50bb763d5c94195eaffa3954c1afd77a31a +Author: Kevin E Martin +Date: Fri Aug 27 20:39:17 2004 +0000 + + Add missing reply for DMX (Rik Faith). + +commit f30fbc600f3e5c3b4aceafb8256594af0069f2c9 +Author: Egbert Eich +Date: Fri Aug 27 20:20:54 2004 +0000 + + Fixed typos. + +commit 276cf271527b7a6f464025457e5dd452ac13605e +Author: Egbert Eich +Date: Fri Aug 27 20:16:28 2004 +0000 + + - adding missing file + +commit ecd889c6ff7427b4e7d3f820586aac178a4dfdc2 +Author: Egbert Eich +Date: Fri Aug 27 19:27:12 2004 +0000 + + Added support for LynxOS 4.0 (Thomas Mueller). + Fix arm netwinder build (Donnie Berkholz). + +commit 7c087078694a6895a9bcbe62d091665c05a86b5a +Author: Egbert Eich +Date: Fri Aug 27 12:32:14 2004 +0000 + + - Make DDC code more VESA compliant: when MaxClock is set to 0xFF it means + 'no value specified'. Therefore setting it to 0. + +commit c0bff215de2d034118d06cac42e234008612204b +Author: Kevin E Martin +Date: Fri Aug 27 01:15:10 2004 +0000 + + Fix xtest failures in Xvfb from XMatchVisualInfo test. + +commit 5335bc8a0657b3e378795b44698ed23020c13891 +Author: Eric Anholt +Date: Thu Aug 26 20:32:59 2004 +0000 + + Bug #1138: Wrap funcs in CW's GC ops as well. While this is unnecessary + according to the rules as I understand them (bug #1045), not everybody + follows the rules. GC funcs were being called on the same GC from + within GC ops, and the cwValidateGC caused a loop in the funcs chain + that resulted in a crash, notably in cwPolylines. + +commit c8672e7ac79c872344f287f7cc106cb5c006e619 +Author: Egbert Eich +Date: Thu Aug 26 11:58:08 2004 +0000 + + Fixed support for LynxOS 3.1 (LynxOS 4 will follow) (Thomas Mueller). + 2 + +commit 198e62c44b99ee0890b944f92b162387f77aa10d +Author: Torrey Lyons +Date: Sat Aug 21 00:46:01 2004 +0000 + + Documentation only update: Update XDarwin application version for release. + +commit 74d84d7b122802230579a4da8c2e6914d2f5f060 +Author: Kevin E Martin +Date: Fri Aug 20 05:22:39 2004 +0000 + + Fix keyboard driver failing to initialize if DoLoadableServer is NO (Bug + #1133, Kristian Høgsberg). + +commit bd3e6e44259155cb37f39eb2ca5e1f0de1c2ebb7 +Author: Kevin E Martin +Date: Thu Aug 19 04:08:40 2004 +0000 + + Add missing no.*Extension symbols (Bug #1131, Aaron Plattner). + +commit 87842285007e9ac4f9de0349abee1fb66b7c795f +Author: Kevin E Martin +Date: Wed Aug 18 21:11:17 2004 +0000 + + Fix CopyArea for non-redir dst, redir src (Bug #1105, Eric Anholt). + +commit 9223baf985778c536ce93846c431b46a0192cf32 +Author: Kevin E Martin +Date: Wed Aug 18 18:41:41 2004 +0000 + + Fix AIX build problems (Bugs #1020, 1102, 1103, Dan McNichol). + Remove old config files (Bug #1123, Jim Gettys). + Remove old log message (Bug #1123, Jim Gettys). + +commit a45bc0df7a1c369e8429e84414ac813187c90059 +Author: Kevin E Martin +Date: Tue Aug 17 17:55:02 2004 +0000 + + Fix DRI module loading (Bug #1057, Ronny Vindenes). + Fix Xvfb at 8bpp (Bug #1091). + Fix link order when building with Xprint in glxgears (Bug #1060, Alexander + Gottwald). + +commit 75de2fe82e7da755555028a724f68b9fb9ddfb14 +Author: Kevin E Martin +Date: Mon Aug 16 22:48:50 2004 +0000 + + Update release and date for first RC. + Fix kbd/keyboard driver for DoLoadableServer NO. + Revert change since it is better to set date in the config files. + +commit 1798cac6fa2e909c9f3df26b97ee8232a0bf1592 +Author: Kevin E Martin +Date: Mon Aug 16 20:17:51 2004 +0000 + + Add kdb <-> keyboard aliasing when UseDeprecatedKeyboardDriver is NO (Bug + #1072, Kristian Høgsberg). + +commit 6cac342517892a20bab6a6177f8b5742feaaed38 +Author: Alexander Gottwald +Date: Mon Aug 16 15:48:53 2004 +0000 + + document broken composite in XWin + +commit 9aa6beb6b7e6272b05a03e0a4fd34eb8ad21bf47 +Author: Kevin E Martin +Date: Mon Aug 16 02:07:53 2004 +0000 + + Fix banner to print out proper version information. + +commit 9da0c214ab5f4ee9c1610b4888f5c7c0dd2bcacc +Author: Keith Packard +Date: Sun Aug 15 21:13:11 2004 +0000 + + Clip destination instead of source. Should be the same, but it looks nicer + to me. + Clean up transition between cheap and expensive GC wrappers by using the + prologue and epilogue macros. Before, the GC would be left unvalidated + sometimes which would cause all kinds of entertaining bugs against a + DDX which cares (XAA). + +commit a68f350195c1c54034f98e2b78c2c3da70044884 +Author: Keith Packard +Date: Sun Aug 15 19:05:01 2004 +0000 + + Remove debugging code which did a full tree walk on every window operation + Eliminate needless (and, it turns out, dangerous) call to ChangeGC on + DestroyGCPrivate. + in cwSetWindowPixmap, check if the pixmap is the screen pixmap and disable + the wrapper by setting the private to NULL. + +commit 5db70ae2575e3e8669d7a66e2218ba28e8bdfa68 +Author: Kristian Høgsberg +Date: Sun Aug 15 15:40:19 2004 +0000 + + Remove #error used for testing. + +commit 1e728c3e88f6a74b93dc11827c9fcfe7b39ca5a5 +Author: Keith Packard +Date: Sun Aug 15 03:34:18 2004 +0000 + + Copy bits from parent window when allocating pixmaps so that Background == + None works. + Copy filter to backing picture during validation. + Mark picture serialNumber when setting Filter or Transform so Validate + occurs. + Initialize xf86Screens[i]->pScreen to NULL so that RADEON driver doesn't + crash during server reset using old pScreen. + +commit 943308517905d16bda1bb27cd745bd291a84dbf6 +Author: Keith Packard +Date: Sun Aug 15 00:43:39 2004 +0000 + + Redraw window borders when switching window pixmaps around + Make cw "own" the window pixmaps by wrapping + GetWindowPixmap/SetWindowPixmap. + +commit 597fdae93e6e1b7e4052097baf3d91e7a134c162 +Author: Kristian Høgsberg +Date: Sat Aug 14 23:59:52 2004 +0000 + + More kbd fun: write out "kbd" from Xorg -configure (#1078). + +commit e483fe3ec384da556c31292001a86ec95c2ddc46 +Author: Keith Packard +Date: Sat Aug 14 21:57:58 2004 +0000 + + Fix offsets again. Really, it works this time. Promise. + +commit e6216b48f5feee72f107348cb21bad724536ec62 +Author: Keith Packard +Date: Sat Aug 14 21:36:10 2004 +0000 + + Fix offsets, do whole region at once by using GC clipping + +commit ed425d1d88a72586d5d7a4aad9d0be0b06637070 +Author: Eric Anholt +Date: Sat Aug 14 20:29:28 2004 +0000 + + Bug #1077: Fix source copy performance problem exposed by Composite. + +commit cc3ad0ed4302f54318e190a2b10646337f242d40 +Author: Keith Packard +Date: Sat Aug 14 19:53:36 2004 +0000 + + Fix clip list computation and setting to ignore clip changes to "real" + GC/Picture and track serial numbers correctly when copying + pCompositeClip down. + +commit 183c6d06455114c61f6db57ec0a084caf11ece3a +Author: Eric Anholt +Date: Sat Aug 14 19:51:11 2004 +0000 + + Wrap CopyWindow in cw, which fixes scrolling in many apps. + +commit e61b5d38ab30c4f73ba0d070f485a32708a03eb6 +Author: Keith Packard +Date: Sat Aug 14 07:12:37 2004 +0000 + + Use XLIB_SKIP_ARGB_VISUALS environment variable to disable all depth 32 + visuals. Necessary to keep Flash from crashing. + Must call ValidateGC/ValidatePicture on "real" GC/Picture to ensure + pCompositeClip is set correctly. + Need to take the composite clip from the "real" GC/Picture and turn it into + the clientClip for the backing version. + Adjust pixmap screen origin to account for drawable->x/y Change debugging + output a bit (disabled by default) + +commit 05f6329eb6f564ad4fc366d75f4ebf9f3ba4b5dd +Author: Alan Coopersmith +Date: Fri Aug 13 23:57:38 2004 +0000 + + Don't enable speedo & type1 modules if they're not being built + Clean up a couple of hardcoded paths & vendor names to use defines set by + Imakefile + +commit 3f84e4f71d9c7c560f9bef675b1cc96fa1d83b14 +Author: Kevin E Martin +Date: Fri Aug 13 19:51:34 2004 +0000 + + Fix Xprt bug by disabling code that merges multiple audit messages (Bug + #964, Roland Mainz). + +commit 922fd3a2e568571171dfd64a94f804350829230f +Author: Alexander Gottwald +Date: Fri Aug 13 19:18:29 2004 +0000 + + Added $(MESASRCDIR)/src/mesa/glapi to INCLUDES. Removed $(SERVERSRC)/mi + from INCLUDES. Rearranged INCLUDES for better readability. + Removed mipointrst.h and miscstruct.h from #include since they are not used + anymore. + +commit f63f4b768cd5ec5bffd270e448e6e51b8ad67016 +Author: Søren Sandmann Pedersen +Date: Fri Aug 13 18:24:07 2004 +0000 + + Fri Aug 13 19:53:10 2004 Soeren Sandmann + Fix for lockups on some versions of Matrox Mystique. #687, Patch from Mike + Harris. + Call xf86EnableDisableFBAccess though the function pointer instead of + directly. #1041, Patch from Aaron Plattner. + Swap the phsyical size of the screen when rotiation. #1050, Patch from + Aaron Plattner. + Fri Aug 13 19:47:12 2004 Soeren Sandmann + Make HAVE_FT_BITMAP_SIZE_Y_PPEM conditional on the FreeType version instead + of proping it. This way it will work with the monolithic version too. + #1062, Patch by Owen Taylor. + +commit a29bfbd3d0a5d39ccee5b83ac1ba632091b031bb +Author: Keith Packard +Date: Fri Aug 13 08:16:14 2004 +0000 + + Empty damage object when freeing pixmap. + Wrap InstallColormap so that the DDX doesn't see colormaps from our ARGB + visual (avoids lovely green tint to screen). Also, set visual->nplanes + of ARGB visual to all used (including alpha) planes so DIX can set + pixel values correctly. + Translate automatic update regions correctly to account for borders + When nplanes == 32 (ARGB visuals), mask in all ones for alpha values to + allocated pixel values. + Remove redundant fbAddTraps declaration + Fix fbCopyWindow to work on non-screen pixmaps (not needed yet) + Replace broken clipping code with that from modular tree. + Respect subWindowMode. + +commit 24bed5cff908a6f8b1857e3dadac22d6db54c69e +Author: Eric Anholt +Date: Fri Aug 13 07:47:21 2004 +0000 + + Fix copy'n'paste-os of x/y in CopyPicture for AlphaXOrigin and ClipXOrigin. + +commit 5825e4559e7aaf3b40205a0dca49a785c8de7b92 +Author: Eric Anholt +Date: Thu Aug 12 23:14:50 2004 +0000 + + Fix after Mesa 20040812 merge: revert glxext.h to vendor branch, and fix + bug #1022. + +commit 2889ad2cb8827f20b6d69da4fe99db33bf9c5ff2 +Author: Torrey Lyons +Date: Thu Aug 12 20:24:36 2004 +0000 + + Fix crash in rootless XDarwin due to rootless being initialized before + damage extension. + +commit 961333143e2df3e3f33e8624fc61e79cf3e86cd1 +Author: Eric Anholt +Date: Thu Aug 12 08:45:33 2004 +0000 + + Apply a kludge to initialize the composite wrapper before DamageSetup. If + not, DamageSetup will wrap some operations first, and the cw + initializes during ExtensionInit, so cw comes higher in the wrapping + chain. cw going first will result in damage getting confused when the + drawables get changed around. + +commit 6e0228722cc2fa37a0e2359bc3dab3646e36c4b7 +Author: Eric Anholt +Date: Thu Aug 12 08:11:59 2004 +0000 + + Fix various cw issues, including a couple reported by deronj: + - Fix wrapping of GC ops/funcs according to policy described in bug #1045. + - Remove ValidateGC/ValidatePictures on the redirected drawables/pictures + -- it's not needed, and DDXs shouldn't be seeing redirected drawables + in render or GC ops/funcs when cw is running. + - Mark all GC/Picture state as dirty when moving from redirected to + non-redirected, since it hadn't been passed down in Change* or + Validate* while redirected. + - Remove CreatePicture wrapper that didn't do anything. + - Comment on why AddTraps wrapper isn't needed. + +commit 789cf3ed846045d91f950cb177ef6bae4c8966fc +Author: Eric Anholt +Date: Thu Aug 12 07:57:03 2004 +0000 + + Fix some issues reported by deronj: + - Hopefully fix a crash in compCheckRedirect on unrealizing windows. + - Remove an extern that doesn't point at anything. + +commit 1a073786e0159a80ac3b8772a1d89b0618a8ff33 +Author: Kevin E Martin +Date: Thu Aug 12 05:11:57 2004 +0000 + + Update version and date for next snapshot + +commit 47ee5f4ba72f0e0bc92a5e04073c70808e85fc08 +Author: Kristian Høgsberg +Date: Thu Aug 12 01:57:51 2004 +0000 + + Add call to SourceValidate() when pDst == pSrc, so misprite.c get a chance + to remove the sprite before the area is copied. The drivers handle pDst + != pSrc (#1030). + +commit 09d0056b8bc103f67a35980934f03d28fed51164 +Author: Adam Jackson +Date: Thu Aug 12 01:30:57 2004 +0000 + + Wrap the Propolice fix in #ifdef __SSP__; Propolice doesn't define this yet + but an RFE has been submitted upstream. + +commit e30c22dbbffa2605f8d7ac010c8208a135a2293a +Author: Adam Jackson +Date: Thu Aug 12 01:16:36 2004 +0000 + + Back out the propolice fix for a second, it causes linktime errors. + +commit 9d0213525f4f692c250f10309146fe9db76ba12d +Author: Keith Packard +Date: Thu Aug 12 00:09:30 2004 +0000 + + Paint to parent window instead of parent window's pixmap (helps for servers + that don't have a pixmap for the root) + Fix offsets for render drawing. + +commit c7bc76f663008119b3681d4b7adef7dc9ffdc236 +Author: Torrey Lyons +Date: Wed Aug 11 23:53:36 2004 +0000 + + Fix leftover XF86_VERSION_SNAP macro. + +commit eb607030e32cbad846696a20cfb3045c5f8f65c1 +Author: Adam Jackson +Date: Wed Aug 11 23:10:02 2004 +0000 + + Teach the loader about the extra symbols needed for Propolice-protected + modules to work under elfloader. From Travis Tilley (Gentoo). + +commit fd439afdfe7ba451aff19b62d1764e4dfd0b782f +Author: Keith Packard +Date: Wed Aug 11 22:40:14 2004 +0000 + + Add COMPOSITE change to fbCopyWindow (not needed yet) + Xnest was half-using midispcur and doing a bad job of it. Replace all of + that code with mipointer which does a lot of the work. + Support DDXen which don't provide GetWindowPixmap, or which return NULL for + the root pixmap. + +commit f95293e5253904883d3b40f9e68e6175247754a3 +Author: Kevin E Martin +Date: Wed Aug 11 22:27:50 2004 +0000 + + Fix bogus contact address in Xserver/os/util.c (Bug #738). + +commit 56520ecd5ceb9526541c241634b467eba6a8f7cf +Author: Eric Anholt +Date: Wed Aug 11 22:13:01 2004 +0000 + + In CopyPicture, add missing call to ChangePicture to notify about the + changes that CopyPicture has done. + +commit f77f1d50723aceb5059a96f7a4068046b7961c51 +Author: Kevin E Martin +Date: Wed Aug 11 21:14:18 2004 +0000 + + Apply PPC64 build patch (Bug #303, Mike A. Harris, Alan Coopersmith). + +commit 3dbaeb2e126d9424b21df91f0be9129c4eea6f1b +Author: Kristian Høgsberg +Date: Wed Aug 11 20:25:13 2004 +0000 + + Patch xorgconfig to generate config files with correct keyboard driver; use + "kbd" by default, "keyboard" if UseDeprecatedKeyboarDriver is YES + (#1040). + +commit ca458e3c9b25c3efc10532eb8e31bdcff44dc321 +Author: Roland Mainz +Date: Wed Aug 11 13:55:03 2004 +0000 + + Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=492 - + /etc/init.d/xprint did not source xorg.conf for font paths additionally + to xfree86 config files + +commit 81881b96861d707b0729e0146a4b53b3dd234885 +Author: Kevin E Martin +Date: Tue Aug 10 21:37:35 2004 +0000 + + Update version to 6.7.99.1 and fix problem with snapshot string generation. + +commit 21c7c8cdc7d2f607177634601cef8b0290fb0e80 +Author: Kevin E Martin +Date: Mon Aug 9 22:37:22 2004 +0000 + + Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339, + Harold L. Hunt II, Alexander Gottwald). + Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao, + David Dawes). + Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson). + HP-PA build fix (Bug #828, Guy Martin, Paul Anderson). + Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine). + Fix attempt to read video ROM before enabling it (Bug #843, Ivan + Kokshaysky, Mike A. Harris). + Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A. + Harris). + Clarify xset man page description of how to use the keyboard repeat rate + settings (Bug #846, Mike A. Harris). + Fix problem where print-screen key would get remapped to sys-req in certain + keymaps, which broke GNOME printscreen functionality (Bug #847, Owen + Taylor). + Fix several render problems: + - MMIO mode support + - Hang on IGP chips + - VT switching hang + - 3D render corruption (Bug #922, Hui Yu). + +commit 26847ef9268f687c4f45f3d048eff4b06c2ba3bf +Author: Kristian Høgsberg +Date: Mon Aug 9 03:40:50 2004 +0000 + + Move the new render symbols to dixsym.c instead so they are grouped with + the other render symbols. + Initialize screen_x and screen_y to 0. This fixes a problem with the new + Damage based sprite, where intersection test against the root pixmap + would fail because the two fields were not initialized (damage.c, + 166-170). + +commit 57eab4dc87670da42e645a4c341d1ee661b43b5b +Author: Kevin E Martin +Date: Mon Aug 9 02:08:35 2004 +0000 + + - Fix building without Xfixes extension + - Fix building without Xevie + - Fix building without DPMS + - Fix "Extensions" section config file support to accept general boolean + options + +commit a2e51b13ea5a2e5fc5626905b6c2caac6358eb11 +Author: Kristian Høgsberg +Date: Sun Aug 8 20:56:56 2004 +0000 + + Disable legacy keyboard driver "keyboard", unless + USE_DEPRECATED_KEYBOARD_DRIVER is defined. Print warning if the old + driver is used. + +commit 3431692bf44e7be01187b421cfb0e46131c5e4c7 +Author: Kristian Høgsberg +Date: Sun Aug 8 17:02:19 2004 +0000 + + Add new render symbols to list of exported extension symbols so + DoLoadableServer works again. + +commit 1e694d2b51a954d1bc4afdde390723e9a1a5b9bf +Author: Keith Packard +Date: Sat Aug 7 01:23:07 2004 +0000 + + Fix minor timestamp lossage in mieq. + Replace miSprite implementation with Damage-based one. Otherwise damage and + misprite conflict causing looping. + Change pScreen usage around a bit to eliminate warnings + +commit 45fde3b041c071ae5a604cefbbfa4da5c1e828f8 +Author: Keith Packard +Date: Sat Aug 7 01:19:01 2004 +0000 + + Eliminate mfb support. Fix visuals to match "normal" PC hardware (making + lightpipe work). + +commit 2bdbc2c0d39b1618440a6a8ed1c38a11703e898c +Author: Keith Packard +Date: Sat Aug 7 01:02:41 2004 +0000 + + Clean up cw initialization, make sure wrappers re-wrap on exit. + +commit cff0043a347ba06e8ab16a84a35c99794b45149b +Author: Keith Packard +Date: Sat Aug 7 00:58:21 2004 +0000 + + Remove alpha-related fields from visual structure to retain binary + compatibilty. Applications using ARGB visuals will need to use Render + or other mechanisms to compute pixel values instead of AllocColor + +commit 196aafb19a3cfdc8c21f9bf75814cf0d84ff4446 +Author: Keith Packard +Date: Fri Aug 6 23:42:10 2004 +0000 + + Add RenderAddTraps. Rewrite trapezoid rendering code. + +commit e847bcda0827ffb87689a0162c648570de6d6f69 +Author: Eric Anholt +Date: Fri Aug 6 00:31:28 2004 +0000 + + Fix missing ';' in cw.c and unwrap the render wrapper properly. + +commit ae1580c494fde2b56f9faa40f7ebcf637728efc8 +Author: Eric Anholt +Date: Thu Aug 5 18:24:58 2004 +0000 + + - Add a new Render function, CopyPicture, which will update a picture with + the flagged bits from a source picture. Approved in principle by + keithp. + - Use CopyPicture and SetTransform to update most of the backing picture's + state in the composite wrapper. Filters are still missing. + - Don't allocate a picture private, now that we calculate clipping properly + and don't need the serialNumber or stateChanges. + - Use the format of the source pixmap rather than generating the format + from the window's visual. + - Wrap the rest of the Render primitives that were stubbed out before. + +commit 73e14bd611fa7eac649a2b4c7964959d9eae887b +Author: Eric Anholt +Date: Wed Aug 4 23:18:38 2004 +0000 + + - Always validate the backing GC in cwValidateGC, not just when the clip + list changes. + - Use FillTiled instead of FillSolid for painting tiled border/background + pixmaps, and don't needlessly change the scratch GC's defaults. + - Use the preferred dixChangeGC instead of DoChangeGC. + - Simplify a silly loop and clean up a couple of comments. + +commit d240c41a3ab9cde9921cc96cf86e630ca5c9005a +Author: Egbert Eich +Date: Wed Aug 4 12:21:48 2004 +0000 + + Optimization of CJK rendering when using versions of freetype prior to + 2.1.8 (Chisato Yamauchi). + A small backward compatibility fix to make the freetype module build with + freetype version < 2.1.7. + Fixed/added some debugging code. + +commit 751fd11a9ad1a473d7311362246b0869a008001b +Author: Eric Anholt +Date: Wed Aug 4 10:05:37 2004 +0000 + + - Add two new XAA hooks, SetupForCPUToScreenTexture2 and + SetupForCPUToScreenAlphaTexture2. These add a dstFormat argument after + the previous format argument, which the driver needs to use to properly + set up the destination format. Two new arrays are added for the list of + destination formats supported that correspond to the previous format + arrays for sources. + - Make Render acceleration only occur when the new hook for that + acceleration type is supplied and the dst format list is set, along + with the src format list being set. Without knowing the destination + format, the Render acceleration couldn't properly support all the + destinations it might encounter. + - Bump XAA module minor version. + - Update the Radeon Render acceleration to use the new hooks when the XAA + module is sufficiently new. Fix a bug in the src/dst alpha booleans for + ops, and use them to set blend_cntl to support destinations without + alpha. Add missing PICT_a1r5g5b5 texture format, and add list + terminator. (!) + +commit 9c1d52a69db841ac85ef97d7223361b83a66ae29 +Author: Alexander Gottwald +Date: Tue Aug 3 10:12:25 2004 +0000 + + Merge from CYGWIN branch + 2004-08-02 Kensuke Matsuzaki + Fix the bug that we can't copy & paste multi-byte string to Unicode-base + Windows application. Rename fUnicodeSupport to fUseUnicode, because it + don't mean wheather Windows support Unicode or not. + +commit defcfe3c7ee3e39ef02da08b7227b758dbede325 +Author: Matthieu Herrb +Date: Tue Aug 3 09:33:54 2004 +0000 + + programs/Xserver/hw/xfree86/ddc/xf86DDC.h + programs/Xserver/hw/xfree86/vgahw/vgaHW.c + programs/Xserver/hw/xfree86/vgahw/vgaHW.h + programs/Xserver/miext/shadow/shadow.h + programs/Xserver/miext/shadow/shpacked.c + programs/Xserver/miext/shadow/shplanar.c + programs/Xserver/miext/shadow/shrotate.c Fix glitches in pointer to + functions declarations. + +commit e6d0b18c24f7f84aabed763be1cc8414883fab95 +Author: Matthieu Herrb +Date: Tue Aug 3 08:52:17 2004 +0000 + + Fix declaration of XAACachePlanarMonoStippleProc. Rename + XAACachePlanarMonoStippleWeak to XAAGetCachePlanarMonoStipple() for + consistency with other parts of xaa and fix forward declaration in + xaalocal.h. Fixes last comments on Bug #962. + +commit bfbb40c28ce6e98c82973bd96054d4787579eaa6 +Author: Eric Anholt +Date: Tue Aug 3 05:49:48 2004 +0000 + + Major improvements to Composite wrapper. Several issues remain, but it now + appears stable in limited testing. + - Allocate the picture private, avoiding segfault. + - Wrap PaintWindow to draw the background/border to the backing pixmap + (based on Deron Johnson's comptran.c). + - Set the x_off/y_off returns to translate coordinates properly. + - Don't bother allocating temporary areas for the modified coordinates. + Layers above are responsible for handling lower layers changing the + arguments, so cw doesn't have to worry about it. mibstore.c has to do + the allocation because it calls down twice (front buffer and backing + store). (Suggested by keithp) + - Handle the mode argument to PolyPoint, Polylines, and FillPolygon. + - Remove some dead elements in the cw privates. + - Kill a prototype warning in compinit.c by adding the cw.h header. + +commit b7ba272da0910c6558f71cfedd0bf9836fc892c1 +Author: Eric Anholt +Date: Tue Aug 3 05:39:19 2004 +0000 + + The Damage extension has to wrap after (be called before) the Composite + extension so that the redirecting of drawables by the wrapper doesn't + confuse Damage. + +commit d112e55992e9e03e74fdf5738c8c47cd90033a37 +Author: Adam Jackson +Date: Tue Aug 3 02:44:23 2004 +0000 + + Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so + DoLoadableServer NO builds work again. + +commit 734cb34dc1697530ecd971b84e1061ed86b4c2a4 +Author: Søren Sandmann Pedersen +Date: Mon Aug 2 21:15:30 2004 +0000 + + Mon Aug 2 21:49:33 2004 Soeren Sandmann + Remove double cast. + +commit e6b9cc79c204420117a1f7b23d131ec24923d612 +Author: Egbert Eich +Date: Mon Aug 2 19:35:07 2004 +0000 + + Removed distro specific stuff. + Fixed FreeType module to build with FreeType versions older than 2.1.7. + Fixed typo. + Added vtSema to protect call of driver DPMS function. + removed unneeded variable + Modified RandR driver hook to reduce the number of function calls to one. + Function is sufficiently generic to be extended in the future. + +commit b759da83ae62a897b7727d9180a68b962b571286 +Author: Alexander Gottwald +Date: Sun Aug 1 16:16:18 2004 +0000 + + added README for Cygwin/X + This file currently contains the Cygwin/X specific release notes from 6.7.0 + and a first collection of what will make up the release notes for the + next release + +commit d638a50f3f039d84d86c00696d7d3ec22560bc3c +Author: Alexander Gottwald +Date: Sat Jul 31 18:33:56 2004 +0000 + + adjust prototype for winInitCmapPrivates to match Egberts change. + +commit 488be6611919af97d7e4f8b0994487882eb78e18 +Author: Kevin E Martin +Date: Sat Jul 31 09:41:27 2004 +0000 + + Fix typo + +commit 383b6b59864098b03d991628ff5933d997793ea1 +Author: Kevin E Martin +Date: Sat Jul 31 09:14:06 2004 +0000 + + Add "Extensions" section support to configuration parser + +commit d690556d496c7331bd112903a0c9e6553c7d3342 +Author: Eric Anholt +Date: Sat Jul 31 08:24:14 2004 +0000 + + Integrate COMPOSITEWRAP branch including composite wrapper. This code still + has several issues, including: + - CopyWindow and PaintWindow wrappers missing (will be done soon) + - Some segfaults seen in the Render wrappers. + - Xprt server build breaks with Composite. + - DDXs must be recompiled for Composite due to VisualRec size change. + - Composite bugs pointed out by Deron Johnson in email. + Also, reorder XFixes initialization according to comments by Keith which + are also in xserver CVS. + +commit 8763cca7f9927bd6c9caf804bf09dcfea929eed0 +Author: Eric Anholt +Date: Sat Jul 31 07:26:50 2004 +0000 + + Update xfixes server code to major version 3 from xserver CVS, and perform + minor diff-reduction versus xserver CVS. + +commit 25bd6ff4a622d09fb0c247b7c40281744c61431e +Author: Kevin E Martin +Date: Sat Jul 31 04:23:21 2004 +0000 + + Add new extension enable/disable feature. This code is a small step in the + right direction -- i.e., moving towards full run-time config of + extensions. Currently, only XTEST, XINERAMA, RENDER, XKB, and XEVIE are + supported. + +commit 326729ebca863c99cf913445126294a3c6d3db5d +Author: Eric Anholt +Date: Sat Jul 31 01:48:27 2004 +0000 + + - Add some XFIXES bits apparently missed in the DAMAGE-XFIXES merge + - Add missing XCSECURITY ifdef. + - Sync some whitespace to xserver CVS and surrounding style. + +commit 370bda820b2912b93dcc34c088075f8e65a9e5cb +Author: Eric Anholt +Date: Sat Jul 31 01:38:46 2004 +0000 + + Integrate latest damage bits, including the addition of Composite code. + Includes REGION_INIT -> REGION_NULL necessary to avoid segfaults with + inlined region macros. + +commit 7542d8a17ad469f9c760f0f843bd6a4fb6deb57d +Author: Stuart Kreitman +Date: Sat Jul 31 01:37:47 2004 +0000 + + Turn on XEVIE https://freedesktop.org/bugzilla/show_bug.cgi?id=947 Modified + Files: miinitext.c + +commit b2065f376b932e49f1f96dfb92ddb52d15796abe +Author: Stuart Kreitman +Date: Sat Jul 31 01:34:26 2004 +0000 + + Integration of XEVIE branch to trunk, latest updates + https://freedesktop.org/bugzilla/show_bug.cgi?id=947 Modified Files: + Imakefile xevie.c + +commit e68bfc801680f2852c59099aa3d7502e49b48b2c +Author: Stuart Kreitman +Date: Sat Jul 31 01:33:40 2004 +0000 + + Integration of XEVIE branch to trunk, Some updates from latest reviews + https://freedesktop.org/bugzilla/show_bug.cgi?id=947 Modified Files: + events.c + +commit 706b2a7e02aa0085769fb87782118488d0f90eaa +Author: Adam Jackson +Date: Sat Jul 31 01:21:19 2004 +0000 + + Change several LoaderSymbol calls introduced by the bug #400 patch to + *Weak() resolver functions. + +commit 9e13805b02f37497971c789b4035abc29463c550 +Author: Alexander Gottwald +Date: Sat Jul 31 00:44:45 2004 +0000 + + adjust prototype for winInitCmapPrivates to match Egberts change. + +commit 4da507a03fd5659e5944d9e47dd2f8920636383b +Author: Kevin E Martin +Date: Sat Jul 31 00:32:43 2004 +0000 + + Fix compiler warning + +commit 64a6d3e9c84a36b4e0550d112f288b695c5056cd +Author: Hui YU +Date: Fri Jul 30 22:20:21 2004 +0000 + + Support for New radeon chips: R420/M18, R423, RV370/M22, RV380/M24, RS300. + Add special handlings for DELL triple-head server (RV100). Misc. bug + fixes for flat panel, host aperture, etc (Bug #946) + +commit d3c98fed2c37a863a6765a3e288bcdbc2738878a +Author: Egbert Eich +Date: Fri Jul 30 21:53:09 2004 +0000 + + Add support for on-the-fly screen rotation when supported by hardware (Aron + Plattner). + +commit 4baf0029418d3eeeac5d1026a7cfea3234e44e48 +Author: Egbert Eich +Date: Fri Jul 30 21:46:38 2004 +0000 + + An experimental pseudocolor emulation layer. Not fully completed, currently + only works for 16bpp. + +commit 63a152f7812d0981e3e7aa41a42e59cd0c3e50dc +Author: Egbert Eich +Date: Fri Jul 30 21:39:20 2004 +0000 + + removing some unnecessary restricitons on the allowed visuals. + +commit 0ba15599466ddb644728c6b68e64e05b1317ac2e +Author: Egbert Eich +Date: Fri Jul 30 21:10:46 2004 +0000 + + Adding a colormap index to the InitColormapPrivate() func call. Without it + it was completely useless. + test if colormap with index really exists in the list of installed maps + before using it. + +commit bbfe7bed3fe4d9bd089327cd59e6faedb592dabb +Author: Egbert Eich +Date: Fri Jul 30 20:56:53 2004 +0000 + + Set DPMS to ON when VT switching away or shutting down the server. Failing + to do this may leave the text console blank. + +commit 40b975e3acb11c1ec2fd4c5984f5efa20b669489 +Author: Egbert Eich +Date: Fri Jul 30 20:51:09 2004 +0000 + + Improved error messages. + build fixes for AMD64. + Made shm* functions in the libc_wrapper more standard conformant by setting + errno correctly. + Use xf86ExendedInitInt10() in VBEExtendedInit() to be able to pass flags. + +commit 7643199de1c4f12a2aadeaf2d539a37ddb45672b +Author: Egbert Eich +Date: Fri Jul 30 20:38:27 2004 +0000 + + Fix static build. + add i845 to the list of chips that allow memory size tweaking. + +commit 48514fee3c8ec26f36e142ffc9272e510b9a4238 +Author: Adam Jackson +Date: Fri Jul 30 20:30:57 2004 +0000 + + Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all + framebuffer formats except cfb and the overlay modes should work, and + r128 and radeon need to be loaded from the ati driver (both issues to + be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga + drivers. elfloader users shouldn't be affected. + +commit 29012adb37c533f57c684ad94c4d83a6c31793e5 +Author: Torrey Lyons +Date: Fri Jul 30 19:28:03 2004 +0000 + + Add generic rootless layer documentation missed from last commit. + +commit 784e4d1cc02dea837a38a4140a18013953296366 +Author: Torrey Lyons +Date: Fri Jul 30 19:12:18 2004 +0000 + + Merge many XDarwin improvements: + - Fix launch of X clients by double clicking in the Finder when there is a + space in the path (Torrey T. Lyons). + - Interpret scroll wheel mouse events correctly when shift is held down + (Benjamin Burke). + - Add option to always use Mac command key equivalents (John Harper and + Torrey T. Lyons). + - Add support for dynamic screen configuration changes in rootless mode + (John Harper and Torrey T. Lyons). + - Add documentation on generic rootless layer (Torrey T. Lyons). + +commit c2275b31adc3c4292c171055db16e00ee0e69e43 +Author: Egbert Eich +Date: Fri Jul 30 19:04:14 2004 +0000 + + Removed bugs on TweakMemorySize() which prevented it from working at all. + Initialized last element of BIOS version number string to 0 to avoid random + problems. + +commit 5ed0aefc67e86abaddf1b6bffdc832996b86fb46 +Author: Egbert Eich +Date: Fri Jul 30 18:40:36 2004 +0000 + + Fixed typo in a comment. + Deleted bogus comment. + Added debugging support. + +commit d380647739e4767da69edc44bbb441b3b9554b03 +Author: Torrey Lyons +Date: Fri Jul 30 18:22:13 2004 +0000 + + Add initial Xinput support for XDarwin (Greg Parker). + +commit 41641c11ec8994f1bc4bd1b05ae2cb38167c8312 +Author: Torrey Lyons +Date: Fri Jul 30 17:37:09 2004 +0000 + + Make XDarwin not default to StaticColor on ix86 (Shantonu Sen). + +commit f4c84e7dbf0f25a2544d4400e600310421683f3c +Author: Roland Mainz +Date: Fri Jul 30 12:03:56 2004 +0000 + + Fix for http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=940 + - Filter /etc/init.d/xprint throught CPP/|MakeScriptFromCpp()| to allow + platform-specific customisation. + +commit ed923a42b800e3f701084ef5828cabbbefe8361f +Author: Eric Anholt +Date: Fri Jul 30 06:54:41 2004 +0000 + + file cw_render.c was initially added on branch COMPOSITEWRAP. + +commit 69e379ddaf85feda6a163b5f4e855ffe86b254df +Author: Eric Anholt +Date: Fri Jul 30 06:54:41 2004 +0000 + + file cw_ops.c was initially added on branch COMPOSITEWRAP. + +commit 0ee93acd103af947fef0a28e32b5b3f2857789bf +Author: Eric Anholt +Date: Fri Jul 30 06:54:40 2004 +0000 + + file cw.c was initially added on branch COMPOSITEWRAP. + +commit 3bdaa0e7fa7b6f5d550907d5fe7d0fb16c53e243 +Author: Eric Anholt +Date: Fri Jul 30 06:54:40 2004 +0000 + + file cw.h was initially added on branch COMPOSITEWRAP. + +commit 94e1ea569171334eb40a2d4a63138c02915203db +Author: Eric Anholt +Date: Fri Jul 30 06:54:40 2004 +0000 + + file compwindow.c was initially added on branch COMPOSITEWRAP. + +commit 705536d04c4f09c84bb04827c07bb899584f399d +Author: Eric Anholt +Date: Fri Jul 30 06:54:40 2004 +0000 + + file compinit.c was initially added on branch COMPOSITEWRAP. + +commit b80dbd886d7cc3a72772f3231a8c8e8df7f6679f +Author: Eric Anholt +Date: Fri Jul 30 06:54:40 2004 +0000 + + file compalloc.c was initially added on branch COMPOSITEWRAP. + +commit beb26caf68d3e25bf85fd63dbb499eca4b1f05ba +Author: Eric Anholt +Date: Fri Jul 30 06:54:40 2004 +0000 + + file compext.c was initially added on branch COMPOSITEWRAP. + +commit 97afc846003bb521cf9d6e92b298024d83db8759 +Author: Eric Anholt +Date: Fri Jul 30 06:54:40 2004 +0000 + + file compint.h was initially added on branch COMPOSITEWRAP. + +commit 854c1afa867ff617b47c4cde3cfd86bd26e9931a +Author: Kevin E Martin +Date: Fri Jul 30 04:44:13 2004 +0000 + + Fix "DoLoadableServer NO" build + +commit 71164d118c192e96eb2b0fc45514233e9563a568 +Author: Stuart Kreitman +Date: Fri Jul 30 01:21:57 2004 +0000 + + Integration of XEVIE branch to trunk + https://freedesktop.org/bugzilla/show_bug.cgi?id=947 + Modified Files: cursorstr.h input.h inputstr.h windowstr.h + +commit 82a6a659248bb66a0364eb9eaf331747834fb5c6 +Author: Stuart Kreitman +Date: Fri Jul 30 01:20:42 2004 +0000 + + Integration of XEVIE branch to trunk + https://freedesktop.org/bugzilla/show_bug.cgi?id=947 + Modified Files: Imakefile Added Files: xevie.c + +commit dd7077cadcdc323e1a301ed5eefa7ff12599aa4d +Author: Kevin E Martin +Date: Fri Jul 30 01:15:57 2004 +0000 + + Cleaned up code since client's saveSet is no longer defined as a pointer* + (forgot one change in previous check-in) + +commit 813d75f9d3c7b540977926e37310fa683daf12e1 +Author: Kevin E Martin +Date: Thu Jul 29 23:43:40 2004 +0000 + + Use LibraryTargetName when not building a loadable server + Move extern function declarations to window.h + Cleaned up code since client's saveSet is no longer defined as a pointer* + Added externs back in + Change #if to #ifdef to fix compiler warning + Add function declarations that were inadvertently removed by previous check + in + Disable extensions that are not (yet) supported by DMX + +commit 274d5044ac41523ff23912c223177c429c710e09 +Author: Stuart Kreitman +Date: Thu Jul 29 18:49:42 2004 +0000 + + Integration of DAMAGE-XFIXES branch to trunk + https://freedesktop.org/bugzilla/show_bug.cgi?id=859 + Modified Files: Imakefile miinitext.c + +commit 406c49eb810cbdcfd833cac4eeaa465598238691 +Author: Stuart Kreitman +Date: Thu Jul 29 18:46:37 2004 +0000 + + Integration of DAMAGE-XFIXES branch to trunk + https://freedesktop.org/bugzilla/show_bug.cgi?id=859 + DAMAGE calls some shape functions. Modified Files: Imakefile shape.c + +commit 0bca00e1205bf1a4537cbf7be6339b3b1f9b953f +Author: Stuart Kreitman +Date: Thu Jul 29 18:43:58 2004 +0000 + + Integration of DAMAGE-XFIXES branch to trunk + https://freedesktop.org/bugzilla/show_bug.cgi?id=859 + Modified Files: dispatch.c dixutils.c events.c window.c + +commit d4a101d4ef9943dcddf08b00b2d3ab4319597193 +Author: Stuart Kreitman +Date: Thu Jul 29 18:37:54 2004 +0000 + + Integration of DAMAGE-XFIXES branch to trunk + https://freedesktop.org/bugzilla/show_bug.cgi?id=859 + These RENDER changes come from the experimental freedesktop tree formerly + known as "Xserver". Partly motivated by compatibility with DAMAGE as + pulled from that tree, also some of the code just is better + implemented. + Modified Files: filter.c picture.c picture.h picturestr.h + +commit e1281790bb3d7cdcc5de85829806dd53da67e326 +Author: Stuart Kreitman +Date: Thu Jul 29 18:16:56 2004 +0000 + + Integration of DAMAGE-XFIXES branch to trunk + https://freedesktop.org/bugzilla/show_bug.cgi?id=859 + Modified Files: cursorstr.h dix.h dixstruct.h regionstr.h window.h + +commit d2f798b6dbaebd0300f42c2e083a962c37647620 +Author: Stuart Kreitman +Date: Thu Jul 29 14:42:24 2004 +0000 + + Integration of DAMAGE-XFIXES branch to trunk + https://freedesktop.org/bugzilla/show_bug.cgi?id=859 + Added Files: Imakefile damage.c damage.h damagestr.h + +commit 682ee8a9f8d55c6a6f517a277d1bfad2a0f28594 +Author: Stuart Kreitman +Date: Thu Jul 29 14:40:33 2004 +0000 + + Integration of DAMAGE-XFIXES branch to trunk + https://freedesktop.org/bugzilla/show_bug.cgi?id=859 + +commit 6ed1c3845517c7731dcc74baa51bb801838afaff +Author: Stuart Kreitman +Date: Thu Jul 29 14:33:43 2004 +0000 + + bugzilla 859 -merging DAMAGE-XFIXES into trunk + +commit 736e511824c4f5e77e637c680a4e45f0b7631644 +Author: Alan Coopersmith +Date: Wed Jul 28 03:57:19 2004 +0000 + + Fix shared reqs for Xlibi18n, Xaw6 & Xmu for Solaris + Improved support for Compose and Kana Lock LED's on Sun keyboards + Add event definitions for additional keys on Sun Japanese keyboards + VUID mouse protocol support for Solaris Make default mouse message clearer + on machines that use a default other than /dev/mouse. + +commit d374dffb20364a3df184cc28888ee7edbe50f474 +Author: Rik Faith +Date: Wed Jul 28 00:28:00 2004 +0000 + + When using DMX console input, make detached screens display as grey (vs. + white for attached and black for dead-space). + +commit 1498414cc85c148ef15b9b57d9f9b6b850bf2702 +Author: Torrey Lyons +Date: Tue Jul 27 20:26:47 2004 +0000 + + Fix Xprint build on Darwin. + +commit ddd58356123f61b863754eb0bdd42a8defa0461b +Author: Torrey Lyons +Date: Tue Jul 27 20:24:00 2004 +0000 + + Fix XDarwin's broken build of libGL and server side GLX. GL library is only + known to build correctly on Mac OS X 10.3.4 and still needs some work + for earlier versions. + +commit 8ef3e7052e8e1db869411e9f6fc88491e3f05474 +Author: Alexander Gottwald +Date: Tue Jul 27 09:53:14 2004 +0000 + + Merge latest changes from CYGWIN branch + Use find | xargs combination instead of simple shell globbing to prevent + commandline argument overflow + +commit a12a678bc9af8df1a3078f574b0c910e3e6983f8 +Author: Matthieu Herrb +Date: Tue Jul 27 06:20:52 2004 +0000 + + Fix a bug that caused an entire batch of events to be thrown out when one + of an unknown type is encountered. (Ty Sarna, NetBSD). + +commit 19002e47a0dbf55e035b674116a533ec9814edfa +Author: Alex Deucher +Date: Tue Jul 27 02:50:41 2004 +0000 + + - enable maven support for TV detection, DPMS, and DDC on crtc2 on G400 + (Ryan Underwood) (http://bugs.xfree86.org/show_bug.cgi?id=1098) + - expose I2CStart; needed for mga maven support (Ryan Underwood) + +commit 2a7b137d41eb8ce6efc45b47b5df0c89eb4f5d93 +Author: Matthieu Herrb +Date: Mon Jul 26 22:41:47 2004 +0000 + + remove extra ';' (Alan Hourihane, Keith Packard). + +commit 799208dd44a65b18dda97b4843a27a2628f955f4 +Author: Adam Jackson +Date: Mon Jul 26 19:06:04 2004 +0000 + + Bug #377: Make lib{glx,GLcore,dri} work when compiled as dlloader modules. + +commit f15f881727cee9a879bd43be8dc849320f8d3cbd +Author: Keith Packard +Date: Mon Jul 26 17:14:27 2004 +0000 + + Eliminate bogus rate check in fbdevModeSupported. Hmm. Potentially bogus + rate selection necessary for Mac fbdev + Don't know about fb changes to pixmaps, so can't track dirt. + Add Mac specific 1280x854 mode. Warn when requested mode isn't found. + Add ability to soft-boot video cards. + Add region expand request. FIXME: need test cases + +commit 20913b7d5daf90e0f7ad1ee967ad2f0daaec40f9 +Author: Matthieu Herrb +Date: Sat Jul 24 17:35:39 2004 +0000 + + Fix a problem with wsmouse driver loosing events on 64bit architectures + (XFree86 Bugzilla #1438, John Heasley). "To fix this, I've added a + mouse buffer (Xisb buffer) "scale" value to the MouseDevPtr type. If + set, it is used as structure size of which we want space for a few." + +commit c57944cd9aaac717d4d4ada44626e35925b39bbd +Author: Keith Packard +Date: Sat Jul 24 17:02:49 2004 +0000 + + Check for mmio before restoring crtc/crtc2 pitch registers + +commit 5fdff8b95e8f90221a46717c2f84715ab238460c +Author: Matthieu Herrb +Date: Sat Jul 24 16:32:39 2004 +0000 + + Bugzilla #884: OpenBSD/amd64 support. + +commit cc3e0173d9fae8a40eb46606d9951e3aa1df975a +Author: Søren Sandmann Pedersen +Date: Thu Jul 22 19:24:50 2004 +0000 + + Thu Jul 22 20:03:11 2004 Soeren Sandmann + Call MMX solid fill routine when available. + Call MMX operations when available. + New HasGcc34 macro + New file with many operations implemented with MMX intrinsics, conditional + on having GCC 3.4 on i386. + +commit 9565d9e0cf85e6f5fb47acebdd66212bd6cc3e08 +Author: Keith Packard +Date: Thu Jul 22 18:17:59 2004 +0000 + + Correct pitch so that accelerator can run on 1400x1050 screens. Add a few + more register sets for cursors. + +commit 67dbad6b3b9163eafae7d9dd7698708e10372a21 +Author: Eric Anholt +Date: Thu Jul 22 06:48:19 2004 +0000 + + DRM 20040721 import + +commit 829b2c72a6433ebaf63f2d2726259c73cca4bd1a +Author: Eric Anholt +Date: Thu Jul 22 06:48:19 2004 +0000 + + Initial revision + +commit 448e0754e369d433a61ae337bbfd7dba195c5e69 +Author: Phil Blundell +Date: Wed Jul 21 20:33:35 2004 +0000 + + Include -lts if appropriate. Patch from pattieja@bentham.ispvip.biz. + +commit 0c32a94623b13dd1ac5b015b465bdf890f498282 +Author: Alexander Gottwald +Date: Tue Jul 20 15:15:13 2004 +0000 + + Bugzilla #889: Bind -from address to port number 0 instead of 177 + +commit 07e6011106dcfa0ab69861aa7dcbb88382625c16 +Author: Phil Blundell +Date: Tue Jul 20 14:33:42 2004 +0000 + + Select optimized + 16bpp shadow copy functions if screen is 16bpp. Select -YX versions for + 90 and 270 rotations if architecture is ARM. + +commit 797114414096d7bf7ed0d73a878d0cffef262301 +Author: Roland Mainz +Date: Mon Jul 19 22:01:52 2004 +0000 + + Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=893 - Fixing the + bug that Xprt did not honor ${LC_ALL} when looking for model-config + dirs. + +commit 8853f9331826899229e5b7c964e9c852c0371ce5 +Author: Eric Anholt +Date: Mon Jul 19 12:07:01 2004 +0000 + + Add support for a8b8g8r8 and x8b8g8r8 pictures, which showed up frequently + with metacity usage. + +commit adf4b38f49da063576b48f9c0750b78bb753b3de +Author: Eric Anholt +Date: Mon Jul 19 11:42:49 2004 +0000 + + Breakage in last commit to this file: pCurPriv->area isn't set up until + Enable, these days. + +commit d2e74e419d2c75c5a5b97236d2714730e6f69ee0 +Author: Eric Anholt +Date: Mon Jul 19 11:19:12 2004 +0000 + + Set the right number of texture coordinates for r200 Render support (still + disabled, needs to be tested). + +commit cefcb7f123c962c3715b0c46f30430e87c82a017 +Author: Eric Anholt +Date: Mon Jul 19 11:16:13 2004 +0000 + + - Add Radeon picture transform support. + - On R128, don't refer to an old Composite's mask transform when the + current Composite doesn't have a mask. + - Staticize some global variables in r128_composite.c. + +commit 9fe216a45836b98b5aea55725019668de3900e83 +Author: Eric Anholt +Date: Mon Jul 19 07:53:54 2004 +0000 + + Use the offscreen memory manager as much as possible to do the reservation + of memory at startup. Do some drive-by cleanups while I'm here + (sorry!). + +commit e2bb9f38cdcb74fd7630f4efe310ad14d597171e +Author: Eric Anholt +Date: Mon Jul 19 07:20:01 2004 +0000 + + Add support for transforms of textures on R128. + +commit c04264727860cbe2e276e1934d6700d0baaf9f73 +Author: Rik Faith +Date: Sun Jul 18 22:19:33 2004 +0000 + + Addition of console input after removal of core backend input that is not + on screen 0 can cause a segfault. Fix by preventing reinitialization of + detached inputs. When Xinerama is active and screen 0 is detached, + pixmaps for XGetImage must be obtained from another screen. + +commit 0addd0d499046fc8a6cdc18fc41d34cac2ba77ea +Author: Roland Mainz +Date: Sun Jul 18 05:21:20 2004 +0000 + + Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=858 - Fixing the + problem that clients cannot use the TrueColor visual without calling + |XInstallColormap();|. + +commit 7f9e263658b1c9c435db851a8afd904a2f584d13 +Author: Kevin E Martin +Date: Sat Jul 17 20:44:14 2004 +0000 + + Revert change to MAXFORMATS to maintain binary compatibility + +commit c47a1bdd7463b6863018e2c4237acfd28b89f38f +Author: Alan Coopersmith +Date: Sat Jul 17 01:13:31 2004 +0000 + + Fix typo in debug message in MakeAllCLTSServerListeners + Add $(GETPEER_DEFINES) to DEPEND_DEFINES for makedepend + Add "localuser" and "localgroup" access types to server-interpreted + authentication scheme. + +commit 3e52373fc8179a59efc9e7ab22ce0cb5160d0409 +Author: Carlos Romero +Date: Thu Jul 15 09:56:40 2004 +0000 + + Enable i810. + +commit aeb78eaa980ac93f6af3e947ab1ad8bce5bc5bd1 +Author: Eric Anholt +Date: Thu Jul 8 08:21:25 2004 +0000 + + Commit the rest of the dirty optimization from 20040703 and add a missing + header include. I don't know how this happened, but I'm going to blame + a "few" fscks having happened between testing the code and committing + (due to other driver changes that made me not blame dirty for the + failures I saw) for disappearance of kasync.c changes. Fixes a lot of + corruption. + +commit b46767352822b09e5dab8b54cbb7a37a9b62de53 +Author: Eric Anholt +Date: Thu Jul 8 06:57:58 2004 +0000 + + Remove duplicate protos in kdrive.h. + +commit 764d9e822b01fdfe3ff088028959cbc48b349026 +Author: Carlos Romero +Date: Wed Jul 7 20:43:25 2004 +0000 + + missing xkb/[xkb.h, xkbDflts.h] and hw/kdrive/mga/g400_common.h + +commit f96ef08d48b01f6119799ede9ffc43d0134cbf8b +Author: Carlos Romero +Date: Wed Jul 7 19:21:07 2004 +0000 + + Initial kdrive XKB/XINPUT support, use --enable-xkb --enable-xinput + +commit a5c9b3229ce418a5e3eacc40b7a7f11c0a26d958 +Author: Rik Faith +Date: Wed Jul 7 04:32:52 2004 +0000 + + Bugzilla #817 + +commit 1498d7a096f0855fa965585acd9ca4a2780cc959 +Author: Kevin E Martin +Date: Tue Jul 6 23:51:00 2004 +0000 + + - Disable building DMX on OSs that have not been verified to build + correctly (Kevin Martin). + - Fix DMX build when Xinerama is not enabled (Kevin Martin). + +commit 0e45f2a7536bf4b66d6f64d96b44431310884af3 +Author: Egbert Eich +Date: Tue Jul 6 14:49:13 2004 +0000 + + ifdef'ed some IA32-only assembler statements. Presently these chipsets are + IA32 only, anyway (Egbert Eich). + Disabling generic VGA testing for IA64 architectures. Temporarily disabling + support for ZX1 bus. This code is extremely invasive and is executed as + fallback without testing for a ZX1 chipset. It brings a SGI Altrix to a + grinding halt. (Egbert Eich). + +commit df2b55a25b7056ac92c1f6cbee9f16bd0a37ba8c +Author: Egbert Eich +Date: Tue Jul 6 14:37:48 2004 +0000 + + Separated Intel drivers from default DriDrivers to avoid building them on + IA64 (Egbert Eich). + Fixed wrong function prototype (Egbert Eich). + Don't test for generic VGA on IA64 (Egbert Eich). + Fixed a segfault when accessing a structure before verifying the pointer + exists (Egbert Eich). + Added a showcache option for debugging (Egbert Eich). + Increase default video RAM size to 16MB when DRI is enabled and more than + 128MB are available (Egbert Eich). Fixed lockups during mode switch. + Problem was introduced when attempting to copy the behavior during + LeaveVT()/EnterVT() but but forgetting to call I810DRILeave() before + I810DRIEnter(). The entire DRILeave()/Enter() scenario has been + commented out as it didn't seem to be necessary (Egbert Eich). + Fix TweakMemorySize() (tested with i855/i865) (Egbert Eich). + increased MAX_DEVICES to 128 (Egbert Eich). + Use OS provided PCI config space access as default method (Egbert Eich). + Added support for Linux 2.6 proc file format. + Fixed unaligned accesses to pieces of the VBE info block. VESA did not + align elements to size (Egbert Eich). + +commit 7c466d64c34e68e0bc50e083861874161ae02db9 +Author: Eric Anholt +Date: Sat Jul 3 10:23:03 2004 +0000 + + Clean up Rage 128 composite code. Now it composites more operations + correctly and is simpler. + +commit 020701566916c8569f5af7f2efe1de36fea2002e +Author: Eric Anholt +Date: Sat Jul 3 09:16:30 2004 +0000 + + Add a "dirty" flag to the pixmap private. Clear it when setting up an + offscreen pixmap area, and set it when any rendering occurs. When + moving a pixmap out of offscreen, don't read data back if it wasn't + dirtied (compared to the system memory copy). + +commit fd594b0559caa98ee0823be956aecf9c9d2e52bc +Author: Phil Blundell +Date: Fri Jul 2 21:30:00 2004 +0000 + + Call ts_read multiple times, to avoid events getting stuck in the pipeline. + +commit 7976ee51afcad41b611e642d2feb31d805dedcf6 +Author: Kevin E Martin +Date: Wed Jun 30 20:06:56 2004 +0000 + + Add Distributed Multihead X (DMX) support + +commit d5db59bd79f5d8788b99056bf9d969b5b3ad99e1 +Author: Eric Anholt +Date: Tue Jun 29 20:37:51 2004 +0000 + + Add an offscreen area scoring to improve choosing offscreen areas to kick + out when allocation can't find a free area of the requested size. When + offscreen pixmaps get used, the offscreen area's score is increased by + a constant value. Every certain number of increases, all offscreen area + scores get decreased by a fraction. When choosing a set of areas to + remove for a new allocation, the set of areas with the smallest total + score is chosen for removal. While this is not the smartest system, it + prevents things like always removing the first offscreen area in memory + (likely the most recent) to be kicked out when doing replacing. + +commit ea78d1c6fcd27d28e69cb97faf72b7b719f6f93e +Author: Alan Coopersmith +Date: Mon Jun 28 18:08:26 2004 +0000 + + Add GLX_ALIAS_VOID for GLX_ALIAS of functions with return type void to fix + builds with non-gcc compilers that refuse to let you do return + function_that_returns_void(...) + programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c Remove includes + of xf86drm.h that break non-DRI builds + +commit 7ff67f2872ddd15908f789ec9bdb76e8211d6431 +Author: Keith Packard +Date: Mon Jun 28 00:48:51 2004 +0000 + + Separate out off-screen allocation from Init. Fix Enable to update + off-screen addresses. Wrap RandR to update off-screen addresses. + Set off_screen_base and memory_size fields correctly. + +commit 5b75aae2cf1ad38556e9a55da72ad65419aa7f84 +Author: Keith Packard +Date: Sat Jun 26 04:13:03 2004 +0000 + + Add ARGB cursor support for Radeon cards. + +commit 8bc0bc6d36dbc5000069017a1984905065164016 +Author: Alexander Gottwald +Date: Fri Jun 25 08:58:18 2004 +0000 + + #Bug 784: Ignore unconfigured interfaces with xdmcp + +commit c5ab3fdd928d12b4dc28108f2242b3b75e1ac65f +Author: Alexander Gottwald +Date: Fri Jun 25 08:56:04 2004 +0000 + + #Bug 780: add RRSetScreenConfig + +commit f8226cee08a00b49f32dc3db814478490febe45d +Author: Roland Mainz +Date: Fri Jun 25 00:02:11 2004 +0000 + + Fix for http://xprint.freedesktop.org/bugzilla/show_bug.cgi?id=791 - Adding + special support for Canon C3200N + +commit ad6b9644a39343437967b4c3b2442dbd47508443 +Author: Roland Mainz +Date: Thu Jun 24 06:26:27 2004 +0000 + + Fix for http://xprint.freedesktop.org/bugzilla/show_bug.cgi?id=660 : Fix + for the issue that GetPrinterList does not return printer descriptions + on Solaris. The patch implements a framework which allows the printer + enumerator scripts to pass additional printer attributes to the + information pool (currently only "xp-printerattr.descriptor" is + implemented). + +commit 884908a63c624585c9b5fcf22d565236298c2916 +Author: Roland Mainz +Date: Tue Jun 22 10:18:13 2004 +0000 + + Fix for http://xprint.freedesktop.org/bugzilla/show_bug.cgi?id=789 : Adding + a workaround for the issue that Xprt may hang when the CUPS spooler + frontend sends messages to stdout. + +commit c66cc2a219e860ae3c0b5d4ad18b22a6dc4e16df +Author: Alexander Gottwald +Date: Mon Jun 21 13:51:57 2004 +0000 + + Bug 783: rootless patches for cygwin + +commit ed7f92e791f052d64cffef4b44eae5160fb24689 +Author: Alexander Gottwald +Date: Mon Jun 21 13:44:14 2004 +0000 + + Bug 778: add ddxBeforeReset + +commit 68d92cca1a696521599db6a826d2187ec0c15f01 +Author: Alexander Gottwald +Date: Mon Jun 21 13:35:05 2004 +0000 + + Bug 782: Merge native OpenGL for Windows from CYGWIN branch + +commit d6e8b1affec7351549c0006cc63b6923091cdd68 +Author: Alexander Gottwald +Date: Mon Jun 21 13:19:32 2004 +0000 + + Bug 777: Merge from CYGWIN branch + +commit dfdbb60bf5f613b3554d5435f08f16bde72aa353 +Author: Roland Mainz +Date: Mon Jun 21 00:29:46 2004 +0000 + + Fix for http://xprint.freedesktop.org/bugzilla/show_bug.cgi?id=772 - RFE: + Switch default resolution from 300DPI to 600DPI + +commit dd831c7a5c1b0c540a78350aadaeb34a8aa67395 +Author: Roland Mainz +Date: Sat Jun 19 21:56:01 2004 +0000 + + Refix for http://freedesktop.org/bugzilla/show_bug.cgi?id=764 : Rework + previous solution and make Xprt to default to "-noreset" (the default + of Solaris version of Xprt) and add a "-reset" option which can be used + to restore the default behaviour on demand. + +commit da78a4ddd833f78baf1d2579a1adea8208016ddb +Author: Damien Ciabrini +Date: Wed Jun 16 21:36:54 2004 +0000 + + Update MGA composite patch commit. (some files were missing in the previous + commit) + +commit e56e24af252bd3b8e58076adf0f8eabf1103f187 +Author: Eric Anholt +Date: Wed Jun 16 09:37:59 2004 +0000 + + Merge DRI-trunk-20040613 changes in programs/Xserver/GL. + +commit 2e1868b560315a8b20d688e646c489a5ad93eeae +Author: Eric Anholt +Date: Wed Jun 16 09:25:21 2004 +0000 + + DRI trunk-20040613 import + +commit f45c46c630855e8e0d1c28b1f0d3b2ad54334619 +Author: Eric Anholt +Date: Wed Jun 16 09:25:15 2004 +0000 + + Initial revision + +commit 22bad9474b8822f03f84a8a39edce624bfb9befa +Author: Eric Anholt +Date: Wed Jun 16 09:22:17 2004 +0000 + + DRI XFree86-4_3_99_12-merge import + +commit 1c133c27ccc1f09b95922fdece3c8d73cc182def +Author: Eric Anholt +Date: Wed Jun 16 09:22:05 2004 +0000 + + Initial revision + +commit b61ff0daa4bd1e3b828dc5b985c3a2f3c92b202e +Author: Eric Anholt +Date: Wed Jun 16 09:16:01 2004 +0000 + + DRM 20040613 import + +commit bcc1eab1fd57e8cb686d625934a6e527b7ae4ea2 +Author: Eric Anholt +Date: Wed Jun 16 09:16:01 2004 +0000 + + Initial revision + +commit 580b9a7da1bf0e20acdcddd676d471b3d6589023 +Author: Jaymz Julian +Date: Mon Jun 14 08:43:57 2004 +0000 + + MGA composite support from Damien Ciabrini - thanks! + +commit 95d65cf6bb753d10f4db3d857fb98bb09389228e +Author: Alan Coopersmith +Date: Sun Jun 13 04:50:21 2004 +0000 + + Manual page X(7) does not reference Xprt(1x), xplsprinters(1x), etc. + xc/config/cf/Imake.rules Correct comment to match rule name for + InstallDriverSDKObjectModule + xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c Log results of + ioctls to probe keyboard type & layout + +commit 4ffde8a6b3299f002c10b1abd881e4c6849767ea +Author: Eric Anholt +Date: Thu Jun 10 19:22:58 2004 +0000 + + - Pass the right pixel mask (all ones) in to PrepareSolid in the + solid-fill-based composite acceleration. + - Use a real pixmap when doing an UploadToScratch (For pDrawable->type == + DRAWABLE_WINDOW, you need to get the backing pixmap). + - Pass back the x/y offsets from kaaGetOffscreenPixmap unconditionally, + because they'll be used in the scratch case. + - Turn on the Render acceleration for Rage 128 and Radeon 100-series at + last! + +commit c3bc6dd551436d5e37a07f37b3b77a83bb5b5da0 +Author: Eric Anholt +Date: Thu Jun 10 09:50:59 2004 +0000 + + Align scratch area offsets to the offscreen byte alignment. + +commit cf3f95d2164604047866b283fe0071574bf16dbc +Author: Eric Anholt +Date: Thu Jun 10 08:37:28 2004 +0000 + + Oops, testers reported that the last patch actually didn't work (conflicts + occurred), so the R300 PDMA doesn't work. Disable. + +commit 0b7647ee359537953b67b0dbf9daa807e356062b +Author: Eric Anholt +Date: Thu Jun 10 05:57:31 2004 +0000 + + Bug #242: Fix setup of R300 cards, by providing R300 CP code from + volodya-project and initializing PDMA. + +commit b3a18ca8b827cfe2ebb295a03a9776028242c1a0 +Author: Franco Catrin L +Date: Mon Jun 7 05:13:29 2004 +0000 + + Neomagic driver enabled + +commit 893ea125597f3c6273f45a51673d4dc514e754e9 +Author: Franco Catrin L +Date: Mon Jun 7 05:05:10 2004 +0000 + + small fixes. README added + +commit d9cca52feba13b69f3eea9e1d958b8a4711e7d67 +Author: Keith Packard +Date: Fri Jun 4 17:06:18 2004 +0000 + + Add (stubbed out) Xgl server code + +commit f8a1dd3ce725195baa6f38a880299752c6c6c2c4 +Author: Keith Packard +Date: Fri Jun 4 16:10:50 2004 +0000 + + Add top-level build support for GL X server (not working yet) + Fix a few allocation bugs with alternate visual ids Allow for non-8/8/8 + alternate visuals + Turn off any existing shadow before enabling it again (avoids + re-registering existing damage) + Add some validation code to catch re-registered damages + +commit 6741fadc52598af0096f106a2cefd640abb434b3 +Author: Phil Blundell +Date: Wed Jun 2 20:49:50 2004 +0000 + + New conditional. (REQUIRED_MODULES): Demand xcalibrateext if building + XCalibrate. + New file. + Add xcalibrate.c. + Read raw events if requested. + +commit d4d0c8470c4272dec642ab4c68f44a83cda06971 +Author: Phil Blundell +Date: Sun May 30 20:40:30 2004 +0000 + + Add -lts if using tslib. + +commit 8124810950d7e0b9db7f66dadee7218b0c26c4c3 +Author: Carlos Romero +Date: Sun May 30 13:51:18 2004 +0000 + + Initialize permedia engine for acceleration to work. + +commit ea1bbf8d83d3780ccce5ebcdff48f0b19863cee1 +Author: Ralph Thomas +Date: Sat May 29 12:15:46 2004 +0000 + + Adding driver for VIA CLE266 graphics chip. Currently it only accelerates + copy and fill operations. + +commit 6af411b02e808220d3afcef14abb97eec86cf1f3 +Author: Daniel Stone +Date: Fri May 28 04:56:49 2004 +0000 + + Hey, I like devfs. + Try /dev/fb/0 if /dev/fb0 fails. + +commit a7b42f685e7a4bf57cf89a3ef664a581ecedb50f +Author: Alexander Gottwald +Date: Thu May 27 14:11:42 2004 +0000 + + file ChangeLog was initially added on branch CYGWIN. + +commit 05a3dbf5dc55ea534c68fc9d05b3949805a0752e +Author: Egbert Eich +Date: Wed May 26 17:44:29 2004 +0000 + + Updated x86emu and resynced with upsteam at Scitech. + +commit 9549f628e066396e6bc9a7edfc919bdd6860f170 +Author: Alan Coopersmith +Date: Tue May 25 20:33:46 2004 +0000 + + getconfig: file '/usr/X11R6/lib/X11/getconfig/xorg.cfg' has bad signature + (Change "Xorg Project" to "Xorg Foundation" to match getconfig script) + +commit f8124d3ef5890d59c3ce41bee46b5e3576d0f9b1 +Author: Carlos Romero +Date: Tue May 25 13:02:44 2004 +0000 + + Add pm2 to the build + +commit 32d0920ef9ec3c5e61089b88dedc82ffab294276 +Author: Carlos Romero +Date: Mon May 24 19:31:41 2004 +0000 + + Initial import of Permedia2 driver + +commit 5b2211ec3545f1634f807daf84b6c4bc2c0fdecf +Author: Egbert Eich +Date: Mon May 24 19:05:01 2004 +0000 + + Muffle compiler warnings. + fix option name in log message. + improve debugging messages. + +commit 932efe8e6d4e6280aed9b5e25af56888c964d37b +Author: Keith Packard +Date: Fri May 21 03:32:27 2004 +0000 + + Allow for multiple composite-based visuals, then add an RGB24 visual in + addition to the ARGB32 one. This allows 'glitz' to run on top of any X + server using mesa. + Switch to using 32bpp for depth 24 pixmaps (even when the frame buffer is + not depth 24). + +commit cde51fd05b2bd413d8db8ad750e6a72398a7039c +Author: Keith Packard +Date: Thu May 20 19:51:44 2004 +0000 + + Miscomputing pitch in 24bpp modes because of rounding errors. + +commit b9d920f3dc060d230a4a7b2d40210524acf50666 +Author: Keith Packard +Date: Thu May 20 05:27:03 2004 +0000 + + Fix SYNC_ALWAYS (debugging) code to use mach64WaitIdle instead of + KdCheckSync -- the boolean used in the latter won't be set yet. + Oops. == instead of =. + Must sync hardware before rasterizing trapezoids in case the mask is in + off-screen memory and has just been erased. Yes, it is silly to place + masks in off-screen memory. That's a separate issue. + +commit 94648799c82e59166155ca5abf22a9391693e6a1 +Author: Keith Packard +Date: Thu May 20 02:42:20 2004 +0000 + + Pin header-only pixmaps in memory. + Off-screen reallocation could have used a stale pointer. + Separate framebuffer mapping computation from actual frame buffer mapping. + Now map the frame buffer from vesaEnable so that VT switch shares the + same mapping code. This makes sure any shadow framebuffer is allocated + again. + +commit cade317d31dddab61199d5e90bcff36fb12f3cd1 +Author: Eric Anholt +Date: Mon May 17 20:18:02 2004 +0000 + + Overhaul of the ATI driver: + - Add monochrome hardware cursor support. + - Try to auto-detect AGP support for DRI on Radeons. And fail. Detect it + properly on R128. + - Set up card for pseudo-DMA if possible. Convert 2D rendering code to + prepare DMA packets only. Use generic code to decode DMA packets to + MMIO if PDMA is unavailable. Add WIP code to support "real" DMA without + DRM support. + - Dispatch pending DMA commands when the server sleeps. Otherwise some + things, such as typing in an xterm, wouldn't show up for a time. + - Fix Radeon Composite acceleration in many ways, and add Rage 128 + Composite acceleration. Disable them both due to still-not-understood + issues they have. They fail with In, Out, AtopReverse, and Xor, and + text rendering is strange. + - Add textured XV support for R100 and Rage 128. No brightness/sat + controls, but it does support multiple ports, and cooperates with + Composite. + - Add WIP code for hostdata uploads. + - Many cleanups and fixes. + +commit 834537e212e01314b60737278b7abc6bb7cef102 +Author: Eric Anholt +Date: Mon May 17 07:19:49 2004 +0000 + + Make kaaMoveInPixmap public. This will be used by the ATI driver's xvideo + support to ensure that the destination is in framebuffer. + +commit 85f46e0bcdf60d145a6868ee71d10688c9113e6e +Author: Eric Anholt +Date: Mon May 17 07:14:23 2004 +0000 + + Add new CheckComposite hook. This allows a driver to avoid the migration of + pixmaps for a Composite operation if the operation can't be supported. + This hook is optional. + +commit 47fb207c8ae2b54e976066f78892a1ee3fb35d30 +Author: Alan Coopersmith +Date: Sun May 16 05:08:39 2004 +0000 + + xc/programs/Xserver/fb/fb.h + xc/programs/Xserver/fb/fboverlay.c + xc/programs/Xserver/fb/fbscreen.c + - Change #ifdef for checking for old format miScreenInit to + FB_OLD_MISCREENINIT for easier portability to xservers with updated + screen structs but old function prototypes. Make it automatically + defined if FB_OLD_SCREEN is defined. + - Add _LP64 to list of #ifdefs for 64-bit platforms to support + 64-bit Solaris. + +commit fc2dd516c3c7382915452207180a1c483d0d73ca +Author: Alan Coopersmith +Date: Sun May 16 00:03:54 2004 +0000 + + xc/programs/Xserver/hw/xfree86/xf86config/Imakefile + xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c + - Clean up server name changes from TM branch + - Set default XKB rules file name correctly + - Use default font path from Imake configuration for the default font path + in generated xorg.conf files. + - Use path variables from Imake configuration for paths to files, in case + vendor has configured them to install somewhere other than the + defaults. + +commit b1aa9499ffb827f4b1acc75f197e332bba382565 +Author: Roland Mainz +Date: Sat May 15 14:43:05 2004 +0000 + + Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=622 - + RFE: Xprt default BIGREQUESTS extension buffer size should be 8MB (to + make |XpPutDocumentData()| happy and to improve performance). + +commit 74b2a7694791297a4f798ecc05c7eb8f68634722 +Author: Eric Anholt +Date: Fri May 14 00:34:28 2004 +0000 + + Add new flag, KAA_OFFSCREEN_ALIGN_POT, which tells KAA to align pixmap + pitches to a power-of-two number of bytes. Useful for Render + acceleration on older cards. + +commit 2bea33e881693e7d7dcf938db79c888a71dfb2fb +Author: Eric Anholt +Date: Fri May 14 00:27:29 2004 +0000 + + Don't let the visible screen get "migrated" offscreen, which manifests + itself as a hang. + Reported by: Ginokas + +commit 40354e761892dc2ef88d2e722d8d7896642003eb +Author: Eric Anholt +Date: Thu May 13 22:57:15 2004 +0000 + + Add generic functions for copying packed/planar XV data, copied from + mach64. + +commit 2e330e980f61b256c55f5b9debb00574e4e85b26 +Author: Eric Anholt +Date: Thu May 13 21:41:48 2004 +0000 + + Move fourcc.h to a generic location in src/. + +commit f52a4d472d2463482d865c5006208182c294e670 +Author: Keith Packard +Date: Thu May 13 21:25:51 2004 +0000 + + Follow GLX in setting ARGB visual nplanes to 24. + Retry current mouse protocol when sync is lost + +commit aa5a87847290d49b03a33351ebfd8df652a42489 +Author: Eric Anholt +Date: Thu May 13 21:15:06 2004 +0000 + + There's no need to explicitly set softCursor -- kdrive handles this if the + cursor hooks aren't set. + +commit 4078457919708a8dbf9db8ee6e4871ecbf72518f +Author: Eric Anholt +Date: Wed May 12 01:49:46 2004 +0000 + + Fix problems in render fb implementation found by rendercheck: + - fbCombineSaturate was pointed at fbCombineDisjointOver, instead of + fbCombineDisjointOverReverse as it should. Instead, point + fbCombineDisjointOverReverse at fbCombineSaturate (which is likely to + be faster). + - fix previously-unused fbCombineSaturate implementation. + - fbCombineMaskAlphaC was just a copy of fbCombineMaskValueC. Make it do + what it's supposed to (return a cs.alpha). + - fbCombineAtopC didn't invert the source alpha value. + - fix copy'n'paste errors in fbCombine(Dis/Con)jointGeneralC, also source + alpha wasn't treated in a component fashion. + - fbCompositeSrc_8888* didn't handle when the source lacks an alpha + channel. Rather than adding that and possilby slowing down the (normal) + alpha case, don't let x8r8g8b8/x8b8g8r8 Pictures be used in + fbCompositeSrc_8888* because Over with one of these is just Src. + +commit a43d5412b4d79d67af20dc8af144a9ca80263e9d +Author: Alexander Gottwald +Date: Sun May 9 16:20:13 2004 +0000 + + file ChangeLog was initially added on branch CYGWIN. + +commit 0498d818fe40cb4eb03983e27a980791bbadf6db +Author: Roland Mainz +Date: Sat May 8 02:06:46 2004 +0000 + + Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=608 + ("Can not print on Debian/CUPS due to error |Xprt_64:lpr: unable to + print file: server-error-not-accepting-jobs|"): Xprt did not setup the + list of supplementary group ids, causing print failure when the the + calling user must be a member in a specific group to be allowed to + print. + +commit 75d96afcc4a1f201da665bd73b7067e8e7139a3f +Author: Egbert Eich +Date: Thu May 6 17:31:17 2004 +0000 + + BugZilla #601: Fixing makedepend choking on floating point exception + because CHAR_BIT is defined to __CHAR_BIT__ which is a compiler + intrinsic define. BugZilla #605: Fixing build on IA64 which is broken + due to the inclusion of the kernel header asm/page.h. Kernel headers + however don't work with + -ansi. The inclusion of asm/page.h can however savely be removed as it + there are plenty of other ways to determine the page size. + +commit 7124cfaa006e840ba48dcc466c0dc8b34503a686 +Author: Keith Packard +Date: Thu May 6 16:19:32 2004 +0000 + + Use current resolution by default, change rate to 75 to match + fbdevModeSupported cut-off (?). Glenn McGrath + +commit e4ac2411eddf1f01ef9204f27b6d1ce8f1749439 +Author: Roland Mainz +Date: Thu May 6 01:53:52 2004 +0000 + + Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=551 - + PS DDX will not build on platforms with BuildFreeType NO. Patch by Alan + Coopersmith . + +commit b1c65e1ca6828ea82ee7790f22c26503b0a5e17d +Author: Roland Mainz +Date: Thu May 6 00:24:32 2004 +0000 + + Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=536 - + RFE: PS output should contain the FreeType2 version being used. + +commit 8d4f21ab53c44ca48501d6211ea6db0c0b8af916 +Author: Eamon Walsh +Date: Wed May 5 20:15:41 2004 +0000 + + Add XACE and XSELINUX extensions to the build system + +commit 0106715000196c7b349a0b4494b61545f0f5e138 +Author: Eamon Walsh +Date: Wed May 5 20:07:37 2004 +0000 + + Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE + +commit 8526cd6395490b03b279f1962df777fb0e4a9878 +Author: Eamon Walsh +Date: Wed May 5 20:04:52 2004 +0000 + + Replace XC-SECURITY code with XACE security hooks + +commit 6d066cb10990d951449b342b40dec1f1b1ae593c +Author: Eamon Walsh +Date: Tue May 4 19:44:02 2004 +0000 + + Merge the new release from HEAD + +commit b5f200ce9d495c6ce94e0170909465a30e8799d9 +Author: Keith Packard +Date: Tue May 4 03:28:06 2004 +0000 + + Attached is a patch to fix a build error whe ncompiling with tslib support, + a variable wasnt set, i just changed it to be like the other + MAkefile.ams :) -- Glenn McGrath + +commit 5ca651e66f3d0ab189962bb4609b87a865364ef8 +Author: Alexander Gottwald +Date: Fri Apr 30 12:48:56 2004 +0000 + + file winmessages.h was initially added on branch CYGWIN. + +commit 2c2c1704b542f29fe5ac9917e1141040a0dbd3e9 +Author: Roland Mainz +Date: Thu Apr 29 23:59:15 2004 +0000 + + Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=567 - + Xorg Xprt starts to consume 100% CPU when being idle for some time + (internal screensaver goes mad after 10mins) + +commit a8429d76103ff0f4fc61db86201c741f91bfcba2 +Author: Keith Packard +Date: Wed Apr 28 07:26:46 2004 +0000 + + Add completely fake X server -- draws to allocated buffer, has no keyboard + or mouse. + +commit 85e4e5445218d70f627fb132a8e8f18470e6749d +Author: Roland Mainz +Date: Mon Apr 26 11:07:03 2004 +0000 + + Work-in-progress for + http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=542 - GLX + support for PS DDX / part #1: Fix visual setup (attachment #243) + +commit 46472cbee679f9757c4003a0dcf158aeb3852f47 +Author: Alan Coopersmith +Date: Mon Apr 26 02:39:58 2004 +0000 + + xc/config/cf/sun.cf + xc/config/cf/sv4Lib.rules + xc/programs/Xserver/Imakefile + xc/programs/Xserver/hw/xfree86/os-support/sunos/find_deps.pl Make Solaris + builds work when using MakeDllModules (it's not the default yet, but at + least it works now if you turn it on) Also improve default compiler, + optimizer, & linker flags for Solaris builds using either Sun cc or gcc + xc/programs/Xserver/cfb/Imakefile.inc + xc/programs/Xserver/cfb/stipsparc.s + xc/programs/Xserver/cfb/stipsprc32.s Remove text relocation error when + building shared versions + +commit 36e3e5430e1ca7103a4e0b796eb3817975b40d90 +Author: Roland Mainz +Date: Sun Apr 25 22:42:09 2004 +0000 + + Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=541 - + Xorg Xprt may crash with "Freeing resource id=40200000 which isnt + there" + +commit 2fb588620030ad393f8500d60e16144d59e4effe +Author: Egbert Eich +Date: Fri Apr 23 19:54:30 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 0664db19bf37f9dd69cca6adff4e238e310c3092 +Author: Egbert Eich +Date: Fri Apr 23 18:54:16 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 68fd529608c58334f13beb88dbcc1d5db85b9b00 +Author: Roland Mainz +Date: Wed Apr 21 23:24:20 2004 +0000 + + Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=535 - + Xprt should not annouce extensions which are not supported + +commit 1af13123fa79ad1c6747aad60ed458bbd69da12d +Author: Roland Mainz +Date: Wed Apr 21 10:03:41 2004 +0000 + + Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=530 - + Land XPRINT branch on XORG-CURRENT + +commit 449e83a9470ec4bdd0871e2f263f608b24455423 +Author: Alan Coopersmith +Date: Sun Apr 18 03:00:43 2004 +0000 + + xc/lib/GL/glx/Imakefile + xc/lib/GL/mesa/src/Imakefile LargePICTable required for Solaris SPARC + builds + xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c + xc/programs/Xserver/hw/xfree86/common/xf86Events.c Add != NULL to if + statements to get past syntax error reported by Sun Forte 6.1 cc. + xc/config/imake/imake.c + xc/config/cf/sun.cf + xc/config/cf/sunLib.tmpl Allow compiling with Sun compilers installed + somewhere other than /opt/SUNWspro + xc/programs/Xserver/hw/xfree86/common/compiler.h + xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h Check for + defined(sparc) as well as defined(__sparc__) since Sun compilers don't + define __sparc__ + +commit 425251a752805affb6ce14baa58d92c384f39501 +Author: Alan Coopersmith +Date: Sat Apr 17 18:47:05 2004 +0000 + + Bugzilla #495: LocalClientCred should use getpeerucred on Solaris 10 + +commit 7215fb186f076a24d0a04c9c20ac9b92cae1f49b +Author: Alan Coopersmith +Date: Fri Apr 16 00:21:24 2004 +0000 + + xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c Solaris mouse + enhancements, including autoprobe support, VUID wheel mouse events, and + streams module pushing. Bugzilla #434. (Russ Blaine & Alan Coopersmith, + Sun Microsystems) + xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c Xorg doesn't + reset console to text mode on Solaris x86 8 and later Bugzilla #469. + +commit c6c6d0de2309019999fa75a2f36a4f4a93ad2f31 +Author: Egbert Eich +Date: Thu Apr 15 10:17:35 2004 +0000 + + Merged changes from RELEASE-1 branch + +commit 9d24a5fa91bf165bbd2048a844edeb59b5e34aad +Author: Harold L Hunt II +Date: Wed Apr 14 00:01:22 2004 +0000 + + file XWinrc.man was initially added on branch CYGWIN. + +commit 01bb5eb5032a7566c86a51053146dba98a3ed749 +Author: Roland Mainz +Date: Tue Apr 13 03:16:46 2004 +0000 + + file psout_ftpstype3.c was initially added on branch XPRINT. + +commit cb3f3d8f2283d384dc5a3af3f38053cc8a2d192e +Author: Roland Mainz +Date: Tue Apr 13 03:16:46 2004 +0000 + + file psout_ft.c was initially added on branch XPRINT. + +commit 7cfb4c2b33ae2147b5d6ddc2afc8b777686a666f +Author: Roland Mainz +Date: Tue Apr 13 03:16:46 2004 +0000 + + file psout_ftpstype1.c was initially added on branch XPRINT. + +commit 4ae42e79d46d7db30f7b6f321bbb0d134862138d +Author: Roland Mainz +Date: Tue Apr 13 03:16:46 2004 +0000 + + file PsFTFonts.c was initially added on branch XPRINT. + +commit b5fb71922b02024aa5a8f349c9d2c956e2f83f0f +Author: Roland Mainz +Date: Tue Apr 13 03:16:45 2004 +0000 + + file xprint.sh was initially added on branch XPRINT. + +commit ca9a9a58be51a21f123b11dd68047034696cae84 +Author: Roland Mainz +Date: Tue Apr 13 03:16:45 2004 +0000 + + file xprint.csh was initially added on branch XPRINT. + +commit 7c1f840108172d6b18af47465ea72f4820640598 +Author: Roland Mainz +Date: Tue Apr 13 03:16:45 2004 +0000 + + file cde_xsessiond_xprint.sh was initially added on branch XPRINT. + +commit 579221198aeac7010435b29db1ad8fe9ee2d7c5d +Author: Roland Mainz +Date: Tue Apr 13 03:16:44 2004 +0000 + + file spooler.c was initially added on branch XPRINT. + +commit 7677b4992fee7eb73cc97914163dcf689ad13d6a +Author: Roland Mainz +Date: Tue Apr 13 03:16:44 2004 +0000 + + file spooler.h was initially added on branch XPRINT. + +commit d3907ca519b476c99e29a58c22258f22dbe63244 +Author: Roland Mainz +Date: Tue Apr 13 03:16:44 2004 +0000 + + file document was initially added on branch XPRINT. + +commit 3646bb9c894d5f011e2df4fac402118d8350102e +Author: Roland Mainz +Date: Tue Apr 13 03:16:39 2004 +0000 + + file spooltodir.sh was initially added on branch XPRINT. + +commit 8c006df3c6d8e5ac95f0b0fa38a030100541598f +Author: Roland Mainz +Date: Tue Apr 13 03:16:39 2004 +0000 + + file model-config was initially added on branch XPRINT. + +commit 95a84bc0cb809e5c7141d0411e329a3ec300b8aa +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file ZapfDingbats.pmf was initially added on branch XPRINT. + +commit 5527b39e668ea7a88c41186dbb6d7b66e892547a +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Times-Roman.pmf was initially added on branch XPRINT. + +commit 69c405ac66b1a15076e247dd1b578b7b4b210b00 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Times-Italic.pmf was initially added on branch XPRINT. + +commit b6b75f677292ed0c694921df0abf40038dd5e99d +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Times-BoldItalic.pmf was initially added on branch XPRINT. + +commit 6605566bcf008551d33a9a68bd03e9a0c57c4f60 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Souvenir-LightItalic.pmf was initially added on branch XPRINT. + +commit 38ad2972bffea1019214785ee479f7670ca70d1f +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Souvenir-Light.pmf was initially added on branch XPRINT. + +commit 10d8eace174a9778a3313ac36a3422637b020d5f +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Souvenir-DemiItalic.pmf was initially added on branch XPRINT. + +commit fb5ac8e2bdfe1217663679f5eae8045473456752 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file NewCenturySchlbk-Roman.pmf was initially added on branch XPRINT. + +commit 5ec311b05dc1e509c115ccca808ee05090cfddad +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file NewCenturySchlbk-Italic.pmf was initially added on branch XPRINT. + +commit 70947a8f1addf4ca17e50d9e6ae590266ac446cc +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Symbol.pmf was initially added on branch XPRINT. + +commit 436ff77b21515cd9fe9732e0bd5361f2bfba44ed +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Times-Bold.pmf was initially added on branch XPRINT. + +commit 4db563027844245d6c9085f997e75da743410885 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file NewCenturySchlbk-Bold.pmf was initially added on branch XPRINT. + +commit 79110faa2eac849756b859071ce68fba64de57aa +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file NewCenturySchlbk-BoldItalic.pmf was initially added on branch XPRINT. + +commit 4e1ae7e9cc04806f4436759764cc680ecf1f014c +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Souvenir-Demi.pmf was initially added on branch XPRINT. + +commit 433913bacf988908b94c420452c042eebcb381ac +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file LubalinGraph-Demi.pmf was initially added on branch XPRINT. + +commit d5bae63138ab833fdd56bb983436ac514536d7b6 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file LubalinGraph-DemiOblique.pmf was initially added on branch XPRINT. + +commit 3acd6856617e784ee30333dc9b779189a3f44052 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file LubalinGraph-Book.pmf was initially added on branch XPRINT. + +commit 5f73192458136fe4b6b82372c3b1653fbf831ebd +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Helvetica.pmf was initially added on branch XPRINT. + +commit e129abc3bf269e857aa65065cc18a31a56ba0373 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Helvetica-Oblique.pmf was initially added on branch XPRINT. + +commit 576a4cddf995082d10e2e29e1b58c1564eb11ee7 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Helvetica-BoldOblique.pmf was initially added on branch XPRINT. + +commit cf26c87833a79427b665abce67ca19f2b68bc8e5 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Helvetica-Bold.pmf was initially added on branch XPRINT. + +commit a091408c372a2aa89fb83b023248f45aa8cd4173 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Courier.pmf was initially added on branch XPRINT. + +commit 9e4221d08ff9a408fb25a32887390b14788b1558 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Courier-Oblique.pmf was initially added on branch XPRINT. + +commit 6b2674078079a5959a2b7758e6c628a14ec1a46c +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Courier-BoldOblique.pmf was initially added on branch XPRINT. + +commit 6aee2d37b95170a65ee08c0866c425f115ebc9f1 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file LubalinGraph-BookOblique.pmf was initially added on branch XPRINT. + +commit 7a59fe1dd987e1ef0abd92e0ac80dd87a15137fe +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file AvantGarde-Demi.pmf was initially added on branch XPRINT. + +commit 22e0316acc8992033fc82a38f663fce130e4031b +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file AvantGarde-DemiOblique.pmf was initially added on branch XPRINT. + +commit f8aded3a7f8c97731e33b4362243da947fb4e774 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file AvantGarde-Book.pmf was initially added on branch XPRINT. + +commit 2224187c05d4dc05f7e03e22307cf7816d69f789 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file AvantGarde-BookOblique.pmf was initially added on branch XPRINT. + +commit 9eafaaf83294d1988b30bde4485a299cf8ae5035 +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file Courier-Bold.pmf was initially added on branch XPRINT. + +commit f9eea9864e333efde97143278916da44639cc18a +Author: Roland Mainz +Date: Tue Apr 13 03:16:38 2004 +0000 + + file ps2pdf_spooltodir.sh was initially added on branch XPRINT. + +commit 20248eedd69c42c27605d7bcfb265994f5846f17 +Author: Franco Catrin L +Date: Sun Apr 11 16:39:48 2004 +0000 + + fixed Changelog format + +commit bc7168ee763ffac9cbb992096a53b346cd640a13 +Author: Franco Catrin L +Date: Sun Apr 11 16:24:03 2004 +0000 + + Added ROP + +commit 784d37ee369b94c83c4cc6e280a39f32da8aa678 +Author: Franco Catrin L +Date: Sun Apr 11 15:51:04 2004 +0000 + + Fixed size calculation in solid rendering + +commit 056322336cbb6093d74aa9d22bbfd42e2248a16a +Author: Franco Catrin L +Date: Sun Apr 11 15:20:17 2004 +0000 + + Basic bitblt implementation + +commit c231856a1343e38381e1b4e545ff1ac279141bf0 +Author: Franco Catrin L +Date: Sun Apr 11 00:53:10 2004 +0000 + + First acceleration function implemented (DrawSolid) + +commit 47436a8af82a00d0d392cef4d5906729d9a37649 +Author: Franco Catrin L +Date: Sun Apr 11 00:15:57 2004 +0000 + + Finnally got MMIO working all timecat ChangeLog cat ChangeLog cat ChangeLog + :-D + +commit 1740b938e4c4f1cd3de700ea26143b01c0312325 +Author: Franco Catrin L +Date: Tue Apr 6 18:09:44 2004 +0000 + + Return back to VESA only version + +commit 07bc231872e7e056fa3049a0fcd963c61f826f80 +Author: Franco Catrin L +Date: Mon Apr 5 18:19:34 2004 +0000 + + small fixes, but still can't get this driver woking again + +commit b526276faa765df893197e04370a915ed73947dc +Author: Brent Cook +Date: Mon Apr 5 02:52:35 2004 +0000 + + removed hardcoded vesa references so we can operate with any backend. fbdev + works for initializing the screen, but input fails shortly after. + +commit 920e6ff81baeec16465f81bacbcff711ce82e149 +Author: Brent Cook +Date: Sun Apr 4 07:30:07 2004 +0000 + + Begin separating VESA calls into a more generic backend wrapper like the + ati driver, cascading between VESA and FBDEV. We only have init + functions done so far; need to add all of the others. Fixed some + compiler warnings. Whitespace and formatting cleanups (using 4 spaces, + no tabs) + +commit 530371ceaf7f593badf38bbc2d2e50f6a920d24f +Author: Brent Cook +Date: Sat Apr 3 22:26:37 2004 +0000 + + added touchscreen support, detect all known PCI chips in the Neomagic line. + We'll not bother with ISA for now. + +commit 962b898868dcab959c390986dcb0b4dd750dc107 +Author: Brent Cook +Date: Sat Apr 3 22:22:48 2004 +0000 + + initial import of original driver by Franco Catrin L. Wraps VESA for most + parts, with some hardware acceleration enabled for the cursor on the + NM2300. + +commit 8a2fce3b90b5efc8bab19675cb8e02690e24442e +Author: Harold L Hunt II +Date: Sat Apr 3 05:01:21 2004 +0000 + + file winkeyhook.c was initially added on branch CYGWIN. + +commit 12d5371ed2fbefab069dea46be972a7269b8c2db +Author: Stuart Kreitman +Date: Tue Mar 30 18:31:54 2004 +0000 + + file xfixes.h was initially added on branch DAMAGE-XFIXES. + +commit a4b319dbf375461c975450659723e6326153e536 +Author: Stuart Kreitman +Date: Tue Mar 30 18:31:54 2004 +0000 + + file xfixes.c was initially added on branch DAMAGE-XFIXES. + +commit 5319d30d45d5f8ec04a496327f32cc6431c6a511 +Author: Stuart Kreitman +Date: Tue Mar 30 18:31:54 2004 +0000 + + file select.c was initially added on branch DAMAGE-XFIXES. + +commit 76f247bd0ef23d688028c63b5f8bd3e9ad6b1b45 +Author: Stuart Kreitman +Date: Tue Mar 30 18:31:54 2004 +0000 + + file saveset.c was initially added on branch DAMAGE-XFIXES. + +commit 83f0f1babb612774f609c71879a225c43f63ac1f +Author: Stuart Kreitman +Date: Tue Mar 30 18:31:54 2004 +0000 + + file cursor.c was initially added on branch DAMAGE-XFIXES. + +commit 52bc7693dbe7e3db916f8d463d9a750e3c6ffa4d +Author: Stuart Kreitman +Date: Tue Mar 30 18:31:54 2004 +0000 + + file region.c was initially added on branch DAMAGE-XFIXES. + +commit 5d9098cb17cd88cfdf49de92bec2a787d6681649 +Author: Stuart Kreitman +Date: Tue Mar 30 18:31:54 2004 +0000 + + file xfixesint.h was initially added on branch DAMAGE-XFIXES. + +commit ace9aa7c45ff2ea6b3476006574da5c27d05afd4 +Author: Stuart Kreitman +Date: Tue Mar 30 17:41:24 2004 +0000 + + file damage.c was initially added on branch DAMAGE-XFIXES. + +commit 72dc7569c6bbc216f613be21ea4f79d3ef1d5534 +Author: Stuart Kreitman +Date: Tue Mar 30 17:41:24 2004 +0000 + + file damage.h was initially added on branch DAMAGE-XFIXES. + +commit 95da7b7e061b6925d8cd85bc7b25708ff253fcb1 +Author: Stuart Kreitman +Date: Tue Mar 30 17:41:24 2004 +0000 + + file damagestr.h was initially added on branch DAMAGE-XFIXES. + +commit 629c3792225cec28572081ebc8dda3fd803fe616 +Author: Egbert Eich +Date: Tue Mar 30 14:23:15 2004 +0000 + + 36. Conversion: __AMD64__ > __amd64__ (Egbert Eich). + 35. Fixed stretching option and centering in C&T driver (Egbert Eich). + 34. Added support for memory size tweaking in BIOS for i845 (Egbert Eich, + thanks to Christian Ziez) + 33. Removed video playback dependency on Accel in NSC drivers (Egbert + 3Eich). + 32. Fix HW cursor state on Savage driver when entering VT as some BIOSes + seem to enable it unconditionally (Egbert Eich). + 31. Fixed Emulate3Button message to distinguish between 'hard' (ie. + configured) and 'soft' (ie. automatic emulation that is disabled as + soon as the middle button is pressed) (Egbert Eich). + 30. Free XrmDB in XCloseDisplay() only when implicitely allocated by + XGetDefaults(). If Client allocates it itself it should free it also. + Trying to free it for the client may result in segfault if the client + has already freed it (Egbert Eich). + +commit b5e400867feab935aa04e9aadb12deb0601b7f83 +Author: Egbert Eich +Date: Tue Mar 30 14:14:31 2004 +0000 + + - backing out XFIXES and DAMAGE related code that accidentally went in + here. + +commit 0017ddaa6406524d0a86ff7020eed4c33758ddbd +Author: Stuart Kreitman +Date: Tue Mar 30 02:16:15 2004 +0000 + + file damageextint.h was initially added on branch DAMAGE-XFIXES. + +commit 4b5112fd0593b34e6e096d88b0841a28636600f6 +Author: Stuart Kreitman +Date: Tue Mar 30 02:16:15 2004 +0000 + + file damageext.c was initially added on branch DAMAGE-XFIXES. + +commit 733bfa4b5dd5255713a98f390a1fb65be6e16c2d +Author: Stuart Kreitman +Date: Tue Mar 30 02:16:15 2004 +0000 + + file damageext.h was initially added on branch DAMAGE-XFIXES. + +commit b1ed473ef2e1da99d7fe3df14fdef4d8b6365626 +Author: Harold L Hunt II +Date: Tue Mar 30 00:31:28 2004 +0000 + + file winrandr.c was initially added on branch CYGWIN. + +commit fec5095bdfb376d0046e2f52188c68bef4e31fd7 +Author: Keith Packard +Date: Sun Mar 28 07:14:30 2004 +0000 + + file xorgcfg.man was initially added on branch XORG-RELEASE-1-TM. + +commit 136a9364be80f407f498e9e9695cadaab39227ad +Author: Keith Packard +Date: Sun Mar 28 07:14:30 2004 +0000 + + file XOrgCfg.cpp was initially added on branch XORG-RELEASE-1-TM. + +commit 881afb356d6992bcfbbfcbdf31f1f71c64d648da +Author: Keith Packard +Date: Sat Mar 27 17:01:11 2004 +0000 + + file Xorg.man was initially added on branch XORG-RELEASE-1-TM. + +commit d2119ac7c56ba94db1d8639937b13e72288a328c +Author: Keith Packard +Date: Sat Mar 27 17:01:11 2004 +0000 + + file xorg.conf.man was initially added on branch XORG-RELEASE-1-TM. + +commit 5a9f3a36a35549f30fc67a8e3a3e9a201efb91ec +Author: Egbert Eich +Date: Fri Mar 26 20:02:03 2004 +0000 + + file xorgHelper.c was initially added on branch XORG-RELEASE-1-TM. + +commit b2b0e70fe5c65c8f2d518f5f0ce89a86938701ed +Author: Egbert Eich +Date: Fri Mar 26 19:54:39 2004 +0000 + + file xorgconf.cpp was initially added on branch XORG-RELEASE-1-TM. + +commit 83880dd464a415d3d0efa546b1f0b9887342e809 +Author: Alan Coopersmith +Date: Fri Mar 26 17:11:49 2004 +0000 + + 29. XkbWriteRulesProp fails if XkbRulesFile is NULL. Bug #376. (Alan + Coopersmith) + +commit 861a33678243349b987ff30912985968ede8ac84 +Author: Stuart Kreitman +Date: Fri Mar 26 01:22:18 2004 +0000 + + oops + +commit 23d552bbef2984afee889f82ded154478548ee15 +Author: Egbert Eich +Date: Thu Mar 25 11:00:52 2004 +0000 + + file xorg.cfg was initially added on branch XORG-RELEASE-1-TM. + +commit d1e52f13ad4610ec4907432c21384d08d6aaaf27 +Author: Stuart Kreitman +Date: Thu Mar 25 05:11:16 2004 +0000 + + oops + +commit f0336f18ee4106050104cb060c38fe87541615da +Author: Stuart Kreitman +Date: Thu Mar 25 03:45:49 2004 +0000 + + built,working DAMAGE/XFIXES in mono tree + +commit f1394ec3cec09ff9c5fbbff3c1f595a642b25f91 +Author: Torrey Lyons +Date: Wed Mar 24 22:15:25 2004 +0000 + + Change XFree86 Project to X.Org Foundation in localized XDarwin splash + screens. + +commit d2bbcc0deed3a607d347ed4ef07ded9bcb44f1bb +Author: Torrey Lyons +Date: Wed Mar 24 22:12:34 2004 +0000 + + Change XFree86 Project to X.Org Foundation in XDarwin splash screen. + +commit 84d25a5e178835234261a63f0a1b8131c01bbe1f +Author: Egbert Eich +Date: Wed Mar 24 15:58:45 2004 +0000 + + file xorgVersion.h was initially added on branch XORG-RELEASE-1-TM. + +commit 685d1630c1540e29644849254bd45708aa5763bb +Author: Egbert Eich +Date: Tue Mar 23 12:46:30 2004 +0000 + + file xorgconfig.man was initially added on branch XORG-RELEASE-1-TM. + +commit 6631bd586f74f89e2dce74fe1cc25ee982883323 +Author: Egbert Eich +Date: Tue Mar 23 12:46:30 2004 +0000 + + file xorgconfig.c was initially added on branch XORG-RELEASE-1-TM. + +commit 05a16f4acce3b6ef4ddafe044f96774de3f75b7c +Author: Alexander Gottwald +Date: Mon Mar 22 13:43:35 2004 +0000 + + file glwindows.h was initially added on branch CYGWIN. + +commit 3c2e2d9ae0704931737bb0879a49a8575a07d13b +Author: Kaleb Keithley +Date: Sun Mar 21 22:55:35 2004 +0000 + + bug #357. Fix XDarwin so it builds on Mac OS X 10.2 and earlier. Merged + down from -RELEASE-1-TM and -RELEASE-1 + +commit 122be5328ffea0a3b92612b8ea0f5b02736ac175 +Author: Kaleb Keithley +Date: Fri Mar 19 23:16:06 2004 +0000 + + no bug report. Restore Credits to the hw/darwin ddx that were deleted + previously. RTF may or may not be "human readable," but with a little + effort it's about as readable as SGML, IMNSHO. + +commit 551c93da612923f8d32707adc16431979bad6fb0 +Author: Harold L Hunt II +Date: Mon Mar 15 04:33:23 2004 +0000 + + file winkeynames.h was initially added on branch CYGWIN. + +commit 0c97b290015186acbaadae9a9bf79f37c3d38b40 +Author: Harold L Hunt II +Date: Mon Mar 15 04:33:23 2004 +0000 + + file winkeymap.h was initially added on branch CYGWIN. + +commit dae90c3af98edd5e95289abd930b3872c996c503 +Author: Egbert Eich +Date: Sun Mar 14 08:34:49 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 4e996f9d76f51e9b1e33bef610bb9c2a746c8b9c +Author: Alexander Gottwald +Date: Fri Mar 12 21:05:47 2004 +0000 + + file winpriv.c was initially added on branch CYGWIN. + +commit c79b4bfd15534de12aaf8eca9965403b4913ca4b +Author: Alexander Gottwald +Date: Fri Mar 12 21:05:47 2004 +0000 + + file winpriv.h was initially added on branch CYGWIN. + +commit 24c02f84cc31475bfba27417dfef66b11c09b25c +Author: Harold L Hunt II +Date: Fri Mar 12 01:11:23 2004 +0000 + + file X-boxed.ico was initially added on branch CYGWIN. + +commit 45b638b87f0daf94f9fce566179775fb2889c663 +Author: Daniel Stone +Date: Wed Mar 10 11:49:11 2004 +0000 + + Twenty link errors for Xizzle now - count 'em. 20. + Get rid of all references to SCO. + Change SDK include dir to $(includedir)/xizzle. Add SDK libs where + necessary. + Reformat to be nicer and easier to shuffle around; also, fix lib ordering + so we get so much closer to the elusive final link. Shuffle + common/xf86Init.c into libxizzle.a. + Fix a couple of early snafus - s/BUILDXI/XINPUT/, et al; make the SDK stuff + conditional as needed; fix the SBus includes. + Name library os-support/libxizzleos.a, not os-support/foo/libxizzlefoo.a. + Clean up ARCH_SOURCES so it's always initialised to something. + Move linked libraries to _LIBADD, which somehow escaped my attention. Make + inclusion of drm/libxizzlelinuxdrm.a dependent on DRI. + s/VERSION/VBE_VERSION/; + Axe this redundant dir. + All Xizzle-specific: axe hw/xizzle/Xi, shuffle link order, fix list of + required modules to be vaguely sane, add some pertinent libs/incs. + +commit 519f76a0867fb2711d311b7929632408c3633e37 +Author: Alan Coopersmith +Date: Sun Mar 7 23:45:10 2004 +0000 + + 24. Update license for Xinerama code from DEC to the version requested by + Compaq for X11R6.5.1 that allows redistribution without written + permission from DEC. Originally X.org Defect #9263. freedesktop.org + bugzilla #283. (Alan Coopersmith) + +commit 505fe2ba307e9270627ca7f3cb6b4e1dbacc327b +Author: Egbert Eich +Date: Fri Mar 5 13:41:12 2004 +0000 + + 23. Merged with XFree86 4.4.0. Added changes that went into infected files. + Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid + future conflicts on ASCII but not humal readable files. (There should + probably be separate CreditsXorg.rtf files) (Egbert Eich). + +commit 1b22db1ebcf1ba98ca8519fa38210e275373f8f6 +Author: Alan Coopersmith +Date: Thu Mar 4 02:13:09 2004 +0000 + + 21. X server crashes when X-Resource has to byte-swap. Sun bug #5007488. + freedesktop.org bugzilla #267. (Alan Coopersmith) + +commit 47c9395969593a4e897e8c8110d5f2414e47b06a +Author: Alan Coopersmith +Date: Wed Mar 3 17:03:46 2004 +0000 + + file solaris-ia32.S was initially added on branch XORG-CURRENT. + +commit ed066cc67b1fca03fb38c80ecb8194b5b40963be +Author: Alan Coopersmith +Date: Wed Mar 3 17:03:46 2004 +0000 + + Enable inlining of assembly functions for inX/outX on Solaris 8 with Sun + compilers + +commit 867451f1ab7b9870621725bd4be3dd8694c364b8 +Author: Egbert Eich +Date: Wed Mar 3 12:12:50 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 2934f0731b3d2bc9c1e25ceab26d9e0d9cadb054 +Author: Harold L Hunt II +Date: Tue Mar 2 20:00:16 2004 +0000 + + file winvalargs.c was initially added on branch CYGWIN. + +commit f72efebf280547c80ff7010e32f56416e7121164 +Author: Harold L Hunt II +Date: Tue Mar 2 19:26:34 2004 +0000 + + Replace a handful of calls to ErrorF and exit(1) with a single call to + FatalError. These direct calls to exit(1) made it impossible to do + anything ddx-specific in these cases; note that most of these calls + occur during argument processing. + +commit 7557d4da10cc482fcec40acadf7744b04c1615a0 +Author: Kaleb Keithley +Date: Tue Mar 2 19:00:06 2004 +0000 + + bug #230 Revert to Xinerama 1.1 In order to make a "quick" release it has + been decided that the priority is to preserve the server's internal + API/ABI so that third-party drivers that depend on symbols like + noPanoramiXExtension, etc., would not need to be recompiled. Toobad gcc + on Linux doesn't support ELF's weak symbols as that would have been a + reasonable solution for preserving the ABI. N.B.: While symbols, i.e. + functions and variables revert to the old name, I did not revert build + names, i.e. -DXINERAMA, to the old -DPANORAMIX. There was no need, and + it's just a build issue that has no impact on the binary output of the + build. + +commit 215a13aa8f537dcb62b0a2f6d335901ee47e9e9b +Author: Alan Coopersmith +Date: Mon Mar 1 16:38:20 2004 +0000 + + Add the .stab.indexstr section produced by Sun's compilers to the list of + SHT_STRTAB sections with debug information to ignore when loading ELF + objects. + +commit d87b05563dc13ba8d9825ec3bb772702dce6c9fe +Author: Harold L Hunt II +Date: Mon Mar 1 03:33:28 2004 +0000 + + file indirect.c was initially added on branch CYGWIN. + +commit f81d63ec5396c8d7f62ddd6ff6bab10b32493264 +Author: Kaleb Keithley +Date: Sun Feb 29 20:11:11 2004 +0000 + + bug #240 Instead of both Meta keys generating Meta_L, and both Alt keys + generating Alt_L, etc, fix the implementation so that you get Meta_L + for the left Meta key and Meta_R for the right Meta key. Ditto for Alt, + Control, and Shift. + +commit 6c412a43e42538a51d3a4d92a6db12b0b6cf0e9b +Author: Jaymz Julian +Date: Sat Feb 28 09:47:55 2004 +0000 + + sdl x server so that we can x-on-x the fb stuff for ease of debugging. if + anyone uses this in production, a big scary monster will eat them. hrm, + perhaps i should make it have a --i-know-what-i'm-doing param that it + doens't start without, heh + +commit bb93fef9877a885da2c6108410155fa996b19abf +Author: Kaleb Keithley +Date: Fri Feb 27 19:35:49 2004 +0000 + + bug #238 test for root-window that XFree86 fixed in their + programs/Xserver/Xext/shm.c + 3.37 and programs/Xserver/Xext/xvdisp.c 1.26 got zapped when Xinerama2 was + merged into the tree. (Xinerama has since been reverted to 1.1, but + that's another story.) + +commit cb718ce08eb25c3999c91b8d614fb88237fad03d +Author: Kaleb Keithley +Date: Fri Feb 27 16:17:12 2004 +0000 + + Revert to Xinerama 1.1 In order to make a "quick" release it has been + decided that the priority is to preserve the server's internal API/ABI + so that third-party drivers that depend on symbols like + noPanoramiXExtension, etc., would not need to be recompiled. Toobad gcc + on Linux doesn't support ELF's weak symbols as that would have been a + reasonable solution for preserving the ABI. N.B.: While symbols, i.e. + functions and variables revert to the old name, I did not revert build + names, i.e. -DXINERAMA, to the old -DPANORAMIX. There was no need, and + it's just a build issue that has no impact on the binary output of the + build. + +commit df0313d35bc89abe9374ed25533db283430716e0 +Author: Egbert Eich +Date: Thu Feb 26 13:36:15 2004 +0000 + + readding XFree86's cvs IDs + +commit 147aae87fde5edeed395f77e60f0f8e812d3b6af +Author: Egbert Eich +Date: Thu Feb 26 09:23:53 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 8844423f890194bcb0419a38249029f1997c8c66 +Author: Stuart Kreitman +Date: Wed Feb 25 23:28:43 2004 +0000 + + file xevie.c was initially added on branch XEVIE. + +commit b052486adb9ea26f37be120966eb60cd3ac3db2f +Author: Kaleb Keithley +Date: Wed Feb 25 21:47:10 2004 +0000 + + bug #230 Revert to Xinerama 1.1 In order to make a "quick" release it has + been decided that the priority is to preserve the server's internal + API/ABI so that third-party drivers that depend on symbols like + noPanoramiXExtension, etc., would not need to be recompiled. Too bad + gcc on Linux doesn't support ELF's weak symbols as that would have been + a reasonable solution for preserving the ABI. N.B.: While symbols, i.e. + functions and variables revert to the old name, I did not revert build + names, i.e. -DXINERAMA, to the old -DPANORAMIX. There was no need, and + it's just a build issue that has no impact on the binary output of the + build. + +commit 14ab4ade74e946c09d633b15ab4d447d7b69ea29 +Author: Kaleb Keithley +Date: Tue Feb 24 15:22:40 2004 +0000 + + bug #214. Merge most of 4.4RC3 + +commit 9343c8f5ac180043c29ead5e83a3efef16d7b3f2 +Author: Kaleb Keithley +Date: Tue Feb 24 15:16:35 2004 +0000 + + bug #188, #214, see versions 1.1.4.3 and 1.1.4.4 of this file. fix bad + merge + +commit 03d893bff9bf5d6be9663a21cc983873d8e8d4c7 +Author: Kaleb Keithley +Date: Mon Feb 23 21:37:29 2004 +0000 + + merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214 + +commit 4ee0a53de870192d57c02baffa106b10bae6e0bf +Author: Kaleb Keithley +Date: Mon Feb 23 20:35:22 2004 +0000 + + Import most of XFree86 4.4RC3. This import excludes files which have the + new license. If we want to, later we can import 4.4RC3 again and pick + up the files that have the new license, but for now the vendor branch + is "pure." + +commit dcdd47ebbd4e9b5f4cbb598a5217004df0e80844 +Author: Kaleb Keithley +Date: Mon Feb 23 20:35:19 2004 +0000 + + Initial revision + +commit 30ac3efde2c3f08b98f31833df4ea7d87f33b092 +Author: Kaleb Keithley +Date: Mon Feb 23 16:32:14 2004 +0000 + + bug #188 report bugs to X.org bugzilla, not XFree86 + +commit d52f3ac58fd596fca392394f16acff84115f6e1d +Author: Alan Coopersmith +Date: Wed Feb 18 21:43:19 2004 +0000 + + Additional fixes to allow building with Sun compilers on Solaris x86 + +commit 07109fd63e0999905e6f7df8fd7f9c713d0dc2cc +Author: Alan Coopersmith +Date: Wed Feb 18 21:30:12 2004 +0000 + + Sun cc on Solaris x86 defines __i386 but not __i386__ so the x86 + architecture #ifdef should accept either form + +commit a27ffd2678ef76453c4fa27932462425d804df6d +Author: Warren Turkal +Date: Wed Feb 18 02:12:44 2004 +0000 + + completely get rid of NeedNestedPrototypes + completely get rid of NeedVarargsPrototypes + remove a lot of NeedFunctionPrototypes + ansify many function declarations + +commit d17586c4dc858d0127fa021e6db62f8cc28ef7a6 +Author: Alan Coopersmith +Date: Mon Feb 16 20:19:59 2004 +0000 + + [fd.o bugzilla #189] _XOPEN_SOURCE defines break builds on Solaris Express + +commit b146ef1548d36d6897fbd674f1c3b8324bed11a7 +Author: Warren Turkal +Date: Sun Feb 15 15:04:57 2004 +0000 + + Moving toward a working input extension. + +commit e90274c2bba1f66a68c2bc30ddb589dbf6fa0929 +Author: Egbert Eich +Date: Wed Feb 11 19:29:37 2004 +0000 + + 2. Fixing segfaults that may happen in some corner cases when VT switching + and during int10 initialization (Egbert Eich). + +commit 453a0743eb524da88dd364ccac86f35e61899e64 +Author: Kaleb Keithley +Date: Sun Feb 8 00:17:31 2004 +0000 + + revert to RC1 version of file with the license we like + +commit d6f33d897221450f3cfcc1162e2a6d09b227326e +Author: Kaleb Keithley +Date: Sun Feb 8 00:12:27 2004 +0000 + + revert to RC1 version of the file with the license we like + +commit bd20c8d340fce0700ae813bd5b55fe7f4b9e0c98 +Author: Jaymz Julian +Date: Thu Feb 5 09:09:51 2004 +0000 + + Polling input mode for the kdrive os layer. And a moose! + +commit af798d27743dbc4f70e85e297daa5863ec89640b +Author: Jaymz Julian +Date: Wed Feb 4 16:08:27 2004 +0000 + + More NULL checks. These ones are more useful than the last (which just made + debugging a bunch of problems easier), since you can implement less in + the basic simplest case driver now (not that i'm lazy, mind :-p) + +commit 3c64b65d805915e5c5628663113c54c3e9c3013b +Author: Egbert Eich +Date: Thu Jan 29 08:08:57 2004 +0000 + + Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 + +commit 2ec70aa70133190ad31a83114fdb9a218e6aa8e6 +Author: Eric Anholt +Date: Sun Jan 25 05:31:24 2004 +0000 + + Disable GLX visuals code on !GLXEXT, and remove a useless prototype. + +commit 01e9cc858ac646b3140d1d85ea9c069bc708fb28 +Author: Eric Anholt +Date: Sun Jan 25 01:30:33 2004 +0000 + + - Add glx visuals code based on XFree86's Radeon driver. + - Reserve areas for back/depth/span when USING_DRI && GLXEXT. This would be + better in a TransitionTo3d, but we'd need to work with the offscreen + memory manager for that. + - Misc. fixes to ati_dri.c for DRI+GLX. Needs more work still. + +commit f2bedd17af7c3b9241c02dc1c899f32fc0cd2f10 +Author: Eric Anholt +Date: Sun Jan 25 01:16:19 2004 +0000 + + Oops, turn fallback output back off. + +commit 26c5a8dfdd2aa09db46c4cf963ca697df3e777ef +Author: Eric Anholt +Date: Sun Jan 25 01:04:12 2004 +0000 + + Whitespace cleanup. + +commit 6870c081572fcf32997e7906a54d09da0ca58ac3 +Author: Keith Packard +Date: Thu Jan 15 09:19:56 2004 +0000 + + Oops, lost a diff needed for the non-screen format pixmap code + +commit 3867e03cb63e49aeb1742a8a4bdaed0b7a23749e +Author: Keith Packard +Date: Thu Jan 15 09:15:53 2004 +0000 + + Fix up some mis-used variable names + +commit f233bbf3652327e62e03efbb8a355e6af2703a1c +Author: Keith Packard +Date: Thu Jan 15 09:13:01 2004 +0000 + + Accelerate non-screen format pixmaps. + +commit 751fb0374b12679f63c922adf0f0e7cadd83d861 +Author: Harold L Hunt II +Date: Thu Jan 15 06:06:44 2004 +0000 + + file winresource.h was initially added on branch CYGWIN. + +commit a265167f19e37aec2173c0ca6c9955450aa69941 +Author: Anders Carlsson +Date: Wed Jan 14 10:00:00 2004 +0000 + + Add IPAQ modeline by Dennis Noordsij. + +commit 6c97b277d9140b9d6bca047c56e303f6fc1d92e0 +Author: Eric Anholt +Date: Sun Jan 11 00:10:34 2004 +0000 + + Support 1x1 repeat sources in R128's Blend. + +commit 92702565657d48f1fcc2bae1b5989b1d6d3dd164 +Author: Eric Anholt +Date: Fri Jan 9 08:43:48 2004 +0000 + + Change PCI ID information field to be one of r128, r100, r200, r300. This + is all the information we need so far. Put that information into atic, + and use it correctly in the code (unlike before). + +commit 5d51dfc69cb245f6a1c7b106954a3365524741e2 +Author: Eric Anholt +Date: Fri Jan 9 08:40:32 2004 +0000 + + Use the scratch area for Composite when one of src or dst is in memory. + +commit 6d8001f4688e2149fcdd480401c46c7540680576 +Author: Eric Anholt +Date: Thu Jan 8 20:18:13 2004 +0000 + + Compile fixes for non-DRI case and for non-C99 compiler. + +commit 1be4b2d5e8048eb3653fad3a1267a0da865bcee8 +Author: Eric Anholt +Date: Thu Jan 8 08:25:49 2004 +0000 + + Forced commit: Previous commit included the removal of the 8192 scanline + limit on offscreen memory in the fbdev case. I remember daenzer (who + originally put that code in) saying he wasn't sure of it, and there + doesn't seem to be any reason for that limit given how acceleration is + done. + +commit b27729ec88f5d4153a0debfe2347bbed022329ba +Author: Eric Anholt +Date: Thu Jan 8 08:16:24 2004 +0000 + + - Add a new UploadToScratch kaa hook for putting the data for a single + pixmap into temporary offscreen storage. Subsequent UploadToScratch may + clobber the data of previous ones. This allows hardware acceleration of + composite operations on glyphs. + - Add a new UploadToScreen kaa hook for doing the actual moving of data to + framebuffer. This would allow us to do things like hostdata blits or + memcpy to agp and then blit. + - Add an UploadToScreen on ATI which is just memcpy, but which will be + replaced with a hostdata blit soon. + - Add UploadToScratch on ATI and reserve 64k of scratch space. This + provided a 3x speedup of rgb24text on my Radeon. + +commit d640cf4cb4e031a0e93dfd5955405847fe4475c0 +Author: Harold L Hunt II +Date: Thu Jan 8 05:10:33 2004 +0000 + + file winprocarg.c was initially added on branch CYGWIN. + +commit 77183abbc499c69fbbbae1d92a6b012c5f80b6c4 +Author: Harold L Hunt II +Date: Thu Jan 8 05:10:32 2004 +0000 + + file winglobals.c was initially added on branch CYGWIN. + +commit eb5bb9c1a16db308eae84ea45a5920c768d4a2ff +Author: Harold L Hunt II +Date: Thu Jan 8 05:10:32 2004 +0000 + + file winclipboardwrappers.c was initially added on branch CYGWIN. + +commit e93d468df21840007cbeea03ed545e75f0f0baf1 +Author: Harold L Hunt II +Date: Thu Jan 8 05:10:32 2004 +0000 + + file winauth.c was initially added on branch CYGWIN. + +commit 737eddfa4b6a8851e20823405b7269dd49c49b89 +Author: Eric Anholt +Date: Wed Jan 7 09:50:28 2004 +0000 + + Disconnect the sis300 driver. I've never managed to fix it, and it breaks + the build on PPC. + +commit 5a2c23f8a18767f0eb2fe2846ca3ba18fd236284 +Author: Eric Anholt +Date: Wed Jan 7 02:30:29 2004 +0000 + + Speed things up slightly by removing Z values from emitted vertices and by + emitting as a tri fan rather than a tri list. A rect list would save an + additional vertex (out of 4) per rectangle, but there's no measurable + speed difference and the tri fan may be useful when transforms come + into play. + +commit cff782078cec9b10606c5873816b7acd9977ce4d +Author: Eric Anholt +Date: Sun Jan 4 20:51:53 2004 +0000 + + - Don't forget to UNINIT miComputeCompositeRegion's regions + - Fix a bit of whitespace nearby. + +commit 34d1529731fff0cb61c71f76edc5c6499ece68d1 +Author: Eric Anholt +Date: Sun Jan 4 20:47:30 2004 +0000 + + - Correctly set the texture coordinate set source for the second texture + unit. + - Re-enable Radeon's Composite accel now that fonts work again. + +commit 9f1a92cd092e87f774ce4ed99d4b3e15f905d4f7 +Author: Eric Anholt +Date: Sat Jan 3 21:52:14 2004 +0000 + + - Call appropriate Done function for Composite. + - Don't allow src transforms for Copy acceleration. + - Minor whitespace fixes. + +commit 3db761a17b60b80acb83f365628b093f0ba6958c +Author: Eric Anholt +Date: Sat Jan 3 11:46:57 2004 +0000 + + - Add more Composite operations, including Saturate, to Radeon Composite + accel. I don't 100% trust that the math works for Saturate, but I can't + tell from existing information. + - Fix texture pitch fallback checks. + - Fallback when src or mask have transforms. + - Disable Radeon Composite accel until the offset thing is fixed. + - Set offscreenPitch to 64 on Radeon thanks to new information and a kaa + fix. Fixes acceleration at width!=1024. + +commit d15acfa79b64b8dab1e930ce8e5423a212a1360b +Author: Eric Anholt +Date: Sat Jan 3 11:25:27 2004 +0000 + + Split the various attempts at accelerating Composite into separate + functions. Along with making things more readable, it fixes a problem + where the coordinates would get messed up if acceleration failed due to + things like pixmaps being in the wrong locations. + +commit 1e1a35e20c1d281bc9700b349cda1e67f65905dd +Author: Eric Anholt +Date: Sat Jan 3 11:17:44 2004 +0000 + + Actually align the offset of allocated offscreen areas. + +commit 354f8f7e943d1a0732f4181420211efff27532b8 +Author: Eric Anholt +Date: Wed Dec 31 23:24:33 2003 +0000 + + Some strange \240 character snuck into the original commit of this file. + +commit 5f947b04da13256e5f514c40dedb98c6e1cbe0f1 +Author: Eric Anholt +Date: Tue Dec 30 08:45:53 2003 +0000 + + There's never a copy between different depths. Remove the check. + +commit c8eb20a08ee9174374b6f5ac6e79f31fce26e181 +Author: Eric Anholt +Date: Tue Dec 30 08:23:56 2003 +0000 + + - Add new Composite hook for kdrive drivers, which only ensures that the + pixmaps are offscreen and don't have alpha maps. It is the last case + checked before going to software fallback + - Use the new Composite hook in the ati driver to implement acceleration of + most Composites that get done in an xcompmgr environment on r100 series + cards. It is only available when using the DRM. There are still some + corruption issues, but the DRI is still non-default and I need to get + this into version control. + +commit adfc1ed8e1e150100accf014e46241201275138f +Author: Eric Anholt +Date: Mon Dec 29 09:04:20 2003 +0000 + + Add dependency lines so that servers are rebuilt when server libraries are + changed. + +commit df03e80ae9162ec87f503322ccbcf2846ad38bef +Author: Eric Anholt +Date: Mon Dec 29 06:24:01 2003 +0000 + + Merge dri-0-1-branch to trunk. Notable changes: + - Add libdrm and libdri. Portions of the DRI extension are stubbed out. + - Use the DRM in the ATI driver when available. This provides a minor + performance improvement in x11perf, and opens the possibility of using + the 3d hardware for acceleration in the future. + - Implement solid fill acceleration for Composite in KAA. + - Implement Blend hook for Composite and use it on r128. + - Fix a bug of mine that resulted in overuse of offscreen memory. + - Fix many miscellaneous bugs in ATI driver and add PCI IDs. + +commit 9bea538745f1a0c14faaac0e61dee5cf86f98dc6 +Author: Eric Anholt +Date: Sun Dec 28 09:56:54 2003 +0000 + + file kaa.h was initially added on branch dri-0-1-branch. + +commit fb8cd7454baec0bc0f693d222f3920ce03dde7c6 +Author: Eric Anholt +Date: Sun Dec 28 09:56:54 2003 +0000 + + file kaapict.c was initially added on branch dri-0-1-branch. + +commit f388f1509cb131cdf0675415214c9610d3d322c7 +Author: Eric Anholt +Date: Tue Dec 23 22:29:38 2003 +0000 + + file r128_blendtmp.h was initially added on branch dri-0-1-branch. + +commit 918958705dd97ce678b8901666c85fb359d0e013 +Author: Kaleb Keithley +Date: Sun Dec 21 13:39:58 2003 +0000 + + Use a different icon + +commit e97c634593dd171a05aa0fa5a35d218dcc3ecfb0 +Author: Kaleb Keithley +Date: Sat Dec 20 00:28:31 2003 +0000 + + merge XFree86 RC2 (4.3.99.902) from vendor branch + +commit 12e532010b9e8cb67bedd44d489c9c40dd265165 +Author: Kaleb Keithley +Date: Fri Dec 19 20:55:39 2003 +0000 + + XFree86 4.3.99.902 (RC 2) + +commit 4b75c7f6358b28978b05ffa4b73853d936454f50 +Author: Kaleb Keithley +Date: Thu Dec 18 19:32:17 2003 +0000 + + First pass at "Standard" Xinerama. The sources for this came from Heather + Lanigan's xinerama tree on Sourceforge.Net. No attempt has been made to + handle previous, non-standard versions of the protocol. Nor has any + attempt been made to preserve the ABI of previous versions -- that part + will be added at a later time, and then probably only on systems that + have nice object/linker semantics, e.g. ELF systems with weak symbols. + +commit 305c444de3baa863d7abc4221e8cebb973805847 +Author: Eric Anholt +Date: Mon Dec 8 01:55:10 2003 +0000 + + Add initial SiS 300-series (300, 305, 540, 630, 730) driver based off of + the ATI driver. It suffers from hw/sw synchronization problems, it + looks like, but may be good enough to work on Render acceleration + experiments. Committing it as-is so I don't lose it again. + +commit 8a7481a27496c842ec2ef5bac5e4d0b5e6279deb +Author: Kaleb Keithley +Date: Sat Dec 6 13:24:29 2003 +0000 + + merge XFree86 4.3.99.901 (RC1) from vendor branch + +commit e82928826f60a2e76a670c936bd557838fc1764c +Author: Kensuke Matsuzaki +Date: Fri Dec 5 03:37:26 2003 +0000 + + file winwin32rootlesswindow.c was initially added on branch CYGWIN. + +commit fc40d0a3cbee053d446032ae3150b06edf66a335 +Author: Kensuke Matsuzaki +Date: Fri Dec 5 03:37:26 2003 +0000 + + file winwin32rootlesswndproc.c was initially added on branch CYGWIN. + +commit c3f26a1b989dbbf5167e6e352aebf2f53bfcc442 +Author: Kensuke Matsuzaki +Date: Fri Dec 5 03:37:26 2003 +0000 + + file winwindowswm.c was initially added on branch CYGWIN. + +commit 0f06636a9a088fc27262da0f0bc9a20a3dbeab69 +Author: Kensuke Matsuzaki +Date: Fri Dec 5 03:37:26 2003 +0000 + + file winwin32rootless.c was initially added on branch CYGWIN. + +commit a84f16a9ad2ed0f874d2c1816aedee96725d2657 +Author: Kaleb Keithley +Date: Thu Dec 4 22:03:38 2003 +0000 + + XFree86 4.3.99.901 (RC 1) + +commit 33fdd50a94baab1db342bfce442907db8f8ad03e +Author: Keith Packard +Date: Tue Dec 2 01:59:38 2003 +0000 + + Wrap ClipNotify to see region motions during MoveWindow. + Check window reorigin in PositionWindow and bump pixmap serial numbers to + revalidate GCs. + Fix picture clip region origin in automatic update + Initialize client private 'critical' value + Clean up pixmap bounds checking code to only affect contents allocated by + fb. + Oops. Call SourceValidate for Composite operations. + Add Xchips server (vesa based) + +commit 6db77925406a0ee600998ad558a50190ba631649 +Author: Eric Anholt +Date: Mon Dec 1 22:56:06 2003 +0000 + + file radeon_sarea.h was initially added on branch dri-0-1-branch. + +commit 313046b42832fa2434d617997d5701157b55e7c8 +Author: Eric Anholt +Date: Mon Dec 1 22:56:06 2003 +0000 + + file radeon_common.h was initially added on branch dri-0-1-branch. + +commit 2ad126286e524392741164babe530210892c377f +Author: Eric Anholt +Date: Mon Dec 1 22:56:06 2003 +0000 + + file r128_sarea.h was initially added on branch dri-0-1-branch. + +commit f486c136ad8d2d893cdf3aee6aa752578a6809d7 +Author: Eric Anholt +Date: Mon Dec 1 22:56:06 2003 +0000 + + file r128_common.h was initially added on branch dri-0-1-branch. + +commit 1eb63ef1b5d0ce10117196df3e81e8312a55a93c +Author: Eric Anholt +Date: Mon Dec 1 22:56:06 2003 +0000 + + file ati_sarea.h was initially added on branch dri-0-1-branch. + +commit 1fa5f28406f8a7ad54049e4bec129953149bd3ed +Author: Eric Anholt +Date: Mon Dec 1 22:56:06 2003 +0000 + + file ati_dri.c was initially added on branch dri-0-1-branch. + +commit 14ce4f2c3ebc20e5f6d57adda0a7e14229541a72 +Author: Eric Anholt +Date: Mon Dec 1 22:56:06 2003 +0000 + + file ati_dri.h was initially added on branch dri-0-1-branch. + +commit 8887456e7d4fc1280287ed3e35c6c4464525827b +Author: Eric Anholt +Date: Mon Dec 1 22:56:06 2003 +0000 + + file ati_dripriv.h was initially added on branch dri-0-1-branch. + +commit 6c9e7f47357b02f41b9f1f43f7f1d9b5a139e5b6 +Author: Eric Anholt +Date: Mon Dec 1 22:56:06 2003 +0000 + + file ati_draw.h was initially added on branch dri-0-1-branch. + +commit 2ad20d4e99d0d8ecb922507e0bfead8b7b7d4a55 +Author: Eric Anholt +Date: Mon Dec 1 22:56:06 2003 +0000 + + file ati_drawtmp.h was initially added on branch dri-0-1-branch. + +commit ae2454f65698eef66b3507e586e4f8125cb1790d +Author: Anders Carlsson +Date: Mon Dec 1 22:11:12 2003 +0000 + + Add support for setting the video mode. + +commit e31051ba26c18f6232798c5a5c4725f5ce53d6b9 +Author: Phil Blundell +Date: Mon Dec 1 21:49:41 2003 +0000 + + Call KdShadowUnset before fbdevSetShadow. + +commit 9cdd6fd9e3d6e44adf392279093f92fb6678a49c +Author: Eric Anholt +Date: Mon Dec 1 04:33:36 2003 +0000 + + - Add fbdev mode-setting backend to Xati. It and vesa are compiled in when + available, with fbdev being used by default. + - Use depth 16 by default when vesa backend is used. + - Add MMIO defines for PowerPC (should be in a common location). + Many thanks for Michel Daenzer for much of this code. + +commit ec7f5539302fafd1ac7609ac423f1379f54916ab +Author: Eric Anholt +Date: Mon Dec 1 03:15:13 2003 +0000 + + Add more RV250 PCI IDs. + +commit d221c484f9521c780fc3c7e88833c62e50463c6d +Author: Eric Anholt +Date: Mon Dec 1 01:46:42 2003 +0000 + + Remove sys/io.h inclusion from some files that didn't need it, and change + asm/io.h to sys/io.h in vga.c, which newer Linux complains about. + +commit 5fd7f82390d78621a8aad959eb216b8fb7e1a97f +Author: Kaleb Keithley +Date: Sun Nov 30 16:47:13 2003 +0000 + + xfree86 merge + +commit 77836ebda2a47e04c56c5842f62fab5992909712 +Author: Kaleb Keithley +Date: Sat Nov 29 16:08:53 2003 +0000 + + xfree86 merge + +commit 88193e928be7cf5a526b50ad1e0b4ac9cddef297 +Author: Kaleb Keithley +Date: Sat Nov 29 15:10:02 2003 +0000 + + xfree86 merge + +commit 0097b6fe2d1739e46e4e7726aaa481b6dc84870c +Author: Kaleb Keithley +Date: Wed Nov 26 22:49:07 2003 +0000 + + merge latest (4.3.99.16) from XFree86 (vendor) branch + +commit d803918a9fb5f80a2d6e4b711d8e43916cd09da5 +Author: Eric Anholt +Date: Tue Nov 25 22:39:54 2003 +0000 + + Add new Radeon 9200 PCI IDs. + +commit adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 +Author: Kaleb Keithley +Date: Tue Nov 25 19:29:01 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 90f1536dd315cd265bfc7ef35058761a65a01734 +Author: Kaleb Keithley +Date: Tue Nov 25 19:29:01 2003 +0000 + + Initial revision + +commit d461855a73d8c9f51a18673aef7ce88f94a71629 +Author: Eric Anholt +Date: Sun Nov 23 10:12:04 2003 +0000 + + - Fix Radeon offscreen pixmap pitch alignment. + - Remove usleeps from idle and waitavail code, recommended by keithp. + - Add a workaround for apparent broken acceleration with Rage 128 and + offset alignment with 8-bit acceleration (24-hack and plain 8-bit). + - Minor cleanup of setup code. + +commit 8e09afe657b110bc1ea9e58dea81a120c343d16e +Author: Eric Anholt +Date: Sun Nov 23 02:08:16 2003 +0000 + + Add RV250 PCI IDs. + +commit b3247251fb7d9f2d50ef41d9c2089629544d534d +Author: Eric Anholt +Date: Thu Nov 20 07:49:46 2003 +0000 + + - Fix a bug in pitch alignment for offscren pixmaps. + - Add 24-bit acceleration for Xati using the 8-bit trick from mach64. + - Add offscreen pixmap support to Xati. + +commit 41dde24b229f4bc4738637d9cd0a86b74b9f8457 +Author: Eric Anholt +Date: Thu Nov 20 00:05:56 2003 +0000 + + - Fix confusion of depth/bitsPerPixel in ati_draw.c + - Disable acceleration with 24bpp due to apparent broken acceleration. + Accel at 24bpp was the cause of the crashes when people tried to use + any depth over 16. XFree86 doesn't support 24 either. + - Disable at < 8bpp, too. + - Add the other Rage 128 PCI IDs. + - Remove unnecessary setting of scissor registers (only default scissor + gets used). + +commit 7abbcce4222958b4670873a17f67ea1ec1d958e2 +Author: Eric Anholt +Date: Wed Nov 19 08:32:38 2003 +0000 + + - Add PCI information (device/vendor id, bus location) to KdCardAttr to + help with ati, and future DRM drivers. + - Add new "ati" kdrive driver. It has ancestry in the r128 driver from + andersca, but took a detour through being the WIP SiS 300 driver on the + way. It supports Radeons (tested on QD VIVO and 7500) and Rage 128. + Current limitations include that it requires depth 16 and that the + other Rage 128 PCI IDs aren't included yet. + +commit e9cb70dae0a85fcd116d7ffac73d1322ec282a94 +Author: Keith Packard +Date: Tue Nov 18 18:38:48 2003 +0000 + + Reset available offscreen segment save function pointer. (Not a functional + change, just cleaning up a bit) + Reset the screen->memory_base value when frame buffer is remapped. This + makes sure new off-screen allocations point at the newly mapped region + rather than the old (now unmapped) region. + +commit f333581b7b4066ab054dd765a1c9bae0f3407188 +Author: Seth W. Klein +Date: Tue Nov 18 04:53:16 2003 +0000 + + Added infrastructure for driver specific usage messages and added vesa + usage message. + +commit 003e87717cfe378261ed1a1e7bcb2cf0d200b1b8 +Author: Keith Packard +Date: Mon Nov 17 22:09:12 2003 +0000 + + Recompute winSize/borderSize to fix them when changing redirection. + Sufficient, but not always necessary. + Add borderClip to damage on creation so that clients needn't guess. + Fix API to FbDots functions to make PolyPoint work with screen_x/screen_y + offsets + Add debugging code to make sure no pictures are left pointing at freed + pixmaps. "Can't" happen, but it did once. + Change KdOffscreenArea structure to eliminate separate private structure, + eliminate the ScreenPtr, change from doubly linked to singly linked + list. + Don't damage BackgroundNone windows on PW_BACKGROUND. Re-clip damage to + borderClip in DamageSubtract. + +commit c57959ad6a4c0f5329762f401fd7871ffb2ee90c +Author: Kaleb Keithley +Date: Mon Nov 17 19:03:47 2003 +0000 + + merge XFree86 4.3.0.1 to -CURRENT + +commit acd200770513ad03dd3f4bdc7448edfd69b1ff9d +Author: Keith Packard +Date: Mon Nov 17 06:54:52 2003 +0000 + + Clear window when Manual Subwindows redirect is destroyed + Fix Tile/Stipple origin with non-zero pixmap window origins + Use computed depth for TrueColor visuals as fbdev doesn't have one. + +commit d568221710959cf7d783e6ff0fb80fb43a231124 +Author: Kaleb Keithley +Date: Fri Nov 14 16:49:22 2003 +0000 + + XFree86 4.3.0.1 + +commit 9508a382f8a9f241dab097d921b6d290c1c3a776 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:57 2003 +0000 + + Initial revision + +commit ded6147bfb5d75ff1e67c858040a628b61bc17d1 +Author: Kaleb Keithley +Date: Fri Nov 14 15:54:54 2003 +0000 + + R6.6 is the Xorg base-line + +commit cb6ef07bf01e72d1a6e6e83ceb7f76d6534da941 +Author: Keith Packard +Date: Fri Nov 14 07:46:20 2003 +0000 + + Accelerated image text code drew glyphs at wrong location when compositing + manager enabled. + +commit 318d525bf2fe52b059b1568e9b31d144b297a781 +Author: Keith Packard +Date: Thu Nov 13 09:14:29 2003 +0000 + + Have the composite extension tell the damage extension about clients which + have redirected subwindows in manual mode. Those clients are marked + Critical and given a significant scheduling boost whenever they receive + a damage notify event. This dramatically improves update frequency. + If the kernel reported a large number of keys, readKernelMapping would walk + off the end of the kdKeysym array. + Fix usage of _IOWR; the 'size' argument is actually a datatype. + +commit e9904cefa39e1c9d3c7bf2f335dbafb23809cdba +Author: Eric Anholt +Date: Tue Nov 11 05:46:15 2003 +0000 + + Fix Makefile.am's to include header files needed for distcheck. Remove + -Werror default and add --enable-werror switch to add it back. + +commit 5dc119b73ffcae32c2d470b734dfa2f8af58e77e +Author: Keith Packard +Date: Mon Nov 10 20:35:05 2003 +0000 + + Fix KdXv interface to pass drawable down so that bits can be put into + drawable pixmap rather than directly into the frame buffer. Rewrite + logic in kdoffscreen to make space for new allocations, now deals + correctly with locked areas. + +commit e500986657ea8b4e14a1ff4730ecda4583c75277 +Author: Keith Packard +Date: Mon Nov 10 06:40:23 2003 +0000 + + Must offset composite parameters by drawable coordinates in accelerated + case. + +commit d694b44259ff51cfca2c3ec9a58bf164010cc1ad +Author: Phil Blundell +Date: Sat Nov 8 18:51:59 2003 +0000 + + Avoid ugly shell error when libXdmcp isn't present. + New functions. (TsInit): Register them. + +commit 3e18c6363454aa87e1ad8c121019bab185e613b8 +Author: Keith Packard +Date: Sat Nov 8 00:28:19 2003 +0000 + + Fix KAA to work with screen_x/screen_y hacks from COMPOSITE Also add + kaaComposite acceleration for simple bltblt case. + +commit 1280f79054dc16ccf321006cd2de53e0f53c7b70 +Author: Keith Packard +Date: Fri Nov 7 23:29:29 2003 +0000 + + Ok, Composite extension is semi-working; when no-one asks for redirection, + the server seems to act as before. With RedirectSubwindows (root, + automatic), the server looks just like a regular X server. Now to go + rewrite the (currently lame) compositing manager to get some real + action on the screen. + Some of the fixes here are to make valgrind quiet with various ioctls used + by kdrive/linux. + Also fixed a bug where fbdev initialization was out of order in fbdev.c and + smi.c + +commit d319a0a610c90524ad29cab3c6d4d21b5298fc7f +Author: Phil Blundell +Date: Fri Nov 7 23:00:06 2003 +0000 + + Fix warnings. + +commit 598c5d549abbb819f3391a2c88432941b546a213 +Author: Matthew Allum +Date: Thu Nov 6 14:01:46 2003 +0000 + + tslib improvements + +commit 7e1a564c416f6dc337a0021b1c0e1f2cb3b27296 +Author: Keith Packard +Date: Wed Nov 5 06:46:13 2003 +0000 + + Replace translucent compositing hacks with PictOpSrc to match eventual + extension semantics. Replace mouse acceleration with quadratic. + +commit 5378236aa647ec9a723a3e5fbd2a57eb286a1938 +Author: Keith Packard +Date: Sun Nov 2 19:56:10 2003 +0000 + + merge xfixes_2_branch back to HEAD + +commit 9e94665cf9cf0f74dff5b3cdaa4cde99e234fa45 +Author: Phil Blundell +Date: Tue Oct 28 22:28:33 2003 +0000 + + try /dev/misc/apm_bios if /dev/apm_bios doesn't exist + +commit bb99451f275827da580dcfa3b66cd0705fcc900a +Author: Phil Blundell +Date: Tue Oct 28 22:27:35 2003 +0000 + + move smi into VESA_SUBDIRS + +commit 9a05f8f7858641b780046ad69d61f21ccbb93db8 +Author: Keith Packard +Date: Sun Oct 19 20:46:23 2003 +0000 + + Minor cleanups -- remove a couple of bogus KdCheckSync calls, restructure + KdOffscreenSwapOut to avoid unneeded 'continue' + +commit 16b2ea64e7e0bd32d6dba078b4891167bd335d44 +Author: Keith Packard +Date: Thu Oct 16 08:03:25 2003 +0000 + + Discard/reconstruct list of offscreen areas on VT switch so no allocations + can occur while switched away. + Set type of off_screen_areas member to actual type instead of pointer + +commit f4bcd36a386116c450ea6893ab3d08e81cea663b +Author: Anders Carlsson +Date: Wed Oct 15 05:34:54 2003 +0000 + + Add a memory_base variable and use it. + +commit f5916edb172738c73c8f78b23981abfd8d03a079 +Author: Keith Packard +Date: Wed Oct 15 04:59:45 2003 +0000 + + hw/kdrive/*/Makefile.am Libraries in local dir must not use global path or + make doesn't build things in the right order (-j) + hw/kdrive/mga/mga.h, mgadraw.c Fix warnings + +commit b3e47ce18ff9c86833fc6302b1e074912edce404 +Author: Keith Packard +Date: Wed Oct 15 01:00:38 2003 +0000 + + various Split out pixmap allocation debug statements Fix bogus offscreen + pixmap size test Add migration to composite function for source + operands + VbeDPMS Remove extraneous call to VbeGetVib. + +commit 28bcd2efd134bfea3daa0738c9155b36cdf84168 +Author: Keith Packard +Date: Tue Oct 14 21:33:04 2003 +0000 + + Avoid attempting acceleration on non-screen formats (for now) + Offscreen allocator API changes. + +commit cb46169759a833605b78409ae68c9fb57618ceba +Author: Keith Packard +Date: Tue Oct 14 21:10:53 2003 +0000 + + Use same assumptions as layergc about what layer kind is approprate for + unwrapping pixmap operations. This makes sure the accelerated code gets + invoked for pixmaps + Add pixmap migration support to kaa. Can't quite automatically migrate + pixmaps off-screen, but soon we will. Can kick objects out of video + memory. Move per-screen linked list pointers to pixmap private. Wrap + Composite in preparation for migrating pixmaps. Have kasync ignore + drawable type so that pixmaps trigger sync Add KdOffscreenFini to + cleanup on server reset. Switch off screen area to have only a 'save' + function; moving objects to off screen memory is done by saving then + freeing the area. + +commit 109b94951654171ada94e2ffb29568b8a1bcde77 +Author: Keith Packard +Date: Tue Oct 14 05:08:35 2003 +0000 + + -Wall fixes. Might have fixed VESA based DPMS code as a result + +commit 4b844cafb2516139c8407822b61939cd6c743742 +Author: Keith Packard +Date: Tue Oct 14 05:07:39 2003 +0000 + + Check for off-screen pixmap support in KaaDrawableIsOffscreenPixmap. -Wall + fixes. Allocate pixmap private space only for screens with off-screen + pixmap support + +commit cdf3377f6d3789628495ac64df80ac7dc235e46d +Author: Keith Packard +Date: Tue Oct 14 05:05:53 2003 +0000 + + -Wall fixes. Support off-screen pixmaps + +commit 777f31cd0b5ec387d975e6d10ae73fa325e4c311 +Author: Keith Packard +Date: Tue Oct 14 05:05:28 2003 +0000 + + -Wall fixes. Add klinux.h to export function declarations + +commit a398339b6d5209a11af93a3b836b0cad326a0799 +Author: Keith Packard +Date: Tue Oct 14 05:04:22 2003 +0000 + + -Wall fixes + +commit 44f2e82f1b463e272f4e521561f74eb14bf24082 +Author: Anders Carlsson +Date: Mon Oct 13 02:19:47 2003 +0000 + + Use pixmaps instead of drawables in the kaa functions. Have the mga server + support accelerated operations on offscreen pixmaps. + +commit 47a9fab5e286c5224047690482a2cb36a3c17b88 +Author: Anders Carlsson +Date: Mon Oct 13 01:19:37 2003 +0000 + + Add support for offscreen pixmaps. + +commit c538fa874257a2cbf53f329d3982e7a01fefe629 +Author: Anders Carlsson +Date: Mon Oct 13 00:56:21 2003 +0000 + + Fix a couple of bugs. + +commit a50438b4709b32ec869e232628971b0dccd27adf +Author: Anders Carlsson +Date: Mon Oct 13 00:19:58 2003 +0000 + + Add offscreen memory manager and update the servers to reflect the name + change for the kaa structure. + +commit 307f3dbd10e0c8e392865e85e9e3e4dff108df02 +Author: Anders Carlsson +Date: Sun Oct 12 14:17:24 2003 +0000 + + Remove this for now. + +commit ab3305d0ac805d0c9e917c35b316d9b58dde2187 +Author: Anders Carlsson +Date: Sat Oct 11 19:36:13 2003 +0000 + + Add ATI Rage 128 server. + +commit ed98d3814ee65cd9fd18eeadbd20c8fc6b4ab342 +Author: Keith Packard +Date: Thu Oct 9 23:35:44 2003 +0000 + + use #if instead of #ifdef + +commit 4dd37de858464c576bfdcd10255a8e233a5b05d5 +Author: Anders Carlsson +Date: Thu Oct 9 16:21:24 2003 +0000 + + Build smi after vesa. + +commit e5a1c9952f7d621493f08257c8b9456b7608c55a +Author: Keith Packard +Date: Thu Oct 9 07:29:31 2003 +0000 + + Initialize smi chip on graphics setup. Seems to help some. + +commit 10f721acc5e59ea4152b94246b62963f2ff9d678 +Author: Keith Packard +Date: Thu Oct 9 07:12:01 2003 +0000 + + Leave iopl set to 3 so vesa module will work + +commit f74555e94264e6f703d399a5e0475c7283e20a88 +Author: Keith Packard +Date: Thu Oct 9 06:36:26 2003 +0000 + + Add xfixes, fix smi driver to use either fbdev or vesa. Add hole mapping to + vesa server by default + +commit 346aff7ef6f47a191c7f134b7843a634189b9e83 +Author: Keith Packard +Date: Thu Oct 9 06:35:11 2003 +0000 + + Use either vesa or fbdev, selectable at compile time + +commit adc5b8068d5532a6f3f23e64d3c668a22d5b1504 +Author: Keith Packard +Date: Sun Oct 5 05:22:35 2003 +0000 + + Fix fbdev server to allow accelerated servers on top to use RandR. Switch + smi server to fbdev (vesa bios doesnt work on the Acer I have here) + +commit f3d8476ced1e3ba4b4ca7c9e23e98c2cc7ffcc14 +Author: Phil Blundell +Date: Sat Oct 4 02:56:54 2003 +0000 + + few more fixes for h3600 ts + +commit aae3e6dcb3d72eba6d7d8d99079782ed1bfe63bd +Author: Keith Packard +Date: Sat Oct 4 02:43:16 2003 +0000 + + configure.ac Makefile.am os/oscolor.c Xext/saver.c Xext/Makefile.am + hw/kdrive/linux/ts.c hw/kdrive/src/Makefile.am hw/kdrive/src/kdrive.h + hw/kdrive/src/kinput.c hw/kdrive/src/kmap.c Autodetect VM86 (for vesa), + AGPGART, APM, MTRR, tslib and handhelds.org touch screen. Add + USE_RGB_BUILTIN and code for fileless RGB database. Add + MIT-SCREEN-SAVER + +commit efbf205a2ac4792b71d39f8fe3ef3b1cf12697c0 +Author: Phil Blundell +Date: Fri Oct 3 15:27:46 2003 +0000 + + add --disable-kdrivevesa option + +commit 89a536f349525e642bb4cd233bc47864ed4a6ad7 +Author: Keith Packard +Date: Thu Oct 2 02:30:28 2003 +0000 + + Add smi server + +commit 5a21f4f4d0c03e0e34f1979fd7cec8f0d19b00d4 +Author: Keith Packard +Date: Wed Oct 1 06:43:50 2003 +0000 + + Add XDM cookies. Fix up support for pkgconfig X bits + +commit a42e31b28c493dc3d6b32cde4e72ff17fc983183 +Author: Matthew Allum +Date: Tue Sep 30 22:14:59 2003 +0000 + + Fixed tslib driver to handle VT switches + +commit a0876ade6479c40dcef63f70f4c6c5a5988edeba +Author: Keith Packard +Date: Tue Sep 30 20:49:47 2003 +0000 + + Enable maintainer mode from autogen.sh. Fix vesa build to create library + before program. Remove bogus AC_SUBST lines for XSERVER_CFLAGS and + XSERVER_LIBS + +commit e8c02296476f068bc8158d112dc15df00dddac2a +Author: Matthew Allum +Date: Tue Sep 30 20:15:14 2003 +0000 + + Added --enable-tslib configure option + +commit a42384e9356ec79510682bacf08410e87d7102ff +Author: Keith Packard +Date: Mon Sep 29 01:42:40 2003 +0000 + + Use other freedesktop.org packages to build the server + +commit 6a098a88af174db1674662c09e2385b4e6e0bb4e +Author: Anders Carlsson +Date: Wed Sep 24 23:36:54 2003 +0000 + + Add beginnings of offscreen memory manager. + +commit 918a8273eeabcb14fc82742cc68223d8a7c2a67a +Author: Keith Packard +Date: Wed Sep 24 21:07:06 2003 +0000 + + hw/kdrive/src/kdrive.c + hw/kdrive/src/kdrive.h Add -switchCmd option to set command that is + executed whenever the VT is enabled or disabled. This permits input + device to be customized by external apps when switching to X. + +commit 20bbd750d0d359e55cbdcc86aeea6013ac665bce +Author: Anders Carlsson +Date: Mon Sep 22 21:14:59 2003 +0000 + + Accelerate server. + +commit 49771e3f074cae3947b0084e6514a19dc4c4cad1 +Author: Anders Carlsson +Date: Thu Sep 18 20:48:48 2003 +0000 + + Add mga server to the build. + +commit 07ab15d61d2468fc858453cdabe7296d19fc9e10 +Author: Anders Carlsson +Date: Thu Sep 18 20:47:43 2003 +0000 + + Add mga server + +commit b260825e880615f589e2bad35491ebb598e21a0f +Author: Anders Carlsson +Date: Thu Sep 18 14:44:57 2003 +0000 + + Try this. + +commit b889d4ba2c2e59769a3ff6fd00ee5bb395108827 +Author: Anders Carlsson +Date: Thu Sep 18 14:42:00 2003 +0000 + + Try things out. + +commit 85ff67670c6216a8c4368a8bd70fd0434a4e0aca +Author: Anders Carlsson +Date: Tue Sep 16 21:07:16 2003 +0000 + + Add fbdev server to the build. + +commit be12dcdcf39a30f69fe73cbb5a4acacef8024db6 +Author: Keith Packard +Date: Fri Sep 12 07:00:19 2003 +0000 + + Switch to freedesktop.org libXfont + +commit eca43a59ec95646836f9704714823249a15747fa +Author: Keith Packard +Date: Fri Sep 12 01:51:16 2003 +0000 + + Clean up mach64 for autofoo + +commit 6b16b827bb125b43b41b7f8558991e90ada316de +Author: Keith Packard +Date: Fri Sep 12 01:49:46 2003 +0000 + + Add some configure options, make the mach64 server build + +commit ce55d3234dc34157f0fc8059a6793cdd17fa4519 +Author: Keith Packard +Date: Thu Sep 11 05:15:08 2003 +0000 + + Move kdrive common sources to src dir + +commit 269b9dac5a96005fe38379377526592cb7930a51 +Author: Keith Packard +Date: Thu Sep 11 05:12:51 2003 +0000 + + Get Xvesa building + +commit 0d775576b9b3cf410e9a463b87340612d34bc13d +Author: Keith Packard +Date: Thu Sep 11 03:26:03 2003 +0000 + + Add Makefile.am + +commit ef8977a30ccb55af8e8bbb635127efb94f232983 +Author: Keith Packard +Date: Thu Sep 11 03:23:13 2003 +0000 + + More build fixes + +commit 14a8311bb3b6273617f7c7b70222e97835e9c8af +Author: Keith Packard +Date: Thu Sep 11 02:31:24 2003 +0000 + + Make more stuff build + +commit 8bc8fd8678b20dde2a3fc47ff5b617bc8046ea9f +Author: Mike A. Harris +Date: Thu Sep 11 02:02:54 2003 +0000 + + POSIX sigaction cleanups - removed act.sa_restorer as it's not in POSIX and + is not portable + +commit 514ab46ce3c6eb0163720315474cba884d029b62 +Author: Anders Carlsson +Date: Thu Sep 11 00:47:36 2003 +0000 + + Start autoifying everything. + +commit 283a7f32c449b1970e5a484351f8396a8afd99da +Author: Keith Packard +Date: Mon Jul 7 19:13:03 2003 +0000 + + Update RCS tags, fix keyboard hang on VT switch, fix scroll wheel mice, add + -rawcoord option to not transform mice on rotate, fix mtrr to use + power-of-two size, add a few vesa options + +commit 804b89284665f19e2c92a07fadc72c25fbb3f5d9 +Author: Keith Packard +Date: Wed Jul 2 17:53:46 2003 +0000 + + Silicon motion driver for kdrive + +commit b923d897a51707c25b2dc62395d9765ba1a47bfe +Author: Keith Packard +Date: Wed Jul 2 17:53:46 2003 +0000 + + Initial revision + +commit 544ee9bb7a060d6a85b5168a2de74ff1db430c89 +Author: Marc Aurele La France +Date: Wed Apr 23 21:51:18 2003 +0000 + + 136. Fix bug that prevented fbman from using the last partial scanline of a + Mach64 framebuffer (Marc La France). + 135. Make ATI Mach64 FIFO cache integrity testing optional (Marc La + France). + 134. Export ATI Mach64 hardware overlay as an XVideo adaptor (derived from + GATOS project, Egbert Eich, Marc La France). + 133. Reorganise ATI Mach64 support into separate source files (Marc La + France). + 132. Refine atimisc's decoding of the panel mode on server entry in an + attempt to reduce the effect of atyfb bugs (Marc La France). + 131. Make Rage128 and Radeon XVideo available even when 2D acceleration is + disabled (Marc La France). + 130. There is no longer any need to require hardware cursors during Rage128 + and Radeon XVideo displays (Marc La France). + 129. Initialise v4l's XVideo adaptors last (Marc La France). + 128. Reduce cut&paste effects by adding more helpers to Xv (derived from + #5645, Björn Augustsson, Marc La France). + 127. Centralise a region comparison primitive into 'mi' and use it instead + of local definitions throughout the server (Marc La France). + 126. DPMSExtension & XvExtension driver cleanups (Marc La France). + +commit 870d0f8752c11c3df42185786ab1e2bd200e4de1 +Author: Egbert Eich +Date: Thu Dec 12 18:29:05 2002 +0000 + + 621. Let kbd driver test if Xserver is in suspend before handling any input + events (Egbert Eich). + 620. Fixed agp version checking to accept minor versions >= the specified + number (Leif Delgass). + +commit 7827fce0b5ff600d0adc3a30eab69e8141c2e548 +Author: Keith Packard +Date: Wed Nov 13 16:37:39 2002 +0000 + + Allow input devices to be closed while the VT is switched away (needs + per-driver support) + +commit 3eaea6608bc33633c00860008f246f59ad5687a7 +Author: Keith Packard +Date: Tue Nov 12 22:20:42 2002 +0000 + + Update ipaq-specific ts driver to match generic tslib version + +commit 612e82053d986df70bcc9c87038244eab8c3dc13 +Author: Keith Packard +Date: Tue Nov 5 05:28:34 2002 +0000 + + Clean up touch screen hacks for controlling pointer on alternate screen + +commit 358d887cbef4d2ec34532a364dd44205eab36c23 +Author: Keith Packard +Date: Fri Nov 1 22:27:49 2002 +0000 + + Add support for ARM linux TS lib (disabled by default) in kdrive + +commit f0a8d06fcaf3fe0a652efa65966f4b0b0d688c12 +Author: Keith Packard +Date: Thu Oct 31 18:29:50 2002 +0000 + + Refix mouse matrix computation for touch screens. Update usage message for + -screen option + +commit 28d191680ecbcd50dc1cccec12e55a3c433fbf48 +Author: Keith Packard +Date: Wed Oct 30 21:25:53 2002 +0000 + + Uninitialized mouse matrix elements + +commit dd7c85f108d01d207248300019e88d56012c33c9 +Author: Alan Hourihane +Date: Wed Oct 30 12:52:06 2002 +0000 + + 441. Import Mesa-4.0.4, and resync with the DRI trunk (DRI Project). + +commit d04246c8fca4132063234ab44a68a7fac8c22261 +Author: Keith Packard +Date: Fri Oct 18 06:31:17 2002 +0000 + + Changed arguments to vesaRandRSetConfig + +commit 7d214e2e2a2a1601ca14be6b52190c5b22611e2d +Author: Keith Packard +Date: Fri Oct 18 06:08:10 2002 +0000 + + Fix additions of RandR support in kmode.c + +commit 5bb4a7b6998132d574d823301333b7e119dc7213 +Author: Keith Packard +Date: Fri Oct 18 06:00:29 2002 +0000 + + Fix other half of kdrive mach64 video code after randr update + +commit e1c304e22b1a29a5259aec1e956dbc75e0fa0138 +Author: Keith Packard +Date: Mon Oct 14 18:01:42 2002 +0000 + + Add refresh rates to RandR (v1.1) + +commit 5804e69f4c20dcd33f69673aa82da3051e6eed3c +Author: Keith Packard +Date: Sun Oct 13 19:35:56 2002 +0000 + + Custom file for rotating pcmcia screens + +commit b5d1c538622b21bed8eb59b557d79323f65ffbd7 +Author: Keith Packard +Date: Tue Oct 8 21:28:05 2002 +0000 + + Add vtxx option to kdrive servers + +commit f214cab20baf57fc23389ef9b63a3e3a50b2a4f6 +Author: Keith Packard +Date: Tue Oct 8 21:27:18 2002 +0000 + + Clear screen on mode switch + +commit b28a8c6e2a1fbc57d96d94b7445c86f94c2d8d4d +Author: Keith Packard +Date: Tue Oct 8 21:25:35 2002 +0000 + + Add another mach64 PCI id + +commit 9373d9186b413e1d53200b191816b9143d19c4bf +Author: Keith Packard +Date: Fri Oct 4 01:44:20 2002 +0000 + + Fix mouse mapping under reflection + +commit a80e1e5aed07cb57151408b0481f18e2ffb7f146 +Author: Keith Packard +Date: Thu Oct 3 22:09:04 2002 +0000 + + Update kdrive servers to support reflection + +commit 238a2ec201a52d59a46540ddd419d8d6f6bf8daa +Author: Keith Packard +Date: Sun Sep 29 23:39:47 2002 +0000 + + Update RandR to 1.0 (library version 2.0) + +commit 5d871996431e33b0d64ad9158e040e46770b6ee4 +Author: Keith Packard +Date: Thu Sep 26 02:56:48 2002 +0000 + + Add image transformation and sub-pixel ordering to Render + +commit a2637ba1f6c8417a48c95c9b65542c696ba0c8c0 +Author: Egbert Eich +Date: Mon Sep 16 18:05:35 2002 +0000 + + 319. Moved LdPreLib define after the vendor/OS specific config files as it + may depend on setting done there (Egbert Eich). + 318. Several fixes for cross compile environment (Egbert Eich). + 317. Added code to allow for building of static only libraries with + -fPIC for platforms which require it (Egbert Eich). + 316. Added '-m32' to gcc flags as default for ia32 builds when gcc version + is >= 3.1. This allows building a 32 bit Version of X on 64bit x86-64 + (Egbert Eich). + 315. Changed direct calls of ld to 'gcc -nostdlib' for Linux (Egbert Eich). + 314. Changed calls to as to 'gcc -c -x assembler-with-cpp' for Linux + (Egbert Eich). + 313. Added '-fno-strict-aliasing' flag to gcc version >= 3.1 (Egbert Eich). + Strict requires that one address must not contain pointers to different + types - a feature heavily used by X (Egbert Eich). + 312. Fixed a core dump problem in libXtt (?) (Egbert Eich). + 311. Removed '#pragma pack' from structures that contain function pointers + in x86emu. This causes problems on gcc 3.1 for ia64 (Egbert Eich). + 310. Added defines for missing X types to saverproto.h (Egbert Eich). + 309. Fixed compiler warings generated by gcc >= 3.1 in mesa drivers (Egbert + Eich). + 308. For platforms that allow both 32 and 64 bit libraries to be executed + split Xlib i18n modules path into + /X11R6/lib/X11/locale/lib/common and + /X11R6/lib/X11/locale/lib64/common. 'lib64' has been defined + to be the default path for 64bit shared libraries on these platforms + (Egbert Eich). + 307. Fixed obvious typo in OMlib (Egbert Eich). + 306. Fixed code in cfb that didn't comply with C sequence rules. Modern C + compilers tend to be more aggressive on code reordering (Egbert Eich). + 305. Changed arguments of NoopDDA() from VarArgs to void. Handling of + VarArgs by gcc isn't compatible with the way it was used on certain + platforms (Egbert Eich). + 304. Added support for 32bit pixmaps for 24bit overlay framebuffers in fb + overlay code (Egbert Eich). + 303. Fixed kdrive to print a meaningful error message instead of just core + dump when no matching graphics cards is found (Egbert Eich). + 302. fixed portability bug in xwd (Andreas Schwab ) + 301. fixed X Server crash, which happended each time a proportional + iso10646 font was loaded with xtt backend (Yong Li + ) + 300. Added some ARM specific fixes to compiler.h (Uli Hecht). + 299. Added a virtual 'dummy' driver (Egbert Eich). + 298. Fixed core dump when certain access functions are not set in xf86Bus.c + (Egbert Eich). + 297. Fixed problem where SIGIO could be disabled after a server reset. + 296. Added configurable list of devices the xf86Misc extension is allowed + to change the mouse device to (Egbert Eich). + 295. Changed default mouse type to 'auto' when generating config file with + '-configure' (Egbert Eich). + 294. Made sure keyboard modifier settings are consistent after exit from + DGA when the xkb extension is used (Egbert Eich). + 293. Disabled keyboard processing when Xserver is suspended by power + management. This allows effective locking of laptops when stolen + (Egbert Eich). + 292. Added/improved options for lockfile syncing (Egbert Eich). + 291. Added support for backup copy of Xserver logfile (Egbert Eich). + 290. Fixed GetTimeInMillis() to use deltas instead of absolute time + returend by gettimeofday(). This ensures time is monotonic in X (Egbert + Eich). + 289. Fixed xf86Misc extension to allow modification of Expps2 mice (Egbert + Eich). + 288. Made code in xf86MiscExt.c more readable (Egbert Eich). + 287. Fixed PCI CardBus bridge handling (Egbert Eich). + 286. Added code to reenable PCI bus mastering after coming back from a VT + switch to radeon driver (Charl P. Botha ) (Egbert + Eich). + 285. Dito for r128 driver (M. Harris). + 284. Dito for glint and mga driver (Egbert Eich). + 283. Fixed double scan issues for low res modes in C&T driver (Egbert + Eich). + 282. Set rgbBits to 8 for all HiQV chips in chips driver (Egbert Eich). + 281. Moved initialization of accel funtions past initialization of + offscreen fb manager in chips driver (Egbert Eich). + 280. Fixed initialization of video in chips driver (?). + 279. Fixed HALlib problem restoring text mode on G550 (Egbert Eich). + 278. Restructured and included Matrox's Merged Framebuffer changes to mga + driver (Egbert Eich). + 277. G450/550 clockchip programming fixes (Matrox). + 276. Fixed HW Cursor for HALlib frame granularity (Egbert Eich). + 275. Enabling 2D accel in 24-bit for neomagic 2360 and 2380 (Egbert Eich). + 274. Added support for builtin 1024x480 mode of Sony subnotebooks for + Neomagic driver (Egbert Eich). + 273. Fixed support for lowRes (320x240) modes in neomagic driver (Egbert + Eich). + 272. Fixed RAC function registration in S3 driver (Egbert Eich). + 271. Added some voodoo to screen initialization of S3 driver (Egbert Eich). + 270. Fixed vbe/int10 support in SMI driver. It used to core dump when BIOS + was not usable (Egbert Eich). + 269. Separated BRIGHTNESS and and CAPTURE_BRIGNTESS video attributes in smi + driver: CAPTURE_BRIGHTNESS refers to the capture chip (ie. Philips + SAA7110) while BRIGHTNESS controls the video overlay of the SMI chip + itself (Egbert Eich). + 268. Disable automatic loading of DRI when running SUN ffb as this is + inconsistent with other drivers (Thorsten Kukuk). + 267. Fixed Gamma/Brightness code in trident driver (Egbert Eich). + 266. Added FpDelay debugging option (Egbert Eich). + 260. Fixed video support for Trident 9397 (Egbert Eich). + 265. Fixed Cursor/VT switch support for vmware driver (Egbert Eich). + 264. Fixed Blit problems in vmware driver when running KDE (Egbert Eich). + 263. Added RENDER support to vmware driver (Egbert Eich). + 262. Added C&T 69030 to extrapci.ids (Egbert Eich). + 261. Improved mouse autodetection code (Egbert Eich). + 260. Restructured int10 code so that vm86 and x86emu support can be loaded + as modules. Implemented heuristic to try vm86 first and fall back to + x86emu. This allows 32 bit Xservers to run on x86_64 on 64-bit kernel + without vm86 support (Egbert Eich). + 259. Restructured elf loader: determine which section to load from + elfheader flags (Egbert Eich). + 258. Adding RENDER Support to RAC (Egbert Eich). + 257. Using borderClip instead of borderSize region for redisplay function + in miext/shadow code to avoid core dumps when vt switched away (Egbert + Eich). + 256. Replacing sprintf() by snprintf() in lbxproxy to eliminate possible + buffer overrun exploits (Egbert Eich). + 255. KP_Decimal fixes to Czech and Slovak keybards (Jan Holesovsky + ) (Egbert Eich). + +commit 2698ee9f29189a44de1c92df99f48d45f0111577 +Author: Keith Packard +Date: Thu Aug 15 18:07:57 2002 +0000 + + Prefer touchscreen to mouse + +commit fe477855d7d714c154dc9fcb1d0aa67fb8e4e5a5 +Author: Keith Packard +Date: Fri Aug 2 16:30:50 2002 +0000 + + Fix for iPaq IOCTL changes + +commit cf49ce6f26caee30f4160e6e0b2b658863e7a145 +Author: Keith Packard +Date: Fri Aug 2 16:15:02 2002 +0000 + + Allow both touchscreen and mouse at the same time + +commit 1a5f923c62dcffb3a81c6532f3dc071c70345cb3 +Author: David Dawes +Date: Tue Jun 4 22:19:58 2002 +0000 + + 174. Fix makedepend so that it can parse a unary '+' operator (#5185, Mark + Snitily). + 173. Fix a typo in Xvesa's emulation of instructions forbidden in vm86 mode + (#5184, Juliusz Chroboczek) + 172. Fix a bounds check in Xlib's Region code (#5183, Owen Taylor). + +commit 98f8d7af3cb7a10cc268a8bdd3039539b1bf90f2 +Author: Keith Packard +Date: Tue Feb 19 00:18:05 2002 +0000 + + kdrive/vesa: apply vm86 patch from Juliusz + +commit 6d8cedf68c7803330bc920cf7506727c4ad6108c +Author: Keith Packard +Date: Thu Feb 14 16:08:05 2002 +0000 + + update kdrive manual and usage + +commit 44b20bfa587def11f3127980e67ff47e695c3e51 +Author: Keith Packard +Date: Fri Feb 1 00:52:15 2002 +0000 + + kdrive/mach64: recognize the mach64li + +commit 3abb3e073961986137f8fec1f194c60636b9e864 +Author: Keith Packard +Date: Fri Jan 18 16:25:19 2002 +0000 + + kdrive: fix button emulation for iPAQ + +commit 88810cfc02941d7e54924e25aa872e5cc740d274 +Author: Keith Packard +Date: Thu Dec 20 16:47:30 2001 +0000 + + kdrive/linux/mouse.c: convert mouse data to signed values for compilers + with default unsigned chars + +commit 83388cb23282471e80d513bd3ab472b51c110b35 +Author: Keith Packard +Date: Mon Dec 10 16:34:20 2001 +0000 + + kdrive/i810: bit swap for i810 cursor (from Pontus Lidman) + +commit 4646a6c3b925676039f50bacb4f3c780f6e81bcc +Author: Keith Packard +Date: Fri Dec 7 02:19:04 2001 +0000 + + kdrive: work around ipaq touch screen compile problems + +commit 54feb8a4c8f0e0cb6eb40b494171fa4f3552cfc3 +Author: Keith Packard +Date: Fri Dec 7 02:18:19 2001 +0000 + + kdrive: missing registration for mouse input type + +commit 636390fb9d6314e506f593da6556fa198b4e9bf6 +Author: Keith Packard +Date: Thu Nov 22 23:38:21 2001 +0000 + + kdrive: initialize all Linux mouse driver fields + +commit 668c25a769044f06ed47a3145a11aceeb9574c9d +Author: Keith Packard +Date: Thu Nov 8 10:26:24 2001 +0000 + + kdrive: fix ALTGR keyboard mappings + +commit e76c6b2acae5622dd2d4944cd6f3673dbc70a571 +Author: Keith Packard +Date: Thu Nov 8 09:35:08 2001 +0000 + + kdrive/linux: update ps/2 mouse detection/configuration code from FreeBSD + bits + +commit 6fafe3b092f799da788a1ae75be1c23da42f0983 +Author: Keith Packard +Date: Thu Nov 8 09:33:51 2001 +0000 + + kdrive: Open APM device r/w for kernel 2.4.14 + +commit 2f2e256de71c42b7856440ec43b1c122019b95b7 +Author: Marc Aurele La France +Date: Mon Oct 29 16:34:56 2001 +0000 + + DPMS warning fix + +commit b8d90c5ea4659a01694864e6c05a563dcea296eb +Author: Marc Aurele La France +Date: Sun Oct 28 03:33:10 2001 +0000 + + 407. Fix for threaded libraries (Marc La France). + 406. Finish removal of SuperProbe (Marc La France). + 405. A rather large number of warning fixes throughout (Marc La France). + 404. Fix bug in HTML install script (Marc La France). + 403. Missing ident lines for some XFree86-modified files (Marc La France). + 402. Add default half-width doublescanned modes (Marc La France). + 401. Mark all driver-registered resources with ResBus (Maarc La France). + 400. Fix DPMS-related build problem (Marc La France). + 399. Log a message just before calling each ChipProbe() during '-probe' + processing (Marc La France). + 398. Temporarily disable ISA probing on SPARCs and PowerPCs (Marc La + France). + 397. Add PCI IDs for Sun hardware (Marc La France). + 396. Fix memory leak in resource relocation (Marc La France). + 395. Do not relocate resources that only conflict with disabled non-video + PCI devices or disabled PCI ROMs (Marc La France). + 394. Re-organise SBUS code (Marc La France). + 393. Add as-yet-unused definitions for PCI resource types other than I/O + and memory (Marc La France). + 392. Add doc for Solaris, but don't format it yet (Marc La France). + 391. Normalise driver names (Marc La France). + 390. For SPARCs, disable DGA support in ATI driver (Marc La France). + 389. Clean up some debugging messages (Marc La France). + 388. Fix newport driver for when a /proc fs isn't mounted (Marc La France). + 387. Fix DAC handling bugs in s3 driver (Marc La France). + 386. Fix resource registration bug for PCI Tseng's (Marc La France). + 385. Add aperture driver for Solaris (not yet used) (Marc La France). + 384. Rework scanpci to fix problems that prevented it from completely + displaying non-PCI bridges and Simba bridges (Marc La France). + 383. Fix build problems in some input drivers (Marc La France). + 382. Fix int10 compile problem for SPARCs and PowerPCs (Marc La France). + 381. Ensure master aborts on secondary buses complete normally during PCI + scans (Marc La France). + 380. Some memory mapping and Solaris cleanups (Marc La France). + +commit a8518b35617a479f50c735c015115b853f4aa327 +Author: Keith Packard +Date: Wed Oct 24 20:14:52 2001 +0000 + + kdrive/savage: Long lines cant be drawn with accelerator + +commit 28fd5f7525848cf0109f9cf2d6311f3717570a5d +Author: Keith Packard +Date: Fri Oct 12 06:33:12 2001 +0000 + + kdrive: add new auto-detecting and auto-switching mouse driver + +commit 5f310d7f8b566b1e331286752d349f87ef43a811 +Author: Keith Packard +Date: Sat Sep 29 04:16:39 2001 +0000 + + kdrive: restructure APM/VT switch support to reset keyboard state and flush + buffer on APM resume + +commit bb2e1c53b58ac94539f0d11ae195186a9ee0a2f7 +Author: Keith Packard +Date: Fri Sep 21 21:58:34 2001 +0000 + + hw/kdrive: Xv window private should be allocated on demand + +commit 59cd35f634468acfa2e48711da09fabc811d96f9 +Author: Keith Packard +Date: Fri Sep 14 19:25:17 2001 +0000 + + hw/kdrive/vesa: initialize mouse matrix for non-rotated case correctly + +commit fbaf3ceae0519ebdfee4b6a73b1bc0000f141cf2 +Author: Keith Packard +Date: Fri Sep 14 19:24:11 2001 +0000 + + hw/kdrive/trident: solid fill checks busted for planemasking + +commit 216090d1aedb23c691a75da25b14d8543b932e1c +Author: Keith Packard +Date: Wed Sep 5 07:12:43 2001 +0000 + + kdrive: Add primitive ct65550 server. Update kdrive/vesa code to support + DPMS using VESA bios routines. Include support for Toshiba SMM DPMS as + well + +commit f856b952ec7251d6e95f0b93d62fb026d07b0ebc +Author: David Dawes +Date: Thu Aug 9 20:45:15 2001 +0000 + + 187. Add an MS mouse driver for KDrive (#4754, Juliusz Chroboczek). + +commit f4db75ac431c14e0c24ff7549c6ce1e3b0b86b87 +Author: Keith Packard +Date: Thu Aug 9 09:08:55 2001 +0000 + + kdrive/mach64: support Xv under RandR + +commit 628d7695d1696f6f5cba6ea1f2548aa5d0f38c80 +Author: Keith Packard +Date: Thu Aug 9 09:06:08 2001 +0000 + + kdrive: disable sigio debugging + +commit 958c0374a6709386e91b4b3ed7ba8fa81d415ebf +Author: Keith Packard +Date: Tue Jul 24 21:26:17 2001 +0000 + + kdrive: add apm support, fix MTRR unmapping bug + +commit b7eb8a35b51aa2edc9ff59f091ee88ea7000b757 +Author: Keith Packard +Date: Tue Jul 24 19:06:04 2001 +0000 + + kdrive: Unmap vesa device when disabled + +commit d2d221a012950b98e48e47b6dea38e6ad385fef8 +Author: Keith Packard +Date: Mon Jul 23 03:44:17 2001 +0000 + + kdrive/mach64: Force read of GUI_STAT on every op to avoid problems across + suspend/resume + +commit 79486b3b5c792a990cb73b4efa453218262e605f +Author: Keith Packard +Date: Fri Jul 20 19:35:30 2001 +0000 + + Too many changes, but all in kdrive: + Add support for global screen origins (-origin option), handles both + Xinerama and mouse crossings. + Fix XV enable/disable sequences -- can't use card wrappers as cards have + more than one screen. + Change vesa/fbdev to use new depth-independent rotation shadow update + Fix vesa to allow starting rotation value (again) + Make vesa driver write all colormap changes in one INT10 call + +commit 9826d5a1339570c037ae1ef29c9a237874a6ffa2 +Author: Keith Packard +Date: Thu Jul 19 08:46:30 2001 +0000 + + kdrive/fbdev: only setting first colormap entry on static hardware + +commit 35d8b5f44269c97497c73d3638b8f0345757c04c +Author: Keith Packard +Date: Mon Jul 16 19:48:00 2001 +0000 + + kdrive/fbdev: fix static color case + +commit 090a429573dfb965ebc4ea8ea57e3bef5f9a8539 +Author: Keith Packard +Date: Wed Jul 11 16:42:17 2001 +0000 + + kdrive/fbdev: dont set DPMS mode repeatedly to the same value + +commit 99fb2eb76d8f93578e4aba75c73b9be0766f7b6f +Author: Keith Packard +Date: Wed Jul 11 05:02:24 2001 +0000 + + Generalize kludge in fbdev that normalizes pixel formats to something that + Render can handle + +commit 562474091a3d52a062eb89d25a7d38200a785425 +Author: Keith Packard +Date: Wed Jul 11 02:58:19 2001 +0000 + + Fix TOUCHSCREEN support in kdrive + +commit 67cd53abfce7ed17ae4c428332a9e0fd908da97a +Author: Keith Packard +Date: Fri Jun 29 14:00:41 2001 +0000 + + Rework kdrive input fd handling, enable multiple simultaneous mice + +commit c872ee82045e8c7ce019df2577d06bec549cd71c +Author: Keith Packard +Date: Fri Jun 29 13:57:45 2001 +0000 + + kdrive: typo in MTRR calculations + +commit 63dd090655ba995b8f26386bb50cb5b7568f7da0 +Author: Keith Packard +Date: Fri Jun 29 13:55:53 2001 +0000 + + kdrive: dont touch hardware when disabled + +commit 01a53daa03a8ee36ce136dde3a9a9b152e9c2e2f +Author: Keith Packard +Date: Sat Jun 23 03:41:24 2001 +0000 + + Clean up mach64 video code to add ReputVideo and make StopVideo not crash + the machine + +commit 31d47ec8bed1b02d04563ba502eaeb028975f653 +Author: Keith Packard +Date: Thu Jun 21 21:44:09 2001 +0000 + + kdrive/mach64: remove useless Xv debug printfs + +commit bd61c15279e2195c72b3add32961ed21e293d48b +Author: Keith Packard +Date: Thu Jun 21 01:01:30 2001 +0000 + + Add RCS tag + +commit 66c9184807997d2a0a155ba1697906c07396863f +Author: Keith Packard +Date: Thu Jun 21 00:58:51 2001 +0000 + + Fix screen physical size in RandR code for kdrive fbdev and pcmcia servers + +commit f8a456f094d8f61c021bbfb6e6f0a4723ebdc73f +Author: Alan Hourihane +Date: Wed Jun 20 21:53:31 2001 +0000 + + Add RandR support to the Kdrive pcmcia driver. + +commit 918ff10f2697ee8c17013bd31596072a38c5ac9b +Author: Keith Packard +Date: Tue Jun 19 09:31:47 2001 +0000 + + Finish Xv support for kdrive/mach64 + +commit 6d86517b0ed0db51f3eaf19c186db52feb1e47e0 +Author: Keith Packard +Date: Sat Jun 16 05:53:05 2001 +0000 + + Screen flipping broken pointer remapping + +commit 54aea8ec0c1c3633788fd9b19636093860c75d53 +Author: Keith Packard +Date: Sat Jun 16 05:48:49 2001 +0000 + + Patch DPMS support in kdrive/mach64, add preliminary (broken) Xv support + +commit f386ca6c69ba10cd8c0dd60bb25cde37ecfc8bc7 +Author: Keith Packard +Date: Wed Jun 13 19:18:44 2001 +0000 + + Support initial rotation in kdrive/fbdev, use that as the normal + orientation + +commit 93dbdc89c172fd5d6450f21ebc91011771ac0100 +Author: Keith Packard +Date: Wed Jun 13 19:18:03 2001 +0000 + + Add -dpi support to kdrive + +commit a6517a3056a88fca35a47185a0e6d83f3e8b0015 +Author: Keith Packard +Date: Mon Jun 11 01:38:54 2001 +0000 + + Advertise supported rotations in kdrive/vesa server + +commit 4f8254b31f30bd12224c2fdcecfbd67b41ecd7e1 +Author: Keith Packard +Date: Tue Jun 5 17:17:39 2001 +0000 + + Attempt to make kdrive/fbdev run on static gray hardware (iPaq 3150) + +commit bf4dbfbf45e4e6b1b86c624b1995a1050b7a0eef +Author: Alan Hourihane +Date: Tue Jun 5 16:57:44 2001 +0000 + + fix some warnings due to new shadow code + +commit a4ba10ba6ffb1c01a0df5b34669b9fb24ad0e7d9 +Author: Keith Packard +Date: Tue Jun 5 16:49:31 2001 +0000 + + kdrive/fbdev: RandR initialization sequence change + +commit 7fcf46356ba70563f036f535e60667727db442ae +Author: Keith Packard +Date: Mon Jun 4 09:45:42 2001 +0000 + + Allow for hardware acceleration under RandR with Layer. Hardware/Software + cursor switching still busted + +commit 54e66d92db917923e33e018e628a7629d6705507 +Author: Keith Packard +Date: Sun Jun 3 21:52:46 2001 +0000 + + Update RandR protocol + +commit 88ae32841d766c7d0df79ee25e1db62996d4ecb3 +Author: Keith Packard +Date: Sun Jun 3 18:48:19 2001 +0000 + + Add mach64 driver to Tiny-X + +commit 14ed0c3d6d674df4edcbcd8840a7cea4b41a0673 +Author: Keith Packard +Date: Wed May 30 15:36:25 2001 +0000 + + Fix kaa to not try Copy for pixmap sources + +commit a2bd75d15a99d4ee117e17921f0426228d53f5e8 +Author: Keith Packard +Date: Tue May 29 21:55:41 2001 +0000 + + Xfbdev: Make sure screen gets re-enabled on RandR failure + +commit 562925c439cf1746f2caa720d4f2dce54ba0311b +Author: Keith Packard +Date: Tue May 29 17:47:55 2001 +0000 + + Fix Xipaq build after layer/RandR additions + +commit 78b53386b51cde4fe4664963ddafa36b814360f2 +Author: Keith Packard +Date: Tue May 29 04:54:13 2001 +0000 + + Add miext/layer for more complete RandR support in kdrive/Xfbdev + +commit 06f758797ab3651b0e293ae26daf4df77702fdde +Author: Keith Packard +Date: Sat May 26 01:25:42 2001 +0000 + + Add initial RandR support to Xvesa + +commit ba8351609869165aa2de92b7a876dc2d2768cb5b +Author: David Dawes +Date: Fri May 25 18:40:59 2001 +0000 + + 38. Fix xmh's use of XtNewString() with getenv (#4694, Tim Waugh). + 37. Xdm/PAM fixes: leave it to PAM to observe whether or not an account is + locked, and reinitialize credentials after calling initgroups(), + because sometimes the credentials pam_setcred() gives are in the form + of group membership (#4693, Mike Harris). + 35. Fix warnings when building mieq.c (#4689, Adam Sulmicki). + 34. Fix some bugs in the cz and sk entried in XKB's keymap/xfree86 file + (#4692, Ivan Pascal). + 33. Add 'hr' entries to XKB's keymap/xfree86 and rules/xfree86.lst files + (#4687, Nerijus Baliunas). + 32. Include in shape.h to get Region typedef (#4686, Adam + Sulmicki). + +commit e9314bd34ec39cc699591123cc8a05a934b66b85 +Author: Alan Hourihane +Date: Fri May 25 07:44:29 2001 +0000 + + wrap some stuff around #ifdef TOUCHSCREEN + +commit e6497f39af98cd25719eab72b0be04fa4146172f +Author: Alan Hourihane +Date: Thu May 24 19:31:46 2001 +0000 + + fix ifdef->if + +commit 0e1a49a7dd00ae494d92ab480d9776ec5320cb3e +Author: Alan Hourihane +Date: Wed May 23 17:28:39 2001 +0000 + + add missing pieces for the pcmcia driver + +commit 85d827f5329fa93dea1125788457fac6835cd134 +Author: Alan Hourihane +Date: Wed May 23 08:56:09 2001 +0000 + + Add PCMCIA server for HP VGA Out PC Card and the Voyager VGA Card. Use on + the Compaq IPAQ. Use -listmodes to see supported modes. Hack the + touchscreen driver to work as a mouse pad for the VGA screen. Fixup key + bindings so xmodmap can remap IPAQ's buttons as mouse buttons. + +commit f9104754cda1212cf48d6d24a0a586c5368d7549 +Author: Keith Packard +Date: Wed May 23 03:29:44 2001 +0000 + + Add RandR extension + +commit dc383e8f77f99e8c2b799a6ab4e4998a1fcacb24 +Author: Marc Aurele La France +Date: Sun Apr 1 14:00:04 2001 +0000 + + 317. glxinfo needs libGLU (Marc La France). + 316. Rage128 fix to Cards database (Marc La France). + 315. Minor fix to PCI resource overlap handling (Marc La France). + 314. Loader code simplification and IA-64 cache flushes (Marc La France). + 313. Workaround in the ATI driver for troublesome interaction between + loader and compiler optimisation (Marc La France). + 312. Warning fixes for `gcc -fno-builtin`, which appears to be the default + on some systems (Marc La France). + more of #301, tags, warnings and build fixes. + +commit 518e205b06d0dc7a0cd35fbc2c6a4376f2959020 +Author: Keith Packard +Date: Fri Mar 30 17:35:55 2001 +0000 + + kdrive/igs: add missing register definitions that used to be in igsregs.t + +commit eb3da37564593b7c9fb574af824e2f5e0cc6bb24 +Author: Keith Packard +Date: Fri Mar 30 02:18:41 2001 +0000 + + Add files for Xmuu and i810 driver + +commit f39a62d122b6e63e2971d8593bf6b24933f66ec8 +Author: Keith Packard +Date: Fri Mar 30 02:15:20 2001 +0000 + + Add Xmuu library to remove requirement for Xt/Xaw from most X utilities Add + i810 and Xv support to kdrive + +commit a161cfd72870ae6dca66ef02f5cdd13b7ac75fd6 +Author: David Dawes +Date: Wed Mar 21 16:43:16 2001 +0000 + + remove Id line + +commit 0aa54b4d409647778b563d77ef6100085d86c6f3 +Author: David Dawes +Date: Tue Feb 13 21:15:15 2001 +0000 + + 144. Fix the neomagic driver so that it saves/restores the palette (#4452, + Ken Hornstein). + 143. Fix a palette saving bug in the vgahw module (#4452, Ken Hornstein). + 142. Fix a typo in Xfbdev.man (#4446, Juliusz Chroboczek). + 141. Major updates to the savage driver, including: + - DDC support + - I2C support + - XVideo YUV overlay support for Savage/MX and Savage/IX + - DGA support + - yanks Ani Joshi's depth/bitsPerPixel patch for searching the BIOS + - fixes interactions with frame buffer and SVGATextMode consoles; VT + switching now seems quite reliable for almost everyone + - yanks unused options + - adds new options for hacks to deal with the status register hangs + - adds one special case memory configuration for Savage 4 + - adds support for doublescan modes (320x240 works) + - adds LCD panel detection + - fixes a panning bug at depth 24 (panning must be to even pixels) + - adds a workaround for bugs in the latest ProSavage BIOSes (#4445, 4448, + Tim Roberts). + 140. Make 'X -configure' use the long monitor name when present in the DDC + info (#4444, Andrew C. Aitchison). + 139. Make glxinfo respect $DISPLAY (#4443, Meelis Roos). + 138. Fix TrueType font problems in 4.0.2 (#4439, Juliusz Chroboczek). + 137. Document the "DisplaySize" keyword in the XF86Config man page (#4438, + Andrew C. Aitchison). + +commit 3dfa6cce9938413e10cc400ba6d9b19b8f28e485 +Author: David Dawes +Date: Sat Jan 27 18:20:40 2001 +0000 + + 88. Set the version strings in man pages dynamically (David Dawes). + 87. Remove the XF86_VERSION string from xf86Version.h, leaving just the + numerical values. All the version information is now derived from that + single set of values (David Dawes). + +commit 60c7a912e257045d1189a19a38d9dbedc20ae78b +Author: David Dawes +Date: Wed Jan 24 00:06:10 2001 +0000 + + 79. Preprocess all man pages to make sure that the references to pages in + sections that are platform-dependent are correct. Also fixed some misc + formatting problems found while doing that (David Dawes). + +commit dacbf5671da08d161cd7a32496e0b58f50a93453 +Author: Keith Packard +Date: Tue Jan 23 06:25:05 2001 +0000 + + Integrate jg patch for iPAQ + +commit 2869e08a328cb6aa51c17b96bdebd37e9eeefc88 +Author: Keith Packard +Date: Wed Dec 13 18:06:54 2000 +0000 + + kdrive: non-x86 compiles broken in kmap.c + +commit ec4916836c42cb4a1dc1622dddd27951a90a52c9 +Author: Keith Packard +Date: Fri Dec 8 23:04:57 2000 +0000 + + kdrive: dont try MTRR on non-x86, fix backspace mapping + +commit d09a156d92dbcd9368be20dabe47ea197f19357e +Author: Keith Packard +Date: Fri Dec 8 22:59:37 2000 +0000 + + kdrive: allow screen size specification + +commit 6b61d48f2146f18c94d5f2b3d16a822c0eee9841 +Author: Keith Packard +Date: Fri Dec 8 21:40:29 2000 +0000 + + kdrive/vesa: type cast warning fix + +commit b59eabd230110d604515868893d9aa06e6d3b748 +Author: Keith Packard +Date: Fri Dec 8 21:40:02 2000 +0000 + + kdrive: A few iPAQ inspired changes to event management + +commit a25637fe789c5127451233c759074780cbc110ac +Author: David Dawes +Date: Mon Dec 4 21:01:00 2000 +0000 + + missing ident lines + +commit 1adbdf76a903aa37d553c1c2cc43a783f21acaa5 +Author: Keith Packard +Date: Fri Dec 1 00:01:32 2000 +0000 + + kdrive: add Xkdrive/Xfbdev man pages, update Xvesa manual + +commit 5f8e75f27d49719f5fd07d48481435f93779da6c +Author: Keith Packard +Date: Wed Nov 29 08:42:25 2000 +0000 + + kdrive: add MTRR support, add clock support to trident driver + +commit 02568ec5a8f278faaa26c973fcb424da3fd31f2b +Author: Keith Packard +Date: Sun Nov 19 20:51:12 2000 +0000 + + kdrive: vesa get mode using uninitialized value + +commit 8f634a6516caca0e4be875e696820a820e480cff +Author: Keith Packard +Date: Fri Oct 20 00:19:51 2000 +0000 + + Add VGA BIOS modes to Tiny-X Xvesa server + +commit f16d5d6817f15be35293ee995d073eb57fafe283 +Author: Keith Packard +Date: Wed Oct 11 06:04:40 2000 +0000 + + Add composite operator support to trident + +commit d579bd5676ea570a8f2765cd2f6ba40074171593 +Author: Marc Aurele La France +Date: Tue Oct 10 14:05:48 2000 +0000 + + Static build fix and ident lines. + +commit 5f5b9ed1ad0591d70354c2b90609051d169fc33e +Author: Keith Packard +Date: Sun Oct 8 02:08:39 2000 +0000 + + kdrive: Add timeout to screen switching to avoid unintentional flipping + +commit fb8b58270fcaee236337d3818df04e651acbcea9 +Author: Keith Packard +Date: Fri Oct 6 22:13:40 2000 +0000 + + kdrive: support jgs new linux keysyms + +commit 15d45ffbd9af5ccce07264d6182b2222c417a2a5 +Author: Keith Packard +Date: Fri Oct 6 22:05:53 2000 +0000 + + kdrive: fix any-edge screen-switching behaviour + +commit fae164a4958b95e3ba4e4d5125da4611fcb14f6d +Author: Keith Packard +Date: Fri Oct 6 05:54:09 2000 +0000 + + kdrive: ignore mouse/keyboard fds in WakeupHandler while switched away + +commit b814019be970bc45f808ec19eef0a48b789d6646 +Author: Keith Packard +Date: Tue Oct 3 17:22:14 2000 +0000 + + kdrive: zero out fbdev screen private as its supposed to be + +commit e0ccbaab226bd3e1d619d66c9ec718c67c0a559a +Author: Keith Packard +Date: Thu Sep 28 20:58:21 2000 +0000 + + kdrive: fix typo initializing touch screen + +commit 6171187e92152a443f7d5dd7f0dad866b3e275ea +Author: Keith Packard +Date: Wed Sep 27 20:47:37 2000 +0000 + + kdrive: memory/fd leaks fixed in fbdev/vesa/trident drivers + +commit 367cab99ece8655bbd8a65096bb68bcfd7ef6fea +Author: Marc Aurele La France +Date: Tue Sep 26 15:57:04 2000 +0000 + + 721. PCI chip ID updates to ATI driver (Marc La France). + 720. Fix i810 driver for -probe and -configure (Marc La France). + 719. Change message when default modes are deleted (Marc La France). + 718. Fix Xinerama byte swapping bug (Marc La France). + 717. IA-64 and Alpha fixes for pswrap, Mesa, DRI, Xpm, libX11, Xt, Xaw, + Xmu, dps, Type1 fonts, cfb24, most output drivers, ELF loader, ramdac + module, xf4bpp and xf86cfg (Marc La France). + 716. Improve IA-64 support by removing a plethora of 32-bit'isms (Marc La + France). + 715. Default HasLinuxDoc to NO (Marc La France). + ident lines and warning fixes. + +commit 94368c3b92b8513d5135fb3c20165f108b0e96fd +Author: Keith Packard +Date: Tue Sep 26 04:31:23 2000 +0000 + + kdrive: Add iPAQ and Touch screen support + +commit 03e3689701007ea40422b4d729b65aaebcd84869 +Author: Alan Hourihane +Date: Sun Sep 24 13:52:40 2000 +0000 + + reversed a tag accidentally - put it back. + +commit 61e8a40f0d4e886bec96c3f9ee90433a3fab9d54 +Author: Alan Hourihane +Date: Sun Sep 24 13:51:22 2000 +0000 + + DRI merge + +commit 2bbb90ebd927607e0b2c7cd8f3a402b44705fe03 +Author: Keith Packard +Date: Fri Sep 22 06:25:29 2000 +0000 + + Changes for PPC support under linux and a few overlay additions + +commit 02777941e6ac8c79f934ba95b6b2e7f388ffbd14 +Author: Keith Packard +Date: Tue Sep 19 23:50:48 2000 +0000 + + kdrive: fix bug in vesa 4plane in 8bpp mode + +commit 5b9f49f64c7fb51afbfaab4f848fc7d67851582c +Author: Keith Packard +Date: Tue Sep 19 23:49:55 2000 +0000 + + kdrive: use VESA instead of FBDEV for trident driver + +commit 18692160c964c80ba83b63bc207660b6254e11cb +Author: Keith Packard +Date: Tue Sep 19 23:49:17 2000 +0000 + + kdrive: make sure allocation worked before accessing + +commit d6e151ce4deaff506c580da7e3baf055db1c3ae3 +Author: Keith Packard +Date: Fri Sep 15 15:19:00 2000 +0000 + + Tiny-X: Add mouse matrix to rotate mouse, allow enable to fail, add render + by default + +commit f7421d836186cd6dfb919c5a48d556a68d6c5a5d +Author: Keith Packard +Date: Fri Sep 15 07:25:13 2000 +0000 + + Add rotation to fbdev and vesa + +commit 5ec29fe9ea788e0dcc47534a2eca479b2c465160 +Author: Marc Aurele La France +Date: Thu Sep 7 19:44:26 2000 +0000 + + Ident lines + +commit db1a883d32ce8138dde288d32c11e147cdfc81a0 +Author: Keith Packard +Date: Sun Sep 3 05:12:28 2000 +0000 + + Rework tiny-x vesa driver for shadowing and multiple screen support. Allow + enable to fail and avoid crashing + +commit c97fb611dd7dedef6d075ef9d56f3d32c8018d39 +Author: Keith Packard +Date: Sun Sep 3 05:11:46 2000 +0000 + + Rework vesa driver for shadowing and multiple screen support. Allow enable + to fail and avoid crashing + +commit 38059656849a5bab5b56b23359a90aca4ba396c7 +Author: Keith Packard +Date: Tue Aug 29 17:20:15 2000 +0000 + + Use VESA driver underneath + +commit 77331f967077ca2fefbfb117c7e9bc2bf65b5e31 +Author: Keith Packard +Date: Tue Aug 29 17:19:51 2000 +0000 + + Changes from Juliusz for emulating some in/out insns, make ready for other + layers to use + +commit 3095deed7701a1a14be85dff4a6994028b5a6d09 +Author: David Dawes +Date: Mon Aug 28 15:29:19 2000 +0000 + + 565. Support for multithreaded libraries on NetBSD when used in conjunction + with the GNU pth library (#4113, Chris Sekiya). + 564. Add /usr/pkg/bin to NetBSD's DefaultUserPath (#4112, Bernd Ernesti). + 563. Add a (Linux-specific) VESA driver for Keith's small X server (#4111, + Juliusz Chroboczek). + 562. Update Hungarian xkb maps (#A.145, Peter Soos). remove koi8-r encoding + file since it's built-in + +commit f32448679118b77825625aafdc4d6ae4d636cc21 +Author: Marc Aurele La France +Date: Mon Aug 28 02:43:14 2000 +0000 + + Ident lines + +commit 83a388c96d665b6bfb0ae195c8c74e0e1520ab8f +Author: Keith Packard +Date: Sat Aug 26 00:24:38 2000 +0000 + + Try to avoid hitting hardware during server reset when not active, add + KdPicture code + +commit 4223801110c8d5873dd668880dff411765dfc18d +Author: Keith Packard +Date: Wed Aug 9 17:52:45 2000 +0000 + + Add overlay support for savage. Make sis setup code work on nIc + +commit 325fb002e8832a05361516bbaf19d1e8b67a3486 +Author: Keith Packard +Date: Wed May 24 23:57:56 2000 +0000 + + Fix 640x480x60 mode, drop inb/outb on non-x86 machines + +commit a6d519e527a81341ad333cb25b410dfde07176ae +Author: Keith Packard +Date: Wed May 24 23:52:48 2000 +0000 + + Add modes, cursors and acceleration + +commit 240aeb4cda91d19f5b19ebd7f7d6c1aad19f1642 +Author: Marc Aurele La France +Date: Thu May 11 18:14:13 2000 +0000 + + 162. Fix possible SEGV in generic int10 module (Marc La France). + 161. Fix *BSD aperture driver to allow for int10 (Bernd Ernesti, Marc La + France). + 160. Fix vesafb restore problem in ATI driver (Marc La France). + 159. Fix a few more compilation glitches (Marc La France). + +commit 3731c184d69e3c1face0c731926433d522d48067 +Author: Keith Packard +Date: Sat May 6 22:17:53 2000 +0000 + + Lots of Tiny-X changes: + Add overlay support in the Tiny-X Savage4 driver (required changing lots of + Tiny-X code). Savage4 now support 8/16, 8/32 overlays. + Add IGS Cyberpro 5050 driver. This chip has bus support for embeded + systems. + +commit 4b54f22b6accf438f31fbbe79877545c38375351 +Author: David Dawes +Date: Wed Feb 23 20:30:15 2000 +0000 + + remove/disable standard RCS ident lines that are in some files some bindist + updates don't define noPanoramiXExtension when Xinerama is not enabled + Add xfontsel to programs/Imakefile + +commit be2dad5954b8fee09a84f417e41bb65745dadf76 +Author: David Dawes +Date: Fri Jan 21 18:41:49 2000 +0000 + + missing ident lines + +commit 306ac1db85c30a796c9a69c639e7f2e4efd98d50 +Author: David Dawes +Date: Fri Jan 21 01:12:02 2000 +0000 + + 3554. Fix "controlization" in XLookupString for chars > 127 (#3569, Ivan + Pascal). + 3553. Take advantage of FB speedups in Tiny-X (#3568, Keith Packard). + 3552. Speed up FB and do 32bit accesses instead of 64bit accesses (#3567, + Keith Packard). + 3551. Eliminate saving the contents of the screen durint VT switching + (#3562, Keith Packard). + 3550. Make using fb easier for driver writers (#3561, Keith Packard). + 3549. Fix TCP font server connections (#3560, Keith Packard). + 3548. Implement the "OverclockMem" option for the Millennium and Millennium + II (#3558, Andrew Aitchison). + 3547. Speed up some FB performance problems (#3557, 3559, 3560, Keith + Packard). + 3546. Work around a bad code generation bug in gcc 2.7.2.3 that shows up in + XAA (#3550, Rik Faith). + 3545. Add a -brief option to xclock to show only hours and minutes when in + digital mode (#3549, Keith Packard). + 3544. Fix some dead key problems with xkb symbols for Swiss French and + Swiss German keyboards (#3546, Charles Lopes). + +commit 6d978d21b0bea6c73b65f2f47c68de4b94dd73c4 +Author: Robin Cutshaw +Date: Thu Dec 30 03:42:58 1999 +0000 + + Itsy cleanup. + +commit 30e35cb44b6ea11d0eac8ce0d986517f3224852a +Author: Robin Cutshaw +Date: Thu Dec 30 03:03:21 1999 +0000 + + 3516. Jumbo Tiny-X patch with Itsy support (#3527, Keith Packard). + +commit f13b792a3a8d307a18cd6a41aa5a06622009e42f +Author: Dirk Hohndel +Date: Fri Nov 19 13:54:06 1999 +0000 + + 3336. Fx up new MMIO macros (#3337, Matt Grossman). + 3335. Clean up compiler warnings in lib/font/bitmap (#3411, Matt Grossman). + 3334. TGA fixes, add sync on green (#3410, Matt Grossman). + 3333. Fix NULL pointer dereference in libXaw (#3406, Christopher Sekiya). + 3332. Add Rage128 support (#3405, Rik Faith, funded by ATI). + 3331. Add MTRR support for NetBSD and OpenBSD. Add new NetBSD aperture + driver (#3404, Matthieu Herrb). + 3330. Xterm patch #121 (#3402, Thomas Dickey). + 3329. Rendition driver bugfixes and alpha related cleanups (#3400, Dejan + Ilic, Marc Langenbach, Egbert Eich). + 3328. Add void input device (#3392, Frederic Lepied). + 3327. Changed the Xon serial option to be able to select xon/xoff for + input, output or both. Add support for Graphire models. Change wacom + init phase to use new Xoff option (#3391, Frederic Lepied). + 3326. Change the SwapAxes option to SwapXY in elographics/microtouch driver + to match an already existing option in the Dynapro driver. Add a Focus + class capability to the elographics driver (#3395, Patrick Lecoanet). + 3325. Update mouse rate handling (#3388, Harald Koenig). + 3324. Fix NULL pointer dereference in misprite.c (#3380, Edward Wang). + 3323. Add FBDev and ShadowFB support to glint driver. Add new option + "NoWriteBitmap" (#3383, Michel Daenzer). + 3322. Update SuperProbe to handle S3 Savage4, Savage200 and clean up + Trio3D/Savage3D detection (#3382,3384 Harald Koenig). + 3321. Add new framebuffer code and tiny X DDX architecture (#3379, Keith + Packard). + 3320. Add DGA2 documentation (#3378, Mark Vojkovich). + 3319. Update XFree86 manpage wrt -bpp/-depth/-fbbpp (#3377, Andy Isaacson). + 3318. Make SuperProbe check primary cards, only (#3374, Harald Koenig). + 3317. Add SilkenMouse to *BSD (#3373, Matthieu Herrb). + 3316. Allow SilkenMouse to work if not all drivers of an OS support SIGIO + (#3372, Keith Packard). + 3315. Fix a few problems in TGA driver and add support for backing store + and SilkenMouse (#3371, Matt Grossman). + 3314. Add smarter scheduler (#3370, Keith Packard). + 3313. Xterm patch #120 (#3369, Thomas Dickey). + 3312. Enable xf86SetKbdRate function on Solaris 8 (#3364, David Holland). + 3311. Fix some bugs and add acceleration to Rendition server (#3360, Dejan + Ilic). + 3310. Make raw DDC information available as properties in the root window + (#3357, Andrew Aitchison). + 3309. Fix for xf86CreateRootWindow (#3355, Andrew Aitchison). + 3308. Add manpage for the chips driver (#3353, David Bateman). + 3307. Update contact info (#3352, Andrew van der Stock). + 3306. Add kbd rate support for Linux (#3363, Harald Koenig). + 3305. Update Portuguese XKB map (#3351, Joao Esteves, Francisco Colaco). + 3304. Fix text clipping in 3dfx driver (#3349, Henrik Harmsen). + 3303. Fix S3 ViRGE hw cursor (#3348, Harald Koenig). + 3302. Fix clipping in 3dfx driver (#3342, Daryll Strauss). + 3301. Enable SilkenMouse for 3dfx driver (#3341, Henrik Harmsen). + 3300. Enable SIGIO support on LynxOS (#3339, Thomas Mueller). + 3299. Get TRUE defined in sigio.c. Fix xterm compile problem on ISC (#3338, + Michael Rohleder). + 3298. Correct DPMS suspend/standby modes for 3dfx driver (#3336, Henrik + Harmsen) + 3297. Xterm patch #119 (#3335, Thomas Dickey). --- xorg-server-1.4.1~git20080131.orig/Xi/Makefile.in +++ xorg-server-1.4.1~git20080131/Xi/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -60,7 +60,7 @@ setbmap.lo setdval.lo setfocus.lo setmmap.lo setmode.lo \ ungrdev.lo ungrdevb.lo ungrdevk.lo libXi_la_OBJECTS = $(am_libXi_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -148,6 +148,7 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ +GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ GLX_DEFINES = @GLX_DEFINES@ GL_CFLAGS = @GL_CFLAGS@ GL_LIBS = @GL_LIBS@ @@ -562,8 +563,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -575,8 +576,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -586,12 +587,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xorg-server-1.4.1~git20080131.orig/compile +++ xorg-server-1.4.1~git20080131/compile @@ -0,0 +1,142 @@ +#! /bin/sh +# Wrapper for compilers which do not understand `-c -o'. + +scriptversion=2005-05-14.22 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; +esac + +ofile= +cfile= +eat= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` + +# Create the lock directory. +# Note: use `[/.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: