commit xf86-video-vesa for openSUSE:Factory

Hello community, here is the log from the commit of package xf86-video-vesa for openSUSE:Factory checked in at 2015-10-03 20:29:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-vesa (Old) and /work/SRC/openSUSE:Factory/.xf86-video-vesa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-vesa" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-vesa/xf86-video-vesa.changes 2015-07-05 17:56:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-vesa.new/xf86-video-vesa.changes 2015-10-03 20:29:59.000000000 +0200 @@ -1,0 +2,14 @@ +Sun Sep 27 11:10:58 UTC 2015 - mpluskal@suse.com + +- Add gpg signature + +------------------------------------------------------------------- +Fri Sep 25 10:22:26 UTC 2015 - eich@suse.com + +- u_DPMS-Query-DPMS-capabilites-and-query-current-state-before-changing.patch + If the Xserver provides the VBEDPMSGetCapabilities() and VBEDPMSGet() + API, check DPMS capabilities if a requested DPMS mode is supported before + changing, and only change DPMS mode when the new state is different from + the old (bsc#947356, boo#947493). + +------------------------------------------------------------------- New: ---- u_DPMS-Query-DPMS-capabilites-and-query-current-state-before-changing.patch xf86-video-vesa-2.3.4.tar.bz2.sig xf86-video-vesa.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-vesa.spec ++++++ --- /var/tmp/diff_new_pack.amDs1N/_old 2015-10-03 20:29:59.000000000 +0200 +++ /var/tmp/diff_new_pack.amDs1N/_new 2015-10-03 20:29:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-vesa # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -24,8 +24,11 @@ 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 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 #PATCH-FIX-UPSTREAM U_mibstore.patch -- removes obsolete include BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -42,6 +45,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x %x11_abi_videodrv_req +%{?x11_abi_has_dpms_get_capabilities: %x11_abi_has_dpms_get_capabilities} %description vesa is an Xorg driver for Generic VESA video cards. @@ -54,6 +58,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure ++++++ u_DPMS-Query-DPMS-capabilites-and-query-current-state-before-changing.patch ++++++ From: Egbert Eich Date: Thu Sep 24 19:42:38 2015 +0200 Subject: [PATCH]DPMS: Query DPMS capabilites and query current state before changing Patch-mainline: to be upstreamed References: bsc#947356 Signed-off-by: Egbert Eich There is a VBE call to query the DPMS capabilities and the current state. If available use these calls to make sure to set only modes which are available and not set the state that is currently active already. The latter works around a problem found on an Intel BIOS. Signed-off-by: Egbert Eich --- src/vesa.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/vesa.c b/src/vesa.c index 44f93b2..983a5f5 100644 --- a/src/vesa.c +++ b/src/vesa.c @@ -1687,10 +1687,20 @@ VESADisplayPowerManagementSet(ScrnInfoPtr pScrn, int mode, int flags) { VESAPtr pVesa = VESAGetRec(pScrn); - +#ifdef VBE_HAVE_DPMS_GET_CAPABILITIES + int val; +#endif if (!pScrn->vtSema) return; +#ifdef VBE_HAVE_DPMS_GET_CAPABILITIES + if (VBEDPMSGetCapabilities(pVesa->pVbe, &val) == FALSE || + (val & (1 << mode)) == 0) + return; + + if (VBEDPMSGet(pVesa->pVbe, &val) == TRUE && val == mode) + return; +#endif VBEDPMSSet(pVesa->pVbe, mode); }