Hello community, here is the log from the commit of package xf86-video-vesa for openSUSE:Factory checked in at 2018-02-20 17:53:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-vesa (Old) and /work/SRC/openSUSE:Factory/.xf86-video-vesa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-vesa" Tue Feb 20 17:53:40 2018 rev:15 rq:577290 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-vesa/xf86-video-vesa.changes 2017-06-04 01:45:39.348347590 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-vesa.new/xf86-video-vesa.changes 2018-02-20 17:53:44.881331863 +0100 @@ -1,0 +2,8 @@ +Fri Feb 16 14:46:06 UTC 2018 - [email protected] + +- Update to version 2.4.0 + * Nothing terribly exciting, but enough bug fixes to justify a + release. +- supersedes u_Enable-DefaultRefresh-by-default.patch + +------------------------------------------------------------------- Old: ---- u_Enable-DefaultRefresh-by-default.patch xf86-video-vesa-2.3.4.tar.bz2 xf86-video-vesa-2.3.4.tar.bz2.sig New: ---- xf86-video-vesa-2.4.0.tar.bz2 xf86-video-vesa-2.4.0.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-vesa.spec ++++++ --- /var/tmp/diff_new_pack.SkViHm/_old 2018-02-20 17:53:45.653304066 +0100 +++ /var/tmp/diff_new_pack.SkViHm/_new 2018-02-20 17:53:45.657303922 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-vesa # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -17,7 +17,7 @@ Name: xf86-video-vesa -Version: 2.3.4 +Version: 2.4.0 Release: 0 Summary: Generic VESA video driver for the Xorg X server License: MIT @@ -26,7 +26,6 @@ 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 -Patch0: u_Enable-DefaultRefresh-by-default.patch Patch1: u_Restore-palette-on-LeaveVT.patch Patch2: u_DPMS-Query-DPMS-capabilites-and-query-current-state-before-changing.patch Patch3: u_DPMS-Check-for-broken-DPMSGet.patch @@ -56,7 +55,6 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 ++++++ xf86-video-vesa-2.3.4.tar.bz2 -> xf86-video-vesa-2.4.0.tar.bz2 ++++++ ++++ 21675 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.3.4/ChangeLog new/xf86-video-vesa-2.4.0/ChangeLog --- old/xf86-video-vesa-2.3.4/ChangeLog 2015-06-16 18:00:08.000000000 +0200 +++ new/xf86-video-vesa-2.4.0/ChangeLog 2018-02-15 20:34:14.000000000 +0100 @@ -1,3 +1,126 @@ +commit 07e4a0f0b3bd6308da2e000c12230b1e171e65a7 +Author: Adam Jackson <[email protected]> +Date: Thu Feb 15 14:33:38 2018 -0500 + + vesa 2.4.0 + + Signed-off-by: Adam Jackson <[email protected]> + +commit f7876ce62c751c9b28d5750e1d01def877e666fb +Author: Ian Lepore <[email protected]> +Date: Wed Jan 31 10:48:09 2018 -0500 + + Honor Option "NoDDC" correctly + + Move xf86CollectOptions before the DDC code so it can actually hear us + when we ask to disable DDC. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=46541 + Signed-off-by: Adam Jackson <[email protected]> + +commit 2cb984533fd7a36151bb8be18a63f678a552ad71 +Author: Adam Jackson <[email protected]> +Date: Wed Jan 31 10:48:08 2018 -0500 + + Use VBEFreeVBEInfo not free + + A VbeInfoBlock has substructure, just freeing the object will leak. + Unfortunately VBEFreeVBEInfo does not check for NULL first so we have + to. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=25029 + Signed-off-by: Adam Jackson <[email protected]> + +commit 9c4f6c7ab011435a492dd5cb1847bf00f290c219 +Author: Adam Jackson <[email protected]> +Date: Wed Jan 31 10:48:07 2018 -0500 + + Fall back to VGA if the palette API isn't supported + + I ported vesa to use the VBE service back in: + + commit 55f585a15f42ffe028ff37ea1f63543795dbf56e + Author: Adam Jackson <[email protected]> + Date: Fri Sep 18 17:02:16 2009 -0400 + + Use VBE palette load, not VGA banging. + + I'm reasonably sure that worked on all the hardware I had handy at the + time. But it doesn't work in seabios, which means 8bpp is broken under + qemu. + + We query this API early in initialization, and if it fails ->savedPal + will be NULL, so use that as the hint to fall back to VGA banging. + + Signed-off-by: Adam Jackson <[email protected]> + Reviewed-by: Dave Airlie <[email protected]> + +commit c6fdaad9649d3fb6a13a8180c17ea8181aabd375 +Author: Adam Jackson <[email protected]> +Date: Wed Jan 31 10:48:06 2018 -0500 + + Don't build old probe method on sufficiently new servers + + If we have pciaccess and not ISA support VESAProbe is effectively return + FALSE, and the server will issue a potentially confusing fallback + message if VESAPciProbe failed and ->Probe is non-NULL. + + Signed-off-by: Adam Jackson <[email protected]> + +commit b9f9c95ca2383460aa283adeeee6e0a66eed722b +Author: Mihail Konev <[email protected]> +Date: Thu Jan 26 14:00:22 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev <[email protected]> + +commit 8912f4afd4903cf383e32a32e2a5c878e5a9fe03 +Author: Emil Velikov <[email protected]> +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 <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit 109fb7b040b009dcaba05d36200f9bba97aad2bc +Author: Peter Hutterer <[email protected]> +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 <[email protected]> + Reviewed-by: Emil Velikov <[email protected]> + +commit 0400b332a90f53b7a1361f832b60f1d4e90fd6e7 +Author: Stefan Dirsch <[email protected]> +Date: Thu Apr 28 13:56:52 2016 +0200 + + Use default refresh by default + + This seems to be a feature that isn't tested well. Too many VBE 3.0 + BIOSes are incorrectly implemented. + + Reviewed-by: Adam Jackson <[email protected]> + Signed-off-by: Stefan Dirsch <[email protected]> + +commit 2792ba7535dc9cc1c5bb2b37c1f862be36710a32 +Author: Matthew Green <[email protected]> +Date: Mon Jul 20 10:55:09 2015 +0200 + + When debugging, print the VGAbase as well. + + Just in case it ends up zero and causes a segmentation fault. + + Signed-off-by: Thomas Klausner <[email protected]> + commit b49c293e67cd88424ff40a2ca4e58b28528691d7 Author: Adam Jackson <[email protected]> Date: Tue Jun 16 11:56:32 2015 -0400 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.3.4/compile new/xf86-video-vesa-2.4.0/compile --- old/xf86-video-vesa-2.3.4/compile 2015-06-16 17:57:01.000000000 +0200 +++ new/xf86-video-vesa-2.4.0/compile 2018-02-15 20:34:10.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -342,6 +343,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # 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.3.4/config.h.in new/xf86-video-vesa-2.4.0/config.h.in --- old/xf86-video-vesa-2.3.4/config.h.in 2015-06-16 17:59:48.000000000 +0200 +++ new/xf86-video-vesa-2.4.0/config.h.in 2018-02-15 20:34:10.000000000 +0100 @@ -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-vesa-2.3.4/configure.ac new/xf86-video-vesa-2.4.0/configure.ac --- old/xf86-video-vesa-2.3.4/configure.ac 2015-06-16 17:58:23.000000000 +0200 +++ new/xf86-video-vesa-2.4.0/configure.ac 2018-02-15 20:34:04.000000000 +0100 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-vesa], - [2.3.4], + [2.4.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-vesa]) 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-vesa-2.3.4/missing new/xf86-video-vesa-2.4.0/missing --- old/xf86-video-vesa-2.3.4/missing 2015-06-16 17:57:01.000000000 +0200 +++ new/xf86-video-vesa-2.4.0/missing 2018-02-15 20:34:10.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -210,6 +210,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # 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.3.4/src/vesa.c new/xf86-video-vesa-2.4.0/src/vesa.c --- old/xf86-video-vesa-2.3.4/src/vesa.c 2015-06-16 17:53:10.000000000 +0200 +++ new/xf86-video-vesa-2.4.0/src/vesa.c 2018-02-15 20:34:04.000000000 +0100 @@ -66,7 +66,11 @@ /* Mandatory functions */ static const OptionInfoRec * VESAAvailableOptions(int chipid, int busid); static void VESAIdentify(int flags); +#if defined(XSERVER_LIBPCIACCESS) && !defined(HAVE_ISA) +#define VESAProbe NULL +#else static Bool VESAProbe(DriverPtr drv, int flags); +#endif #ifdef XSERVER_LIBPCIACCESS static Bool VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, intptr_t match_data); @@ -466,6 +470,7 @@ } #endif +#ifndef VESAProbe static Bool VESAProbe(DriverPtr drv, int flags) { @@ -536,6 +541,7 @@ return (foundScreen); } +#endif #ifdef HAVE_ISA static int @@ -590,7 +596,8 @@ } #endif free(pVesa->monitor); - free(pVesa->vbeInfo); + if (pVesa->vbeInfo) + VBEFreeVBEInfo(pVesa->vbeInfo); free(pVesa->pal); free(pVesa->savedPal); free(pVesa->fonts); @@ -717,6 +724,9 @@ xf86SetGamma(pScrn, gzeros); + /* set up options before loading any modules that may look at them */ + xf86CollectOptions(pScrn, NULL); + if (pVesa->major >= 2) { /* Load ddc module */ if ((pDDCModule = xf86LoadSubModule(pScrn, "ddc")) == NULL) { @@ -827,7 +837,6 @@ } /* options */ - xf86CollectOptions(pScrn, NULL); if (!(pVesa->Options = malloc(sizeof(VESAOptions)))) { vbeFree(pVesa->pVbe); return FALSE; @@ -838,9 +847,11 @@ /* Use shadow by default */ pVesa->shadowFB = xf86ReturnOptValBool(pVesa->Options, OPTION_SHADOW_FB, TRUE); - - if (xf86ReturnOptValBool(pVesa->Options, OPTION_DFLT_REFRESH, FALSE)) - pVesa->defaultRefresh = TRUE; + /* Use default refresh by default. Too many VBE 3.0 + * BIOSes are incorrectly implemented. + */ + pVesa->defaultRefresh = xf86ReturnOptValBool(pVesa->Options, + OPTION_DFLT_REFRESH, TRUE); pVesa->ModeSetClearScreen = xf86ReturnOptValBool(pVesa->Options, @@ -1304,9 +1315,10 @@ #endif xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB, - "virtual address = %p,\n" + "virtual address = %p, VGAbase = %p\n" "\tphysical address = 0x%lx, size = %ld\n", - pVesa->base, pScrn->memPhysBase, pVesa->mapSize); + pVesa->base, pVesa->VGAbase, + pScrn->memPhysBase, pVesa->mapSize); return (pVesa->base != NULL); } @@ -1347,6 +1359,27 @@ int i, idx; int base; + if (!pVesa->savedPal) { +#define VESADACDelay() \ + do { \ + (void)inb(pVesa->ioBase + VGA_IOBASE_COLOR + VGA_IN_STAT_1_OFFSET); \ + (void)inb(pVesa->ioBase + VGA_IOBASE_COLOR + VGA_IN_STAT_1_OFFSET); \ + } while (0) + + for (i = 0; i < numColors; i++) { + idx = indices[i]; + outb(pVesa->ioBase + VGA_DAC_WRITE_ADDR, idx); + VESADACDelay(); + outb(pVesa->ioBase + VGA_DAC_DATA, colors[idx].red); + VESADACDelay(); + outb(pVesa->ioBase + VGA_DAC_DATA, colors[idx].green); + VESADACDelay(); + outb(pVesa->ioBase + VGA_DAC_DATA, colors[idx].blue); + VESADACDelay(); + } + return; + } + if (pVesa->pal == NULL) pVesa->pal = calloc(1, sizeof(CARD32) * 256);
