Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Thu Jul 30 23:02:38 CEST 2009. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-07-30 09:08:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-07-30 16:46:30.000000000 +0200 @@ -1,0 +2,28 @@ +Thu Jul 30 16:41:04 CEST 2009 - sndirsch@suse.de + +- fixed build on %ix86 + +------------------------------------------------------------------- +Thu Jul 30 11:28:28 CEST 2009 - sndirsch@suse.de + +- xf86-video-apm 1.2.2 +- xf86-video-ast 0.89.9 +- xf86-video-cirrus 1.3.2 +- xf86-video-fbdev 0.4.1 +- xf86-video-glint 1.2.4 +- xf86-video-i128 1.3.3 +- xf86-video-i740 1.3.2 +- xf86-video-mach64 6.8.2 +- xf86-video-mga 1.4.11 +- xf86-video-neomagic 1.2.4 +- xf86-video-r128 6.8.1 +- xf86-video-s3 0.6.3 +- xf86-video-s3virge 1.10.4 +- xf86-video-savage 2.3.1 +- xf86-video-sis 0.10.2 +- xf86-video-sisusb 0.9.3 +- xf86-video-tdfx 1.4.3 +- xf86-video-vesa 2.2.1 +- xf86-video-voodoo 1.2.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-video-apm-1.2.1.tar.bz2 xf86-video-ast-0.88.8.tar.bz2 xf86-video-fbdev-0.4.0.tar.bz2 xf86-video-glint-1.2.3.tar.bz2 xf86-video-i128-1.3.2.tar.bz2 xf86-video-i740-1.3.1.tar.bz2 xf86-video-mach64-6.8.1.tar.bz2 xf86-video-mga-1.4.10.tar.bz2 xf86-video-neomagic-1.2.3.tar.bz2 xf86-video-r128-6.8.0.tar.bz2 xf86-video-s3-0.6.2.tar.bz2 xf86-video-s3virge-1.10.3.tar.bz2 xf86-video-savage-2.3.0.tar.bz2 xf86-video-sis-0.10.1.tar.bz2 xf86-video-sisusb-0.9.2.tar.bz2 xf86-video-tdfx-1.4.2.tar.bz2 xf86-video-vesa-2.2.0.tar.bz2 xf86-video-voodoo-1.2.2.tar.bz2 New: ---- xf86-video-apm-1.2.2.tar.bz2 xf86-video-ast-0.89.9.tar.bz2 xf86-video-fbdev-0.4.1.tar.bz2 xf86-video-glint-1.2.4.tar.bz2 xf86-video-i128-1.3.3.tar.bz2 xf86-video-i740-1.3.2.tar.bz2 xf86-video-mach64-6.8.2.tar.bz2 xf86-video-mga-1.4.11.tar.bz2 xf86-video-neomagic-1.2.4.tar.bz2 xf86-video-r128-6.8.1.tar.bz2 xf86-video-s3-0.6.3.tar.bz2 xf86-video-s3virge-1.10.4.tar.bz2 xf86-video-savage-2.3.1.tar.bz2 xf86-video-sis-0.10.2.tar.bz2 xf86-video-sisusb-0.9.3.tar.bz2 xf86-video-tdfx-1.4.3.tar.bz2 xf86-video-vesa-2.2.1.tar.bz2 xf86-video-voodoo-1.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.r7xwoL/_old 2009-07-30 23:01:31.000000000 +0200 +++ /var/tmp/diff_new_pack.r7xwoL/_new 2009-07-30 23:01:31.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 72 +Release: 73 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -35,37 +35,37 @@ Supplements: xorg-x11-server Summary: X.Org video drivers ExcludeArch: s390 s390x -Source0: xf86-video-apm-1.2.1.tar.bz2 +Source0: xf86-video-apm-1.2.2.tar.bz2 Source1: xf86-video-ark-0.7.1.tar.bz2 -Source2: xf86-video-ast-0.88.8.tar.bz2 +Source2: xf86-video-ast-0.89.9.tar.bz2 Source4: xf86-video-chips-1.2.1.tar.bz2 Source5: xf86-video-cirrus-1.2.1.tar.bz2 Source7: xf86-video-dummy-0.3.2.tar.bz2 -Source8: xf86-video-fbdev-0.4.0.tar.bz2 -Source9: xf86-video-glint-1.2.3.tar.bz2 -Source10: xf86-video-i128-1.3.2.tar.bz2 -Source11: xf86-video-i740-1.3.1.tar.bz2 -Source14: xf86-video-mga-1.4.10.tar.bz2 -Source15: xf86-video-neomagic-1.2.3.tar.bz2 +Source8: xf86-video-fbdev-0.4.1.tar.bz2 +Source9: xf86-video-glint-1.2.4.tar.bz2 +Source10: xf86-video-i128-1.3.3.tar.bz2 +Source11: xf86-video-i740-1.3.2.tar.bz2 +Source14: xf86-video-mga-1.4.11.tar.bz2 +Source15: xf86-video-neomagic-1.2.4.tar.bz2 Source16: xf86-video-newport-0.2.2.tar.bz2 Source17: xf86-video-nsc-2.8.3.tar.bz2 Source18: xf86-video-nv-2.1.14.tar.bz2 Source19: xf86-video-rendition-4.2.2.tar.bz2 -Source20: xf86-video-s3-0.6.2.tar.bz2 -Source21: xf86-video-s3virge-1.10.3.tar.bz2 -Source22: xf86-video-savage-2.3.0.tar.bz2 +Source20: xf86-video-s3-0.6.3.tar.bz2 +Source21: xf86-video-s3virge-1.10.4.tar.bz2 +Source22: xf86-video-savage-2.3.1.tar.bz2 Source23: xf86-video-siliconmotion-1.7.2.tar.bz2 -Source24: xf86-video-sis-0.10.1.tar.bz2 -Source25: xf86-video-sisusb-0.9.2.tar.bz2 -Source33: xf86-video-tdfx-1.4.2.tar.bz2 +Source24: xf86-video-sis-0.10.2.tar.bz2 +Source25: xf86-video-sisusb-0.9.3.tar.bz2 +Source33: xf86-video-tdfx-1.4.3.tar.bz2 Source34: xf86-video-tga-1.2.0.tar.bz2 Source35: xf86-video-trident-1.3.2.tar.bz2 Source36: xf86-video-tseng-1.2.2.tar.bz2 Source37: xf86-video-v4l-0.2.0.tar.bz2 -Source38: xf86-video-vesa-2.2.0.tar.bz2 +Source38: xf86-video-vesa-2.2.1.tar.bz2 Source39: xf86-video-vga-4.1.0_080718_97e2d12.tar.bz2 Source41: xf86-video-vmware-10.16.7.tar.bz2 -Source42: xf86-video-voodoo-1.2.2.tar.bz2 +Source42: xf86-video-voodoo-1.2.3.tar.bz2 Source43: xf86-video-impact-0.2.0.tar.bz2 Source44: HALlib-4.1.tar.gz Source45: xf86-video-intel-2.8.0.tar.bz2 @@ -74,8 +74,8 @@ Source50: xf86-video-xgi-1.5.0.tar.bz2 Source51: xf86-video-geode-2.11.3.tar.bz2 Source53: xf86-video-xgixp-1.7.99.3.tar.bz2 -Source54: xf86-video-mach64-6.8.1.tar.bz2 -Source55: xf86-video-r128-6.8.0.tar.bz2 +Source54: xf86-video-mach64-6.8.2.tar.bz2 +Source55: xf86-video-r128-6.8.1.tar.bz2 Source56: intel-gpu-tools-1.0.1.tar.bz2 Source100: sax2-hwinfo-data.tar.gz Patch10: xf86-video-tdfx.diff @@ -131,7 +131,7 @@ %patch62 -p1 %patch67 -p1 popd -pushd xf86-video-mga-1.4.10 +pushd xf86-video-mga-1.4.11 tar xzf %{SOURCE44} -C src %ifarch %ix86 %patch12 @@ -194,7 +194,7 @@ ) intel-gpu-tools-*; do pushd $dir case $dir in - xf86-video-mga-1.4.10 | \ + xf86-video-mga-1.4.11 | \ xf86-video-intel-* | \ xf86-video-ati-6.12.* | \ xf86-video-xgixp | \ @@ -221,7 +221,7 @@ make -C $dir install DESTDIR=$RPM_BUILD_ROOT done %ifarch %ix86 -pushd xf86-video-mga-1.4.10/src +pushd xf86-video-mga-1.4.11/src gcc -m32 \ -o $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/mgahal_drv.so \ -shared \ ++++++ xf86-video-apm-1.2.1.tar.bz2 -> xf86-video-apm-1.2.2.tar.bz2 ++++++ ++++ 4675 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-1.2.1/config.h.in new/xf86-video-apm-1.2.2/config.h.in --- old/xf86-video-apm-1.2.1/config.h.in 2008-12-22 05:13:49.000000000 +0100 +++ new/xf86-video-apm-1.2.2/config.h.in 2009-07-30 03:17:21.000000000 +0200 @@ -35,6 +35,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* xextproto 7.1 available */ +#undef HAVE_XEXTPROTO_71 + /* Have 1bpp support */ #undef HAVE_XF1BPP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-1.2.1/configure.ac new/xf86-video-apm-1.2.2/configure.ac --- old/xf86-video-apm-1.2.1/configure.ac 2008-12-22 05:12:44.000000000 +0100 +++ new/xf86-video-apm-1.2.2/configure.ac 2009-07-30 03:17:07.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-apm], - 1.2.1, + 1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-apm) @@ -55,6 +55,10 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) PKG_CHECK_MODULES(XF86RUSH, xxf86rush, have_xf86rush=yes, have_xf86rush=no) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-1.2.1/man/apm.man new/xf86-video-apm-1.2.2/man/apm.man --- old/xf86-video-apm-1.2.1/man/apm.man 2008-03-10 02:26:50.000000000 +0100 +++ new/xf86-video-apm-1.2.2/man/apm.man 2009-07-27 05:31:49.000000000 +0200 @@ -101,6 +101,6 @@ .BI "Option \*qShadowFB\*q \*q" boolean \*q Enable or disable use of the shadow framebuffer layer. Default: off. .SH "SEE ALSO" -__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__) +__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__) .SH AUTHORS Authors include: ... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-1.2.1/missing new/xf86-video-apm-1.2.2/missing --- old/xf86-video-apm-1.2.1/missing 2008-03-11 01:36:59.000000000 +0100 +++ new/xf86-video-apm-1.2.2/missing 2009-07-27 05:31:58.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-1.2.1/src/apm_driver.c new/xf86-video-apm-1.2.2/src/apm_driver.c --- old/xf86-video-apm-1.2.1/src/apm_driver.c 2008-12-22 05:12:28.000000000 +0100 +++ new/xf86-video-apm-1.2.2/src/apm_driver.c 2009-07-30 03:19:27.000000000 +0200 @@ -6,14 +6,21 @@ #include "apm.h" #include "xf86cmap.h" #include "shadowfb.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" -#include "xf86int10.h" #include "xf86RAC.h" +#endif +#include "xf86int10.h" #include "vbe.h" #include "opaque.h" +#ifdef HAVE_XEXTPROTO_71 +#include +#else #define DPMS_SERVER #include +#endif + #define APM_VERSION 4000 #define APM_NAME "APM" @@ -134,102 +141,6 @@ {0}, FALSE} }; -/* - * List of symbols from other modules that this module references. This - * list is used to tell the loader that it is OK for symbols here to be - * unresolved providing that it hasn't been told that they haven't been - * told that they are essential via a call to xf86LoaderReqSymbols() or - * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about - * unresolved symbols that are not required. - */ - -static const char *vgahwSymbols[] = { - "vgaHWBlankScreen", - "vgaHWCursor", - "vgaHWFreeHWRec", - "vgaHWGetHWRec", - "vgaHWGetIOBase", - "vgaHWInit", - "vgaHWLock", - "vgaHWMapMem", - "vgaHWProtect", - "vgaHWRestore", - "vgaHWSave", - "vgaHWSetMmioFuncs", - "vgaHWUnlock", - NULL -}; - -static const char *xaaSymbols[] = { - "XAACreateInfoRec", - "XAACursorInfoRec", - "XAACursorInit", - "XAADestroyInfoRec", - "XAAGlyphScanlineFuncLSBFirst", - "XAAInit", - "XAAReverseBitOrder", - "XAAStippleScanlineFuncMSBFirst", - NULL -}; - -static const char *ramdacSymbols[] = { - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - "xf86InitCursor", - NULL -}; - -#ifdef XFree86LOADER -static const char *vbeSymbols[] = { - "VBEInit", - "vbeDoEDID", - "vbeFree", - NULL -}; -#endif - -static const char *ddcSymbols[] = { - "xf86DoEDID_DDC1", - "xf86DoEDID_DDC2", - "xf86PrintEDID", - NULL -}; - -static const char *i2cSymbols[] = { - "xf86CreateI2CBusRec", - "xf86I2CBusInit", - NULL -}; - -static const char *shadowSymbols[] = { - "ShadowFBInit", - NULL -}; - -#ifdef XFree86LOADER -static const char *miscfbSymbols[] = { -#ifdef HAVE_XF1BPP - "xf1bppScreenInit", -#endif -#ifdef HAVE_XF4BPP - "xf4bppScreenInit", -#endif - NULL -}; -#endif - -static const char *fbSymbols[] = { - "fbPictureInit", - "fbScreenInit", - NULL -}; - -static const char *int10Symbols[] = { - "xf86Free10", - "xf86InitInt10", - NULL -}; - #ifdef XFree86LOADER static XF86ModuleVersionInfo apmVersRec = { @@ -262,11 +173,6 @@ setupDone = TRUE; xf86AddDriver(&APM, module, 0); - LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols, - miscfbSymbols, ramdacSymbols, vbeSymbols, - ddcSymbols, i2cSymbols, shadowSymbols, - int10Symbols, NULL); - return (pointer)1; } else { @@ -584,8 +490,6 @@ if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE; - xf86LoaderReqSymLists(vgahwSymbols, NULL); - /* * Allocate a vgaHWRec */ @@ -854,9 +758,7 @@ (unsigned long)pApm->LinAddress); if (xf86LoadSubModule(pScrn, "ddc")) { - xf86LoaderReqSymLists(ddcSymbols, NULL); if (xf86LoadSubModule(pScrn, "i2c")) { - xf86LoaderReqSymLists(i2cSymbols, NULL); pApm->I2C = TRUE; } } @@ -882,13 +784,13 @@ if (xf86LoadSubModule(pScrn, "int10")) { void *ptr; - xf86LoaderReqSymLists(int10Symbols, NULL); xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n"); ptr = xf86InitInt10(pEnt->index); if (ptr) xf86FreeInt10(ptr); } +#ifndef XSERVER_LIBPCIACCESS xf86RegisterResources(pEnt->index, NULL, ResNone); xf86SetOperatingState(resVga, pEnt->index, ResDisableOpr); pScrn->racMemFlags = 0; /* For noLinear, access to 0xA0000 */ @@ -896,7 +798,7 @@ pScrn->racIoFlags = 0; else pScrn->racIoFlags = RAC_COLORMAP | RAC_VIEWPORT; - +#endif if (pEnt->device->videoRam != 0) { pScrn->videoRam = pEnt->device->videoRam; from = X_CONFIG; @@ -1176,7 +1078,7 @@ req = "xf1bppScreenInit"; break; #endif -#ifndef HAVE_XF4BPP +#ifdef HAVE_XF4BPP case 4: mod = "xf4bpp"; req = "xf4bppScreenInit"; @@ -1195,21 +1097,12 @@ return FALSE; } - if (mod) { - if (req) { - xf86LoaderReqSymbols(req, NULL); - } else { - xf86LoaderReqSymLists(fbSymbols, NULL); - } - } - /* Load XAA if needed */ if (!pApm->NoAccel) { if (!xf86LoadSubModule(pScrn, "xaa")) { ApmFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(xaaSymbols, NULL); } /* Load ramdac if needed */ @@ -1218,7 +1111,6 @@ ApmFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(ramdacSymbols, NULL); } /* Load shadowfb if needed */ @@ -1227,7 +1119,6 @@ ApmFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(shadowSymbols, NULL); } pApm->CurrentLayout.displayWidth = pScrn->virtualX; ++++++ xf86-video-ast-0.88.8.tar.bz2 -> xf86-video-ast-0.89.9.tar.bz2 ++++++ ++++ 17338 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-0.88.8/ChangeLog new/xf86-video-ast-0.89.9/ChangeLog --- old/xf86-video-ast-0.88.8/ChangeLog 2009-01-16 07:52:37.000000000 +0100 +++ new/xf86-video-ast-0.89.9/ChangeLog 2009-07-27 05:32:30.000000000 +0200 @@ -1,3 +1,17 @@ +2009-06-03 Y.C. Chen + * src/ast_driver.c, ast_vgatool.c + - Fixed the screen flashing issue while running x11perf + * src/ast.h, ast_driver.c, ast_vgatool.c/h + - Fixed Suspend can't resume issue + +2009-04-13 Y.C. Chen + * src/ast.h, ast_cursor.c + - Fixed xorg bugzilla #20606 + * src/ast_driver.c + - Fixed xorg bugzilla #20472 + * src/ast_accel.c + - Fixed desktop display abnormal if video buffer is above than 16MB + 2009-01-16 Y.C. Chen * src/ast_driver.c - Fixed Support Modes Incorrect Issues on Solaris 10 x86 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-0.88.8/README new/xf86-video-ast-0.89.9/README --- old/xf86-video-ast-0.88.8/README 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-video-ast-0.89.9/README 2009-07-27 05:32:30.000000000 +0200 @@ -0,0 +1,20 @@ +xf86-video-ast - ASpeed Technologies graphics driver for Xorg X server + +Please submit bugs & patches to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast + + http://cgit.freedesktop.org/xorg/driver/xf86-video-ast + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-0.88.8/configure.ac new/xf86-video-ast-0.89.9/configure.ac --- old/xf86-video-ast-0.88.8/configure.ac 2009-01-16 07:53:45.000000000 +0100 +++ new/xf86-video-ast-0.89.9/configure.ac 2009-07-30 03:47:38.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-ast], - 0.88.8, + 0.89.9, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-ast) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-0.88.8/missing new/xf86-video-ast-0.89.9/missing --- old/xf86-video-ast-0.88.8/missing 2009-01-16 07:54:38.000000000 +0100 +++ new/xf86-video-ast-0.89.9/missing 2009-07-27 05:32:39.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-0.88.8/src/ast.h new/xf86-video-ast-0.89.9/src/ast.h --- old/xf86-video-ast-0.88.8/src/ast.h 2009-01-16 07:50:21.000000000 +0100 +++ new/xf86-video-ast-0.89.9/src/ast.h 2009-07-27 05:32:30.000000000 +0200 @@ -132,7 +132,8 @@ USHORT offset_y; ULONG fg; ULONG bg; - + + UCHAR cursorpattern[1024]; } HWCINFO, *PHWCINFO; @@ -157,6 +158,7 @@ ScreenBlockHandlerProcPtr BlockHandler; UCHAR jChipType; + UCHAR jDRAMType; Bool noAccel; Bool noHWC; @@ -185,6 +187,11 @@ HWCINFO HWCInfo; ULONG ulCMDReg; Bool EnableClip; + + int clip_left; + int clip_top; + int clip_right; + int clip_bottom; } ASTRec, *ASTRecPtr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-0.88.8/src/ast_2dtool.c new/xf86-video-ast-0.89.9/src/ast_2dtool.c --- old/xf86-video-ast-0.88.8/src/ast_2dtool.c 2009-01-16 07:50:21.000000000 +0100 +++ new/xf86-video-ast-0.89.9/src/ast_2dtool.c 2009-07-28 02:11:49.000000000 +0200 @@ -25,8 +25,6 @@ #endif #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" -#include "xf86RAC.h" #include "xf86cmap.h" #include "compiler.h" #include "mibstore.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-0.88.8/src/ast_accel.c new/xf86-video-ast-0.89.9/src/ast_accel.c --- old/xf86-video-ast-0.88.8/src/ast_accel.c 2009-01-16 07:50:21.000000000 +0100 +++ new/xf86-video-ast-0.89.9/src/ast_accel.c 2009-07-28 02:12:11.000000000 +0200 @@ -25,8 +25,6 @@ #endif #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" -#include "xf86RAC.h" #include "xf86cmap.h" #include "compiler.h" #include "mibstore.h" @@ -152,6 +150,7 @@ static void ASTSetClippingRectangle(ScrnInfoPtr pScrn, int left, int top, int right, int bottom); static void ASTDisableClipping(ScrnInfoPtr pScrn); +static void ASTSetHWClipping(ScrnInfoPtr pScrn, int delta_y); Bool ASTAccelInit(ScreenPtr pScreen) @@ -338,6 +337,7 @@ PKT_SC *pSingleCMD; int src_x, src_y, dst_x, dst_y; ULONG srcbase, dstbase, cmdreg; + int delta_y = 0; /* xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentScreenToScreenCopy\n"); */ @@ -351,22 +351,30 @@ else cmdreg &= ~CMD_ENABLE_CLIP; srcbase = dstbase = 0; + + if (x1 < x2) + cmdreg |= CMD_X_DEC; + + if (y1 < y2) + cmdreg |= CMD_Y_DEC; - if (y1 >= MAX_SRC_Y) + if ((y1 + height) >= MAX_SRC_Y) { srcbase=pAST->VideoModeInfo.ScreenPitch*y1; + y1 = 0; } - if (y2 >= pScrn->virtualY) - { + if ((y2 + height) >= pScrn->virtualY) + { + delta_y = y2; dstbase=pAST->VideoModeInfo.ScreenPitch*y2; + y2 = 0; } - if (x1 < x2) + if (cmdreg & CMD_X_DEC) { - src_x = x1 + width - 1; - dst_x = x2 + width - 1; - cmdreg |= CMD_X_DEC; + src_x = x1 + width - 1; + dst_x = x2 + width - 1; } else { @@ -374,23 +382,19 @@ dst_x = x2; } - if (y1 < y2) - { - if (srcbase) y1 = 0; - if (dstbase) y2 = 0; - + if (cmdreg & CMD_Y_DEC) + { src_y = y1 + height - 1; dst_y = y2 + height - 1; - cmdreg |= CMD_Y_DEC; } else { - if (srcbase) y1 = 0; - if (dstbase) y2 = 0; - src_y = y1; dst_y = y2; } + + if (pAST->EnableClip) + ASTSetHWClipping(pScrn, delta_y); if (!pAST->MMIO2D) { @@ -488,7 +492,9 @@ { ASTRecPtr pAST = ASTPTR(pScrn); PKT_SC *pSingleCMD; - ULONG dstbase, cmdreg; + ULONG dstbase, cmdreg; + int delta_y = 0; + /* xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentSolidFillRect\n"); */ @@ -504,11 +510,15 @@ dstbase = 0; if (dst_y >= pScrn->virtualY) - { + { + delta_y = dst_y; dstbase=pAST->VideoModeInfo.ScreenPitch*dst_y; dst_y=0; } - + + if (pAST->EnableClip) + ASTSetHWClipping(pScrn, delta_y); + if (!pAST->MMIO2D) { /* Write to CMDQ */ @@ -606,6 +616,7 @@ PKT_SC *pSingleCMD; ULONG dstbase, cmdreg; int width, height; + int delta_y = 0; /* xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentSolidHorVertLine\n"); */ @@ -629,12 +640,15 @@ } if ((y + height) >= pScrn->virtualY) - { + { + delta_y = y; dstbase=pAST->VideoModeInfo.ScreenPitch*y; y=0; } - + if (pAST->EnableClip) + ASTSetHWClipping(pScrn, delta_y); + if (!pAST->MMIO2D) { /* Write to CMDQ */ @@ -678,6 +692,8 @@ ULONG dstbase, ulCommand; ULONG miny, maxy; USHORT usXM; + int delta_y = 0; + /* xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentSolidTwoPointLine\n"); */ @@ -696,6 +712,7 @@ miny = (y1 > y2) ? y2 : y1; maxy = (y1 > y2) ? y1 : y2; if(maxy >= pScrn->virtualY) { + delta_y = miny; dstbase = pAST->VideoModeInfo.ScreenPitch * miny; y1 -= miny; y2 -= miny; @@ -714,6 +731,9 @@ ulCommand |= CMD_Y_DEC; usXM = (dsLineParam.dwLineAttributes & LINEPARAM_XM) ? 1:0; + + if (pAST->EnableClip) + ASTSetHWClipping(pScrn, delta_y); if (!pAST->MMIO2D) { @@ -841,6 +861,8 @@ ULONG dstbase, ulCommand; ULONG miny, maxy; USHORT usXM; + int delta_y = 0; + /* xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentDashedTwoPointLine\n"); */ @@ -859,6 +881,7 @@ miny = (y1 > y2) ? y2 : y1; maxy = (y1 > y2) ? y1 : y2; if(maxy >= pScrn->virtualY) { + delta_y = miny; dstbase = pAST->VideoModeInfo.ScreenPitch * miny; y1 -= miny; y2 -= miny; @@ -877,6 +900,9 @@ ulCommand |= CMD_Y_DEC; usXM = (dsLineParam.dwLineAttributes & LINEPARAM_XM) ? 1:0; + + if (pAST->EnableClip) + ASTSetHWClipping(pScrn, delta_y); if (!pAST->MMIO2D) { @@ -991,7 +1017,9 @@ { ASTRecPtr pAST = ASTPTR(pScrn); PKT_SC *pSingleCMD; - ULONG dstbase, cmdreg; + ULONG dstbase, cmdreg; + int delta_y = 0; + /* xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentMonoPatternFill\n"); */ @@ -1006,10 +1034,14 @@ if (dst_y >= pScrn->virtualY) { + delta_y = dst_y; dstbase=pAST->VideoModeInfo.ScreenPitch*dst_y; dst_y=0; } - + + if (pAST->EnableClip) + ASTSetHWClipping(pScrn, delta_y); + if (!pAST->MMIO2D) { /* Write to CMDQ */ @@ -1116,7 +1148,9 @@ { ASTRecPtr pAST = ASTPTR(pScrn); PKT_SC *pSingleCMD; - ULONG dstbase, cmdreg; + ULONG dstbase, cmdreg; + int delta_y = 0; + /* xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentColor8x8PatternFillRect\n"); */ @@ -1131,9 +1165,13 @@ if (dst_y >= pScrn->virtualY) { + delta_y = dst_y; dstbase=pAST->VideoModeInfo.ScreenPitch*dst_y; dst_y=0; } + + if (pAST->EnableClip) + ASTSetHWClipping(pScrn, delta_y); if (!pAST->MMIO2D) { @@ -1235,6 +1273,7 @@ ASTRecPtr pAST = ASTPTR(pScrn); PKT_SC *pSingleCMD; ULONG dstbase, cmdreg; + int delta_y = 0; /* xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentCPUToScreenColorExpandFill\n"); @@ -1250,10 +1289,14 @@ if (dst_y >= pScrn->virtualY) { + delta_y = dst_y; dstbase=pAST->VideoModeInfo.ScreenPitch*dst_y; dst_y=0; } - + + if (pAST->EnableClip) + ASTSetHWClipping(pScrn, delta_y); + if (!pAST->MMIO2D) { /* Write to CMDQ */ @@ -1364,6 +1407,7 @@ PKT_SC *pSingleCMD; ULONG srcbase, dstbase, cmdreg; USHORT srcpitch; + int delta_y = 0; /* xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentScreenToScreenColorExpandFill\n"); @@ -1378,11 +1422,15 @@ dstbase = 0; if (dst_y >= pScrn->virtualY) { + delta_y = dst_y; dstbase=pAST->VideoModeInfo.ScreenPitch*dst_y; dst_y=0; } srcbase = pAST->VideoModeInfo.ScreenPitch*src_y + ((pScrn->bitsPerPixel+1)/8)*src_x; srcpitch = (pScrn->displayWidth+7)/8; + + if (pAST->EnableClip) + ASTSetHWClipping(pScrn, delta_y); if (!pAST->MMIO2D) { @@ -1423,25 +1471,19 @@ /* Clipping */ static void -ASTSetClippingRectangle(ScrnInfoPtr pScrn, - int left, int top, int right, int bottom) +ASTSetHWClipping(ScrnInfoPtr pScrn, int delta_y) { - ASTRecPtr pAST = ASTPTR(pScrn); PKT_SC *pSingleCMD; -/* - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSetClippingRectangle\n"); -*/ - pAST->EnableClip = TRUE; - + if (!pAST->MMIO2D) { /* Write to CMDQ */ pSingleCMD = (PKT_SC *) pjRequestCMDQ(pAST, PKT_SINGLE_LENGTH*2); - ASTSetupCLIP1(pSingleCMD, left, top); + ASTSetupCLIP1(pSingleCMD, pAST->clip_left, pAST->clip_top - delta_y); pSingleCMD++; - ASTSetupCLIP2(pSingleCMD, right, bottom); + ASTSetupCLIP2(pSingleCMD, pAST->clip_right + 1, pAST->clip_bottom - delta_y + 1); /* Update Write Pointer */ mUpdateWritePointer; @@ -1449,9 +1491,28 @@ } else { - ASTSetupCLIP1_MMIO(left, top); - ASTSetupCLIP2_MMIO(right, bottom); + ASTSetupCLIP1_MMIO(pAST->clip_left, pAST->clip_top - delta_y); + ASTSetupCLIP2_MMIO(pAST->clip_right + 1, pAST->clip_bottom - delta_y + 1); } + +} + +static void +ASTSetClippingRectangle(ScrnInfoPtr pScrn, + int left, int top, int right, int bottom) +{ + + ASTRecPtr pAST = ASTPTR(pScrn); + PKT_SC *pSingleCMD; +/* + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSetClippingRectangle\n"); +*/ + pAST->EnableClip = TRUE; + + pAST->clip_left = left; + pAST->clip_top = top; + pAST->clip_right = right; + pAST->clip_bottom = bottom; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-0.88.8/src/ast_cursor.c new/xf86-video-ast-0.89.9/src/ast_cursor.c --- old/xf86-video-ast-0.88.8/src/ast_cursor.c 2009-01-16 07:50:21.000000000 +0100 +++ new/xf86-video-ast-0.89.9/src/ast_cursor.c 2009-07-28 02:12:29.000000000 +0200 @@ -25,8 +25,6 @@ #endif #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" -#include "xf86RAC.h" #include "xf86cmap.h" #include "compiler.h" #include "mibstore.h" @@ -200,9 +198,19 @@ ASTSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) { ASTRecPtr pAST = ASTPTR(pScrn); - - pAST->HWCInfo.fg = (fg & 0x0F) | (((fg>>8) & 0x0F) << 4) | (((fg>>16) & 0x0F) << 8); - pAST->HWCInfo.bg = (bg & 0x0F) | (((bg>>8) & 0x0F) << 4) | (((bg>>16) & 0x0F) << 8); + ULONG fg1, bg1; + + fg1 = (fg & 0x0F) | (((fg>>8) & 0x0F) << 4) | (((fg>>16) & 0x0F) << 8); + bg1 = (bg & 0x0F) | (((bg>>8) & 0x0F) << 4) | (((bg>>16) & 0x0F) << 8); + + /* Fixed xorg bugzilla #20609, ycchen@031209 */ + if ( (fg1 != pAST->HWCInfo.fg) || (bg1 != pAST->HWCInfo.bg) ) + { + pAST->HWCInfo.fg = fg1; + pAST->HWCInfo.bg = bg1; + ASTLoadCursorImage(pScrn, pAST->HWCInfo.cursorpattern); + } + } static void @@ -223,6 +231,10 @@ pAST->HWCInfo.offset_x = MAX_HWC_WIDTH - pAST->HWCInfo.width; pAST->HWCInfo.offset_y = MAX_HWC_HEIGHT - pAST->HWCInfo.height; + /* copy to hwc info */ + for (i=0; i< MAX_HWC_WIDTH*MAX_HWC_HEIGHT/4; i+=4) + *(ULONG *) (pAST->HWCInfo.cursorpattern + i) = *(ULONG *) (src + i); + /* copy cursor image to cache */ pjSrcXor = src; pjSrcAnd = src + (MAX_HWC_WIDTH*MAX_HWC_HEIGHT/8); @@ -242,12 +254,11 @@ ulTempDstAnd32[1] = ((jTempSrcAnd32 >> (k-1)) & 0x01) ? 0x80000000L:0x00L; ulTempDstXor32[1] = ((jTempSrcXor32 >> (k-1)) & 0x01) ? 0x40000000L:0x00L; ulTempDstData32[1] = ((jTempSrcXor32 >> (k-1)) & 0x01) ? (pAST->HWCInfo.fg << 16):(pAST->HWCInfo.bg << 16); - ulTempDstData32[1] = ((jTempSrcXor32 >> (k-1)) & 0x01) ? (pAST->HWCInfo.fg << 16):(pAST->HWCInfo.bg << 16); /* No inverse for X Window cursor, ycchen@111808 */ if (ulTempDstAnd32[0]) ulTempDstXor32[0] = 0; if (ulTempDstAnd32[1]) - ulTempDstXor32[1] = 0; + ulTempDstXor32[1] = 0; *((ULONG *) pjDstData) = ulTempDstAnd32[0] | ulTempDstXor32[0] | ulTempDstData32[0] | ulTempDstAnd32[1] | ulTempDstXor32[1] | ulTempDstData32[1]; ulCheckSum += *((ULONG *) pjDstData); pjDstData += 4; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-0.88.8/src/ast_driver.c new/xf86-video-ast-0.89.9/src/ast_driver.c --- old/xf86-video-ast-0.88.8/src/ast_driver.c 2009-01-16 07:51:00.000000000 +0100 +++ new/xf86-video-ast-0.89.9/src/ast_driver.c 2009-07-28 07:20:21.000000000 +0200 @@ -25,8 +25,10 @@ #endif #include "xf86.h" #include "xf86_OSproc.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #include "xf86RAC.h" +#endif #include "xf86cmap.h" #include "compiler.h" #include "mibstore.h" @@ -64,6 +66,7 @@ extern void vASTOpenKey(ScrnInfoPtr pScrn); extern Bool bASTRegInit(ScrnInfoPtr pScrn); +extern void GetDRAMInfo(ScrnInfoPtr pScrn); extern ULONG GetVRAMInfo(ScrnInfoPtr pScrn); extern ULONG GetMaxDCLK(ScrnInfoPtr pScrn); extern void GetChipType(ScrnInfoPtr pScrn); @@ -73,6 +76,9 @@ extern Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); extern Bool GetVGA2EDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer); extern void vInitDRAMReg(ScrnInfoPtr pScrn); +extern Bool bIsVGAEnabled(ScrnInfoPtr pScrn); +extern void ASTBlankScreen(ScrnInfoPtr pScreen, Bool unblack); +extern Bool InitVGA(ScrnInfoPtr pScrn); extern Bool bInitCMDQInfo(ScrnInfoPtr pScrn, ASTRecPtr pAST); extern Bool bEnableCMDQ(ScrnInfoPtr pScrn, ASTRecPtr pAST); @@ -158,93 +164,6 @@ {-1, NULL, OPTV_NONE, {0}, FALSE} }; -const char *vgahwSymbols[] = { - "vgaHWFreeHWRec", - "vgaHWGetHWRec", - "vgaHWGetIOBase", - "vgaHWGetIndex", - "vgaHWInit", - "vgaHWLock", - "vgaHWMapMem", - "vgaHWProtect", - "vgaHWRestore", - "vgaHWSave", - "vgaHWSaveScreen", - "vgaHWSetMmioFuncs", - "vgaHWUnlock", - "vgaHWUnmapMem", - NULL -}; - -const char *fbSymbols[] = { - "fbPictureInit", - "fbScreenInit", - NULL -}; - -const char *vbeSymbols[] = { - "VBEInit", - "VBEFreeModeInfo", - "VBEFreeVBEInfo", - "VBEGetModeInfo", - "VBEGetModePool", - "VBEGetVBEInfo", - "VBEGetVBEMode", - "VBEPrintModes", - "VBESaveRestore", - "VBESetDisplayStart", - "VBESetGetDACPaletteFormat", - "VBESetGetLogicalScanlineLength", - "VBESetGetPaletteData", - "VBESetModeNames", - "VBESetModeParameters", - "VBESetVBEMode", - "VBEValidateModes", - "vbeDoEDID", - "vbeFree", - NULL -}; - -#ifdef XFree86LOADER -static const char *vbeOptionalSymbols[] = { - "VBEDPMSSet", - "VBEGetPixelClock", - NULL -}; -#endif - -const char *ddcSymbols[] = { - "xf86PrintEDID", - "xf86SetDDCproperties", - NULL -}; - -const char *int10Symbols[] = { - "xf86ExecX86int10", - "xf86InitInt10", - "xf86Int10AllocPages", - "xf86int10Addr", - "xf86FreeInt10", - NULL -}; - -const char *xaaSymbols[] = { - "XAACreateInfoRec", - "XAADestroyInfoRec", - "XAAInit", - "XAACopyROP", - "XAAPatternROP", - NULL -}; - -const char *ramdacSymbols[] = { - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - "xf86InitCursor", - NULL -}; - - #ifdef XFree86LOADER static MODULESETUPPROTO(astSetup); @@ -280,15 +199,6 @@ xf86AddDriver(&AST, module, 0); /* - * Tell the loader about symbols from other modules that this module - * might refer to. - */ - LoaderRefSymLists(vgahwSymbols, - fbSymbols, xaaSymbols, ramdacSymbols, - vbeSymbols, vbeOptionalSymbols, - ddcSymbols, int10Symbols, NULL); - - /* * The return value must be non-NULL on success even though there * is no TearDownProc. */ @@ -439,18 +349,18 @@ if (pEnt->location.type != BUS_PCI) return FALSE; +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pEnt->index, 0, ResExclusive)) return FALSE; +#endif /* The vgahw module should be loaded here when needed */ if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE; - xf86LoaderReqSymLists(vgahwSymbols, NULL); /* The fb module should be loaded here when needed */ if (!xf86LoadSubModule(pScrn, "fb")) return FALSE; - xf86LoaderReqSymLists(fbSymbols, NULL); /* Allocate a vgaHWRec */ if (!vgaHWGetHWRec(pScrn)) @@ -492,8 +402,10 @@ pScrn->progClock = TRUE; pScrn->rgbBits = 6; pScrn->monitor = pScrn->confScreen->monitor; /* should be initialized before set gamma */ +#ifndef XSERVER_LIBPCIACCESS pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; +#endif /* * If the driver can do gamma correction, it should call xf86SetGamma() @@ -624,13 +536,7 @@ /* Init VGA Adapter */ if (!xf86IsPrimaryPci(pAST->PciInfo)) { - if (xf86LoadSubModule(pScrn, "int10")) { - xf86Int10InfoPtr pInt10; - xf86LoaderReqSymLists(int10Symbols, NULL); - xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n"); - pInt10 = xf86InitInt10(pAST->pEnt->index); - xf86FreeInt10(pInt10); - } + InitVGA(pScrn); } vASTOpenKey(pScrn); @@ -642,10 +548,8 @@ else pAST->jChipType = AST2000; - if (!xf86IsPrimaryPci(pAST->PciInfo)) - { - vInitDRAMReg (pScrn); - } + /* Get DRAM Info */ + GetDRAMInfo(pScrn); /* Map Framebuffer */ pScrn->videoRam = GetVRAMInfo(pScrn) / 1024; @@ -658,10 +562,12 @@ pAST->FbMapSize = pScrn->videoRam * 1024; +#if 0 if (!ASTMapMem(pScrn)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Map FB Memory Failed \n"); return FALSE; } +#endif pScrn->memPhysBase = (ULONG)pAST->FBPhysAddr; pScrn->fbOffset = 0; @@ -729,7 +635,6 @@ ASTFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(xaaSymbols, NULL); pAST->noAccel = FALSE; @@ -763,7 +668,6 @@ ASTFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(ramdacSymbols, NULL); pAST->noHWC = FALSE; pAST->HWCInfo.HWC_NUM = DEFAULT_HWC_NUM; @@ -774,9 +678,11 @@ } #endif +#ifndef XSERVER_LIBPCIACCESS /* We won't be using the VGA access after the probe */ xf86SetOperatingState(resVgaIo, pAST->pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pAST->pEnt->index, ResDisableOpr); +#endif return TRUE; } @@ -797,6 +703,11 @@ pScrn = xf86Screens[pScreen->myNum]; pAST = ASTPTR(pScrn); hwp = VGAHWPTR(pScrn); + + if (!ASTMapMem(pScrn)) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Map FB Memory Failed \n"); + return FALSE; + } /* if (!pAST->noAccel) */ { @@ -970,6 +881,13 @@ { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + /* Fixed suspend can't resume issue */ + if (!bIsVGAEnabled(pScrn)) + { + InitVGA(pScrn); + ASTRestore(pScrn); + } + if (!ASTModeInit(pScrn, pScrn->currentMode)) return FALSE; ASTAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); @@ -1106,7 +1024,17 @@ static Bool ASTSaveScreen(ScreenPtr pScreen, Bool unblack) { - return vgaHWSaveScreen(pScreen, unblack); + /* replacement of vgaHWBlankScreen(pScrn, unblank) without seq reset */ + /* return vgaHWSaveScreen(pScreen, unblack); */ + ScrnInfoPtr pScrn = NULL; + + if (pScreen != NULL) + pScrn = xf86Screens[pScreen->myNum]; + + if ((pScrn != NULL) && pScrn->vtSema) { + ASTBlankScreen(pScrn, unblack); + } + return (TRUE); } static Bool @@ -1254,7 +1182,6 @@ } if (xf86LoadSubModule(pScrn, "vbe") && (pVbe = VBEInit(NULL, index))) { - xf86LoaderReqSymLists(vbeSymbols, NULL); MonInfo1 = vbeDoEDID(pVbe, NULL); MonInfo = MonInfo1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-0.88.8/src/ast_mode.c new/xf86-video-ast-0.89.9/src/ast_mode.c --- old/xf86-video-ast-0.88.8/src/ast_mode.c 2009-01-16 07:50:21.000000000 +0100 +++ new/xf86-video-ast-0.89.9/src/ast_mode.c 2009-07-28 02:15:13.000000000 +0200 @@ -25,8 +25,6 @@ #endif #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" -#include "xf86RAC.h" #include "xf86cmap.h" #include "compiler.h" #include "mibstore.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-0.88.8/src/ast_tool.c new/xf86-video-ast-0.89.9/src/ast_tool.c --- old/xf86-video-ast-0.88.8/src/ast_tool.c 2009-01-16 07:50:21.000000000 +0100 +++ new/xf86-video-ast-0.89.9/src/ast_tool.c 2009-07-28 02:15:37.000000000 +0200 @@ -25,8 +25,6 @@ #endif #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" -#include "xf86RAC.h" #include "xf86cmap.h" #include "compiler.h" #include "mibstore.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-0.88.8/src/ast_vgatool.c new/xf86-video-ast-0.89.9/src/ast_vgatool.c --- old/xf86-video-ast-0.88.8/src/ast_vgatool.c 2009-01-16 07:57:54.000000000 +0100 +++ new/xf86-video-ast-0.89.9/src/ast_vgatool.c 2009-07-28 02:16:02.000000000 +0200 @@ -25,8 +25,6 @@ #endif #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" -#include "xf86RAC.h" #include "xf86cmap.h" #include "compiler.h" #include "mibstore.h" @@ -59,16 +57,20 @@ /* Prototype type declaration*/ void vASTOpenKey(ScrnInfoPtr pScrn); Bool bASTRegInit(ScrnInfoPtr pScrn); +void GetDRAMInfo(ScrnInfoPtr pScrn); ULONG GetVRAMInfo(ScrnInfoPtr pScrn); ULONG GetMaxDCLK(ScrnInfoPtr pScrn); void GetChipType(ScrnInfoPtr pScrn); void vAST1000DisplayOn(ASTRecPtr pAST); void vAST1000DisplayOff(ASTRecPtr pAST); +void ASTBlankScreen(ScrnInfoPtr pScrn, Bool unblack); void vSetStartAddressCRT1(ASTRecPtr pAST, ULONG base); void vASTLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, VisualPtr pVisual); void ASTDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags); Bool GetVGA2EDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer); void vInitDRAMReg(ScrnInfoPtr pScrn); +Bool bIsVGAEnabled(ScrnInfoPtr pScrn); +Bool InitVGA(ScrnInfoPtr pScrn); void vASTOpenKey(ScrnInfoPtr pScrn) @@ -91,6 +93,46 @@ } +void +GetDRAMInfo(ScrnInfoPtr pScrn) +{ + ASTRecPtr pAST = ASTPTR(pScrn); + ULONG ulData; + + if ( (pAST->jChipType != AST2000) ) + { + *(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = 0x1e6e0000; + *(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x1; + + *(ULONG *) (pAST->MMIOVirtualAddr + 0x10000) = 0xFC600309; + do { + ; + } while (*(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x10000) != 0x01); + + ulData = *(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x10004); + + switch (ulData & 0x0C) + { + case 0x00: + case 0x04: + pAST->jDRAMType = DRAMTYPE_512Mx16; + break; + + case 0x08: + if (ulData & 0x40) /* 16bits */ + pAST->jDRAMType = DRAMTYPE_1Gx16; + else /* 32bits */ + pAST->jDRAMType = DRAMTYPE_512Mx32; + break; + + case 0x0C: + pAST->jDRAMType = DRAMTYPE_1Gx32; + break; + } + } + +} /* GetDRAMInfo */ + ULONG GetVRAMInfo(ScrnInfoPtr pScrn) { @@ -275,6 +317,17 @@ } +void ASTBlankScreen(ScrnInfoPtr pScrn, Bool unblack) +{ + ASTRecPtr pAST; + + pAST = ASTPTR(pScrn); + + if (unblack) + vAST1000DisplayOn(pAST); + else + vAST1000DisplayOff(pAST); +} void vASTLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, @@ -474,6 +527,69 @@ } /* GetVGA2EDID */ +/* Init VGA */ +Bool bIsVGAEnabled(ScrnInfoPtr pScrn) +{ + ASTRecPtr pAST; + UCHAR ch; + + pAST = ASTPTR(pScrn); + + ch = GetReg(pAST->RelocateIO+0x43); + + return (ch & 0x01); +} + +void vEnableVGA(ScrnInfoPtr pScrn) +{ + ASTRecPtr pAST; + + pAST = ASTPTR(pScrn); + + SetReg(pAST->RelocateIO+0x43, 0x01); + SetReg(pAST->RelocateIO+0x42, 0x01); + +} + +UCHAR ExtRegInfo[] = { + 0x0F, + 0x07, + 0x1C, + 0xFF +}; + +void vSetDefExtReg(ScrnInfoPtr pScrn) +{ + ASTRecPtr pAST; + UCHAR i, jIndex, *pjExtRegInfo; + + pAST = ASTPTR(pScrn); + + /* Reset Scratch */ + for (i=0x81; i<=0x8F; i++) + { + SetIndexReg(CRTC_PORT, i, 0x00); + } + + /* Set Ext. Reg */ + pjExtRegInfo = ExtRegInfo; + jIndex = 0xA0; + while (*(UCHAR *) (pjExtRegInfo) != 0xFF) + { + SetIndexRegMask(CRTC_PORT,jIndex, 0x00, *(UCHAR *) (pjExtRegInfo)); + jIndex++; + pjExtRegInfo++; + } + + /* Set Ext. Default */ + SetIndexRegMask(CRTC_PORT,0x8C, 0x00, 0x01); + SetIndexRegMask(CRTC_PORT,0xB7, 0x00, 0x00); + + /* Enable RAMDAC for A1, ycchen@113005 */ + SetIndexRegMask(CRTC_PORT,0xB6, 0xFF, 0x04); + +} + typedef struct _AST_DRAMStruct { USHORT Index; @@ -619,7 +735,7 @@ { AST_DRAMStruct *pjDRAMRegInfo; ASTRecPtr pAST = ASTPTR(pScrn); - ULONG i, ulTemp; + ULONG i, ulTemp, ulData; UCHAR jReg; GetIndexRegMask(CRTC_PORT, 0xD0, 0xFF, jReg); @@ -640,9 +756,7 @@ } else /* AST2100/1100 */ - { - GetChipType(pScrn); - + { if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST2200)) pjDRAMRegInfo = AST2100DRAMTableData; else @@ -672,9 +786,17 @@ } else if ( (pjDRAMRegInfo->Index == 0x0004) && (pAST->jChipType != AST2000) ) { + ulData = pjDRAMRegInfo->Data; + + if (pAST->jDRAMType == DRAMTYPE_1Gx16) + ulData = 0x00000d89; + else if (pAST->jDRAMType == DRAMTYPE_1Gx32) + ulData = 0x00000c8d; + ulTemp = *(ULONG *) (pAST->MMIOVirtualAddr + 0x12070); ulTemp &= 0x0000000C; - *(ULONG *) (pAST->MMIOVirtualAddr + 0x10000 + pjDRAMRegInfo->Index) = (pjDRAMRegInfo->Data | ulTemp); + ulTemp <<= 2; + *(ULONG *) (pAST->MMIOVirtualAddr + 0x10000 + pjDRAMRegInfo->Index) = (ulData | ulTemp); } else { @@ -708,3 +830,29 @@ } while ((jReg & 0x40) == 0); } /* vInitDRAMReg */ + +Bool InitVGA(ScrnInfoPtr pScrn) +{ + ASTRecPtr pAST; + ULONG ulData; + + pAST = ASTPTR(pScrn); + + { + /* Enable PCI */ + PCI_READ_LONG(pAST->PciInfo, &ulData, 0x04); + ulData |= 0x03; + PCI_WRITE_LONG(pAST->PciInfo, ulData, 0x04); + + /* Enable VGA */ + vEnableVGA(pScrn); + + vASTOpenKey(pScrn); + vSetDefExtReg(pScrn); + + vInitDRAMReg(pScrn); + + } + + return (TRUE); +} /* Init VGA */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-0.88.8/src/ast_vgatool.h new/xf86-video-ast-0.89.9/src/ast_vgatool.h --- old/xf86-video-ast-0.88.8/src/ast_vgatool.h 2009-01-16 07:50:21.000000000 +0100 +++ new/xf86-video-ast-0.89.9/src/ast_vgatool.h 2009-07-27 05:32:30.000000000 +0200 @@ -27,6 +27,11 @@ #define VIDEOMEM_SIZE_64M 0x04000000 #define VIDEOMEM_SIZE_128M 0x08000000 +#define DRAMTYPE_512Mx16 0 +#define DRAMTYPE_1Gx16 1 +#define DRAMTYPE_512Mx32 2 +#define DRAMTYPE_1Gx32 3 + #define AR_PORT_WRITE (pAST->RelocateIO + 0x40) #define MISC_PORT_WRITE (pAST->RelocateIO + 0x42) #define SEQ_PORT (pAST->RelocateIO + 0x44) @@ -44,9 +49,8 @@ val = inb(base+1); \ } while (0) #define SetIndexReg(base,index, val) do { \ - outb(base,index); \ - outb(base+1,val); \ - } while (0) + outw(base, ((USHORT)(val) << 8) | index); \ + } while (0) #define GetIndexRegMask(base,index, and, val) do { \ outb(base,index); \ val = (inb(base+1) & and); \ ++++++ xf86-video-fbdev-0.4.0.tar.bz2 -> xf86-video-fbdev-0.4.1.tar.bz2 ++++++ ++++ 14794 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-fbdev-0.4.0/README new/xf86-video-fbdev-0.4.1/README --- old/xf86-video-fbdev-0.4.0/README 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-video-fbdev-0.4.1/README 2009-07-27 05:35:11.000000000 +0200 @@ -0,0 +1,20 @@ +xf86-video-fbdev - video driver for framebuffer device + +Please submit bugs & patches to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/driver/xf86-video-fbdev + + http://cgit.freedesktop.org/xorg/driver/xf86-video-fbdev + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-fbdev-0.4.0/config.h.in new/xf86-video-fbdev-0.4.1/config.h.in --- old/xf86-video-fbdev-0.4.0/config.h.in 2008-03-19 18:50:53.000000000 +0100 +++ new/xf86-video-fbdev-0.4.1/config.h.in 2009-07-30 03:50:57.000000000 +0200 @@ -8,6 +8,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Have ISA support */ +#undef HAVE_ISA + /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-fbdev-0.4.0/configure.ac new/xf86-video-fbdev-0.4.1/configure.ac --- old/xf86-video-fbdev-0.4.0/configure.ac 2008-03-19 18:50:36.000000000 +0100 +++ new/xf86-video-fbdev-0.4.1/configure.ac 2009-07-30 03:47:47.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-fbdev], - 0.4.0, + 0.4.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-fbdev) @@ -59,6 +59,14 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) +save_CFLAGS="$CFLAGS" +CFLAGS="$XORG_CFLAGS" +AC_CHECK_DECL(xf86ConfigIsaEntity, + [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])], + [], + [#include "xf86.h"]) +CFLAGS="$save_CFLAGS" + AM_CONDITIONAL(PCIACCESS, [test "x$PCIACCESS" = xyes]) if test "x$PCIACCESS" = xyes; then AC_DEFINE(PCIACCESS, 1, [Use libpciaccess]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-fbdev-0.4.0/man/fbdev.man new/xf86-video-fbdev-0.4.1/man/fbdev.man --- old/xf86-video-fbdev-0.4.0/man/fbdev.man 2008-03-19 15:29:32.000000000 +0100 +++ new/xf86-video-fbdev-0.4.1/man/fbdev.man 2009-07-27 05:35:11.000000000 +0200 @@ -57,7 +57,7 @@ 90 degrees), "UD" (upside down, 180 degrees) and "CCW" (counter clockwise, 270 degrees). Implies use of the shadow framebuffer layer. Default: off. .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), fbdevhw(__drivermansuffix__) .SH AUTHORS Authors include: Gerd Knorr, Michel D\(:anzer, Geert Uytterhoeven diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-fbdev-0.4.0/missing new/xf86-video-fbdev-0.4.1/missing --- old/xf86-video-fbdev-0.4.0/missing 2008-03-19 18:50:54.000000000 +0100 +++ new/xf86-video-fbdev-0.4.1/missing 2009-07-27 05:35:21.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-fbdev-0.4.0/src/fbdev.c new/xf86-video-fbdev-0.4.1/src/fbdev.c --- old/xf86-video-fbdev-0.4.0/src/fbdev.c 2008-03-19 15:29:32.000000000 +0100 +++ new/xf86-video-fbdev-0.4.1/src/fbdev.c 2009-07-28 07:20:10.000000000 +0200 @@ -27,8 +27,10 @@ #include "afb.h" #endif +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #include "xf86RAC.h" +#endif #include "fbdevhw.h" @@ -141,67 +143,6 @@ /* -------------------------------------------------------------------- */ -static const char *afbSymbols[] = { - "afbScreenInit", - "afbCreateDefColormap", - NULL -}; - -static const char *fbSymbols[] = { - "fbScreenInit", - "fbPictureInit", - NULL -}; - -static const char *shadowSymbols[] = { - "shadowAdd", - "shadowInit", - "shadowSetup", - "shadowUpdatePacked", - "shadowUpdatePackedWeak", - "shadowUpdateRotatePacked", - "shadowUpdateRotatePackedWeak", - NULL -}; - -static const char *fbdevHWSymbols[] = { - "fbdevHWInit", - "fbdevHWProbe", - "fbdevHWSetVideoModes", - "fbdevHWUseBuildinMode", - - "fbdevHWGetDepth", - "fbdevHWGetLineLength", - "fbdevHWGetName", - "fbdevHWGetType", - "fbdevHWGetVidmem", - "fbdevHWLinearOffset", - "fbdevHWLoadPalette", - "fbdevHWMapVidmem", - "fbdevHWUnmapVidmem", - - /* colormap */ - "fbdevHWLoadPalette", - "fbdevHWLoadPaletteWeak", - - /* ScrnInfo hooks */ - "fbdevHWAdjustFrameWeak", - "fbdevHWEnterVTWeak", - "fbdevHWLeaveVTWeak", - "fbdevHWModeInit", - "fbdevHWRestore", - "fbdevHWSave", - "fbdevHWSaveScreen", - "fbdevHWSaveScreenWeak", - "fbdevHWSwitchModeWeak", - "fbdevHWValidModeWeak", - - "fbdevHWDPMSSet", - "fbdevHWDPMSSetWeak", - - NULL -}; - #ifdef XFree86LOADER MODULESETUPPROTO(FBDevSetup); @@ -230,8 +171,6 @@ if (!setupDone) { setupDone = TRUE; xf86AddDriver(&FBDEV, module, HaveDriverFuncs); - LoaderRefSymLists(afbSymbols, fbSymbols, - shadowSymbols, fbdevHWSymbols, NULL); return (pointer)1; } else { if (errmaj) *errmaj = LDR_ONCEONLY; @@ -307,8 +246,6 @@ if (!xf86LoadDrvSubModule(drv, "fbdevhw")) return FALSE; - xf86LoaderReqSymLists(fbdevHWSymbols, NULL); - pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, NULL, NULL, NULL, NULL, NULL); if (pScrn) { @@ -369,13 +306,9 @@ if (!xf86LoadDrvSubModule(drv, "fbdevhw")) return FALSE; - xf86LoaderReqSymLists(fbdevHWSymbols, NULL); - for (i = 0; i < numDevSections; i++) { Bool isIsa = FALSE; -#ifndef XSERVER_LIBPCIACCESS Bool isPci = FALSE; -#endif dev = xf86FindOptionValue(devSections[i]->options,"fbdev"); if (devSections[i]->busID) { @@ -387,14 +320,18 @@ isPci = TRUE; } else #endif +#ifdef HAVE_ISA if (xf86ParseIsaBusString(devSections[i]->busID)) isIsa = TRUE; + else +#endif + 0; } if (fbdevHWProbe(NULL,dev,NULL)) { pScrn = NULL; -#ifndef XSERVER_LIBPCIACCESS if (isPci) { +#ifndef XSERVER_LIBPCIACCESS /* XXX what about when there's no busID set? */ int entity; @@ -410,9 +347,9 @@ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "claimed PCI slot %d:%d:%d\n",bus,device,func); - } else #endif - if (isIsa) { + } else if (isIsa) { +#ifdef HAVE_ISA int entity; entity = xf86ClaimIsaSlot(drv, 0, @@ -420,6 +357,7 @@ pScrn = xf86ConfigIsaEntity(pScrn,0,entity, NULL,RES_SHARED_VGA, NULL,NULL,NULL,NULL); +#endif } else { int entity; @@ -460,7 +398,6 @@ FBDevPtr fPtr; int default_depth, fbbpp; const char *mod = NULL, *s; - const char **syms = NULL; int type; if (flags & PROBE_DETECT) return FALSE; @@ -478,6 +415,7 @@ fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]); +#ifndef XSERVER_LIBPCIACCESS pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; /* XXX Is this right? Can probably remove RAC_FB */ pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; @@ -488,7 +426,7 @@ "xf86RegisterResources() found resource conflicts\n"); return FALSE; } - +#endif /* open device */ if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev"))) return FALSE; @@ -617,7 +555,6 @@ { case FBDEVHW_PLANES: mod = "afb"; - syms = afbSymbols; break; case FBDEVHW_PACKED_PIXELS: switch (pScrn->bitsPerPixel) @@ -627,7 +564,6 @@ case 24: case 32: mod = "fb"; - syms = fbSymbols; break; default: xf86DrvMsg(pScrn->scrnIndex, X_ERROR, @@ -663,9 +599,6 @@ FBDevFreeRec(pScrn); return FALSE; } - if (mod && syms) { - xf86LoaderReqSymLists(syms, NULL); - } /* Load shadow if needed */ if (fPtr->shadowFB) { @@ -675,7 +608,6 @@ FBDevFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(shadowSymbols, NULL); } TRACE_EXIT("PreInit"); @@ -1236,6 +1168,7 @@ static Bool FBDevDGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen) { +#ifdef XFreeXDGA FBDevPtr fPtr = FBDEVPTR(pScrn); if (pScrn->depth < 8) @@ -1246,6 +1179,9 @@ return (DGAInit(pScreen, &FBDevDGAFunctions, fPtr->pDGAMode, fPtr->nDGAMode)); +#else + return TRUE; +#endif } static Bool ++++++ xf86-video-glint-1.2.3.tar.bz2 -> xf86-video-glint-1.2.4.tar.bz2 ++++++ ++++ 57694 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-1.2.3/config.h.in new/xf86-video-glint-1.2.4/config.h.in --- old/xf86-video-glint-1.2.3/config.h.in 2009-07-02 17:11:21.000000000 +0200 +++ new/xf86-video-glint-1.2.4/config.h.in 2009-07-30 03:51:15.000000000 +0200 @@ -35,9 +35,8 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR +/* xextproto 7.1 available */ +#undef HAVE_XEXTPROTO_71 /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-1.2.3/configure.ac new/xf86-video-glint-1.2.4/configure.ac --- old/xf86-video-glint-1.2.3/configure.ac 2009-07-02 17:10:56.000000000 +0200 +++ new/xf86-video-glint-1.2.4/configure.ac 2009-07-30 03:47:51.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-glint], - 1.2.3, + 1.2.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-glint) @@ -61,6 +61,10 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-1.2.3/missing new/xf86-video-glint-1.2.4/missing --- old/xf86-video-glint-1.2.3/missing 2008-08-15 21:28:45.000000000 +0200 +++ new/xf86-video-glint-1.2.4/missing 2009-07-27 05:36:17.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-1.2.3/src/glint_driver.c new/xf86-video-glint-1.2.4/src/glint_driver.c --- old/xf86-video-glint-1.2.3/src/glint_driver.c 2009-07-02 17:10:19.000000000 +0200 +++ new/xf86-video-glint-1.2.4/src/glint_driver.c 2009-07-28 07:11:11.000000000 +0200 @@ -42,8 +42,10 @@ #include "xf86cmap.h" #include "shadowfb.h" #include "fbdevhw.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86RAC.h" #include "xf86Resources.h" +#endif #include "xf86int10.h" #include "dixstruct.h" #include "vbe.h" @@ -65,8 +67,13 @@ #endif #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include +#else #define DPMS_SERVER #include +#endif + #define DEBUG 0 @@ -929,12 +936,13 @@ return FALSE; } +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVga, pGlint->pEnt->index, ResDisableOpr); /* Operations for which memory access is required. */ pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; - +#endif /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; /* @@ -1261,6 +1269,7 @@ pGlint->irq = pGlint->pEnt->device->irq; +#ifndef XSERVER_LIBPCIACCESS /* Register all entities */ for (i = 0; i < pScrn->numEntities; i++) { EntityInfoPtr pEnt; @@ -1271,8 +1280,10 @@ return FALSE; } } +#endif } + #if !defined(__sparc__) /* Initialize the card through int10 interface if needed */ if (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_GAMMA && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-1.2.3/src/glint_shadow.c new/xf86-video-glint-1.2.4/src/glint_shadow.c --- old/xf86-video-glint-1.2.3/src/glint_shadow.c 2008-03-17 18:21:21.000000000 +0100 +++ new/xf86-video-glint-1.2.4/src/glint_shadow.c 2009-07-28 05:14:22.000000000 +0200 @@ -12,7 +12,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "glint.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-1.2.3/src/pm3_video.c new/xf86-video-glint-1.2.4/src/pm3_video.c --- old/xf86-video-glint-1.2.3/src/pm3_video.c 2008-03-17 18:21:21.000000000 +0100 +++ new/xf86-video-glint-1.2.4/src/pm3_video.c 2009-07-28 05:15:01.000000000 +0200 @@ -30,7 +30,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" ++++++ xf86-video-i128-1.3.2.tar.bz2 -> xf86-video-i128-1.3.3.tar.bz2 ++++++ ++++ 58224 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.2/config.h.in new/xf86-video-i128-1.3.3/config.h.in --- old/xf86-video-i128-1.3.2/config.h.in 2009-07-02 17:16:37.000000000 +0200 +++ new/xf86-video-i128-1.3.3/config.h.in 2009-07-30 03:51:51.000000000 +0200 @@ -41,10 +41,6 @@ /* Have 4bpp support */ #undef HAVE_XF4BPP -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.2/configure.ac new/xf86-video-i128-1.3.3/configure.ac --- old/xf86-video-i128-1.3.2/configure.ac 2009-07-02 17:16:13.000000000 +0200 +++ new/xf86-video-i128-1.3.3/configure.ac 2009-07-30 03:47:55.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-i128], - 1.3.2, + 1.3.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-i128) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.2/missing new/xf86-video-i128-1.3.3/missing --- old/xf86-video-i128-1.3.2/missing 2009-05-28 20:59:44.000000000 +0200 +++ new/xf86-video-i128-1.3.3/missing 2009-07-27 05:36:52.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.2/src/i128.h new/xf86-video-i128-1.3.3/src/i128.h --- old/xf86-video-i128-1.3.2/src/i128.h 2008-03-20 19:41:34.000000000 +0100 +++ new/xf86-video-i128-1.3.3/src/i128.h 2009-07-28 05:16:03.000000000 +0200 @@ -38,8 +38,8 @@ pciVideoPtr PciInfo; #ifndef XSERVER_LIBPCIACCESS PCITAG PciTag; -#endif xf86AccessRec Access; +#endif int Chipset; int ChipRev; Bool Primary; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.2/src/i128_driver.c new/xf86-video-i128-1.3.3/src/i128_driver.c --- old/xf86-video-i128-1.3.2/src/i128_driver.c 2009-05-28 20:59:20.000000000 +0200 +++ new/xf86-video-i128-1.3.3/src/i128_driver.c 2009-07-28 07:11:16.000000000 +0200 @@ -31,7 +31,10 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#include "xf86RAC.h" +#endif #include "compiler.h" @@ -52,7 +55,6 @@ #include "micmap.h" #include "xf86DDC.h" -#include "xf86RAC.h" #include "vbe.h" #include "xaa.h" @@ -723,12 +725,14 @@ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "MMIO registers at 0x%lX\n", (unsigned long)PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO)); +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pI128->pEnt->index, NULL, ResExclusive)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "xf86RegisterResources() found resource conflicts\n"); I128FreeRec(pScrn); return FALSE; } +#endif /* HW bpp matches reported bpp */ pI128->bitsPerPixel = pScrn->bitsPerPixel; ++++++ xf86-video-i128-1.3.2.tar.bz2 -> xf86-video-i740-1.3.2.tar.bz2 ++++++ ++++ 70292 lines of diff (skipped) ++++++ xf86-video-mach64-6.8.1.tar.bz2 -> xf86-video-mach64-6.8.2.tar.bz2 ++++++ ++++ 33618 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.8.1/COPYING new/xf86-video-mach64-6.8.2/COPYING --- old/xf86-video-mach64-6.8.1/COPYING 2008-10-08 17:43:35.000000000 +0200 +++ new/xf86-video-mach64-6.8.2/COPYING 2009-07-27 05:37:07.000000000 +0200 @@ -1,12 +1,105 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org -Please submit updated COPYING files to the Xorg bugzilla: +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 Marc Aurele La France not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. Marc Aurele La France makes no representations +about the suitability of this software for any purpose. It is provided +"as-is" without express or implied warranty. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO +EVENT SHALL MARC AURELE LA FRANCE 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. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +************************************************************************* -http://lists.freedesktop.org/mailman/listinfo/xorg +Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, + Precision Insight, Inc., Cedar Park, Texas, and + VA Linux Systems Inc., Fremont, California. + +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 on 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 (including the +next paragraph) 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 +NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX +SYSTEMS AND/OR THEIR SUPPLIERS 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. + +************************************************************************* +Copyright 2000 Gareth Hughes +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 (including the next +paragraph) 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 +GARETH HUGHES 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. + +************************************************************************* + +Copyright 2006, 2007 George Sapountzis +All Rights Reserved. + +Based on the mach64 DRI and DRM drivers: +Copyright 2000 Gareth Hughes +Copyright 2002-2003 Leif Delgass +All Rights Reserved. + +Based on the ati hw/kdrive driver: +Copyright 2003 Eric Anholt, Anders Carlsson + +Based on the via hw/xfree86 driver: +Copyright 2006 Thomas Hellstrom. 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 (including the next +paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.8.1/ChangeLog new/xf86-video-mach64-6.8.2/ChangeLog --- old/xf86-video-mach64-6.8.1/ChangeLog 2009-04-30 02:36:21.000000000 +0200 +++ new/xf86-video-mach64-6.8.2/ChangeLog 2009-07-30 03:52:33.000000000 +0200 @@ -1,3 +1,51 @@ +commit 4f08e83e50059df494f5f53cd05eb8809d18656e +Author: Dave Airlie +Date: Tue Jul 28 15:22:40 2009 +1000 + + mach64: change to using ABI version check + +commit 64960253ea5dcfb01d92b5b684790f16be5b73be +Author: Dave Airlie +Date: Tue Jul 28 13:32:31 2009 +1000 + + mach64: update for resources/RAC API removal + +commit 965614f27d42106e859000264a6eb89d9fcba67e +Author: Peter Hutterer +Date: Thu Jul 16 11:43:33 2009 +1000 + + Update to xextproto 7.1 support. + + DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers + need to include dpmsconst.h if xextproto 7.1 is available. + + Signed-off-by: Peter Hutterer + +commit 9caef14defaf892d957875f6d774003a036bad45 +Author: Alan Coopersmith +Date: Mon May 11 22:06:40 2009 -0700 + + Fill in COPYING file, add SubmittingPatches URL to README + +commit d9d787167795862909738892195fcdc751c413ed +Author: Alan Coopersmith +Date: Sun May 10 16:56:02 2009 -0700 + + Doublecheck pictFormat is a supported format + + Fixes these warnings from parfait source checker: + + Error: Read buffer overflow at src/atimach64render.c:601 + in function 'Mach64PrepareTexture' [Symbolic analysis] + In array dereference of Mach64TexFormats[i] with index 'i' + Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6 + Error: Read buffer overflow at src/atimach64render.c:712 + in function 'Mach64PrepareComposite' [Symbolic analysis] + In array dereference of Mach64TexFormats[i] with index 'i' + Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6 + + Signed-off-by: Alan Coopersmith + commit 99db87ed49d7eca8de2ff1f7d53b580637ebb916 Author: Alan Coopersmith Date: Wed Apr 29 17:32:47 2009 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.8.1/README new/xf86-video-mach64-6.8.2/README --- old/xf86-video-mach64-6.8.1/README 2009-01-31 04:53:26.000000000 +0100 +++ new/xf86-video-mach64-6.8.2/README 2009-07-27 05:37:07.000000000 +0200 @@ -1,20 +1,25 @@ xf86-video-mach64 - ATI Mach64 driver for the Xorg X server -Please submit bugs & patches to the Xorg bugzilla: - - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - All questions regarding this software should be directed at the Xorg mailing list: http://lists.freedesktop.org/mailman/listinfo/xorg +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + The master development code repository can be found at: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-mach64 http://cgit.freedesktop.org/xorg/driver/xf86-video-mach64 +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + For more information on the git code manager, see: http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.8.1/config.h.in new/xf86-video-mach64-6.8.2/config.h.in --- old/xf86-video-mach64-6.8.1/config.h.in 2009-04-30 02:36:21.000000000 +0200 +++ new/xf86-video-mach64-6.8.2/config.h.in 2009-07-30 03:52:32.000000000 +0200 @@ -38,6 +38,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* xextproto 7.1 available */ +#undef HAVE_XEXTPROTO_71 + /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.8.1/configure.ac new/xf86-video-mach64-6.8.2/configure.ac --- old/xf86-video-mach64-6.8.1/configure.ac 2009-04-30 02:32:25.000000000 +0200 +++ new/xf86-video-mach64-6.8.2/configure.ac 2009-07-30 03:48:00.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-mach64], - 6.8.1, + 6.8.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-mach64) @@ -73,6 +73,10 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.8.1/missing new/xf86-video-mach64-6.8.2/missing --- old/xf86-video-mach64-6.8.1/missing 2009-04-30 02:16:57.000000000 +0200 +++ new/xf86-video-mach64-6.8.2/missing 2009-07-27 05:37:16.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.8.1/src/atibus.c new/xf86-video-mach64-6.8.2/src/atibus.c --- old/xf86-video-mach64-6.8.1/src/atibus.c 2008-10-08 17:43:35.000000000 +0200 +++ new/xf86-video-mach64-6.8.2/src/atibus.c 2009-07-28 05:20:45.000000000 +0200 @@ -59,6 +59,7 @@ ) { +#ifndef XSERVER_LIBPCIACCESS #ifndef AVOID_CPIO resRange Resources[2] = {{0, 0, 0}, _END}; @@ -101,7 +102,7 @@ } #endif /* AVOID_CPIO */ - +#endif } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.8.1/src/atimach64.c new/xf86-video-mach64-6.8.2/src/atimach64.c --- old/xf86-video-mach64-6.8.1/src/atimach64.c 2008-10-08 17:43:35.000000000 +0200 +++ new/xf86-video-mach64-6.8.2/src/atimach64.c 2009-07-27 05:37:07.000000000 +0200 @@ -63,10 +63,15 @@ #include "atimach64io.h" #include "atirgb514.h" +#ifdef HAVE_XEXTPROTO_71 +#include +#else #ifndef DPMS_SERVER # define DPMS_SERVER #endif #include +#endif + /* * ATIMach64PreInit -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.8.1/src/atimach64render.c new/xf86-video-mach64-6.8.2/src/atimach64render.c --- old/xf86-video-mach64-6.8.1/src/atimach64render.c 2008-10-08 17:43:35.000000000 +0200 +++ new/xf86-video-mach64-6.8.2/src/atimach64render.c 2009-07-27 05:37:07.000000000 +0200 @@ -598,6 +598,9 @@ if (Mach64TexFormats[i].pictFormat == pPict->format) break; } + if (i == MACH64_NR_TEX_FORMATS) + MACH64_FALLBACK(("Unsupported picture format 0x%x\n", + (int)pPict->format)); texFormat = Mach64TexFormats[i].texFormat; /* Prepare picture size */ @@ -709,6 +712,9 @@ if (Mach64TexFormats[i].pictFormat == pDstPicture->format) break; } + if (i == MACH64_NR_TEX_FORMATS) + MACH64_FALLBACK(("Unsupported picture format 0x%x\n", + (int)pPict->format)); dstFormat = Mach64TexFormats[i].dstFormat; m3d->dp_pix_width = SetBits(dstFormat, DP_DST_PIX_WIDTH) | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.8.1/src/atipreinit.c new/xf86-video-mach64-6.8.2/src/atipreinit.c --- old/xf86-video-mach64-6.8.1/src/atipreinit.c 2008-10-08 17:43:35.000000000 +0200 +++ new/xf86-video-mach64-6.8.2/src/atipreinit.c 2009-07-28 07:15:07.000000000 +0200 @@ -52,7 +52,9 @@ #include "atixv.h" #include "vbe.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86RAC.h" +#endif /* * FreeScreen handles the clean-up. @@ -507,7 +509,9 @@ ATIPtr pATI; GDevPtr pGDev; EntityInfoPtr pEntity; +#ifndef XSERVER_LIBPCIACCESS resPtr pResources; +#endif pciVideoPtr pVideo; DisplayModePtr pMode; CARD32 IOValue; @@ -548,7 +552,9 @@ /* Register resources */ pEntity = xf86GetEntityInfo(pScreenInfo->entityList[0]); pGDev = pEntity->device; +#ifndef XSERVER_LIBPCIACCESS pResources = pEntity->resources; +#endif pATI->iEntity = pEntity->index; pATI->Chip = pEntity->chipset; @@ -556,6 +562,7 @@ xfree(pEntity); +#ifndef XSERVER_LIBPCIACCESS if (!pResources) pResources = xf86RegisterResources(pATI->iEntity, NULL, ResShared); if (pResources) @@ -565,7 +572,7 @@ xf86FreeResList(pResources); return FALSE; } - +#endif ConfiguredMonitor = NULL; (void)memset(BIOS, 0, SizeOf(BIOS)); @@ -753,6 +760,7 @@ #endif /* AVOID_CPIO */ +#ifndef XSERVER_LIBPCIACCESS #ifdef AVOID_CPIO pScreenInfo->racMemFlags = @@ -765,7 +773,7 @@ pScreenInfo->racMemFlags = RAC_FB | RAC_CURSOR; #endif /* AVOID_CPIO */ - +#endif /* Finish private area initialisation */ pATI->nFIFOEntries = 16; /* For now */ @@ -1056,6 +1064,7 @@ xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED, "%s.\n", Buffer); } +#ifndef XSERVER_LIBPCIACCESS #ifndef AVOID_CPIO if (pATI->CPIO_VGAWonder) @@ -1064,6 +1073,7 @@ pATI->CPIO_VGAWonder); #endif /* AVOID_CPIO */ +#endif xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED, "ATI Mach64 adapter detected.\n"); @@ -1174,6 +1184,7 @@ xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, "Using Mach64 accelerator CRTC.\n"); +#ifndef XSERVER_LIBPCIACCESS #ifndef AVOID_CPIO if (pATI->VGAAdapter) @@ -1206,6 +1217,7 @@ } #endif /* AVOID_CPIO */ +#endif } @@ -1961,6 +1973,7 @@ } } +#ifndef XSERVER_LIBPCIACCESS #ifndef AVOID_CPIO if (pATI->VGAAdapter) @@ -1981,6 +1994,7 @@ } #endif /* AVOID_CPIO */ +#endif /* * Remap apertures. Must lock and re-unlock around this in case the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.8.1/src/atistruct.h new/xf86-video-mach64-6.8.2/src/atistruct.h --- old/xf86-video-mach64-6.8.1/src/atistruct.h 2008-10-08 17:43:35.000000000 +0200 +++ new/xf86-video-mach64-6.8.2/src/atistruct.h 2009-07-28 07:15:26.000000000 +0200 @@ -59,7 +59,9 @@ #endif #include "xf86Cursor.h" #include "xf86Pci.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#endif #include "atipcirename.h" @@ -269,9 +271,9 @@ CARD8 BusType; #ifndef AVOID_CPIO - - resRange VGAWonderResources[2]; - +#ifndef XSERVER_LIBPCIACCESS + resRange VGAWonderResources[2]; +#endif #endif /* AVOID_CPIO */ /* ++++++ xf86-video-mga-1.4.10.tar.bz2 -> xf86-video-mga-1.4.11.tar.bz2 ++++++ ++++ 58554 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/COPYING new/xf86-video-mga-1.4.11/COPYING --- old/xf86-video-mga-1.4.10/COPYING 2008-03-17 18:22:43.000000000 +0100 +++ new/xf86-video-mga-1.4.11/COPYING 2009-07-27 05:37:46.000000000 +0200 @@ -1,12 +1,237 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. -Please submit updated COPYING files to the Xorg bugzilla: +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: -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +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. + +*********************************************************** + +Copyright 1989, 1998 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, +FITNESS 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. + +*********************************************************** + +Copyright 1994 by Robin Cutshaw + +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 Robin Cutshaw not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Robin Cutshaw makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +ROBIN CUTSHAW DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ROBIN CUTSHAW 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. + +*********************************************************** + +Copyright 2000 VA Linux Systems Inc., Fremont, California. +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 (including the next +paragraph) 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 +VA LINUX SYSTEMS AND/OR ITS SUPPLIERS 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. + +*********************************************************** + +Copyright 2006 Red Hat, Inc. + +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 +on the rights to use, copy, modify, merge, publish, distribute, sub +license, and/or sell copies of the Software, and to permit persons to whom +them Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) 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 MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS 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. + +*********************************************************** + +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 +STEPHEN CROWLEY, OR ANY OTHER CONTRIBUTORS 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. + +*********************************************************** + +Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas. +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 (including the next +paragraph) 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 +PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +*********************************************************** + +(c) 1999 Matrox Graphics Inc. + +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 +MATROX GRAPHICS INC., OR ANY OTHER CONTRIBUTORS 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. + +*********************************************************** + +Copyright © 1997, Matrox Graphics Inc. +All Rights Reserved. + +*********************************************************** + +Copyright 2000 Gareth Hughes +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 (including the next +paragraph) 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 +GARETH HUGHES 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. + +Authors: + Gareth Hughes + +*********************************************************** + +(C) Copyright IBM Corporation 2005 +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 +on the rights to use, copy, modify, merge, publish, distribute, sub +license, 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 (including the next +paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL +IBM AND/OR THEIR SUPPLIERS 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. -http://lists.freedesktop.org/mailman/listinfo/xorg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/ChangeLog new/xf86-video-mga-1.4.11/ChangeLog --- old/xf86-video-mga-1.4.10/ChangeLog 2009-04-27 20:00:24.000000000 +0200 +++ new/xf86-video-mga-1.4.11/ChangeLog 2009-07-30 03:53:14.000000000 +0200 @@ -1,3 +1,65 @@ +commit e29477ef4d4ae50c39ef608ad0e2344c5c68ed40 +Author: Dave Airlie +Date: Tue Jul 28 15:22:40 2009 +1000 + + mga: change to using ABI version check + +commit 26ca92acc58b74202ec5eacaffc8e418d878da5e +Author: Dave Airlie +Date: Tue Jul 28 13:32:31 2009 +1000 + + mga: update for resources/RAC API removal + +commit c1b8e89f367510958ffa8072ccbf416a13790c96 +Author: Gaetan Nadon +Date: Thu Jul 9 13:09:42 2009 -0400 + + xf86-video-mga: use XORG_CHANGELOG macro to create ChangeLog. #22611 + + Adding the macro in configure.ac and use it in Makefile.am + Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 + + Signed-off-by: Gaetan Nadon + Signed-off-by: Peter Hutterer + +commit 828b55d822f644976df40c8b835043895b7785e3 +Author: Adam Jackson +Date: Thu May 28 15:06:19 2009 -0400 + + Remove useless loader symbol lists. + +commit afda628bf77d4c6d58de6f1b88a8fa5391f1df1a +Author: Alan Coopersmith +Date: Mon May 11 22:20:56 2009 -0700 + + Fill in COPYING file, add SubmittingPatches URL to README + +commit 2972b5707bbee5ac0d046b5100bcf572d82e1c4d +Author: Adam Jackson +Date: Wed May 6 14:12:35 2009 -0400 + + Do E-EDID if built against a server that supports it. + +commit b3fc1acaedd5d45b2c8eb2ba99b24579cf7d2a79 +Author: Adam Jackson +Date: Wed May 6 13:02:36 2009 -0400 + + Normalize DDC for the second head. + + The exit path wasn't symmetric with the exit path for the first head. + +commit bf6aee62b891d4305cb96f8a37e625e5cf7c1504 +Author: Adam Jackson +Date: Wed May 6 12:04:48 2009 -0400 + + Remove redundant MGAuseI2C macro + +commit 626af26098ab5d0823bf1d6c08157b4c89ec578a +Author: Adam Jackson +Date: Mon Apr 27 14:01:03 2009 -0400 + + mga 1.4.10 + commit d33b06038223b2b121be7e3f8c207de5f518b28c Author: Adam Jackson Date: Mon Apr 27 14:00:00 2009 -0400 @@ -338,7 +400,7 @@ Bumped version to 1.4.7. commit 6fde3fd6d34e7252ee16422b19896d71b1622039 -Merge: 4bfc1e1 923176f +Merge: 4bfc1e1... 923176f... Author: James Cloos Date: Mon Sep 3 06:07:32 2007 -0400 @@ -380,7 +442,7 @@ Fix compile error introduced by merge. commit 707d3adbc7d9ee918d6c70083f51ad851ce68852 -Merge: 741c50c 489e007 +Merge: 741c50c... 489e007... Author: Ian Romanick Date: Mon Aug 20 15:20:39 2007 -0700 @@ -532,7 +594,7 @@ Pass the correct pointer to pci_device_cfg_write_bits. commit d5b4dbe749e860e4349607c57467f8085dc28c33 -Merge: cb103a1 876657e +Merge: cb103a1... 876657e... Author: Ian Romanick Date: Tue Jan 9 16:04:06 2007 -0800 @@ -566,7 +628,7 @@ Bug #9448: Actually write the C2STARTADD0 register. commit fd91b601ec4dd48cfb6ea5495b595fec6d932ab5 -Merge: f84b138 0ce8f52 +Merge: f84b138... 0ce8f52... Author: Daniel Stone Date: Sun Dec 24 06:32:53 2006 +0200 @@ -598,14 +660,14 @@ bump to 1.4.6 commit cb103a18067adb3256c0b791255ce8435ff57e06 -Merge: d0e0362 4bcfca9 +Merge: d0e0362... 4bcfca9... Author: Ian Romanick Date: Mon Dec 11 15:06:19 2006 -0800 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework commit d0e03622811fd94c830c0b5233ff505392c0d331 -Merge: 8fee907 1dd6e69 +Merge: 8fee907... 1dd6e69... Author: Ian Romanick Date: Mon Dec 11 15:06:03 2006 -0800 @@ -758,7 +820,7 @@ Bump to 1.4.3 commit 8fee907cac7e5924630e3648bfb72ad9bd021ea8 -Merge: 7cecee1 2fc0ebf +Merge: 7cecee1... 2fc0ebf... Author: Ian Romanick Date: Tue Oct 10 11:43:52 2006 -0700 @@ -791,7 +853,7 @@ Added a FIXME on BLK support for GXcopy instead. commit ecc155e27b6566196e56de241ae81266e03dc90e -Merge: e7b36c6 2e73c29 +Merge: e7b36c6... 2e73c29... Author: Tilman Sauerbeck Date: Wed Sep 20 20:43:55 2006 +0200 @@ -1150,7 +1212,7 @@ by myself. commit 7cecee186c889902bed9b7fa042f0bd3cc0297ef -Merge: 160b1f7 bde5920 +Merge: 160b1f7... bde5920... Author: Ian Romanick Date: Thu Aug 10 10:19:55 2006 -0700 @@ -1181,7 +1243,7 @@ searching for it in MGAPreInit. commit 068e3427cfdf3e3b5dc5c97872d5f52f47ff0d68 -Merge: 95e0722 7170de8 +Merge: 95e0722... 7170de8... Author: Ian Romanick Date: Wed Jul 26 11:47:32 2006 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/Makefile.am new/xf86-video-mga-1.4.11/Makefile.am --- old/xf86-video-mga-1.4.10/Makefile.am 2009-04-27 19:59:58.000000000 +0200 +++ new/xf86-video-mga-1.4.11/Makefile.am 2009-07-27 05:37:46.000000000 +0200 @@ -27,6 +27,6 @@ .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/README new/xf86-video-mga-1.4.11/README --- old/xf86-video-mga-1.4.10/README 2009-04-27 17:47:42.000000000 +0200 +++ new/xf86-video-mga-1.4.11/README 2009-07-27 05:37:46.000000000 +0200 @@ -1,20 +1,25 @@ xf86-video-mga - Matrox video driver for the Xorg X server -Please submit bugs & patches to the Xorg bugzilla: - - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - All questions regarding this software should be directed at the Xorg mailing list: http://lists.freedesktop.org/mailman/listinfo/xorg +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + The master development code repository can be found at: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-mga http://cgit.freedesktop.org/xorg/driver/xf86-video-mga +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + For more information on the git code manager, see: http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/config.h.in new/xf86-video-mga-1.4.11/config.h.in --- old/xf86-video-mga-1.4.10/config.h.in 2009-04-27 19:59:39.000000000 +0200 +++ new/xf86-video-mga-1.4.11/config.h.in 2009-07-30 03:53:14.000000000 +0200 @@ -35,10 +35,6 @@ /* Have xf86ModeBandwidth */ #undef HAVE_XF86MODEBANDWIDTH -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/configure.ac new/xf86-video-mga-1.4.11/configure.ac --- old/xf86-video-mga-1.4.10/configure.ac 2009-04-27 19:58:59.000000000 +0200 +++ new/xf86-video-mga-1.4.11/configure.ac 2009-07-30 03:48:04.000000000 +0200 @@ -23,7 +23,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-mga], - 1.4.10, + 1.4.11, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-mga) @@ -31,6 +31,11 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) + +# Require xorg-macros: XORG_RELEASE_VERSION XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -173,6 +178,7 @@ XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([ Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/missing new/xf86-video-mga-1.4.11/missing --- old/xf86-video-mga-1.4.10/missing 2009-04-27 19:20:09.000000000 +0200 +++ new/xf86-video-mga-1.4.11/missing 2009-07-27 05:37:56.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/src/mga.h new/xf86-video-mga-1.4.11/src/mga.h --- old/xf86-video-mga-1.4.10/src/mga.h 2008-08-15 19:55:06.000000000 +0200 +++ new/xf86-video-mga-1.4.11/src/mga.h 2009-07-28 02:24:51.000000000 +0200 @@ -464,9 +464,9 @@ #else pciVideoPtr PciInfo; PCITAG PciTag; + xf86AccessRec Access; #endif const struct mga_device_attributes * chip_attribs; - xf86AccessRec Access; int Chipset; int ChipRev; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/src/mga_bios.c new/xf86-video-mga-1.4.11/src/mga_bios.c --- old/xf86-video-mga-1.4.10/src/mga_bios.c 2009-04-27 17:47:42.000000000 +0200 +++ new/xf86-video-mga-1.4.11/src/mga_bios.c 2009-07-28 02:23:43.000000000 +0200 @@ -41,7 +41,6 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" /* All drivers need this */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/src/mga_driver.c new/xf86-video-mga-1.4.11/src/mga_driver.c --- old/xf86-video-mga-1.4.10/src/mga_driver.c 2009-04-27 19:37:38.000000000 +0200 +++ new/xf86-video-mga-1.4.11/src/mga_driver.c 2009-07-28 07:11:40.000000000 +0200 @@ -52,7 +52,11 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" + +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#include "xf86RAC.h" +#endif /* All drivers need this */ @@ -75,7 +79,7 @@ #include "micmap.h" #include "xf86DDC.h" -#include "xf86RAC.h" + #include "vbe.h" #include "fb.h" @@ -435,25 +439,25 @@ }; static PciChipsets MGAPciChipsets[] = { - { PCI_CHIP_MGA2064, PCI_CHIP_MGA2064, (resRange*)RES_SHARED_VGA }, - { PCI_CHIP_MGA1064, PCI_CHIP_MGA1064, (resRange*)RES_SHARED_VGA }, - { PCI_CHIP_MGA2164, PCI_CHIP_MGA2164, (resRange*)RES_SHARED_VGA }, - { PCI_CHIP_MGA2164_AGP, PCI_CHIP_MGA2164_AGP,(resRange*)RES_SHARED_VGA }, - { PCI_CHIP_MGAG100, PCI_CHIP_MGAG100, (resRange*)RES_SHARED_VGA }, - { PCI_CHIP_MGAG100_PCI, PCI_CHIP_MGAG100_PCI,(resRange*)RES_SHARED_VGA }, - { PCI_CHIP_MGAG200, PCI_CHIP_MGAG200, (resRange*)RES_SHARED_VGA }, - { PCI_CHIP_MGAG200_PCI, PCI_CHIP_MGAG200_PCI,(resRange*)RES_SHARED_VGA }, + { PCI_CHIP_MGA2064, PCI_CHIP_MGA2064, RES_SHARED_VGA }, + { PCI_CHIP_MGA1064, PCI_CHIP_MGA1064, RES_SHARED_VGA }, + { PCI_CHIP_MGA2164, PCI_CHIP_MGA2164, RES_SHARED_VGA }, + { PCI_CHIP_MGA2164_AGP, PCI_CHIP_MGA2164_AGP,RES_SHARED_VGA }, + { PCI_CHIP_MGAG100, PCI_CHIP_MGAG100, RES_SHARED_VGA }, + { PCI_CHIP_MGAG100_PCI, PCI_CHIP_MGAG100_PCI,RES_SHARED_VGA }, + { PCI_CHIP_MGAG200, PCI_CHIP_MGAG200, RES_SHARED_VGA }, + { PCI_CHIP_MGAG200_PCI, PCI_CHIP_MGAG200_PCI,RES_SHARED_VGA }, { PCI_CHIP_MGAG200_SE_B_PCI, PCI_CHIP_MGAG200_SE_B_PCI, - (resRange*)RES_SHARED_VGA }, + RES_SHARED_VGA }, { PCI_CHIP_MGAG200_SE_A_PCI, PCI_CHIP_MGAG200_SE_A_PCI, - (resRange*)RES_SHARED_VGA }, + RES_SHARED_VGA }, { PCI_CHIP_MGAG200_EV_PCI, PCI_CHIP_MGAG200_EV_PCI, - (resRange*)RES_SHARED_VGA }, + RES_SHARED_VGA }, { PCI_CHIP_MGAG200_WINBOND_PCI, PCI_CHIP_MGAG200_WINBOND_PCI, - (resRange*)RES_SHARED_VGA }, - { PCI_CHIP_MGAG400, PCI_CHIP_MGAG400, (resRange*)RES_SHARED_VGA }, - { PCI_CHIP_MGAG550, PCI_CHIP_MGAG550, (resRange*)RES_SHARED_VGA }, - { -1, -1, (resRange*)RES_UNDEFINED } + RES_SHARED_VGA }, + { PCI_CHIP_MGAG400, PCI_CHIP_MGAG400, RES_SHARED_VGA }, + { PCI_CHIP_MGAG550, PCI_CHIP_MGAG550, RES_SHARED_VGA }, + { -1, -1, RES_UNDEFINED } }; /* @@ -526,190 +530,6 @@ { -1, NULL, OPTV_NONE, {0}, FALSE } }; - -/* - * List of symbols from other modules that this module references. This - * list is used to tell the loader that it is OK for symbols here to be - * unresolved providing that it hasn't been told that they haven't been - * told that they are essential via a call to xf86LoaderReqSymbols() or - * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about - * unresolved symbols that are not required. - */ - -static const char *vgahwSymbols[] = { - "vgaHWFreeHWRec", - "vgaHWGetHWRec", - "vgaHWGetIOBase", - "vgaHWGetIndex", - "vgaHWInit", - "vgaHWLock", - "vgaHWMapMem", - "vgaHWProtect", - "vgaHWRestore", - "vgaHWSave", - "vgaHWSaveScreen", - "vgaHWSetMmioFuncs", - "vgaHWUnlock", - "vgaHWUnmapMem", - "vgaHWddc1SetSpeedWeak", - NULL -}; - -static const char *fbSymbols[] = { - "fbPictureInit", - "fbScreenInit", - NULL -}; - -#ifdef USE_EXA -static const char *exaSymbols[] = { - "exaDriverInit", - "exaDriverFini", - "exaGetPixmapOffset", - "exaGetVersion", - NULL -}; -#endif - -#ifdef USE_XAA -static const char *xaaSymbols[] = { - "XAACachePlanarMonoStipple", - "XAACreateInfoRec", - "XAADestroyInfoRec", - "XAAGetFallbackOps", - "XAAInit", - "XAAMoveDWORDS", - "XAA_888_plus_PICT_a8_to_8888", - NULL -}; -#endif - -static const char *ramdacSymbols[] = { - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - "xf86InitCursor", - NULL -}; - -#ifdef XF86DRI -static const char *drmSymbols[] = { - "drmAddBufs", - "drmAddMap", - "drmAgpAcquire", - "drmAgpAlloc", - "drmAgpBind", - "drmAgpDeviceId", - "drmAgpEnable", - "drmAgpFree", - "drmAgpGetMode", - "drmAgpRelease", - "drmAgpUnbind", - "drmAgpVendorId", - "drmCommandNone", - "drmCommandWrite", - "drmCtlInstHandler", - "drmCtlUninstHandler", - "drmFreeVersion", - "drmGetInterruptFromBusID", - "drmGetLibVersion", - "drmGetVersion", - "drmMap", - "drmMapBufs", - "drmUnmap", - "drmUnmapBufs", - NULL -}; - -static const char *driSymbols[] = { - "DRICloseScreen", - "DRICreateInfoRec", - "DRIDestroyInfoRec", - "DRIFinishScreenInit", - "DRIGetDeviceInfo", - "DRILock", - "DRIQueryVersion", - "DRIScreenInit", - "DRIUnlock", - "GlxSetVisualConfigs", - "DRICreatePCIBusID", - NULL -}; -#endif - -#define MGAuseI2C 1 - -static const char *ddcSymbols[] = { - "xf86DoEDID_DDC1", -#if MGAuseI2C - "xf86DoEDID_DDC2", -#endif - "xf86PrintEDID", - "xf86SetDDCproperties", - NULL -}; - -static const char *i2cSymbols[] = { - "xf86CreateI2CBusRec", - "xf86I2CBusInit", - NULL -}; - -static const char *shadowSymbols[] = { - "ShadowFBInit", - NULL -}; - -#ifdef XFree86LOADER -static const char *vbeSymbols[] = { - "VBEInit", - "vbeDoEDID", - "vbeFree", - NULL -}; -#endif - -static const char *int10Symbols[] = { - "xf86FreeInt10", - "xf86InitInt10", - NULL -}; - -static const char *fbdevHWSymbols[] = { - "fbdevHWAdjustFrameWeak", - "fbdevHWEnterVT", - "fbdevHWGetVidmem", - "fbdevHWInit", - "fbdevHWLeaveVTWeak", - "fbdevHWLoadPaletteWeak", - "fbdevHWMapMMIO", - "fbdevHWMapVidmem", - "fbdevHWModeInit", - "fbdevHWRestore", - "fbdevHWSave", - "fbdevHWSwitchModeWeak", - "fbdevHWUnmapMMIO", - "fbdevHWUnmapVidmem", - "fbdevHWUseBuildinMode", - "fbdevHWValidModeWeak", - NULL -}; - -#ifdef USEMGAHAL -static const char *halSymbols[] = { - "MGACloseLibrary", - "MGAGetBOARDHANDLESize", - "MGAGetHardwareInfo", - "MGAOpenLibrary", - "MGARestoreVgaState", - "MGASaveVgaState", - "MGASetMode", - "MGASetVgaMode", - "MGAValidateMode", - "MGAValidateVideoParameters", - "HALSetDisplayStart", - NULL -}; -#endif #ifdef XFree86LOADER static MODULESETUPPROTO(mgaSetup); @@ -740,34 +560,6 @@ if (!setupDone) { setupDone = TRUE; xf86AddDriver(&MGA_C_NAME, module, 1); - - /* - * Modules that this driver always requires may be loaded here - * by calling LoadSubModule(). - */ - - /* - * Tell the loader about symbols from other modules that this module - * might refer to. - */ - LoaderRefSymLists(vgahwSymbols, -#ifdef USE_XAA - xaaSymbols, -#endif -#ifdef USE_EXA - exaSymbols, -#endif - ramdacSymbols, ddcSymbols, i2cSymbols, - shadowSymbols, fbdevHWSymbols, vbeSymbols, - fbSymbols, int10Symbols, -#ifdef XF86DRI - drmSymbols, driSymbols, -#endif -#ifdef USEMGAHAL - halSymbols, -#endif - NULL); - /* * The return value must be non-NULL on success even though there * is no TearDownProc. @@ -1403,137 +1195,124 @@ return SizeFound; } +#ifdef EDID_COMPLETE_RAWDATA +#undef xf86DoEDID_DDC2 +#define xf86DoEDID_DDC2(a, b) xf86DoEEDID(a, b, TRUE) +#endif + static xf86MonPtr MGAdoDDC(ScrnInfoPtr pScrn) { - vgaHWPtr hwp; - MGAPtr pMga; - xf86MonPtr MonInfo = NULL; - - hwp = VGAHWPTR(pScrn); - pMga = MGAPTR(pScrn); - - /* Load DDC if we have the code to use it */ - /* This gives us DDC1 */ - if (pMga->ddc1Read || pMga->i2cInit) { - if (xf86LoadSubModule(pScrn, "ddc")) { - xf86LoaderReqSymLists(ddcSymbols, NULL); - } else { - /* ddc module not found, we can do without it */ - pMga->ddc1Read = NULL; - pMga->DDC_Bus1 = NULL; - pMga->DDC_Bus2 = NULL; - return NULL; + vgaHWPtr hwp; + MGAPtr pMga; + xf86MonPtr MonInfo = NULL; + char *from = NULL; + + hwp = VGAHWPTR(pScrn); + pMga = MGAPTR(pScrn); + + /* Load DDC if we have the code to use it */ + /* This gives us DDC1 */ + if (pMga->ddc1Read || pMga->i2cInit) { + if (!xf86LoadSubModule(pScrn, "ddc")) { + /* ddc module not found, we can do without it */ + pMga->ddc1Read = NULL; + pMga->DDC_Bus1 = NULL; + pMga->DDC_Bus2 = NULL; + return NULL; } } else - return NULL; + return NULL; -#if MGAuseI2C /* - DDC can use I2C bus */ /* Load I2C if we have the code to use it */ if (pMga->i2cInit) { - if ( xf86LoadSubModule(pScrn, "i2c") ) { - xf86LoaderReqSymLists(i2cSymbols,NULL); - } else { - /* i2c module not found, we can do without it */ - pMga->i2cInit = NULL; - pMga->DDC_Bus1 = NULL; - pMga->DDC_Bus2 = NULL; - } - } -#endif /* MGAuseI2C */ - - /* Map the MGA memory and MMIO areas */ - if (!MGAMapMem(pScrn)) - return NULL; - - /* Initialise the MMIO vgahw functions */ - vgaHWSetMmioFuncs(hwp, pMga->IOBase, PORT_OFFSET); - vgaHWGetIOBase(hwp); - - /* Map the VGA memory when the primary video */ - if (pMga->Primary) { - hwp->MapSize = 0x10000; - if (!vgaHWMapMem(pScrn)) - return NULL; - } else { - /* XXX Need to write an MGA mode ddc1SetSpeed */ - if (pMga->DDC1SetSpeed == vgaHWddc1SetSpeedWeak()) { - pMga->DDC1SetSpeed = NULL; - xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, - "DDC1 disabled - chip not in VGA mode\n"); - } - } - - /* Save the current state */ - MGASave(pScrn); - - /* It is now safe to talk to the card */ - -#if MGAuseI2C - /* Initialize I2C buses - used by DDC if available */ - if (pMga->i2cInit) { - pMga->i2cInit(pScrn); - } - - /* DDC for second head... */ - if (pMga->SecondCrtc && pMga->DDC_Bus2) { - MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pMga->DDC_Bus2); - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "I2C Monitor info: %p\n", - (void *)MonInfo); - xf86PrintEDID(MonInfo); - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of I2C Monitor info\n"); - xf86SetDDCproperties(pScrn, MonInfo); - return MonInfo; - } + if (!xf86LoadSubModule(pScrn, "i2c")) { + /* i2c module not found, we can do without it */ + pMga->i2cInit = NULL; + pMga->DDC_Bus1 = NULL; + pMga->DDC_Bus2 = NULL; + } + } - else { + /* Map the MGA memory and MMIO areas */ + if (!MGAMapMem(pScrn)) + return NULL; + + /* Initialise the MMIO vgahw functions */ + vgaHWSetMmioFuncs(hwp, pMga->IOBase, PORT_OFFSET); + vgaHWGetIOBase(hwp); + + /* Map the VGA memory when the primary video */ + if (pMga->Primary) { + hwp->MapSize = 0x10000; + if (!vgaHWMapMem(pScrn)) + return NULL; + } else { + /* XXX Need to write an MGA mode ddc1SetSpeed */ + if (pMga->DDC1SetSpeed == vgaHWddc1SetSpeedWeak()) { + pMga->DDC1SetSpeed = NULL; + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, + "DDC1 disabled - chip not in VGA mode\n"); + } + } + + /* Save the current state */ + MGASave(pScrn); + + /* It is now safe to talk to the card */ + + /* Initialize I2C buses - used by DDC if available */ + if (pMga->i2cInit) { + pMga->i2cInit(pScrn); + } + + /* DDC for second head... */ + if (pMga->SecondCrtc && pMga->DDC_Bus2) { + MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pMga->DDC_Bus2); + from = "I2C"; + } else { /* Its the first head... */ - if (pMga->DDC_Bus1) { - MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pMga->DDC_Bus1); - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "I2C Monitor info: %p\n", (void *) MonInfo); - xf86PrintEDID(MonInfo); - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of I2C Monitor info\n"); - } - if (!MonInfo) -#endif /* MGAuseI2C */ - /* Read and output monitor info using DDC1 */ - if (pMga->ddc1Read && pMga->DDC1SetSpeed) { - MonInfo = xf86DoEDID_DDC1(pScrn->scrnIndex, - pMga->DDC1SetSpeed, - pMga->ddc1Read ) ; - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n", (void *) MonInfo); - xf86PrintEDID( MonInfo ); - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of DDC Monitor info\n"); - } - if (!MonInfo){ + if (pMga->DDC_Bus1) { + MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pMga->DDC_Bus1); + from = "I2C"; + } + if (!MonInfo) + /* Read and output monitor info using DDC1 */ + if (pMga->ddc1Read && pMga->DDC1SetSpeed) { + MonInfo = xf86DoEDID_DDC1(pScrn->scrnIndex, + pMga->DDC1SetSpeed, + pMga->ddc1Read ) ; + from = "DDC1"; + } + if (!MonInfo){ vbeInfoPtr pVbe; if (xf86LoadSubModule(pScrn, "vbe")) { - pVbe = VBEInit(NULL,pMga->pEnt->index); - MonInfo = vbeDoEDID(pVbe, NULL); - vbeFree(pVbe); - - if (MonInfo){ - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VBE DDC Monitor info: %p\n", (void *) MonInfo); - xf86PrintEDID( MonInfo ); - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of VBE DDC Monitor info\n\n"); - } + pVbe = VBEInit(NULL, pMga->pEnt->index); + MonInfo = vbeDoEDID(pVbe, NULL); + vbeFree(pVbe); + from = "VBE"; } - } -#if MGAuseI2C - } -#endif - /* Restore previous state and unmap MGA memory and MMIO areas */ - MGARestore(pScrn); - MGAUnmapMem(pScrn); - /* Unmap vga memory if we mapped it */ - if (xf86IsPrimaryPci(pMga->PciInfo) && !pMga->FBDev) { - vgaHWUnmapMem(pScrn); - } + } + } + + if (MonInfo) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%s monitor info\n", from); + xf86PrintEDID(MonInfo); + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of monitor info\n"); + } - xf86SetDDCproperties(pScrn, MonInfo); + /* Restore previous state and unmap MGA memory and MMIO areas */ + MGARestore(pScrn); + MGAUnmapMem(pScrn); + /* Unmap vga memory if we mapped it */ + if (xf86IsPrimaryPci(pMga->PciInfo) && !pMga->FBDev) { + vgaHWUnmapMem(pScrn); + } + + xf86SetDDCproperties(pScrn, MonInfo); - return MonInfo; + return MonInfo; } #ifdef DISABLE_VGA_IO @@ -1723,8 +1502,6 @@ if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE; - xf86LoaderReqSymLists(vgahwSymbols, NULL); - /* * Allocate a vgaHWRec */ @@ -1741,8 +1518,10 @@ pMga->Primary = xf86IsPrimaryPci(pMga->PciInfo); #ifndef DISABLE_VGA_IO +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVgaIo, pMga->pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pMga->pEnt->index, ResDisableOpr); +#endif #else /* * Set our own access functions, which control the vgaioen bit. @@ -1831,7 +1610,6 @@ from = X_CONFIG; } if (loadHal && xf86LoadSubModule(pScrn, "mga_hal")) { - xf86LoaderReqSymLists(halSymbols, NULL); xf86DrvMsg(pScrn->scrnIndex, from,"Matrox HAL module used\n"); pMga->HALLoaded = TRUE; } else { @@ -2000,12 +1778,14 @@ } #endif +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pMga->pEnt->index, NULL, ResExclusive)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "xf86RegisterResources() found resource conflicts\n"); MGAFreeRec(pScrn); return FALSE; } +#endif /* * The first thing we should figure out is the depth, bpp, etc. @@ -2026,7 +1806,6 @@ /* check for linux framebuffer device */ if (!xf86LoadSubModule(pScrn, "fbdevhw")) return FALSE; - xf86LoaderReqSymLists(fbdevHWSymbols, NULL); if (!fbdevHWInit(pScrn, pMga->PciInfo, NULL)) return FALSE; } @@ -2127,7 +1906,6 @@ xf86LoadSubModule(pScrn, "int10")) { xf86Int10InfoPtr pInt; - xf86LoaderReqSymLists(int10Symbols, NULL); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n"); pInt = xf86InitInt10(pMga->pEnt->index); if (pInt) pMga->softbooted = TRUE; @@ -2897,8 +2675,6 @@ MGAFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(fbSymbols, NULL); - /* Load XAA if needed */ if (!pMga->NoAccel) { @@ -2907,14 +2683,14 @@ if (!xf86LoadSubModule(pScrn, "exa")) { MGAFreeRec(pScrn); return FALSE; - } else xf86LoaderReqSymLists(exaSymbols, NULL); + } } else { #endif #ifdef USE_XAA if (!xf86LoadSubModule(pScrn, "xaa")) { MGAFreeRec(pScrn); return FALSE; - } else xf86LoaderReqSymLists(xaaSymbols, NULL); + } #endif #ifdef USE_EXA } @@ -2927,7 +2703,6 @@ MGAFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(ramdacSymbols, NULL); } /* Load shadowfb if needed */ @@ -2936,15 +2711,12 @@ MGAFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(shadowSymbols, NULL); } #ifdef XF86DRI /* Load the dri module if requested. */ if (xf86ReturnOptValBool(pMga->Options, OPTION_DRI, FALSE)) { - if (xf86LoadSubModule(pScrn, "dri")) { - xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL); - } + xf86LoadSubModule(pScrn, "dri"); } #endif pMga->CurrentLayout.bitsPerPixel = pScrn->bitsPerPixel; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/src/mga_esc.c new/xf86-video-mga-1.4.11/src/mga_esc.c --- old/xf86-video-mga-1.4.10/src/mga_esc.c 2008-08-15 19:55:06.000000000 +0200 +++ new/xf86-video-mga-1.4.11/src/mga_esc.c 2009-07-28 02:23:57.000000000 +0200 @@ -15,7 +15,6 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" /* All drivers need this */ @@ -36,7 +35,6 @@ #include "micmap.h" #include "xf86DDC.h" -#include "xf86RAC.h" #include "vbe.h" #include "fb.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/src/mga_merge.c new/xf86-video-mga-1.4.11/src/mga_merge.c --- old/xf86-video-mga-1.4.10/src/mga_merge.c 2008-08-15 19:55:06.000000000 +0200 +++ new/xf86-video-mga-1.4.11/src/mga_merge.c 2009-07-28 02:24:03.000000000 +0200 @@ -5,7 +5,6 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" /* All drivers need this */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/src/mga_shadow.c new/xf86-video-mga-1.4.11/src/mga_shadow.c --- old/xf86-video-mga-1.4.10/src/mga_shadow.c 2008-08-15 19:55:06.000000000 +0200 +++ new/xf86-video-mga-1.4.11/src/mga_shadow.c 2009-07-28 02:23:48.000000000 +0200 @@ -9,7 +9,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "mga_reg.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.10/src/mga_video.c new/xf86-video-mga-1.4.11/src/mga_video.c --- old/xf86-video-mga-1.4.10/src/mga_video.c 2008-08-15 19:55:06.000000000 +0200 +++ new/xf86-video-mga-1.4.11/src/mga_video.c 2009-07-28 02:23:37.000000000 +0200 @@ -4,7 +4,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" ++++++ xf86-video-mga-hal.diff ++++++ --- /var/tmp/diff_new_pack.r7xwoL/_old 2009-07-30 23:01:38.000000000 +0200 +++ /var/tmp/diff_new_pack.r7xwoL/_new 2009-07-30 23:01:38.000000000 +0200 @@ -50,26 +50,6 @@ .TP .BI "Option \*qOverclockMem\*q" diff -u -r -p ../xf86-video-mga-1.4.9.orig//src/mga_driver.c ./src/mga_driver.c ---- ../xf86-video-mga-1.4.9.orig//src/mga_driver.c 2008-10-07 21:49:31.852868503 +0200 -+++ src/mga_driver.c 2008-10-07 21:50:51.524413133 +0200 -@@ -1800,7 +1800,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - "Hal", loadHal); - from = X_CONFIG; - } -- if (loadHal && xf86LoadSubModule(pScrn, "mga_hal")) { -+ if (loadHal && xf86LoadSubModule(pScrn, "mgahal")) { - xf86LoaderReqSymLists(halSymbols, NULL); - xf86DrvMsg(pScrn->scrnIndex, from,"Matrox HAL module used\n"); - pMga->HALLoaded = TRUE; -@@ -1822,7 +1822,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - pMga->DualHeadEnabled = TRUE; - } else if (xf86IsPrimInitDone(pScrn->entityList[0])) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- "This card requires the \"mga_hal\" module for dual-head operation\n" -+ "This card requires the \"mgahal\" module for dual-head operation\n" - "\tIt can be found at the Matrox web site http://www.matrox.com\n"); - } - } diff -u -r -p ../xf86-video-mga-1.4.9.orig//src/mga_halmod.c ./src/mga_halmod.c --- ../xf86-video-mga-1.4.9.orig//src/mga_halmod.c 2008-10-07 21:49:32.324889503 +0200 +++ src/mga_halmod.c 2008-10-07 21:51:29.818116810 +0200 @@ -91,3 +71,23 @@ static pointer halSetup(pointer module, pointer opts, int *errmaj, int *errmin) +--- src/mga_driver.c.orig 2009-07-28 07:11:40.000000000 +0200 ++++ src/mga_driver.c 2009-07-30 16:33:45.000000000 +0200 +@@ -1609,7 +1609,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) + "Hal", loadHal); + from = X_CONFIG; + } +- if (loadHal && xf86LoadSubModule(pScrn, "mga_hal")) { ++ if (loadHal && xf86LoadSubModule(pScrn, "mgahal")) { + xf86DrvMsg(pScrn->scrnIndex, from,"Matrox HAL module used\n"); + pMga->HALLoaded = TRUE; + } else { +@@ -1630,7 +1630,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) + pMga->DualHeadEnabled = TRUE; + } else if (xf86IsPrimInitDone(pScrn->entityList[0])) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, +- "This card requires the \"mga_hal\" module for dual-head operation\n" ++ "This card requires the \"mgahal\" module for dual-head operation\n" + "\tIt can be found at the Matrox web site http://www.matrox.com\n"); + } + } ++++++ xf86-video-neomagic-1.2.3.tar.bz2 -> xf86-video-neomagic-1.2.4.tar.bz2 ++++++ ++++ 57353 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-1.2.3/config.h.in new/xf86-video-neomagic-1.2.4/config.h.in --- old/xf86-video-neomagic-1.2.3/config.h.in 2009-07-02 17:23:59.000000000 +0200 +++ new/xf86-video-neomagic-1.2.4/config.h.in 2009-07-30 03:57:14.000000000 +0200 @@ -35,10 +35,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-1.2.3/configure.ac new/xf86-video-neomagic-1.2.4/configure.ac --- old/xf86-video-neomagic-1.2.3/configure.ac 2009-07-02 17:23:34.000000000 +0200 +++ new/xf86-video-neomagic-1.2.4/configure.ac 2009-07-30 03:48:34.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-neomagic], - 1.2.3, + 1.2.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-neomagic) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-1.2.3/missing new/xf86-video-neomagic-1.2.4/missing --- old/xf86-video-neomagic-1.2.3/missing 2009-05-28 21:07:00.000000000 +0200 +++ new/xf86-video-neomagic-1.2.4/missing 2009-07-27 05:38:26.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-1.2.3/src/neo_driver.c new/xf86-video-neomagic-1.2.4/src/neo_driver.c --- old/xf86-video-neomagic-1.2.3/src/neo_driver.c 2009-05-28 20:21:05.000000000 +0200 +++ new/xf86-video-neomagic-1.2.4/src/neo_driver.c 2009-07-28 07:18:09.000000000 +0200 @@ -54,7 +54,11 @@ /* Everything using inb/outb, etc needs "compiler.h" */ #include "compiler.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +/* Needed by Resources Access Control (RAC) */ +#include "xf86RAC.h" +#endif /* Drivers for PCI hardware need this */ #include "xf86PciInfo.h" @@ -81,9 +85,6 @@ #include "fb.h" -/* Needed by Resources Access Control (RAC) */ -#include "xf86RAC.h" - /* int10 */ #include "xf86int10.h" #include "vbe.h" @@ -687,7 +688,9 @@ /* This is the general case */ for (i = 0; i<pScrn->numEntities; i++) { nPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[i]); +#ifndef XSERVER_LIBPCIACCESS if (nPtr->pEnt->resources) return FALSE; +#endif nPtr->NeoChipset = nPtr->pEnt->chipset; pScrn->chipset = (char *)xf86TokenToString(NEOChipsets, nPtr->pEnt->chipset); @@ -1171,11 +1174,15 @@ nPtr->NeoMMIOAddr2); } } +#ifndef XSERVER_LIBPCIACCESS /* XXX What about VGA resources in OPERATING mode? */ if (xf86RegisterResources(nPtr->pEnt->index, NULL, ResExclusive)) RETURN; +#endif - } else if (nPtr->pEnt->location.type == BUS_ISA) { + } +#ifndef XSERVER_LIBPCIACCESS + else if (nPtr->pEnt->location.type == BUS_ISA) { unsigned int addr; resRange linearRes[] = { {ResExcMemBlock|ResBios|ResBus,0,0},_END }; @@ -1194,12 +1201,15 @@ "MMIO base address is set at 0x%lX.\n", nPtr->NeoMMIOAddr); } + linearRes[0].rBegin = nPtr->NeoLinearAddr; linearRes[1].rEnd = nPtr->NeoLinearAddr + nPtr->NeoFbMapSize - 1; if (xf86RegisterResources(nPtr->pEnt->index,linearRes,ResNone)) { nPtr->noLinear = TRUE; /* XXX */ } - } else + } +#endif + else RETURN; if (nPtr->pEnt->device->videoRam != 0) { @@ -1426,7 +1436,9 @@ int ret; VisualPtr visual; int allocatebase, freespace, currentaddr; +#ifndef XSERVER_LIBPCIACCESS unsigned int racflag = RAC_FB; +#endif unsigned char *FBStart; int height, width, displayWidth; @@ -1718,11 +1730,13 @@ CMAP_PALETTED_TRUECOLOR | CMAP_RELOAD_ON_MODE_SWITCH)) return FALSE; +#ifndef XSERVER_LIBPCIACCESS racflag |= RAC_COLORMAP; if (nPtr->NeoHWCursorInitialized) racflag |= RAC_CURSOR; pScrn->racIoFlags = pScrn->racMemFlags = racflag; +#endif NEOInitVideo(pScreen); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-1.2.3/src/neo_shadow.c new/xf86-video-neomagic-1.2.4/src/neo_shadow.c --- old/xf86-video-neomagic-1.2.3/src/neo_shadow.c 2008-05-12 16:50:17.000000000 +0200 +++ new/xf86-video-neomagic-1.2.4/src/neo_shadow.c 2009-07-28 02:32:25.000000000 +0200 @@ -10,7 +10,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "shadowfb.h" ++++++ xf86-video-r128-6.8.0.tar.bz2 -> xf86-video-r128-6.8.1.tar.bz2 ++++++ ++++ 15013 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.8.0/ChangeLog new/xf86-video-r128-6.8.1/ChangeLog --- old/xf86-video-r128-6.8.0/ChangeLog 2008-06-12 01:20:41.000000000 +0200 +++ new/xf86-video-r128-6.8.1/ChangeLog 2009-07-30 03:53:45.000000000 +0200 @@ -1,3 +1,73 @@ +commit d519ef9adca6e60bbafbc5649f1bafef43cebb4e +Author: Dave Airlie +Date: Tue Jul 28 15:22:41 2009 +1000 + + r128: change to using ABI version check + +commit e3568b4e5d404076c0f02c1b64af35c8e6d5745f +Author: Dave Airlie +Date: Tue Jul 28 13:32:32 2009 +1000 + + r128: update for resources/RAC API removal + +commit 38d301388cfa1f228a6fa0cddf5b7ad6258154d2 +Author: Gaetan Nadon +Date: Wed Jul 15 15:44:01 2009 -0400 + + Use XORG_CHANGELOG macro to create ChangeLog. #22611 + + Adding the macro in configure.ac and use it in Makefile.am + Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 + Global maintenance on all modules + + Signed-off-by: Peter Hutterer + +commit 178e6f509bb8b351cfa01425ada7331781843954 +Author: Peter Hutterer +Date: Thu Jul 16 11:51:08 2009 +1000 + + Update to xextproto 7.1 support. + + DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers + need to include dpmsconst.h if xextproto 7.1 is available. + + Signed-off-by: Peter Hutterer + +commit 5d8a8df3aca2f14366946e48df9b674d7254ce04 +Author: Matthieu Herrb +Date: Sat Jun 13 19:20:24 2009 +0200 + + Don't de-reference a NULL pointer in R128FreeScreen in the error path. + + If R128PreInit() failed, R128FreeRec() was already called and info + will be NULL. + +commit 771c707eb2bba21b6013327bb62859c37be08673 +Author: John Nielsen +Date: Fri Apr 17 16:16:57 2009 -0400 + + R128: fix zaphod dualhead after libpciaccess switch + + fixes bug 21251 + +commit 08d56c886c6f5cb848e4f5079a66da781ef6da21 +Author: Alan Coopersmith +Date: Fri Jan 30 20:58:51 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + +commit 23a502faeae838010061269184082348a5c43b39 +Author: Alan Coopersmith +Date: Fri Jan 9 16:32:13 2009 -0800 + + Remove xorgconfig & xorgcfg from See Also list in man page + +commit ba8cdda0c8c1151e528d5cd432612ab664abf4f3 +Author: Matthieu Herrb +Date: Sun Sep 21 19:55:55 2008 +0200 + + Kill bare RCS id. + commit e65e95c8c44f47ef044980f59a2549684e6c9403 Author: Dave Airlie Date: Mon Apr 28 10:24:50 2008 +1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.8.0/Makefile.am new/xf86-video-r128-6.8.1/Makefile.am --- old/xf86-video-r128-6.8.0/Makefile.am 2008-04-28 02:24:21.000000000 +0200 +++ new/xf86-video-r128-6.8.1/Makefile.am 2009-07-27 05:41:07.000000000 +0200 @@ -33,6 +33,6 @@ .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.8.0/README new/xf86-video-r128-6.8.1/README --- old/xf86-video-r128-6.8.0/README 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-video-r128-6.8.1/README 2009-07-27 05:41:07.000000000 +0200 @@ -0,0 +1,20 @@ +xf86-video-r128 - ATI Rage 128 video driver for the Xorg X server + +Please submit bugs & patches to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/driver/xf86-video-r128 + + http://cgit.freedesktop.org/xorg/driver/xf86-video-r128 + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.8.0/config.h.in new/xf86-video-r128-6.8.1/config.h.in --- old/xf86-video-r128-6.8.0/config.h.in 2008-06-12 01:20:13.000000000 +0200 +++ new/xf86-video-r128-6.8.1/config.h.in 2009-07-30 03:53:45.000000000 +0200 @@ -32,6 +32,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* xextproto 7.1 available */ +#undef HAVE_XEXTPROTO_71 + /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.8.0/configure.ac new/xf86-video-r128-6.8.1/configure.ac --- old/xf86-video-r128-6.8.0/configure.ac 2008-04-28 02:24:21.000000000 +0200 +++ new/xf86-video-r128-6.8.1/configure.ac 2009-07-30 03:48:06.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-r128], - 6.8.0, + 6.8.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-r128) @@ -32,6 +32,10 @@ AM_INIT_AUTOMAKE([dist-bzip2]) +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + AM_MAINTAINER_MODE # Checks for programs. @@ -66,6 +70,10 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. @@ -128,6 +136,7 @@ XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION XORG_CHECK_LINUXDOC +XORG_CHANGELOG AC_MSG_NOTICE( [Please change the Driver line in xorg.conf from "ati" to "r128" or install] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.8.0/man/Makefile.am new/xf86-video-r128-6.8.1/man/Makefile.am --- old/xf86-video-r128-6.8.0/man/Makefile.am 2008-04-28 02:24:21.000000000 +0200 +++ new/xf86-video-r128-6.8.1/man/Makefile.am 2009-07-27 05:41:07.000000000 +0200 @@ -1,4 +1,3 @@ -# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.8.0/man/r128.man new/xf86-video-r128-6.8.1/man/r128.man --- old/xf86-video-r128-6.8.0/man/r128.man 2008-04-28 02:24:21.000000000 +0200 +++ new/xf86-video-r128-6.8.1/man/r128.man 2009-07-27 05:41:07.000000000 +0200 @@ -149,7 +149,7 @@ another VT and back. .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) .SH AUTHORS .nf Rickard E. (Rik) Faith \fIfaith@precisioninsight.com\fP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.8.0/missing new/xf86-video-r128-6.8.1/missing --- old/xf86-video-r128-6.8.0/missing 2008-06-12 01:20:14.000000000 +0200 +++ new/xf86-video-r128-6.8.1/missing 2009-07-27 05:41:17.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.8.0/src/r128_driver.c new/xf86-video-r128-6.8.1/src/r128_driver.c --- old/xf86-video-r128-6.8.0/src/r128_driver.c 2008-04-28 02:24:43.000000000 +0200 +++ new/xf86-video-r128-6.8.1/src/r128_driver.c 2009-07-28 07:15:42.000000000 +0200 @@ -87,8 +87,10 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86PciInfo.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86RAC.h" #include "xf86Resources.h" +#endif #include "xf86cmap.h" #include "xf86xv.h" #include "vbe.h" @@ -101,8 +103,13 @@ #include "dixstruct.h" /* DPMS support. */ +#ifdef HAVE_XEXTPROTO_71 +#include +#else #define DPMS_SERVER #include +#endif + #ifndef MAX #define MAX(a,b) ((a)>(b)?(a):(b)) @@ -234,6 +241,16 @@ if (info->FBDev) { info->MMIO = fbdevHWMapMMIO(pScrn); } else { + /* If the primary screen has already mapped the MMIO region, + use its pointer instead of mapping it a second time. */ + if (info->IsSecondary) { + DevUnion* pPriv = xf86GetEntityPrivate(pScrn->entityList[0], + getR128EntityIndex()); + R128EntPtr pR128Ent = pPriv->ptr; + R128InfoPtr info0 = R128PTR(pR128Ent->pPrimaryScrn); + info->MMIO=info0->MMIO; + if (info->MMIO) return TRUE; + } #ifndef XSERVER_LIBPCIACCESS info->MMIO = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO | VIDMEM_READSIDEEFFECT, @@ -1965,10 +1982,12 @@ PCI_DEV_DEV(info->PciInfo), PCI_DEV_FUNC(info->PciInfo)); +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(info->pEnt->index, 0, ResNone)) goto fail; if (xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr)) goto fail; pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR; +#endif pScrn->monitor = pScrn->confScreen->monitor; if (!R128PreInitVisual(pScrn)) goto fail; @@ -4327,6 +4346,8 @@ R128InfoPtr info = R128PTR(pScrn); R128TRACE(("R128FreeScreen\n")); + if (info == NULL) + return; #ifdef WITH_VGAHW if (info->VGAAccess && xf86LoaderCheckSymbol("vgaHWFreeHWRec")) vgaHWFreeHWRec(pScrn); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.8.0/src/r128_probe.c new/xf86-video-r128-6.8.1/src/r128_probe.c --- old/xf86-video-r128-6.8.0/src/r128_probe.c 2008-04-28 02:24:21.000000000 +0200 +++ new/xf86-video-r128-6.8.1/src/r128_probe.c 2009-07-28 07:21:08.000000000 +0200 @@ -45,7 +45,11 @@ #include "xf86.h" #include "xf86PciInfo.h" + + +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#endif #ifndef XSERVER_LIBPCIACCESS static Bool R128Probe(DriverPtr drv, int flags); ++++++ xf86-video-s3-0.6.2.tar.bz2 -> xf86-video-s3-0.6.3.tar.bz2 ++++++ ++++ 57021 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.6.2/config.h.in new/xf86-video-s3-0.6.3/config.h.in --- old/xf86-video-s3-0.6.2/config.h.in 2009-07-02 17:33:09.000000000 +0200 +++ new/xf86-video-s3-0.6.3/config.h.in 2009-07-30 03:54:30.000000000 +0200 @@ -32,10 +32,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.6.2/configure.ac new/xf86-video-s3-0.6.3/configure.ac --- old/xf86-video-s3-0.6.2/configure.ac 2009-07-02 17:32:46.000000000 +0200 +++ new/xf86-video-s3-0.6.3/configure.ac 2009-07-30 03:48:12.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-s3], - 0.6.2, + 0.6.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-s3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.6.2/missing new/xf86-video-s3-0.6.3/missing --- old/xf86-video-s3-0.6.2/missing 2009-05-28 21:14:27.000000000 +0200 +++ new/xf86-video-s3-0.6.3/missing 2009-07-27 05:41:39.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.6.2/src/s3_bios.c new/xf86-video-s3-0.6.3/src/s3_bios.c --- old/xf86-video-s3-0.6.2/src/s3_bios.c 2008-08-15 19:55:19.000000000 +0200 +++ new/xf86-video-s3-0.6.3/src/s3_bios.c 2009-07-27 05:41:30.000000000 +0200 @@ -36,27 +36,38 @@ #include "s3.h" -static unsigned char *find_bios_string(S3Ptr pS3, int BIOSbase, +static unsigned char *find_bios_string(ScrnInfoPtr pScrn, int BIOSbase, char *match1, char *match2) { - static unsigned char bios[BIOS_BSIZE]; + static unsigned char *bios; static int init=0; - int i, j, l1, l2; + int i, j, l1, l2, ret; + + S3Ptr pS3 = S3PTR(pScrn); + + bios = xalloc(BIOS_BSIZE); + if (bios = NULL) + return NULL; if (!init) { init = 1; #ifndef XSERVER_LIBPCIACCESS if (xf86ReadDomainMemory(pS3->PciTag, BIOSbase, BIOS_BSIZE, bios) != BIOS_BSIZE) - return NULL; + goto error; #else - if (pci_device_read_rom(pS3->PciInfo, bios)) - return NULL; + ret = pci_device_read_rom(pS3->PciInfo, bios); + if (ret) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "libpciaccess failed to read video BIOS: %s\n", + strerror(-ret)); + goto error; + } #endif if ((bios[0] != 0x55) || (bios[1] != 0xaa)) - return NULL; + goto error; } if (match1 == NULL) - return NULL; + goto error; l1 = strlen(match1); if (match2 != NULL) @@ -74,17 +85,17 @@ !memcmp(&bios[j], match2, l2)) return &bios[j+l2]; } - +error: + xfree(bios); return NULL; } int S3GetRefClock(ScrnInfoPtr pScrn) { - S3Ptr pS3 = S3PTR(pScrn); int RefClock = 16000; /* default */ - if (find_bios_string(pS3, BIOS_BASE, "Number Nine Visual Technology", + if (find_bios_string(pScrn, BIOS_BASE, "Number Nine Visual Technology", "Motion 771") != NULL) RefClock = 16000; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.6.2/src/s3_driver.c new/xf86-video-s3-0.6.3/src/s3_driver.c --- old/xf86-video-s3-0.6.2/src/s3_driver.c 2009-07-02 17:32:23.000000000 +0200 +++ new/xf86-video-s3-0.6.3/src/s3_driver.c 2009-07-28 07:18:39.000000000 +0200 @@ -43,10 +43,12 @@ #include "xf86_OSproc.h" #include "xf86Pci.h" #include "xf86PciInfo.h" -#include "xf86Resources.h" #include "xf86fbman.h" #include "xf86cmap.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 +#include "xf86Resources.h" #include "xf86RAC.h" +#endif #include "compiler.h" #include "xaa.h" #include "mipointer.h" @@ -277,7 +279,9 @@ if (flags & PROBE_DETECT) foundScreen = TRUE; else for (i=0; idriverVersion = VERSION_MAJOR; pScrn->driverName = DRIVER_NAME; @@ -292,9 +296,6 @@ pScrn->FreeScreen = S3FreeScreen; foundScreen = TRUE; - - xf86ConfigActivePciEntity(pScrn, usedChips[i], S3PciChipsets, - NULL, NULL, NULL, NULL, NULL); } xfree(usedChips); @@ -422,11 +423,13 @@ } pEnt = xf86GetEntityInfo(pScrn->entityList[0]); +#ifndef XSERVER_LIBPCIACCESS if (pEnt->resources) { xfree(pEnt); S3FreeRec(pScrn); return FALSE; } +#endif if (xf86LoadSubModule(pScrn, "int10")) { pS3->pInt10 = xf86InitInt10(pEnt->index); @@ -447,10 +450,10 @@ return FALSE; pS3->PciInfo = xf86GetPciInfoForEntity(pEnt->index); - xf86RegisterResources(pEnt->index, NULL, ResNone); +#ifndef XSERVER_LIBPCIACCESS /* don't disable PIO funcs */ xf86SetOperatingState(resVgaMemShared, pEnt->index, ResDisableOpr); - +#endif if (pEnt->device->chipset && *pEnt->device->chipset) { pScrn->chipset = pEnt->device->chipset; pS3->Chipset = xf86StringToToken(S3Chipsets, pScrn->chipset); @@ -936,9 +939,11 @@ xf86DPMSInit(pScreen, S3DisplayPowerManagementSet, 0); +#ifndef XSERVER_LIBPCIACCESS /* XXX Check if I/O and Mem flags need to be the same. */ pScrn->racIoFlags = pScrn->racMemFlags = RAC_COLORMAP | RAC_FB | RAC_VIEWPORT | RAC_CURSOR; +#endif if (pS3->SlowEDODRAM) xf86DrvMsg(pScrn->scrnIndex, X_INFO, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.6.2/src/s3_shadow.c new/xf86-video-s3-0.6.3/src/s3_shadow.c --- old/xf86-video-s3-0.6.2/src/s3_shadow.c 2009-05-27 23:31:49.000000000 +0200 +++ new/xf86-video-s3-0.6.3/src/s3_shadow.c 2009-07-28 02:48:19.000000000 +0200 @@ -34,7 +34,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "shadowfb.h" ++++++ xf86-video-s3virge-1.10.3.tar.bz2 -> xf86-video-s3virge-1.10.4.tar.bz2 ++++++ ++++ 57484 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-1.10.3/config.h.in new/xf86-video-s3virge-1.10.4/config.h.in --- old/xf86-video-s3virge-1.10.3/config.h.in 2009-07-02 17:36:29.000000000 +0200 +++ new/xf86-video-s3virge-1.10.4/config.h.in 2009-07-30 03:54:09.000000000 +0200 @@ -32,9 +32,8 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR +/* xextproto 7.1 available */ +#undef HAVE_XEXTPROTO_71 /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-1.10.3/configure.ac new/xf86-video-s3virge-1.10.4/configure.ac --- old/xf86-video-s3virge-1.10.3/configure.ac 2009-07-02 17:36:10.000000000 +0200 +++ new/xf86-video-s3virge-1.10.4/configure.ac 2009-07-30 03:48:09.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-s3virge], - 1.10.3, + 1.10.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-s3virge) @@ -55,6 +55,10 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-1.10.3/missing new/xf86-video-s3virge-1.10.4/missing --- old/xf86-video-s3virge-1.10.3/missing 2009-05-28 21:15:05.000000000 +0200 +++ new/xf86-video-s3virge-1.10.4/missing 2009-07-27 05:42:03.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-1.10.3/src/s3v_driver.c new/xf86-video-s3virge-1.10.4/src/s3v_driver.c --- old/xf86-video-s3virge-1.10.3/src/s3v_driver.c 2009-05-28 20:21:05.000000000 +0200 +++ new/xf86-video-s3virge-1.10.4/src/s3v_driver.c 2009-07-30 03:08:48.000000000 +0200 @@ -29,9 +29,13 @@ #endif #include + +#include "xf86.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" /* Needed by Resources Access Control (RAC) */ #include "xf86RAC.h" +#endif #include "xf86DDC.h" #include "vbe.h" @@ -58,8 +62,13 @@ #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include +#else #define DPMS_SERVER #include +#endif + #ifndef USE_INT10 #define USE_INT10 0 @@ -786,11 +795,13 @@ pEnt = xf86GetEntityInfo(pScrn->entityList[0]); +#ifndef XSERVER_LIBPCIACCESS if (pEnt->resources) { xfree(pEnt); S3VFreeRec(pScrn); return FALSE; } +#endif #if USE_INT10 if (xf86LoadSubModule(pScrn, "int10")) { @@ -807,9 +818,11 @@ } ps3v->PciInfo = xf86GetPciInfoForEntity(pEnt->index); +#ifndef XSERVER_LIBPCIACCESS xf86RegisterResources(pEnt->index,NULL,ResNone); xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); +#endif /* * Set the Chipset and ChipRev, allowing config file entries to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-1.10.3/src/s3v_shadow.c new/xf86-video-s3virge-1.10.4/src/s3v_shadow.c --- old/xf86-video-s3virge-1.10.3/src/s3v_shadow.c 2008-04-07 23:08:38.000000000 +0200 +++ new/xf86-video-s3virge-1.10.4/src/s3v_shadow.c 2009-07-28 02:52:19.000000000 +0200 @@ -60,7 +60,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "shadowfb.h" ++++++ xf86-video-savage-2.3.0.tar.bz2 -> xf86-video-savage-2.3.1.tar.bz2 ++++++ ++++ 56830 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.3.0/config.h.in new/xf86-video-savage-2.3.1/config.h.in --- old/xf86-video-savage-2.3.0/config.h.in 2009-07-02 17:38:58.000000000 +0200 +++ new/xf86-video-savage-2.3.1/config.h.in 2009-07-30 04:23:38.000000000 +0200 @@ -32,13 +32,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* xextproto 7.1 available */ +#undef HAVE_XEXTPROTO_71 + /* Have xf86XVFillKeyHelperDrawable prototype */ #undef HAVE_XV_DRAWABLE_HELPER -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.3.0/configure.ac new/xf86-video-savage-2.3.1/configure.ac --- old/xf86-video-savage-2.3.0/configure.ac 2009-07-02 17:38:34.000000000 +0200 +++ new/xf86-video-savage-2.3.1/configure.ac 2009-07-30 04:23:21.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-savage], - 2.3.0, + 2.3.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-savage) @@ -60,6 +60,10 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.1.0 xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.3.0/missing new/xf86-video-savage-2.3.1/missing --- old/xf86-video-savage-2.3.0/missing 2009-05-28 21:16:04.000000000 +0200 +++ new/xf86-video-savage-2.3.1/missing 2009-07-27 05:42:26.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.3.0/src/savage_driver.c new/xf86-video-savage-2.3.1/src/savage_driver.c --- old/xf86-video-savage-2.3.0/src/savage_driver.c 2009-05-28 21:16:34.000000000 +0200 +++ new/xf86-video-savage-2.3.1/src/savage_driver.c 2009-07-30 04:23:21.000000000 +0200 @@ -42,12 +42,16 @@ #include #include -#include "xf86RAC.h" #include "shadowfb.h" #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include +#else #define DPMS_SERVER #include +#endif + #include "xf86xv.h" @@ -56,6 +60,10 @@ #include "savage_bci.h" #include "savage_streams.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 +#include "xf86RAC.h" +#endif + #define TRANSPARENCY_KEY 0xff; #ifdef XF86DRI @@ -675,7 +683,7 @@ } pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, - RES_SHARED_VGA, NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL, NULL); if (pScrn != NULL) { EntityInfoPtr pEnt; SavagePtr psav; @@ -1388,20 +1396,24 @@ } pEnt = xf86GetEntityInfo(pScrn->entityList[0]); +#ifndef XSERVER_LIBPCIACCESS if (pEnt->resources) { xfree(pEnt); SavageFreeRec(pScrn); return FALSE; } +#endif psav->EntityIndex = pEnt->index; if (xf86LoadSubModule(pScrn, "vbe")) { psav->pVbe = VBEInit(NULL, pEnt->index); } +#ifndef XSERVER_LIBPCIACCESS xf86RegisterResources(pEnt->index, NULL, ResNone); xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); +#endif from = X_DEFAULT; if (pEnt->device->chipset && *pEnt->device->chipset) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.3.0/src/savage_driver.h new/xf86-video-savage-2.3.1/src/savage_driver.h --- old/xf86-video-savage-2.3.0/src/savage_driver.h 2009-05-08 17:11:04.000000000 +0200 +++ new/xf86-video-savage-2.3.1/src/savage_driver.h 2009-07-28 07:12:26.000000000 +0200 @@ -51,7 +51,9 @@ #include "compiler.h" #include "vgaHW.h" #include "xf86.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#endif #include "xf86Pci.h" #include "xf86PciInfo.h" #include "xf86_OSproc.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.3.0/src/savage_hwmc.c new/xf86-video-savage-2.3.1/src/savage_hwmc.c --- old/xf86-video-savage-2.3.0/src/savage_hwmc.c 2008-03-17 18:23:52.000000000 +0100 +++ new/xf86-video-savage-2.3.1/src/savage_hwmc.c 2009-07-28 02:55:17.000000000 +0200 @@ -28,7 +28,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" ++++++ xf86-video-sis-0.10.1.tar.bz2 -> xf86-video-sis-0.10.2.tar.bz2 ++++++ ++++ 3636 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.10.1/config.h.in new/xf86-video-sis-0.10.2/config.h.in --- old/xf86-video-sis-0.10.1/config.h.in 2008-12-22 05:39:07.000000000 +0100 +++ new/xf86-video-sis-0.10.2/config.h.in 2009-07-30 03:55:13.000000000 +0200 @@ -32,6 +32,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* xextproto 7.1 available */ +#undef HAVE_XEXTPROTO_71 + /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.10.1/configure.ac new/xf86-video-sis-0.10.2/configure.ac --- old/xf86-video-sis-0.10.1/configure.ac 2008-12-22 05:38:15.000000000 +0100 +++ new/xf86-video-sis-0.10.2/configure.ac 2009-07-30 03:48:18.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-sis], - 0.10.1, + 0.10.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-sis) @@ -62,6 +62,10 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.10.1/man/sis.man new/xf86-video-sis-0.10.2/man/sis.man --- old/xf86-video-sis-0.10.1/man/sis.man 2008-03-10 06:34:57.000000000 +0100 +++ new/xf86-video-sis-0.10.2/man/sis.man 2009-07-27 05:43:18.000000000 +0200 @@ -429,7 +429,7 @@ none. .SH "SEE ALSO" #ifdef __xservername__ -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) #else XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.10.1/missing new/xf86-video-sis-0.10.2/missing --- old/xf86-video-sis-0.10.1/missing 2008-12-22 05:39:07.000000000 +0100 +++ new/xf86-video-sis-0.10.2/missing 2009-07-27 05:43:28.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.10.1/src/sis.h new/xf86-video-sis-0.10.2/src/sis.h --- old/xf86-video-sis-0.10.1/src/sis.h 2008-12-22 05:37:57.000000000 +0100 +++ new/xf86-video-sis-0.10.2/src/sis.h 2009-07-28 07:20:48.000000000 +0200 @@ -77,7 +77,9 @@ #include "xf86Pci.h" #include "xf86Priv.h" #include "xf86_OSproc.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#endif #include "xf86.h" #include "xf86PciInfo.h" #include "xf86Cursor.h" @@ -747,7 +749,7 @@ UChar sisRegsGR[10]; UChar sisDAC[768]; UChar sisRegs3C4[0x80]; - UChar sisRegs3D4[0xff]; + UChar sisRegs3D4[0x100]; UChar sisRegs3C2; UChar sisCapt[0x60]; UChar sisVid[0x50]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.10.1/src/sis_driver.c new/xf86-video-sis-0.10.2/src/sis_driver.c --- old/xf86-video-sis-0.10.1/src/sis_driver.c 2008-12-22 05:37:57.000000000 +0100 +++ new/xf86-video-sis-0.10.2/src/sis_driver.c 2009-07-28 07:17:04.000000000 +0200 @@ -49,7 +49,9 @@ #include "sis.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86RAC.h" +#endif #include "dixstruct.h" #include "shadowfb.h" #include "fb.h" @@ -78,8 +80,13 @@ #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include +#else #define DPMS_SERVER #include +#endif + #ifdef XF86DRI #include "dri.h" @@ -191,127 +198,6 @@ { -1, -1, RES_UNDEFINED } }; -#ifdef SIS_USE_XAA -static const char *xaaSymbols[] = { - "XAACreateInfoRec", - "XAADestroyInfoRec", - "XAAHelpPatternROP", - "XAAInit", - NULL -}; -#endif - -#ifdef SIS_USE_EXA -static const char *exaSymbols[] = { - "exaDriverAccel", - "exaDriverInit", - "exaDriverFini", - "exaOffscreenAlloc", - "exaOffscreenFree", - NULL -}; -#endif - -static const char *fbSymbols[] = { - "fbPictureInit", - "fbScreenInit", - NULL -}; - -static const char *shadowSymbols[] = { - "ShadowFBInit", - NULL -}; - -static const char *ramdacSymbols[] = { - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - "xf86InitCursor", - NULL -}; - -static const char *ddcSymbols[] = { - "xf86PrintEDID", - "xf86SetDDCproperties", - "xf86InterpretEDID", - NULL -}; - -static const char *int10Symbols[] = { - "xf86FreeInt10", - "xf86InitInt10", - NULL -}; - -static const char *vbeSymbols[] = { -#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) - "VBEInit", -#else - "VBEExtendedInit", -#endif - "vbeDoEDID", - "vbeFree", - "VBEGetVBEInfo", - "VBEFreeVBEInfo", - "VBEGetModeInfo", - "VBEFreeModeInfo", - "VBESaveRestore", - "VBESetVBEMode", - "VBEGetVBEMode", - "VBESetDisplayStart", - "VBESetGetLogicalScanlineLength", - NULL -}; - -#ifdef XF86DRI -static const char *drmSymbols[] = { - "drmAddMap", - "drmAgpAcquire", - "drmAgpRelease", - "drmAgpAlloc", - "drmAgpFree", - "drmAgpBase", - "drmAgpBind", - "drmAgpUnbind", - "drmAgpEnable", - "drmAgpGetMode", - "drmCtlInstHandler", - "drmCtlUninstHandler", - "drmGetInterruptFromBusID", -#ifndef SISHAVEDRMWRITE - "drmSiSAgpInit", -#else - "drmCommandWrite", -#endif -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) - "drmGetVersion", - "drmFreeVersion", -#endif - NULL -}; - -static const char *driSymbols[] = { - "DRICreateInfoRec", - "DRIScreenInit", - "DRIFinishScreenInit", - "DRIDestroyInfoRec", - "DRICloseScreen", - "DRIGetSAREAPrivate", - "DRILock", - "DRIUnlock", - "DRIQueryVersion", - "GlxSetVisualConfigs", - NULL -}; - -#ifdef XFree86LOADER -static const char *driRefSymbols[] = { - "DRICreatePCIBusID", /* not REQUIRED, but eventually referenced */ - NULL -}; -#endif -#endif /* XF86DRI */ - #ifdef XFree86LOADER static MODULESETUPPROTO(sisSetup); @@ -347,19 +233,6 @@ if(!setupDone) { setupDone = TRUE; xf86AddDriver(&SIS, module, SIS_HaveDriverFuncs); - LoaderRefSymLists(fbSymbols, -#ifdef SIS_USE_XAA - xaaSymbols, -#endif -#ifdef SIS_USE_EXA - exaSymbols, -#endif - shadowSymbols, ramdacSymbols, - vbeSymbols, int10Symbols, -#ifdef XF86DRI - drmSymbols, driSymbols, driRefSymbols, -#endif - NULL); return (pointer)TRUE; } @@ -2949,7 +2822,6 @@ if(pSiS->pVbe) return; if(xf86LoadSubModule(pScrn, "vbe")) { - xf86LoaderReqSymLists(vbeSymbols, NULL); #if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) pSiS->pVbe = VBEInit(pSiS->pInt, pSiS->pEnt->index); #else @@ -3628,7 +3500,6 @@ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing adapter through int10\n"); if(xf86LoadSubModule(pScrn, "int10")) { - xf86LoaderReqSymLists(int10Symbols, NULL); pSiS->pInt = xf86InitInt10(pSiS->pEnt->index); } else { SISErrorLog(pScrn, "Failed to load int10 module\n"); @@ -3683,6 +3554,7 @@ SiS_MapVGAMem(pScrn); #endif +#ifndef XSERVER_LIBPCIACCESS /* Set operating state */ /* 1. memory */ @@ -3712,14 +3584,14 @@ /* Operations for which I/O access is required */ pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; +#endif + /* Load ramdac module */ if(!xf86LoadSubModule(pScrn, "ramdac")) { SISErrorLog(pScrn, "Could not load ramdac module\n"); goto my_error_1; } - xf86LoaderReqSymLists(ramdacSymbols, NULL); - /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; @@ -4557,6 +4429,7 @@ xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX (size %ldK)\n", (ULong)pSiS->IOAddress, pSiS->mmioSize); +#ifndef XSERVER_LIBPCIACCESS /* Register the PCI-assigned resources */ if(xf86RegisterResources(pSiS->pEnt->index, NULL, ResExclusive)) { SISErrorLog(pScrn, "PCI resource conflicts detected\n"); @@ -4568,6 +4441,7 @@ SISFreeRec(pScrn); return FALSE; } +#endif from = X_PROBED; if(pSiS->pEnt->device->videoRam != 0) { @@ -6086,7 +5960,6 @@ if((pSiS->VGAEngine == SIS_300_VGA) || (pSiS->VGAEngine == SIS_315_VGA)) { if(xf86LoadSubModule(pScrn, "ddc")) { int crtnum = 0; - xf86LoaderReqSymLists(ddcSymbols, NULL); if((pMonitor = SiSDoPrivateDDC(pScrn, &crtnum))) { didddc2 = TRUE; xf86DrvMsg(pScrn->scrnIndex, X_PROBED, ddcsstr, crtnum); @@ -6119,8 +5992,6 @@ if(xf86LoadSubModule(pScrn, "ddc")) { - xf86LoaderReqSymLists(ddcSymbols, NULL); - /* Now load and initialize VBE module. */ SiS_LoadInitVBE(pScrn); @@ -6957,18 +6828,15 @@ SISErrorLog(pScrn, "Unsupported framebuffer bpp (%d)\n", pScrn->bitsPerPixel); goto my_error_1; } - xf86LoaderReqSymLists(fbSymbols, NULL); /* Load XAA/EXA (if needed) */ if(!pSiS->NoAccel) { - const char **symNames = NULL; #ifdef SIS_USE_XAA if(!pSiS->useEXA) { if (!xf86LoadSubModule(pScrn, "xaa")) { SISErrorLog(pScrn, "Could not load xaa module\n"); goto my_error_1; } - symNames = xaaSymbols; } #endif #ifdef SIS_USE_EXA @@ -6984,13 +6852,9 @@ LoaderErrorMsg(NULL, "exa", errmaj, errmin); goto my_error_1; } - symNames = exaSymbols; } #endif - if(symNames) { - xf86LoaderReqSymLists(symNames, NULL); - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n"); - } + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n"); } /* Load shadowfb (if needed) */ @@ -6999,7 +6863,6 @@ SISErrorLog(pScrn, "Could not load shadowfb module\n"); goto my_error_1; } - xf86LoaderReqSymLists(shadowSymbols, NULL); } /* Load the dri and glx modules if requested. */ @@ -7008,9 +6871,7 @@ if(!xf86LoaderCheckSymbol("DRIScreenInit")) { if(xf86LoadSubModule(pScrn, "dri")) { if(!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) { - if(xf86LoadSubModule(pScrn, "glx")) { - xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL); - } else { + if(!xf86LoadSubModule(pScrn, "glx")) { SISErrorLog(pScrn, "Failed to load glx module\n"); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.10.1/src/sis_video.c new/xf86-video-sis-0.10.2/src/sis_video.c --- old/xf86-video-sis-0.10.1/src/sis_video.c 2008-12-22 05:37:57.000000000 +0100 +++ new/xf86-video-sis-0.10.2/src/sis_video.c 2009-07-27 05:43:18.000000000 +0200 @@ -4174,7 +4174,7 @@ * adapt->flags but we provide it anyway. */ - if(index > NUM_BLIT_PORTS) return; + if(index >= NUM_BLIT_PORTS) return; REGION_EMPTY(pScrn->pScreen, &pPriv->blitClip[index]); @@ -4214,7 +4214,7 @@ SiS_Packet12_YUV MyPacket; Bool first; - if(index > NUM_BLIT_PORTS) return BadMatch; + if(index >= NUM_BLIT_PORTS) return BadMatch; if(!height || !width) return Success; ++++++ xf86-video-sisusb-0.9.2.tar.bz2 -> xf86-video-sisusb-0.9.3.tar.bz2 ++++++ ++++ 57578 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-0.9.2/config.h.in new/xf86-video-sisusb-0.9.3/config.h.in --- old/xf86-video-sisusb-0.9.2/config.h.in 2009-07-02 17:46:02.000000000 +0200 +++ new/xf86-video-sisusb-0.9.3/config.h.in 2009-07-30 03:55:56.000000000 +0200 @@ -32,9 +32,8 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR +/* xextproto 7.1 available */ +#undef HAVE_XEXTPROTO_71 /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-0.9.2/configure.ac new/xf86-video-sisusb-0.9.3/configure.ac --- old/xf86-video-sisusb-0.9.2/configure.ac 2009-07-02 17:45:37.000000000 +0200 +++ new/xf86-video-sisusb-0.9.3/configure.ac 2009-07-30 03:48:21.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-sisusb], - 0.9.2, + 0.9.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-sisusb) @@ -57,6 +57,10 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-0.9.2/missing new/xf86-video-sisusb-0.9.3/missing --- old/xf86-video-sisusb-0.9.2/missing 2009-02-24 16:22:19.000000000 +0100 +++ new/xf86-video-sisusb-0.9.3/missing 2009-07-27 05:29:21.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-0.9.2/src/sisusb.h new/xf86-video-sisusb-0.9.3/src/sisusb.h --- old/xf86-video-sisusb-0.9.2/src/sisusb.h 2008-08-19 16:22:20.000000000 +0200 +++ new/xf86-video-sisusb-0.9.3/src/sisusb.h 2009-07-27 06:09:26.000000000 +0200 @@ -83,7 +83,6 @@ #include "compiler.h" #include "xf86Priv.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "xf86.h" #include "xf86Cursor.h" #include "xf86cmap.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-0.9.2/src/sisusb_driver.c new/xf86-video-sisusb-0.9.3/src/sisusb_driver.c --- old/xf86-video-sisusb-0.9.2/src/sisusb_driver.c 2009-05-28 20:21:05.000000000 +0200 +++ new/xf86-video-sisusb-0.9.3/src/sisusb_driver.c 2009-07-27 06:10:30.000000000 +0200 @@ -35,7 +35,6 @@ #include "sisusb.h" -#include "xf86RAC.h" #include "dixstruct.h" #include "shadowfb.h" #include "fb.h" @@ -51,8 +50,13 @@ #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include +#else #define DPMS_SERVER #include +#endif + /* * This is intentionally screen-independent. It indicates the binding @@ -843,11 +847,6 @@ pScrn->chipset, pSiSUSB->sisusbversion, pSiSUSB->sisusbrevision, pSiSUSB->sisusbpatchlevel); - /* Operations for which memory access is required */ - /* USB2VGA: We never need memory or i/o access */ - pScrn->racMemFlags = 0; - pScrn->racIoFlags = 0; - /* Load ramdac module */ if(!xf86LoadSubModule(pScrn, "ramdac")) { SISUSBErrorLog(pScrn, "Could not load ramdac module\n"); ++++++ xf86-video-tdfx-1.4.2.tar.bz2 -> xf86-video-tdfx-1.4.3.tar.bz2 ++++++ ++++ 56696 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.4.2/config.h.in new/xf86-video-tdfx-1.4.3/config.h.in --- old/xf86-video-tdfx-1.4.2/config.h.in 2009-07-02 17:48:10.000000000 +0200 +++ new/xf86-video-tdfx-1.4.3/config.h.in 2009-07-30 03:56:12.000000000 +0200 @@ -32,10 +32,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.4.2/configure.ac new/xf86-video-tdfx-1.4.3/configure.ac --- old/xf86-video-tdfx-1.4.2/configure.ac 2009-07-02 17:47:46.000000000 +0200 +++ new/xf86-video-tdfx-1.4.3/configure.ac 2009-07-30 03:48:24.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-tdfx], - 1.4.2, + 1.4.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-tdfx) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.4.2/missing new/xf86-video-tdfx-1.4.3/missing --- old/xf86-video-tdfx-1.4.2/missing 2009-05-28 21:21:13.000000000 +0200 +++ new/xf86-video-tdfx-1.4.3/missing 2009-07-27 05:44:10.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.4.2/src/tdfx_driver.c new/xf86-video-tdfx-1.4.3/src/tdfx_driver.c --- old/xf86-video-tdfx-1.4.2/src/tdfx_driver.c 2009-05-28 20:21:05.000000000 +0200 +++ new/xf86-video-tdfx-1.4.3/src/tdfx_driver.c 2009-07-28 07:20:34.000000000 +0200 @@ -54,8 +54,10 @@ */ #include "xf86.h" #include "xf86_OSproc.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #include "xf86RAC.h" +#endif #include "vbe.h" #include "xf86cmap.h" @@ -855,10 +857,12 @@ pTDFX->Primary = xf86IsPrimaryPci(pTDFX->PciInfo); #endif +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pTDFX->pEnt->index, NULL, ResExclusive)) { TDFXFreeRec(pScrn); return FALSE; } + /* * We don't need VGA resources during OPERATING state. However I'm * not sure if they are disabled. @@ -876,7 +880,7 @@ pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; } else pScrn->racMemFlags = 0; - +#endif /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; ++++++ xf86-video-vesa-2.2.0.tar.bz2 -> xf86-video-vesa-2.2.1.tar.bz2 ++++++ ++++ 57134 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-vesa-2.2.0/config.h.in new/xf86-video-vesa-2.2.1/config.h.in --- old/xf86-video-vesa-2.2.0/config.h.in 2009-02-18 00:03:57.000000000 +0100 +++ new/xf86-video-vesa-2.2.1/config.h.in 2009-07-30 03:56:36.000000000 +0200 @@ -14,6 +14,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H +/* Have VBE PanelID call */ +#undef HAVE_PANELID + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -35,9 +38,8 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR +/* xextproto 7.1 available */ +#undef HAVE_XEXTPROTO_71 /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-vesa-2.2.0/configure.ac new/xf86-video-vesa-2.2.1/configure.ac --- old/xf86-video-vesa-2.2.0/configure.ac 2009-02-18 00:03:35.000000000 +0100 +++ new/xf86-video-vesa-2.2.1/configure.ac 2009-07-30 03:48:27.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-vesa], - 2.2.0, + 2.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-vesa) @@ -54,6 +54,10 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) save_CFLAGS="$CFLAGS" @@ -65,6 +69,14 @@ CFLAGS="$save_CFLAGS" save_CFLAGS="$CFLAGS" +CFLAGS="$XORG_CFLAGS" +AC_CHECK_DECL(VBEReadPanelID, + [AC_DEFINE(HAVE_PANELID, 1, [Have VBE PanelID call])], + [], + [#include "vbe.h"]) +CFLAGS="$save_CFLAGS" + +save_CFLAGS="$CFLAGS" CFLAGS="$XORG_CFLAGS" AC_CHECK_DECL(XSERVER_LIBPCIACCESS, [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-vesa-2.2.0/missing new/xf86-video-vesa-2.2.1/missing --- old/xf86-video-vesa-2.2.0/missing 2009-02-05 22:11:19.000000000 +0100 +++ new/xf86-video-vesa-2.2.1/missing 2009-07-27 05:45:42.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-vesa-2.2.0/src/vesa.c new/xf86-video-vesa-2.2.1/src/vesa.c --- old/xf86-video-vesa-2.2.0/src/vesa.c 2009-02-05 22:15:07.000000000 +0100 +++ new/xf86-video-vesa-2.2.1/src/vesa.c 2009-07-27 05:45:33.000000000 +0200 @@ -59,8 +59,13 @@ #include "xf86Modes.h" /* DPMS */ +#ifdef HAVE_XEXTPROTO_71 +#include +#else #define DPMS_SERVER #include +#endif + /* Mandatory functions */ static const OptionInfoRec * VESAAvailableOptions(int chipid, int busid); @@ -671,6 +676,13 @@ if ((pScrn->monitor->DDC = pVesa->monitor) != NULL) xf86SetDDCproperties(pScrn, pVesa->monitor); +#ifdef HAVE_PANELID + else { + void *panelid = VBEReadPanelID(pVesa->pVbe); + VBEInterpretPanelID(pScrn->scrnIndex, panelid); + xfree(panelid); + } +#endif xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB, "Searching for matching VESA mode(s):\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-vesa-2.2.0/src/vesa.h new/xf86-video-vesa-2.2.1/src/vesa.h --- old/xf86-video-vesa-2.2.0/src/vesa.h 2008-08-15 19:55:41.000000000 +0200 +++ new/xf86-video-vesa-2.2.1/src/vesa.h 2009-07-28 07:19:59.000000000 +0200 @@ -35,7 +35,11 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" + +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#include "xf86RAC.h" +#endif /* All drivers need this */ @@ -66,8 +70,7 @@ /* Dga definitions */ #include "dgaproc.h" -#include "xf86Resources.h" -#include "xf86RAC.h" + #include "fb.h" ++++++ xf86-video-voodoo-1.2.2.tar.bz2 -> xf86-video-voodoo-1.2.3.tar.bz2 ++++++ ++++ 58114 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.2.2/config.h.in new/xf86-video-voodoo-1.2.3/config.h.in --- old/xf86-video-voodoo-1.2.2/config.h.in 2009-07-02 17:54:46.000000000 +0200 +++ new/xf86-video-voodoo-1.2.3/config.h.in 2009-07-30 03:56:55.000000000 +0200 @@ -32,16 +32,15 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* xextproto 7.1 available */ +#undef HAVE_XEXTPROTO_71 + /* Have 1bpp support */ #undef HAVE_XF1BPP /* Have 4bpp support */ #undef HAVE_XF4BPP -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.2.2/configure.ac new/xf86-video-voodoo-1.2.3/configure.ac --- old/xf86-video-voodoo-1.2.2/configure.ac 2009-07-02 17:54:26.000000000 +0200 +++ new/xf86-video-voodoo-1.2.3/configure.ac 2009-07-30 03:48:30.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-voodoo], - 1.2.2, + 1.2.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-voodoo) @@ -54,6 +54,10 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.2.2/missing new/xf86-video-voodoo-1.2.3/missing --- old/xf86-video-voodoo-1.2.2/missing 2009-02-24 16:28:41.000000000 +0100 +++ new/xf86-video-voodoo-1.2.3/missing 2009-07-27 05:46:20.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.2.2/src/voodoo_dga.c new/xf86-video-voodoo-1.2.3/src/voodoo_dga.c --- old/xf86-video-voodoo-1.2.2/src/voodoo_dga.c 2008-08-15 21:55:43.000000000 +0200 +++ new/xf86-video-voodoo-1.2.3/src/voodoo_dga.c 2009-07-28 05:43:56.000000000 +0200 @@ -47,8 +47,6 @@ #include "xf86cmap.h" #include "shadowfb.h" #include "vgaHW.h" -#include "xf86RAC.h" -#include "xf86Resources.h" #include "compiler.h" #include "xaa.h" #include "dgaproc.h" @@ -59,8 +57,13 @@ #include #include "opaque.h" +#ifdef HAVE_XEXTPROTO_71 +#include +#else #define DPMS_SERVER #include +#endif + /*********************************************************************** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.2.2/src/voodoo_driver.c new/xf86-video-voodoo-1.2.3/src/voodoo_driver.c --- old/xf86-video-voodoo-1.2.2/src/voodoo_driver.c 2009-05-28 20:21:06.000000000 +0200 +++ new/xf86-video-voodoo-1.2.3/src/voodoo_driver.c 2009-07-28 07:13:29.000000000 +0200 @@ -56,8 +56,10 @@ #include "xf86cmap.h" #include "shadowfb.h" #include "vgaHW.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86RAC.h" #include "xf86Resources.h" +#endif #include "compiler.h" #include "xaa.h" @@ -67,8 +69,13 @@ #include #include "opaque.h" +#ifdef HAVE_XEXTPROTO_71 +#include +#else #define DPMS_SERVER #include +#endif + static const OptionInfoRec * VoodooAvailableOptions(int chipid, int busid); static void VoodooIdentify(int flags); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.2.2/src/voodoo_hardware.c new/xf86-video-voodoo-1.2.3/src/voodoo_hardware.c --- old/xf86-video-voodoo-1.2.2/src/voodoo_hardware.c 2009-02-24 16:27:23.000000000 +0100 +++ new/xf86-video-voodoo-1.2.3/src/voodoo_hardware.c 2009-07-28 05:45:29.000000000 +0200 @@ -48,8 +48,6 @@ #include "xf86cmap.h" #include "shadowfb.h" #include "vgaHW.h" -#include "xf86RAC.h" -#include "xf86Resources.h" #include "xaa.h" #include "compiler.h" @@ -58,8 +56,13 @@ #include #include "opaque.h" +#ifdef HAVE_XEXTPROTO_71 +#include +#else #define DPMS_SERVER #include +#endif + #include "mipict.h" #include "dixstruct.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org