Hello community, here is the log from the commit of package xf86-video-sis for openSUSE:Factory checked in at 2020-01-07 23:51:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-sis (Old) and /work/SRC/openSUSE:Factory/.xf86-video-sis.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-sis" Tue Jan 7 23:51:12 2020 rev:19 rq:760850 version:0.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-sis/xf86-video-sis.changes 2018-05-25 21:38:28.301455129 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-sis.new.6675/xf86-video-sis.changes 2020-01-07 23:51:13.699965123 +0100 @@ -1,0 +2,7 @@ +Fri Jan 3 15:18:53 UTC 2020 - Chocy Orange <callumjfarme...@gmail.com> + +- Update to version 1.12.0 +- supersedes U_06-Remove-reference-to-virtualFrom.patch, + U_07-xf86-video-sis-remove-the-GlxSetVisualConfigs-stub-and-friends.patch + +------------------------------------------------------------------- Old: ---- U_06-Remove-reference-to-virtualFrom.patch U_07-xf86-video-sis-remove-the-GlxSetVisualConfigs-stub-and-friends.patch xf86-video-sis-0.10.9.tar.bz2 xf86-video-sis-0.10.9.tar.bz2.sig xf86-video-sis.keyring New: ---- xf86-video-sis-0.12.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-sis.spec ++++++ --- /var/tmp/diff_new_pack.TS8nOV/_old 2020-01-07 23:51:14.871965731 +0100 +++ /var/tmp/diff_new_pack.TS8nOV/_new 2020-01-07 23:51:14.875965733 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-sis # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,22 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: xf86-video-sis -Version: 0.10.9 +Version: 0.12.0 Release: 0 Summary: SiS and XGI video driver for the Xorg X server -License: BSD-3-Clause and MIT +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 -Source1: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2.sig -Source2: %{name}.keyring -Patch6: U_06-Remove-reference-to-virtualFrom.patch -Patch7: U_07-xf86-video-sis-remove-the-GlxSetVisualConfigs-stub-and-friends.patch +Url: https://xorg.freedesktop.org/ +Source0: https://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -60,9 +56,6 @@ %prep %setup -q -%patch6 -p1 -%patch7 -p1 - %build %configure make %{?_smp_mflags} ++++++ xf86-video-sis-0.10.9.tar.bz2 -> xf86-video-sis-0.12.0.tar.bz2 ++++++ ++++ 4873 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.9/ChangeLog new/xf86-video-sis-0.12.0/ChangeLog --- old/xf86-video-sis-0.10.9/ChangeLog 2017-01-17 23:45:50.000000000 +0100 +++ new/xf86-video-sis-0.12.0/ChangeLog 2019-12-03 20:19:30.000000000 +0100 @@ -1,3 +1,232 @@ +commit 866e109fc12752b1679e0b59baf40326d421a03f +Author: Kevin Brace <kevinbr...@gmx.com> +Date: Tue Dec 3 10:09:49 2019 -0800 + + Version bumped to 0.12.0 + + A maintenance release to support X.Org X Server 1.20. + + Signed-off-by: Kevin Brace <kevinbr...@gmx.com> + +commit f0c0896a83e8545aa3b779934b4c30c2e5f371cf +Author: Kevin Brace <kevinbr...@gmx.com> +Date: Tue Nov 26 09:31:52 2019 -0800 + + Enable SISGAMMARAMP macro on X.Org X Server + + Signed-off-by: Kevin Brace <kevinbr...@gmx.com> + +commit eac25b01caee75210fe4df60bf2363a642981d93 +Author: Kevin Brace <kevinbr...@gmx.com> +Date: Tue Nov 26 09:31:37 2019 -0800 + + Fix for xf86InterceptSigIll() discontinuation in X Server 1.20 + + xf86InterceptSigIll() will still be used on X.Org X Server 1.19 or + older. + + Signed-off-by: Kevin Brace <kevinbr...@gmx.com> + +commit 5d816e15d8bbafa59b072e5fd561e1897a0ea04b +Author: Kevin Brace <kevinbr...@bracecomputerlab.com> +Date: Tue Nov 26 09:31:22 2019 -0800 + + Do not call xf86DisableRandR() for X Server 1.20 + + This is needed for X Server 1.20 support. + + Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com> + +commit dfe2ce49b5e9664787f5677507eba7ea0446fb7e +Author: Kevin Brace <kevinbr...@gmx.com> +Date: Fri Jul 26 15:44:13 2019 -0700 + + Version bumped to 0.11.0 + + Signed-off-by: Kevin Brace <kevinbr...@gmx.com> + +commit 16fe43012005f249375e83ebf43da76d6de67cb7 +Author: Kevin Brace <kevinbr...@gmx.com> +Date: Thu Jul 18 15:31:14 2019 -0700 + + Convert text format specifier type to unsigned short + + Signed-off-by: Kevin Brace <kevinbr...@gmx.com> + +commit 9e42918588b65860422cb296a92ecede15db7419 +Author: Fabrice Fontaine <fontaine.fabr...@gmail.com> +Date: Sat May 4 16:57:57 2019 +0200 + + configure.ac: fix cross-compilation + + AC_CHECK_FILE can't be used when cross-compiling + + [Retrieved from: + https://git.buildroot.net/buildroot/tree/package/x11r7/xdriver_xf86-video-sis/0001-cross.patch] + Signed-off-by: Fabrice Fontaine <fontaine.fabr...@gmail.com> + +commit 22d3c79f9718dada0d8ef386a3a2cd2db31d7bc8 +Author: Kevin Brace <kevinbr...@gmx.com> +Date: Mon Dec 17 18:53:46 2018 -0600 + + Convert EXA support preprocessor macro to USE_EXA + + All the other DDXs do it this way. + + Signed-off-by: Kevin Brace <kevinbr...@gmx.com> + +commit 0baf5baf7ecb0197961c8ce92943fedba852e437 +Author: Kevin Brace <kevinbr...@gmx.com> +Date: Mon Dec 17 15:23:07 2018 -0600 + + Eliminate constant related compilation warnings for native functions + + Signed-off-by: Kevin Brace <kevinbr...@gmx.com> + +commit 0b2cce041e445cee8a8308b9ae4ea70794ae8c13 +Author: Kevin Brace <kevinbr...@gmx.com> +Date: Mon Dec 17 15:08:45 2018 -0600 + + Eliminate swap macro related unused variable compilation warnings + + Unfortunately, commit c530ebb5d4ad0663838a0132e3610d713eaaa640 did not + the check for ABI_VIDEODRV_VERSION where the swap macros are actually + used in the code. Checking for ABI_VIDEODRV_VERSION suppresses unused + variable compilation warnings for newer versions of the X Server. + + Signed-off-by: Kevin Brace <kevinbr...@gmx.com> + +commit 301cefae671cb2a4f25b068b0ef2ea9331ae17f3 +Author: Kevin Brace <kevinbr...@gmx.com> +Date: Mon Dec 17 15:07:55 2018 -0600 + + Suppress logical operation and parenthesis related compilation warnings + + Signed-off-by: Kevin Brace <kevinbr...@gmx.com> + +commit 940eed5b73b28d3067b025e583ebf257cdd4603f +Author: Kevin Brace <kevinbr...@gmx.com> +Date: Mon Dec 17 15:06:53 2018 -0600 + + Eliminate set but not used variable compilation warnings + + Signed-off-by: Kevin Brace <kevinbr...@gmx.com> + +commit 7e75c8b1e944132186f8b3a9227d0eaf651b1206 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Dec 7 19:09:21 2018 -0800 + + Update configure.ac bug URL for gitlab migration + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 3fcdc11644f65744c1980e24f860bd20fc4cc782 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Nov 10 13:03:46 2018 -0800 + + Remove obsolete B16 & B32 tags in struct definitions + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 413dfdfc456d4b8a33c55012227850b1bdc07d84 +Author: Kevin Brace <kevinbr...@gmx.com> +Date: Wed Jul 11 21:15:33 2018 -0700 + + Elimination of many "variable set but not used" compilation warnings + + Signed-off-by: Kevin Brace <kevinbr...@gmx.com> + +commit 5559abc347a698ed0baf79ba7d57b4bc0056f33e +Author: Kevin Brace <kevinbr...@gmx.com> +Date: Wed Jul 11 21:02:37 2018 -0700 + + Add conditional compilation directives to suppress compilation warnings + + Signed-off-by: Kevin Brace <kevinbr...@gmx.com> + +commit 31f3dd0df2bc855ba9955b588cbcaaa25e3e60d6 +Author: Kevin Brace <kevinbr...@gmx.com> +Date: Wed Jul 11 17:09:04 2018 -0700 + + Minor adjustment to the compilation order + + Signed-off-by: Kevin Brace <kevinbr...@gmx.com> + +commit a50b2b3412dd8e7f3916acb142c942e85ffcb3e5 +Author: Emil Velikov <emil.veli...@collabora.com> +Date: Mon Jul 17 12:01:57 2017 +0100 + + xf86-video-sis: remove the GlxSetVisualConfigs stub and friends + + The function was an empty since 2008 at least. Remove it alongside the + unused GLX visuals code. + + With this all the GL/GLX dependencies in the driver are gone. + + Cc: Connor Behan <connor.be...@gmail.com> + Cc: Thomas Klausner <w...@netbsd.org> + Signed-off-by: Emil Velikov <emil.veli...@collabora.com> + +commit 4b1356a2b7fd06e9a05d134caa4033681c939737 +Author: Adam Jackson <a...@redhat.com> +Date: Thu Feb 16 11:21:27 2017 -0500 + + Remove reference to ->virtualFrom + + The core will print this information as well anyway. + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit d8b449d331a16e80a75382de60f10b3670ad4cf0 +Author: Mihail Konev <k....@ya.ru> +Date: Thu Jan 26 14:00:22 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev <k....@ya.ru> + +commit e281d49ee462afe27f52be8334c67613216a62a6 +Author: Emil Velikov <emil.l.veli...@gmail.com> +Date: Mon Mar 9 12:00:52 2015 +0000 + + autogen.sh: use quoted string variables + + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent + fall-outs, when they contain space. + + Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 96f78918e84971578f5217affba31a535227d947 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue Jan 24 10:32:07 2017 +1000 + + autogen.sh: use exec instead of waiting for configure to finish + + Syncs the invocation of configure with the one from the server. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Emil Velikov <emil.veli...@collabora.com> + +commit 576d819d534c22e7b9cd1488e847b95ed856f527 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Jun 1 21:03:14 2014 -0700 + + autogen.sh: Honor NOCONFIGURE=1 + + See http://people.gnome.org/~walters/docs/build-api.txt + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 9c55c0de3e96d2758c1fe5176531b98c7009bdca +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Jun 1 21:03:13 2014 -0700 + + configure: Drop AM_MAINTAINER_MODE + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + commit 3b1aca65448a0660d8ecb60b2431a306b66d5a5a Author: Matt Turner <matts...@gmail.com> Date: Tue Jan 17 14:45:31 2017 -0800 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.9/config.h.in new/xf86-video-sis-0.12.0/config.h.in --- old/xf86-video-sis-0.10.9/config.h.in 2017-01-17 23:45:46.000000000 +0100 +++ new/xf86-video-sis-0.12.0/config.h.in 2019-12-03 20:19:06.000000000 +0100 @@ -80,8 +80,8 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Build support for EXA */ +#undef USE_EXA + /* Version number of package */ #undef VERSION - -/* Build support for Exa */ -#undef XF86EXA 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.9/configure.ac new/xf86-video-sis-0.12.0/configure.ac --- old/xf86-video-sis-0.10.9/configure.ac 2017-01-17 23:45:29.000000000 +0100 +++ new/xf86-video-sis-0.12.0/configure.ac 2019-12-03 20:18:51.000000000 +0100 @@ -23,8 +23,8 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-sis], - [0.10.9], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [0.12.0], + [https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/issues], [xf86-video-sis]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -32,7 +32,6 @@ # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], @@ -76,12 +75,18 @@ # Checks for libraries. if test "$DRI" != no; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) + if test "$cross_compiling" = "no" ; then + AC_CHECK_FILE([${sdkdir}/dri.h], + [have_dri_h="yes"], [have_dri_h="no"]) + AC_CHECK_FILE([${sdkdir}/sarea.h], + [have_sarea_h="yes"], [have_sarea_h="no"]) + AC_CHECK_FILE([${sdkdir}/dristruct.h], + [have_dristruct_h="yes"], [have_dristruct_h="no"]) + else + have_dri_h="yes" + have_sarea_h="yes" + have_dristruct_h="yes" + fi fi AC_MSG_CHECKING([whether to include DRI support]) @@ -122,7 +127,7 @@ AC_MSG_RESULT([$XAA]) # technically this should be a configure flag. meh. -AC_DEFINE(XF86EXA, 1, [Build support for Exa]) +AC_DEFINE(USE_EXA, 1, [Build support for EXA]) SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" 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.9/src/Makefile.am new/xf86-video-sis-0.12.0/src/Makefile.am --- old/xf86-video-sis-0.10.9/src/Makefile.am 2015-08-30 01:34:25.000000000 +0200 +++ new/xf86-video-sis-0.12.0/src/Makefile.am 2019-12-03 20:18:51.000000000 +0100 @@ -32,16 +32,17 @@ 300vtbl.h \ 310vtbl.h \ compat-api.h \ + init.c \ + init.h \ init301.c \ init301.h \ - init.c \ initdef.h \ initextx.c \ initextx.h \ - init.h \ oem300.h \ oem310.h \ osdef.h \ + sis.h \ sis300_accel.c \ sis300_accel.h \ sis310_accel.c \ @@ -58,7 +59,6 @@ sis_dga.c \ sis_driver.c \ sis_driver.h \ - sis.h \ sis_memcpy.c \ sis_opt.c \ sis_regs.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-sis-0.10.9/src/init.c new/xf86-video-sis-0.12.0/src/init.c --- old/xf86-video-sis-0.10.9/src/init.c 2015-08-30 01:34:25.000000000 +0200 +++ new/xf86-video-sis-0.12.0/src/init.c 2019-12-03 20:18:51.000000000 +0100 @@ -2669,7 +2669,7 @@ SiS_SetCRT1ModeRegs(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RRTI) { - unsigned short data, infoflag = 0, modeflag, resindex; + unsigned short data, infoflag = 0, modeflag; #ifdef SIS315H unsigned char *ROMAddr = SiS_Pr->VirtualRomBase; unsigned short data2, data3; @@ -2680,7 +2680,6 @@ if(SiS_Pr->UseCustomMode) { infoflag = SiS_Pr->CInfoFlag; } else { - resindex = SiS_GetResInfo(SiS_Pr, ModeNo, ModeIdIndex); if(ModeNo > 0x13) { infoflag = SiS_Pr->SiS_RefIndex[RRTI].Ext_InfoFlag; } 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.9/src/init301.c new/xf86-video-sis-0.12.0/src/init301.c --- old/xf86-video-sis-0.10.9/src/init301.c 2010-03-07 20:36:10.000000000 +0100 +++ new/xf86-video-sis-0.12.0/src/init301.c 2019-12-03 20:18:51.000000000 +0100 @@ -2256,17 +2256,15 @@ unsigned short RefreshRateTableIndex) { unsigned short CRT2Index, VCLKIndex = 0, VCLKIndexGEN = 0, VCLKIndexGENCRT = 0; - unsigned short modeflag, resinfo, tempbx; + unsigned short resinfo, tempbx; const unsigned char *CHTVVCLKPtr = NULL; if(ModeNo <= 0x13) { - modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag; resinfo = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo; CRT2Index = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_CRT2CRTC; VCLKIndexGEN = (SiS_GetRegByte((SiS_Pr->SiS_P3ca+0x02)) >> 2) & 0x03; VCLKIndexGENCRT = VCLKIndexGEN; } else { - modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag; resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO; CRT2Index = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC; VCLKIndexGEN = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK; @@ -7434,7 +7432,7 @@ static void SiS_SetGroup4_C_ELV(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short ModeIdIndex) { - unsigned short temp, temp1, resinfo = 0; + unsigned short temp, temp1; unsigned char *ROMAddr = SiS_Pr->VirtualRomBase; if(!(SiS_Pr->SiS_VBType & VB_SIS30xCLV)) return; @@ -7446,10 +7444,6 @@ if(!(ROMAddr[0x61] & 0x04)) return; } - if(ModeNo > 0x13) { - resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO; - } - SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x3a,0x08); temp = SiS_GetReg(SiS_Pr->SiS_Part4Port,0x3a); if(!(temp & 0x01)) { 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.9/src/initextx.c new/xf86-video-sis-0.12.0/src/initextx.c --- old/xf86-video-sis-0.10.9/src/initextx.c 2015-08-30 01:34:25.000000000 +0200 +++ new/xf86-video-sis-0.12.0/src/initextx.c 2019-12-03 20:18:51.000000000 +0100 @@ -252,7 +252,7 @@ current = new; - sprintf(current->name, "%dx%d", pSiS->SiS_Pr->SiS_RefIndex[i].XRes, + sprintf(current->name, "%hu%hu", pSiS->SiS_Pr->SiS_RefIndex[i].XRes, pSiS->SiS_Pr->SiS_RefIndex[i].YRes); current->status = MODE_OK; 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.9/src/sis.h new/xf86-video-sis-0.12.0/src/sis.h --- old/xf86-video-sis-0.10.9/src/sis.h 2015-08-30 01:34:25.000000000 +0200 +++ new/xf86-video-sis-0.12.0/src/sis.h 2019-12-03 20:18:51.000000000 +0100 @@ -197,7 +197,6 @@ #include "sarea.h" #define _XF86DRI_SERVER_ #include "dri.h" -#include "GL/glxint.h" #include "sis_dri.h" #endif /* SISDRI */ @@ -231,7 +230,7 @@ #ifdef SISVRAMQ #ifdef XORG_VERSION_CURRENT -#if defined(SIS_HAVE_EXA) || (defined(XF86EXA) && (XF86EXA != 0)) +#if defined(SIS_HAVE_EXA) || (defined(USE_EXA) && (USE_EXA != 0)) #if 1 #define SIS_USE_EXA /* Include code for EXA */ #endif @@ -271,14 +270,14 @@ #undef SISCHECKOSSSE #ifdef XORG_VERSION_CURRENT -#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) +#if (XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)) || (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,19,99,1,0)) #define SISCHECKOSSSE /* Automatic check OS for SSE; requires SigIll facility */ #endif #endif #undef SISGAMMARAMP #ifdef XORG_VERSION_CURRENT -#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) +#if (XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)) || (XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,0,0,0,0)) #define SISGAMMARAMP /* Driver can set gamma ramp; requires additional symbols in xf86sym.h */ #endif #endif @@ -1198,9 +1197,6 @@ Bool directRenderingEnabled; DRIInfoPtr pDRIInfo; int drmSubFD; - int numVisualConfigs; - __GLXvisualConfig* pVisualConfigs; - SISConfigPrivPtr pVisualConfigsPriv; SISRegRec DRContextRegs; #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.9/src/sis310_accel.c new/xf86-video-sis-0.12.0/src/sis310_accel.c --- old/xf86-video-sis-0.10.9/src/sis310_accel.c 2015-08-30 01:34:25.000000000 +0200 +++ new/xf86-video-sis-0.12.0/src/sis310_accel.c 2019-12-03 20:18:51.000000000 +0100 @@ -1874,7 +1874,7 @@ SISPtr pSiS = SISPTR(pScrn); unsigned char *src, *dst; int src_pitch = exaGetPixmapPitch(pSrc); - int dst_pitch, size, w, h, bytes; + int dst_pitch, size, w, h; w = pSrc->drawable.width; @@ -1907,8 +1907,6 @@ src_pitch = exaGetPixmapPitch(pSrc); dst = pDst->devPrivate.ptr; - bytes = (src_pitch < dst_pitch) ? src_pitch : dst_pitch; - h = pSrc->drawable.height; (pSiS->SyncAccel)(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-sis-0.10.9/src/sis_cursor.c new/xf86-video-sis-0.12.0/src/sis_cursor.c --- old/xf86-video-sis-0.10.9/src/sis_cursor.c 2015-08-30 01:34:25.000000000 +0200 +++ new/xf86-video-sis-0.12.0/src/sis_cursor.c 2019-12-03 20:18:51.000000000 +0100 @@ -759,7 +759,7 @@ } if(pSiS->VBFlags & CRT2_ENABLE) { - if((pSiS->UseHWARGBCursor) && (!pSiS->VBFlags & DISPTYPE_CRT1)) { + if((pSiS->UseHWARGBCursor) && (!(pSiS->VBFlags & DISPTYPE_CRT1))) { status2 = sis301GetCursorStatus; sis301DisableHWCursor() SISWaitRetraceCRT2(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-sis-0.10.9/src/sis_dri.c new/xf86-video-sis-0.12.0/src/sis_dri.c --- old/xf86-video-sis-0.10.9/src/sis_dri.c 2015-08-30 01:34:25.000000000 +0200 +++ new/xf86-video-sis-0.12.0/src/sis_dri.c 2019-12-03 20:18:51.000000000 +0100 @@ -44,7 +44,6 @@ #include "sis_regs.h" #include "fb.h" -#include "GL/glxtokens.h" #ifndef SISHAVEDRMWRITE # if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) @@ -96,12 +95,6 @@ while( (SIS_MMIO_IN16(pSiS->IOBase, Q_STATUS+2) & 0x8000) != 0x8000){}; \ } -extern void GlxSetVisualConfigs( - int nconfigs, - __GLXvisualConfig *configs, - void **configprivs -); - /* The kernel's "sis" DRM module handles all chipsets */ static char SISKernelDriverName[] = "sis"; @@ -110,7 +103,6 @@ static char SISClientDriverNameSiS315[] = "sis315"; /* All of 315/330 series */ static char SISClientDriverNameXGI[] = "xgi"; /* XGI V3, V5, V8 */ -static Bool SISInitVisualConfigs(ScreenPtr pScreen); static Bool SISCreateContext(ScreenPtr pScreen, VisualPtr visual, drm_context_t hwContext, void *pVisualConfigPriv, DRIContextType contextStore); @@ -125,141 +117,6 @@ static void SISDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg, RegionPtr prgnSrc, CARD32 index); -static Bool -SISInitVisualConfigs(ScreenPtr pScreen) -{ - ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - SISPtr pSIS = SISPTR(pScrn); - int numConfigs = 0; - __GLXvisualConfig *pConfigs = 0; - SISConfigPrivPtr pSISConfigs = 0; - SISConfigPrivPtr *pSISConfigPtrs = 0; - int i, db, z_stencil, accum; - Bool useZ16 = FALSE; - - if(getenv("SIS_FORCE_Z16")) { - useZ16 = TRUE; - } - - switch (pScrn->bitsPerPixel) { - case 8: - case 24: - break; - case 16: - case 32: - numConfigs = (useZ16) ? 8 : 16; - - if(!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig), - numConfigs))) { - return FALSE; - } - if(!(pSISConfigs = (SISConfigPrivPtr)calloc(sizeof(SISConfigPrivRec), - numConfigs))) { - free(pConfigs); - return FALSE; - } - if(!(pSISConfigPtrs = (SISConfigPrivPtr*)calloc(sizeof(SISConfigPrivPtr), - numConfigs))) { - free(pConfigs); - free(pSISConfigs); - return FALSE; - } - for(i=0; i<numConfigs; i++) pSISConfigPtrs[i] = &pSISConfigs[i]; - - i = 0; - for(accum = 0; accum <= 1; accum++) { - for(z_stencil = 0; z_stencil < (useZ16 ? 2 : 4); z_stencil++) { - for(db = 0; db <= 1; db++) { - pConfigs[i].vid = -1; - pConfigs[i].class = -1; - pConfigs[i].rgba = TRUE; - if(pScrn->bitsPerPixel == 16) { - pConfigs[i].redSize = 5; - pConfigs[i].greenSize = 6; - pConfigs[i].blueSize = 5; - pConfigs[i].alphaSize = 0; - pConfigs[i].redMask = 0x0000F800; - pConfigs[i].greenMask = 0x000007E0; - pConfigs[i].blueMask = 0x0000001F; - pConfigs[i].alphaMask = 0x00000000; - } else { - pConfigs[i].redSize = 8; - pConfigs[i].greenSize = 8; - pConfigs[i].blueSize = 8; - pConfigs[i].alphaSize = 8; - pConfigs[i].redMask = 0x00FF0000; - pConfigs[i].greenMask = 0x0000FF00; - pConfigs[i].blueMask = 0x000000FF; - pConfigs[i].alphaMask = 0xFF000000; - } - if(accum) { - pConfigs[i].accumRedSize = 16; - pConfigs[i].accumGreenSize = 16; - pConfigs[i].accumBlueSize = 16; - if(pConfigs[i].alphaMask == 0) - pConfigs[i].accumAlphaSize = 0; - else - pConfigs[i].accumAlphaSize = 16; - } else { - pConfigs[i].accumRedSize = 0; - pConfigs[i].accumGreenSize = 0; - pConfigs[i].accumBlueSize = 0; - pConfigs[i].accumAlphaSize = 0; - } - if(db) pConfigs[i].doubleBuffer = TRUE; - else pConfigs[i].doubleBuffer = FALSE; - pConfigs[i].stereo = FALSE; - pConfigs[i].bufferSize = -1; - switch(z_stencil) { - case 0: - pConfigs[i].depthSize = 0; - pConfigs[i].stencilSize = 0; - break; - case 1: - pConfigs[i].depthSize = 16; - pConfigs[i].stencilSize = 0; - break; - case 2: - pConfigs[i].depthSize = 32; - pConfigs[i].stencilSize = 0; - break; - case 3: - pConfigs[i].depthSize = 24; - pConfigs[i].stencilSize = 8; - break; - } - pConfigs[i].auxBuffers = 0; - pConfigs[i].level = 0; - if(pConfigs[i].accumRedSize != 0) - pConfigs[i].visualRating = GLX_SLOW_CONFIG; - else - pConfigs[i].visualRating = GLX_NONE_EXT; - pConfigs[i].transparentPixel = GLX_NONE; - pConfigs[i].transparentRed = 0; - pConfigs[i].transparentGreen = 0; - pConfigs[i].transparentBlue = 0; - pConfigs[i].transparentAlpha = 0; - pConfigs[i].transparentIndex = 0; - i++; - } - } - } - if(i != numConfigs) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "[dri] Incorrect initialization of visuals. Disabling the DRI.\n"); - return FALSE; - } - break; - } - - pSIS->numVisualConfigs = numConfigs; - pSIS->pVisualConfigs = pConfigs; - pSIS->pVisualConfigsPriv = pSISConfigs; - GlxSetVisualConfigs(numConfigs, pConfigs, (void**)pSISConfigPtrs); - - return TRUE; -} - Bool SISDRIScreenInit(ScreenPtr pScreen) { @@ -276,10 +133,9 @@ pSIS->cmdQ_SharedWritePortBackup = NULL; #endif - /* Check that the GLX, DRI, and DRM modules have been loaded by testing + /* Check that the DRI, and DRM modules have been loaded by testing * for canonical symbols in each module. */ - if(!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) return FALSE; if(!xf86LoaderCheckSymbol("drmAvailable")) return FALSE; if(!xf86LoaderCheckSymbol("DRIQueryVersion")) { xf86DrvMsg(pScreen->myNum, X_ERROR, @@ -651,11 +507,6 @@ pSISDRI->irqEnabled = pSIS->irqEnabled; - if(!(SISInitVisualConfigs(pScreen))) { - SISDRICloseScreen(pScreen); - return FALSE; - } - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[dri] Visual configs initialized\n" ); return TRUE; @@ -801,16 +652,6 @@ pSIS->pDRIInfo = NULL; } - if(pSIS->pVisualConfigs) { - free(pSIS->pVisualConfigs); - pSIS->pVisualConfigs = NULL; - } - - if(pSIS->pVisualConfigsPriv) { - free(pSIS->pVisualConfigsPriv); - pSIS->pVisualConfigsPriv = NULL; - } - } /* TODO: xserver receives driver's swapping event and do something 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.9/src/sis_dri.h new/xf86-video-sis-0.12.0/src/sis_dri.h --- old/xf86-video-sis-0.10.9/src/sis_dri.h 2010-03-07 20:36:10.000000000 +0100 +++ new/xf86-video-sis-0.12.0/src/sis_dri.h 2019-12-03 20:18:51.000000000 +0100 @@ -106,11 +106,6 @@ typedef struct { /* Nothing here yet */ int dummy; -} SISConfigPrivRec, *SISConfigPrivPtr; - -typedef struct { - /* Nothing here yet */ - int dummy; } SISDRIContextRec, *SISDRIContextPtr; #include "screenint.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-sis-0.10.9/src/sis_driver.c new/xf86-video-sis-0.12.0/src/sis_driver.c --- old/xf86-video-sis-0.10.9/src/sis_driver.c 2017-01-17 23:45:12.000000000 +0100 +++ new/xf86-video-sis-0.12.0/src/sis_driver.c 2019-12-03 20:18:51.000000000 +0100 @@ -1305,7 +1305,7 @@ * (Code base taken from mga driver) */ static DisplayModePtr -SiSGetModeFromName(char* str, DisplayModePtr i) +SiSGetModeFromName(const char* str, DisplayModePtr i) { DisplayModePtr c = i; if(!i) return NULL; @@ -2148,7 +2148,9 @@ SiSProcXineramaQueryVersion(ClientPtr client) { xPanoramiXQueryVersionReply rep; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif REQUEST_SIZE_MATCH(xPanoramiXQueryVersionReq); rep.type = X_Reply; @@ -2172,7 +2174,9 @@ REQUEST(xPanoramiXGetStateReq); WindowPtr pWin; xPanoramiXGetStateReply rep; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif int rc; REQUEST_SIZE_MATCH(xPanoramiXGetStateReq); @@ -2198,7 +2202,9 @@ REQUEST(xPanoramiXGetScreenCountReq); WindowPtr pWin; xPanoramiXGetScreenCountReply rep; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif int rc; REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq); @@ -2224,7 +2230,9 @@ REQUEST(xPanoramiXGetScreenSizeReq); WindowPtr pWin; xPanoramiXGetScreenSizeReply rep; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif int rc; REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq); @@ -2259,7 +2267,9 @@ rep.sequenceNumber = client->sequence; rep.state = !SiSnoPanoramiXExtension; if(client->swapped) { +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif _swaps(&rep.sequenceNumber, n); _swapl(&rep.length, n); _swapl(&rep.state, n); @@ -2280,7 +2290,9 @@ rep.number = (SiSnoPanoramiXExtension) ? 0 : SiSXineramaNumScreens; rep.length = rep.number * sz_XineramaScreenInfo >> 2; if(client->swapped) { +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif _swaps(&rep.sequenceNumber, n); _swapl(&rep.length, n); _swapl(&rep.number, n); @@ -2297,7 +2309,9 @@ scratch.width = SiSXineramadataPtr[i].width; scratch.height = SiSXineramadataPtr[i].height; if(client->swapped) { +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif _swaps(&scratch.x_org, n); _swaps(&scratch.y_org, n); _swaps(&scratch.width, n); @@ -2337,7 +2351,9 @@ SiSSProcXineramaQueryVersion (ClientPtr client) { REQUEST(xPanoramiXQueryVersionReq); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif _swaps(&stuff->length,n); REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq); return SiSProcXineramaQueryVersion(client); @@ -2347,7 +2363,9 @@ SiSSProcXineramaGetState(ClientPtr client) { REQUEST(xPanoramiXGetStateReq); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif _swaps (&stuff->length, n); REQUEST_SIZE_MATCH(xPanoramiXGetStateReq); return SiSProcXineramaGetState(client); @@ -2357,7 +2375,9 @@ SiSSProcXineramaGetScreenCount(ClientPtr client) { REQUEST(xPanoramiXGetScreenCountReq); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif _swaps (&stuff->length, n); REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq); return SiSProcXineramaGetScreenCount(client); @@ -2367,7 +2387,9 @@ SiSSProcXineramaGetScreenSize(ClientPtr client) { REQUEST(xPanoramiXGetScreenSizeReq); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif _swaps (&stuff->length, n); REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq); return SiSProcXineramaGetScreenSize(client); @@ -2377,7 +2399,9 @@ SiSSProcXineramaIsActive(ClientPtr client) { REQUEST(xXineramaIsActiveReq); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif _swaps (&stuff->length, n); REQUEST_SIZE_MATCH(xXineramaIsActiveReq); return SiSProcXineramaIsActive(client); @@ -2387,7 +2411,9 @@ SiSSProcXineramaQueryScreens(ClientPtr client) { REQUEST(xXineramaQueryScreensReq); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif _swaps (&stuff->length, n); REQUEST_SIZE_MATCH(xXineramaQueryScreensReq); return SiSProcXineramaQueryScreens(client); @@ -2738,7 +2764,7 @@ float hsync, refresh = 0.0; char *desc, *desc2, *prefix, *uprefix, *output; - xf86DrvMsg(pScrn->scrnIndex, pScrn->virtualFrom, "Virtual size is %dx%d " + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Virtual size is %dx%d " "(pitch %d)\n", pScrn->virtualX, pScrn->virtualY, pScrn->displayWidth); @@ -6192,7 +6218,6 @@ Bool acceptcustommodes = TRUE; /* Accept user modelines */ Bool includelcdmodes = TRUE; /* Include modes reported by DDC */ Bool isfordvi = FALSE; /* Is for digital DVI output */ - Bool fakecrt2modes = FALSE; /* Fake some modes for CRT2 */ Bool IsForCRT2 = FALSE; if(pSiS->UseVESA) { acceptcustommodes = FALSE; @@ -6210,15 +6235,11 @@ if(pSiS->VBFlags & (CRT2_TV|CRT2_LCD)) { acceptcustommodes = FALSE; includelcdmodes = FALSE; - fakecrt2modes = TRUE; } } } else { acceptcustommodes = FALSE; includelcdmodes = FALSE; - if(pSiS->VBFlags & (CRT2_TV|CRT2_LCD)) { - fakecrt2modes = TRUE; - } } clockRanges->interlaceAllowed = FALSE; IsForCRT2 = TRUE; @@ -6227,7 +6248,6 @@ if(!(pSiS->VBFlags2 & VB2_SISTMDSLCDABRIDGE)) { acceptcustommodes = FALSE; includelcdmodes = FALSE; - fakecrt2modes = TRUE; /* Will handle i-lace in mode-switching code */ } else { isfordvi = TRUE; @@ -6246,7 +6266,6 @@ if(!(pSiS->VBFlags2 & VB2_SISTMDSLCDABRIDGE)) { acceptcustommodes = FALSE; includelcdmodes = FALSE; - fakecrt2modes = TRUE; /* Will handle i-lace in mode-switching code */ } else { isfordvi = TRUE; @@ -6282,7 +6301,6 @@ acceptcustommodes = FALSE; includelcdmodes = FALSE; if(!(pSiS->VBFlags & DISPTYPE_CRT1)) { - fakecrt2modes = TRUE; IsForCRT2 = TRUE; } } @@ -6291,7 +6309,6 @@ acceptcustommodes = FALSE; includelcdmodes = FALSE; if((pSiS->VBFlags & CRT1_LCDA) || (!(pSiS->VBFlags & DISPTYPE_CRT1))) { - fakecrt2modes = TRUE; IsForCRT2 = TRUE; } } else { @@ -6301,7 +6318,7 @@ pSiS->HaveCustomModes = FALSE; if(SiSMakeOwnModeList(pScrn, acceptcustommodes, includelcdmodes, - isfordvi, &pSiS->HaveCustomModes, FALSE /*fakecrt2modes*/, IsForCRT2)) { + isfordvi, &pSiS->HaveCustomModes, FALSE, IsForCRT2)) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Replaced %s mode list with built-in modes\n", pSiS->HaveCustomModes ? "default" : "entire"); @@ -6621,7 +6638,6 @@ Bool acceptcustommodes = TRUE; Bool includelcdmodes = TRUE; Bool isfordvi = FALSE; - Bool fakecrt2modes = FALSE; xf86DrvMsg(pScrn->scrnIndex, X_INFO, crtsetupstr, 2); @@ -6649,20 +6665,16 @@ if(pSiS->VBFlags & (CRT2_LCD|CRT2_TV)) { includelcdmodes = FALSE; acceptcustommodes = FALSE; - fakecrt2modes = TRUE; } } } else { includelcdmodes = FALSE; acceptcustommodes = FALSE; - if(pSiS->VBFlags & (CRT2_LCD|CRT2_TV)) { - fakecrt2modes = TRUE; - } } pSiS->HaveCustomModes2 = FALSE; if(!SiSMakeOwnModeList(pSiS->CRT2pScrn, acceptcustommodes, includelcdmodes, - isfordvi, &pSiS->HaveCustomModes2, FALSE /* fakecrt2modes */, TRUE )) { + isfordvi, &pSiS->HaveCustomModes2, FALSE, TRUE )) { SISErrorLog(pScrn, "Building list of built-in modes for CRT2 failed, %s\n", mergeddisstr); @@ -6901,17 +6913,11 @@ } } - /* Load the dri and glx modules if requested. */ + /* Load the dri modules if requested. */ #ifdef SISDRI if(pSiS->loadDRI) { if(!xf86LoaderCheckSymbol("DRIScreenInit")) { - if(xf86LoadSubModule(pScrn, "dri")) { - if(!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) { - if(!xf86LoadSubModule(pScrn, "glx")) { - SISErrorLog(pScrn, "Failed to load glx module\n"); - } - } - } else { + if(!xf86LoadSubModule(pScrn, "dri")) { SISErrorLog(pScrn, "Failed to load dri module\n"); } } @@ -8979,7 +8985,7 @@ case 24: refreshArea = SISRefreshArea24; break; case 32: refreshArea = SISRefreshArea32; break; } -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) +#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)) && (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24) xf86DisableRandR(); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Driver rotation enabled, disabling RandR\n"); @@ -8992,7 +8998,7 @@ if(!pSiS->PointerMoved) pSiS->PointerMoved = pScrn->PointerMoved; pScrn->PointerMoved = SISPointerMovedReflect; refreshArea = SISRefreshAreaReflect; -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) +#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)) && (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24) xf86DisableRandR(); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Driver reflection enabled, disabling RandR\n"); @@ -9103,7 +9109,7 @@ pSiS->Rotate = 0; pSiS->Reflect = 0; pSiS->ShadowFB = FALSE; -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) +#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)) && (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24) if(pSiS->CRT1XOffs || pSiS->CRT1YOffs || pSiS->CRT2XOffs || pSiS->CRT2YOffs) { xf86DisableRandR(); xf86DrvMsg(pScrn->scrnIndex, X_INFO, @@ -9322,7 +9328,9 @@ int CRT1XOffs = 0, CRT1YOffs = 0, CRT2XOffs = 0, CRT2YOffs = 0; int HVirt = pScrn1->virtualX; int VVirt = pScrn1->virtualY; +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 20 int sigstate; +#endif Bool doit = FALSE, HaveNonRect = FALSE, HaveOffsRegions = FALSE; SiSScrn2Rel srel = ((SiSMergedDisplayModePtr)pSiS->CurrentLayout.mode->Private)->CRT2Position; @@ -14003,9 +14011,11 @@ SiS_GetSetBIOSScratch(ScrnInfoPtr pScrn, UShort offset, UChar value) { UChar ret = 0; +#ifndef XSERVER_LIBPCIACCESS #ifdef SIS_USE_BIOS_SCRATCH UChar *base; #endif +#endif /* For some reasons (like detecting the current display mode), * we need to read (or write-back) values from the BIOS 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.9/src/sis_utility.c new/xf86-video-sis-0.12.0/src/sis_utility.c --- old/xf86-video-sis-0.10.9/src/sis_utility.c 2015-08-30 01:34:25.000000000 +0200 +++ new/xf86-video-sis-0.12.0/src/sis_utility.c 2019-12-03 20:18:51.000000000 +0100 @@ -193,30 +193,30 @@ typedef struct _SiSCtrlQueryVersion { CARD8 reqType; /* always SiSCtrlReqCode */ CARD8 SiSCtrlReqType; /* always X_SiSCtrlQueryVersion */ - CARD16 length B16; + CARD16 length; } xSiSCtrlQueryVersionReq; #define sz_xSiSCtrlQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of SISCTRL */ - CARD16 minorVersion B16; /* minor version of SISCTRL */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of SISCTRL */ + CARD16 minorVersion; /* minor version of SISCTRL */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xSiSCtrlQueryVersionReply; #define sz_xSiSCtrlQueryVersionReply 32 typedef struct { CARD8 reqType; /* always SiSCtrlReqCode */ CARD8 SiSCtrlReqType; /* always SiSCtrl_SiSCtrlCommand */ - CARD16 length B16; - CARD32 pad1 B32; + CARD16 length; + CARD32 pad1; CARD32 screen; CARD32 sdc_id; CARD32 sdc_chksum; @@ -231,8 +231,8 @@ typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD32 screen; CARD32 sdc_id; CARD32 sdc_chksum; @@ -523,7 +523,7 @@ } #endif - if((!(newvbflags & CRT2_ENABLE)) && (!newvbflags & DISPTYPE_CRT1)) { + if((!(newvbflags & CRT2_ENABLE)) && (!(newvbflags & DISPTYPE_CRT1))) { if(!quiet) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "CRT2 can't be switched off while CRT1 is off\n"); @@ -850,7 +850,7 @@ ***********************************/ static void -sisutil_prepare_string(xSiSCtrlCommandReply *sdcbuf, char *mystring) +sisutil_prepare_string(xSiSCtrlCommandReply *sdcbuf, const char *mystring) { int slen = 0; sdcbuf->sdc_buffer[0] = 0; @@ -1871,7 +1871,9 @@ SiSProcSiSCtrlQueryVersion(ClientPtr client) { xSiSCtrlQueryVersionReply rep; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif REQUEST_SIZE_MATCH(xSiSCtrlQueryVersionReq); rep.type = X_Reply; @@ -1896,7 +1898,9 @@ xSiSCtrlCommandReply rep; ExtensionEntry *myext; xSiSCtrlScreenTable *myctrl; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif int i, ret; REQUEST_SIZE_MATCH(xSiSCtrlCommandReq); @@ -1958,7 +1962,9 @@ SiSSProcSiSCtrlQueryVersion(ClientPtr client) { REQUEST(xSiSCtrlQueryVersionReq); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif _swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xSiSCtrlQueryVersionReq); return SiSProcSiSCtrlQueryVersion(client); @@ -1968,7 +1974,9 @@ SiSSProcSiSCtrlCommand(ClientPtr client) { REQUEST(xSiSCtrlCommandReq); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 register int n; +#endif int i; _swaps(&stuff->length, n); _swapl(&stuff->screen, 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.9/src/sis_video.c new/xf86-video-sis-0.12.0/src/sis_video.c --- old/xf86-video-sis-0.10.9/src/sis_video.c 2015-08-30 01:34:25.000000000 +0200 +++ new/xf86-video-sis-0.12.0/src/sis_video.c 2019-12-03 20:18:51.000000000 +0100 @@ -4212,7 +4212,11 @@ UChar *ybased, *uvbased, packed; CARD16 *myuvbased; SiS_Packet12_YUV MyPacket; +#if 0 +#ifdef SISMERGED Bool first; +#endif +#endif if(index >= NUM_BLIT_PORTS) return BadMatch; @@ -4388,7 +4392,11 @@ } #endif +#if 0 +#ifdef SISMERGED first = TRUE; +#endif +#endif while(nbox--) { left = pbox->x1; if(left >= drw_x + xoffset + width) goto mycont; @@ -4477,7 +4485,11 @@ #if 0 MyPacket.P12_Command &= ~(pPriv->VBlankTriggerCRT1 | pPriv->VBlankTriggerCRT2); #endif +#if 0 +#ifdef SISMERGED first = FALSE; +#endif +#endif mycont: pbox++; }
