Hello community, here is the log from the commit of package xf86-video-sis for openSUSE:Factory checked in at 2015-09-03 17:59:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-sis (Old) and /work/SRC/openSUSE:Factory/.xf86-video-sis.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-sis" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-sis/xf86-video-sis.changes 2015-02-10 20:17:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-sis.new/xf86-video-sis.changes 2015-09-03 18:05:21.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Sep 1 08:04:19 UTC 2015 - sndir...@suse.com + +- Update to version 0.10.8: + * Remove mibstore.h + * Stop including xf86Priv.h + * Fix HDisplay/VDisplay typos + * Remove upload / download EXA hooks + * sis: fix build against latest xserver + * sis: more build fixes against master X server. + * sis: force build, who uses this crazy code anyways + * Replace xf86UnMapVidMem with pci_device_unmap_range + * Fix format-security warnings +- supersedes patches: + * U_Remove-mibstore.h.patch + * U_Replace-xf86UnMapVidMem-with-pci_device_unmap_range.patch + * U_Stop-including-xf86Priv.h.patch + * U_sis-fix-build-against-latest-xserver.patch + * U_sis-more-build-fixes-against-master-X-server.patch + * u_Fixed-build-with-INPUT_API-19.patch + +------------------------------------------------------------------- Old: ---- U_Remove-mibstore.h.patch U_Replace-xf86UnMapVidMem-with-pci_device_unmap_range.patch U_Stop-including-xf86Priv.h.patch U_sis-fix-build-against-latest-xserver.patch U_sis-more-build-fixes-against-master-X-server.patch u_Fixed-build-with-INPUT_API-19.patch xf86-video-sis-0.10.7.tar.bz2 New: ---- xf86-video-sis-0.10.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-sis.spec ++++++ --- /var/tmp/diff_new_pack.ir0yhA/_old 2015-09-03 18:05:24.000000000 +0200 +++ /var/tmp/diff_new_pack.ir0yhA/_new 2015-09-03 18:05:24.000000000 +0200 @@ -17,19 +17,13 @@ Name: xf86-video-sis -Version: 0.10.7 +Version: 0.10.8 Release: 0 Summary: SiS and XGI video driver for the Xorg X server License: BSD-3-Clause and MIT Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 -Patch0: U_Replace-xf86UnMapVidMem-with-pci_device_unmap_range.patch -Patch1: U_Remove-mibstore.h.patch -Patch2: U_Stop-including-xf86Priv.h.patch -Patch3: u_Fixed-build-with-INPUT_API-19.patch -Patch4: U_sis-fix-build-against-latest-xserver.patch -Patch5: U_sis-more-build-fixes-against-master-X-server.patch BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -61,12 +55,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %configure ++++++ xf86-video-sis-0.10.7.tar.bz2 -> xf86-video-sis-0.10.8.tar.bz2 ++++++ ++++ 24029 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.7/ChangeLog new/xf86-video-sis-0.10.8/ChangeLog --- old/xf86-video-sis-0.10.7/ChangeLog 2012-07-17 08:29:10.000000000 +0200 +++ new/xf86-video-sis-0.10.8/ChangeLog 2015-08-30 01:41:54.000000000 +0200 @@ -1,3 +1,113 @@ +commit 13b56dc68af8cc41f4fd44115302a3ebbe6662a1 +Author: Matt Turner <matts...@gmail.com> +Date: Sat Aug 29 16:35:43 2015 -0700 + + xf86-video-sis: bump to version 0.10.8. + + Signed-off-by: Matt Turner <matts...@gmail.com> + +commit e834b2cdaedccff5e13cef86af23e46992c2530a +Author: Connor Behan <connor.be...@gmail.com> +Date: Mon Aug 3 13:22:24 2015 -0400 + + Remove upload / download EXA hooks + + Support based on something other than libc memcpy was never added, so + these functions did not improve upon software fallback at all. + + Signed-off-by: Connor Behan <connor.be...@gmail.com> + +commit 0f50f8c3db2b9f1c9d4ecab8ad278e9db6418a92 +Author: Dave Airlie <airl...@redhat.com> +Date: Wed Nov 12 09:27:33 2014 +1000 + + sis: force build, who uses this crazy code anyways + +commit d2597696ba81862d80ec17b978d8370c58572e27 +Author: Dave Airlie <airl...@redhat.com> +Date: Wed Nov 12 08:04:21 2014 +1000 + + sis: more build fixes against master X server. + +commit d0550de19cacab3e591641ba358a72fbc798b231 +Author: Dave Airlie <airl...@redhat.com> +Date: Mon Sep 22 12:45:02 2014 +1000 + + sis: fix build against latest xserver + +commit 49796d6a3274adc0250ee07faa6bc63e41c98740 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Nov 22 08:21:18 2013 +1000 + + Fix format-security warnings + + sis_driver.c: In function 'SISErrorLog': + sis_driver.c:432:5: error: format not a string literal and no format arguments [-Werror=format-security] + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); + ^ + sis_driver.c:439:5: error: format not a string literal and no format arguments [-Werror=format-security] + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); + ^ + sis_driver.c: In function 'SiSUpdateXineramaScreenInfo': + sis_driver.c:1917:4: error: format not a string literal and no format arguments [-Werror=format-security] + xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine); + ^ + sis_driver.c:1924:8: error: format not a string literal and no format arguments [-Werror=format-security] + xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine); + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 0a4336efaafac4c34d4287b5df586bbb418f7f76 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Oct 26 14:27:17 2013 -0700 + + Fix HDisplay/VDisplay typos + + Found by gcc -Wlogicalops: + + sis_driver.c: In function 'SiS_CheckModeCRT2': + sis_driver.c:13754:5: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op] + sis_driver.c:13755:6: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op] + sis_driver.c:13756:6: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op] + sis_driver.c:13758:5: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op] + sis_driver.c:13759:6: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op] + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Gaetan Nadon <mems...@videotron.ca> + +commit 7d4402786b758de3e6ce2641e15a39d612d5c518 +Author: Adam Jackson <a...@redhat.com> +Date: Mon Oct 15 19:11:30 2012 -0400 + + Stop including xf86Priv.h + + As the name might suggest, it's server-private. + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit 926d4f655c8491b68a338f50c810f6729686ec9f +Author: Adam Jackson <a...@redhat.com> +Date: Tue Sep 25 08:54:51 2012 -0400 + + Remove mibstore.h + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit 339fb3bc032b9f35b07b90480ae82a0fd352e078 +Author: Jan Lindemann <j...@jannet.de> +Date: Thu Aug 30 20:09:10 2012 +0200 + + Replace xf86UnMapVidMem with pci_device_unmap_range + + Mixing pci_device_map_range with xf86UnMapVidMem doesn't work too well. + + X.Org bug#18028 <https://bugs.freedesktop.org/show_bug.cgi?id=18028> + + Bug found by Bryan Henderson <bry...@giraffe-data.com> + + Signed-off-by: Julien Cristau <jcris...@debian.org> + commit 8c5127a6815935635b84835055bf4c2501c0bf6e Author: Dave Airlie <airl...@redhat.com> Date: Tue Jul 17 16:05:09 2012 +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-sis-0.10.7/INSTALL new/xf86-video-sis-0.10.8/INSTALL --- old/xf86-video-sis-0.10.7/INSTALL 2012-07-17 08:29:10.000000000 +0200 +++ new/xf86-video-sis-0.10.8/INSTALL 2015-08-30 01:41:54.000000000 +0200 @@ -1,11 +1,13 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -159,10 +222,15 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -174,6 +242,16 @@ ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -189,7 +267,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -277,7 +356,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. 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.7/config.h.in new/xf86-video-sis-0.10.8/config.h.in --- old/xf86-video-sis-0.10.7/config.h.in 2012-07-17 08:29:10.000000000 +0200 +++ new/xf86-video-sis-0.10.8/config.h.in 2015-08-30 01:38:40.000000000 +0200 @@ -38,8 +38,7 @@ /* xextproto 7.1 available */ #undef HAVE_XEXTPROTO_71 -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of 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.7/configure.ac new/xf86-video-sis-0.10.8/configure.ac --- old/xf86-video-sis-0.10.7/configure.ac 2012-07-17 08:00:16.000000000 +0200 +++ new/xf86-video-sis-0.10.8/configure.ac 2015-08-30 01:35:40.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-sis], - [0.10.7], + [0.10.8], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-sis]) AC_CONFIG_SRCDIR([Makefile.am]) 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.7/missing new/xf86-video-sis-0.10.8/missing --- old/xf86-video-sis-0.10.7/missing 2012-06-06 10:28:40.000000000 +0200 +++ new/xf86-video-sis-0.10.8/missing 2011-09-25 18:24:54.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2012-01-06.13; # UTC +scriptversion=2009-04-28.21; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -84,6 +84,7 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file + 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 @@ -121,6 +122,15 @@ # Not GNU programs, they don't have --version. ;; + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -216,7 +226,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG=\${$#} + eval LASTARG="\${$#}" case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -246,7 +256,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG=\${$#} + eval LASTARG="\${$#}" case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -308,6 +318,41 @@ touch $file ;; + tar*) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. 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.7/src/sis.h new/xf86-video-sis-0.10.8/src/sis.h --- old/xf86-video-sis-0.10.7/src/sis.h 2012-07-17 07:20:28.000000000 +0200 +++ new/xf86-video-sis-0.10.8/src/sis.h 2015-08-30 01:34:25.000000000 +0200 @@ -75,7 +75,6 @@ #include "compiler.h" #include "xf86Pci.h" -#include "xf86Priv.h" #include "xf86_OSproc.h" #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" @@ -1005,7 +1004,9 @@ ScrnInfoPtr pScrn; pciVideoPtr PciInfo; int PciBus, PciDevice, PciFunc; +#ifndef XSERVER_LIBPCIACCESS PCITAG PciTag; +#endif EntityInfoPtr pEnt; int Chipset; unsigned char ChipType; 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.7/src/sis300_accel.c new/xf86-video-sis-0.10.8/src/sis300_accel.c --- old/xf86-video-sis-0.10.7/src/sis300_accel.c 2012-06-06 10:47:03.000000000 +0200 +++ new/xf86-video-sis-0.10.8/src/sis300_accel.c 2015-08-30 01:34:25.000000000 +0200 @@ -59,10 +59,7 @@ #ifdef SIS_USE_EXA extern void SiSScratchSave(ScreenPtr pScreen, ExaOffscreenArea *area); -extern Bool SiSUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int src_pitch); extern Bool SiSUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst); -extern Bool SiSDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, - char *dst, int dst_pitch); #endif /* EXA */ extern UChar SiSGetCopyROP(int rop); @@ -1273,10 +1270,6 @@ /* Composite not supported */ - /* Upload, download to/from Screen */ - pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; - pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; - } else { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 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.7/src/sis310_accel.c new/xf86-video-sis-0.10.8/src/sis310_accel.c --- old/xf86-video-sis-0.10.7/src/sis310_accel.c 2012-06-06 10:47:03.000000000 +0200 +++ new/xf86-video-sis-0.10.8/src/sis310_accel.c 2015-08-30 01:34:25.000000000 +0200 @@ -129,9 +129,7 @@ #ifdef SIS_USE_EXA /* EXA */ void SiSScratchSave(ScreenPtr pScreen, ExaOffscreenArea *area); -Bool SiSUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int src_pitch); Bool SiSUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst); -Bool SiSDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch); #endif /* EXA */ #ifdef INCL_YUV_BLIT_ADAPTOR @@ -1870,30 +1868,6 @@ #endif Bool -SiSUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int src_pitch) -{ - ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen); - SISPtr pSiS = SISPTR(pScrn); - unsigned char *dst = pDst->devPrivate.ptr; - int dst_pitch = exaGetPixmapPitch(pDst); - - (pSiS->SyncAccel)(pScrn); - - if(pDst->drawable.bitsPerPixel < 8) - return FALSE; - - dst += (x * pDst->drawable.bitsPerPixel / 8) + (y * src_pitch); - while(h--) { - SiSMemCopyToVideoRam(pSiS, dst, (unsigned char *)src, - (w * pDst->drawable.bitsPerPixel / 8)); - src += src_pitch; - dst += dst_pitch; - } - - return TRUE; -} - -Bool SiSUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst) { ScrnInfoPtr pScrn = xf86ScreenToScrn(pSrc->drawable.pScreen); @@ -1947,30 +1921,6 @@ return TRUE; } - -Bool -SiSDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch) -{ - ScrnInfoPtr pScrn = xf86ScreenToScrn(pSrc->drawable.pScreen); - SISPtr pSiS = SISPTR(pScrn); - unsigned char *src = pSrc->devPrivate.ptr; - int src_pitch = exaGetPixmapPitch(pSrc); - int size = src_pitch < dst_pitch ? src_pitch : dst_pitch; - - (pSiS->SyncAccel)(pScrn); - - if(pSrc->drawable.bitsPerPixel < 8) - return FALSE; - - src += (x * pSrc->drawable.bitsPerPixel / 8) + (y * src_pitch); - while(h--) { - SiSMemCopyFromVideoRam(pSiS, (unsigned char *)dst, src, size); - src += src_pitch; - dst += dst_pitch; - } - - return TRUE; -} #endif /* EXA */ /* Helper for xv video blitter */ @@ -2303,10 +2253,6 @@ } #endif - /* Upload, download to/from Screen */ - pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; - pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; - } #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.7/src/sis_accel.c new/xf86-video-sis-0.10.8/src/sis_accel.c --- old/xf86-video-sis-0.10.7/src/sis_accel.c 2012-06-06 10:47:03.000000000 +0200 +++ new/xf86-video-sis-0.10.8/src/sis_accel.c 2015-08-30 01:34:25.000000000 +0200 @@ -53,9 +53,7 @@ #ifdef SIS_USE_EXA extern void SiSScratchSave(ScreenPtr pScreen, ExaOffscreenArea *area); -extern Bool SiSUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int src_pitch); extern Bool SiSUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst); -extern Bool SiSDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch); #endif /* EXA */ extern UChar SiSGetCopyROP(int rop); @@ -801,10 +799,6 @@ /* Composite not supported */ - /* Upload, download to/from Screen */ - pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; - pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; - } #endif /* EXA */ 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.7/src/sis_driver.c new/xf86-video-sis-0.10.8/src/sis_driver.c --- old/xf86-video-sis-0.10.7/src/sis_driver.c 2012-07-17 07:20:28.000000000 +0200 +++ new/xf86-video-sis-0.10.8/src/sis_driver.c 2015-08-30 01:34:25.000000000 +0200 @@ -57,7 +57,6 @@ #include "fb.h" #include "micmap.h" #include "mipointer.h" -#include "mibstore.h" #include "edid.h" #define SIS_NEED_inSISREG @@ -94,6 +93,10 @@ #include "dri.h" #endif +#ifndef DEFAULT_DPI +#define DEFAULT_DPI 96 +#endif + /* * LookupWindow was removed with video abi 11. */ @@ -426,14 +429,14 @@ static const char *str = "**************************************************\n"; va_start(ap, format); - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, " ERROR:\n"); xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap); va_end(ap); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, " END OF MESSAGE\n"); - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str); } static void @@ -1911,14 +1914,14 @@ if(infochanged && !usenonrect) { xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "Virtual screen size does not match maximum display modes...\n"); - xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine); + xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "%s", rectxine); } } else if(infochanged && usenonrect) { usenonrect = FALSE; xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "Only clone modes available for this virtual screen size...\n"); - xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine); + xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "%s", rectxine); } if(pSiS->maxCRT1_X1) { /* Means we have at least one non-clone mode */ @@ -3276,9 +3279,11 @@ pSiS->PciDevice = PCI_CFG_DEV(pSiS->PciInfo); /*SIS_PCI_DEVICE(pSiS->PciInfo);*/ pSiS->PciFunc = PCI_CFG_FUNC(pSiS->PciInfo); /*SIS_PCI_FUNC(pSiS->PciInfo);*/ +#ifndef XSERVER_LIBPCIACCESS pSiS->PciTag = pciTag(PCI_DEV_BUS(pSiS->PciInfo), PCI_DEV_DEV(pSiS->PciInfo), PCI_DEV_FUNC(pSiS->PciInfo)); +#endif #ifdef SIS_NEED_MAP_IOP /********************************************/ @@ -3902,7 +3907,9 @@ if(pSiSEnt) pSiSEnt->SiS_Pr = pSiS->SiS_Pr; #endif memset(pSiS->SiS_Pr, 0, sizeof(struct SiS_Private)); +#ifndef XSERVER_LIBPCIACCESS pSiS->SiS_Pr->PciTag = pSiS->PciTag; +#endif pSiS->SiS_Pr->ChipType = pSiS->ChipType; pSiS->SiS_Pr->ChipRevision = pSiS->ChipRev; pSiS->SiS_Pr->SiS_Backup70xx = 0xff; @@ -7131,7 +7138,9 @@ SISMapMem(ScrnInfoPtr pScrn) { SISPtr pSiS = SISPTR(pScrn); +#ifndef XSERVER_LIBPCIACCESS int mmioFlags = VIDMEM_MMIO; +#endif #ifdef SISDUALHEAD SISEntPtr pSiSEnt = pSiS->entityPrivate; #endif @@ -7141,9 +7150,11 @@ * (For Alpha, we need to map SPARSE memory, since we need * byte/short access.) */ +#ifndef XSERVER_LIBPCIACCESS #if defined(__alpha__) mmioFlags |= VIDMEM_SPARSE; #endif +#endif #ifdef SISDUALHEAD if(pSiS->DualHeadMode) { @@ -7344,7 +7355,11 @@ if(pSiSEnt->MapCountIOBase) { pSiSEnt->MapCountIOBase--; if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) { +#ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024)); +#else + pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase, (pSiS->mmioSize * 1024)); +#endif pSiSEnt->IOBase = NULL; pSiSEnt->MapCountIOBase = 0; pSiSEnt->forceUnmapIOBase = FALSE; @@ -7355,7 +7370,11 @@ if(pSiSEnt->MapCountIOBaseDense) { pSiSEnt->MapCountIOBaseDense--; if((pSiSEnt->MapCountIOBaseDense == 0) || (pSiSEnt->forceUnmapIOBaseDense)) { +#ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024)); +#else + pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024)); +#endif pSiSEnt->IOBaseDense = NULL; pSiSEnt->MapCountIOBaseDense = 0; pSiSEnt->forceUnmapIOBaseDense = FALSE; @@ -7366,7 +7385,11 @@ if(pSiSEnt->MapCountFbBase) { pSiSEnt->MapCountFbBase--; if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) { +#ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize); +#else + pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize); +#endif pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL; pSiSEnt->MapCountFbBase = 0; pSiSEnt->forceUnmapFbBase = FALSE; @@ -7376,13 +7399,25 @@ } } else { #endif +#ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024)); +#else + pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024)); +#endif pSiS->IOBase = NULL; #ifdef __alpha__ +#ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024)); +#else + pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024)); +#endif pSiS->IOBaseDense = NULL; #endif +#ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->RealFbBase, pSiS->FbMapSize); +#else + pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->RealFbBase, pSiS->FbMapSize); +#endif pSiS->FbBase = pSiS->RealFbBase = NULL; #ifdef SISDUALHEAD } @@ -8859,7 +8894,6 @@ } pSiS->SiSFastVidCopyDone = TRUE; - miInitializeBackingStore(pScreen); xf86SetBackingStore(pScreen); xf86SetSilkenMouse(pScreen); @@ -9351,6 +9385,7 @@ } } if(doit) { +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 20 /* screw it */ sigstate = xf86BlockSIGIO(); #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 { @@ -9368,6 +9403,7 @@ miPointerAbsoluteCursor(x, y, currentTime.milliseconds); #endif xf86UnblockSIGIO(sigstate); +#endif return; } } @@ -13725,12 +13761,12 @@ if( ((mode->HDisplay <= pSiS->LCDwidth) && (mode->VDisplay <= pSiS->LCDheight)) || ((pSiS->SiS_Pr->SiS_CustomT == CUT_PANEL848) && - (((mode->HDisplay == 1360) && (mode->HDisplay == 768)) || - ((mode->HDisplay == 1024) && (mode->HDisplay == 768)) || - ((mode->HDisplay == 800) && (mode->HDisplay == 600)))) || + (((mode->HDisplay == 1360) && (mode->VDisplay == 768)) || + ((mode->HDisplay == 1024) && (mode->VDisplay == 768)) || + ((mode->HDisplay == 800) && (mode->VDisplay == 600)))) || ((pSiS->SiS_Pr->SiS_CustomT == CUT_PANEL856) && - (((mode->HDisplay == 1024) && (mode->HDisplay == 768)) || - ((mode->HDisplay == 800) && (mode->HDisplay == 600)))) ) { + (((mode->HDisplay == 1024) && (mode->VDisplay == 768)) || + ((mode->HDisplay == 800) && (mode->VDisplay == 600)))) ) { ModeIndex = SiS_GetModeID_LCD(pSiS->VGAEngine, VBFlags, mode->HDisplay, mode->VDisplay, i, pSiS->FSTN, pSiS->SiS_Pr->SiS_CustomT, pSiS->LCDwidth, pSiS->LCDheight, @@ -13991,6 +14027,7 @@ break; } +#ifndef XSERVER_LIBPCIACCESS #ifdef SIS_USE_BIOS_SCRATCH if(SISPTR(pScrn)->Primary) { base = xf86MapVidMem(pScrn->scrnIndex, VIDMEM_MMIO, 0, 0x2000); @@ -14009,6 +14046,7 @@ xf86UnMapVidMem(pScrn->scrnIndex, base, 0x2000); } #endif +#endif return ret; } 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.7/src/vstruct.h new/xf86-video-sis-0.10.8/src/vstruct.h --- old/xf86-video-sis-0.10.7/src/vstruct.h 2012-06-06 10:47:03.000000000 +0200 +++ new/xf86-video-sis-0.10.8/src/vstruct.h 2015-08-30 01:34:25.000000000 +0200 @@ -237,8 +237,10 @@ unsigned char ChipType; unsigned char ChipRevision; #ifdef SIS_XORG_XF86 +#ifndef XSERVER_LIBPCIACCESS PCITAG PciTag; #endif +#endif #ifdef SIS_LINUX_KERNEL void *ivideo; #endif
