rpms/xorg-x11-drv-savage/F-11 import.log, NONE, 1.1 savage-2.2.1-panel-fixes.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 xorg-x11-drv-savage.spec, 1.28, 1.29 savage-2.1.2-missing-symbol.patch, 1.1, NONE savage-2.1.2-panel-range-hack.patch, 1.1, NONE

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-savage/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10719/F-11

Modified Files:
	.cvsignore sources xorg-x11-drv-savage.spec 
Added Files:
	import.log savage-2.2.1-panel-fixes.patch 
Removed Files:
	savage-2.1.2-missing-symbol.patch 
	savage-2.1.2-panel-range-hack.patch 
Log Message:
savage 2.2.1



--- NEW FILE import.log ---
xorg-x11-drv-savage-2_2_1-1_fc11:F-11:xorg-x11-drv-savage-2.2.1-1.fc11.src.rpm:1241795724

savage-2.2.1-panel-fixes.patch:

--- NEW FILE savage-2.2.1-panel-fixes.patch ---
commit 0fae48235841f05d7e52e61a2450835fdb8892b3
Author: Tormod Volden <debian.tormod at gmail.com>
Date:   Thu Jan 22 01:22:53 2009 -0500

    Savage: Do not add panel modes when there is no panel
    
    SavageGetPanelInfo will reset DisplayType if the panel is not
    active, so check again before calling SavageAddPanelMode so that
    bogus modes are not added.
    
    This fixes startup failures in some cases, for instance when there is no
    real panel and EDID is missing. The bogus sync ranges (typically 0 Hz)
    would also block the default sync ranges from being applied.
    
    Thanks to Peter Belew for testing.
    https://bugs.launchpad.net/bugs/294899

diff --git a/src/savage_driver.c b/src/savage_driver.c
index da472e9..4115fb0 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -2206,10 +2206,11 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
     /* Check LCD panel information */
 
     if(psav->DisplayType == MT_LCD)
-    {
 	SavageGetPanelInfo(pScrn);
+
+    /* DisplayType will be reset if panel is not active */
+    if(psav->DisplayType == MT_LCD)
 	SavageAddPanelMode(pScrn);
-    }
   
 #if 0
     if (psav->CrtOnly && !psav->UseBIOS) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-savage/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	20 Mar 2008 01:43:40 -0000	1.11
+++ .cvsignore	8 May 2009 15:15:52 -0000	1.12
@@ -1 +1 @@
-xf86-video-savage-2.2.0.tar.bz2
+xf86-video-savage-2.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-savage/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	20 Mar 2008 01:43:40 -0000	1.11
+++ sources	8 May 2009 15:15:52 -0000	1.12
@@ -1 +1 @@
-0f7858b58e14dce53bcbaec2160bfcb9  xf86-video-savage-2.2.0.tar.bz2
+62b8aba48b54eaefeae87df502bf219c  xf86-video-savage-2.2.1.tar.bz2


Index: xorg-x11-drv-savage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-savage/F-11/xorg-x11-drv-savage.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xorg-x11-drv-savage.spec	26 Feb 2009 11:08:18 -0000	1.28
+++ xorg-x11-drv-savage.spec	8 May 2009 15:15:52 -0000	1.29
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
-Version:   2.2.0
-Release:   3%{?dist}
+Version:   2.2.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -14,8 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   savage.xinf
 
-Patch1:    savage-2.1.2-missing-symbol.patch
-Patch2:    savage-2.1.2-panel-range-hack.patch
+Patch1:	    savage-2.2.1-panel-fixes.patch
 
 ExcludeArch: s390 s390x
 
@@ -31,8 +30,7 @@ X.Org X11 savage video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch1 -p1 -b .missing-symbol
-%patch2 -p1 -b .range-hack
+%patch1 -p1 -b .panel
 
 %build
 %configure --disable-static --enable-dri
@@ -60,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/savage.4*
 
 %changelog
+* Fri May 08 2009 Adam Jackson <ajax at redhat.com> 2.2.1-1
+- savage 2.2.1
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- savage-2.1.2-missing-symbol.patch DELETED ---


--- savage-2.1.2-panel-range-hack.patch DELETED ---