Hello community,
here is the log from the commit of package sax2
checked in at Thu Jun 5 17:58:42 CEST 2008.
--------
--- sax2/sax2.changes 2008-06-03 16:29:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2008-06-04 14:35:24.978060000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 4 11:56:13 CEST 2008 - ms@suse.de
+
+- prevent sax2 from calling too many test X-Servers
+- removed redundant DDC entry for STC0777 (bnc #396029)
+- fixed xapi DISPLAY handling (bnc #396777)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.p27035/_old 2008-06-05 17:56:09.000000000 +0200
+++ /var/tmp/diff_new_pack.p27035/_new 2008-06-05 17:56:09.000000000 +0200
@@ -40,7 +40,7 @@
PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq
Summary: SuSE advanced X Window System-configuration
Version: 8.1
-Release: 437
+Release: 439
Group: System/X11/Utilities
License: GPL v2 or later
Source: sax2.tar.bz2
@@ -468,6 +468,10 @@
%endif
%changelog
+* Wed Jun 04 2008 ms@suse.de
+- prevent sax2 from calling too many test X-Servers
+- removed redundant DDC entry for STC0777 (bnc #396029)
+- fixed xapi DISPLAY handling (bnc #396777)
* Tue Jun 03 2008 ms@suse.de
- update hwinfo source (bnc #374101)
* Mon Jun 02 2008 ms@suse.de
++++++ sax2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/api/data/cdb/Monitors new/sax/api/data/cdb/Monitors
--- old/sax/api/data/cdb/Monitors 2008-05-26 17:49:27.000000000 +0200
+++ new/sax/api/data/cdb/Monitors 2008-06-04 11:53:29.000000000 +0200
@@ -1,7 +1,7 @@
# /.../
# Copyright (c) 2001 SuSE GmbH Nuernberg, Germany. All rights reserved.
#
-# Author: Marcus Schaefer , Mon May 26 17:50:46 2008
+# Author: Marcus Schaefer , Wed Jun 4 11:54:44 2008
#
# Template for monitor data
# --------------------------
@@ -21553,15 +21553,6 @@
}
#==============================================
-# XF-70
-#----------------------------------------------
-KDS:XF-70 {
- DDC=STC0777
- Hsync=30-70
- Vsync=50-160
-}
-
-#==============================================
# DATA SYSTEMS AVITRON AV-5T
#----------------------------------------------
KOREA:DATA SYSTEMS AVITRON AV-5T {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/api/xapi.cpp new/sax/api/xapi.cpp
--- old/sax/api/xapi.cpp 2008-02-06 09:14:31.000000000 +0100
+++ new/sax/api/xapi.cpp 2008-06-04 14:34:23.000000000 +0200
@@ -53,6 +53,9 @@
bool mYaSTMode = false;
bool mMiddle = false;
bool mSizeCheck = false;
+ if (getenv("DISPLAY") != NULL) {
+ SaXDisplay = getenv("DISPLAY");
+ }
//=====================================
// init variables...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/init.pl new/sax/init.pl
--- old/sax/init.pl 2008-04-16 17:20:29.000000000 +0200
+++ new/sax/init.pl 2008-06-04 11:56:52.000000000 +0200
@@ -237,7 +237,7 @@
$var{Monitor}{0}{VendorName} = "Unknown";
$var{Monitor}{0}{ModelName} = "Unknown";
$var{Monitor}{0}{HorizSync} = "29-70";
- $var{Monitor}{0}{VertRefresh} = "40-90";
+ $var{Monitor}{0}{VertRefresh} = "50-90";
$var{Monitor}{0}{Option} = "DPMS";
$var{Desktop}{0}{CalcModelines} = "on";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/modules/detect/Monitor.pm new/sax/modules/detect/Monitor.pm
--- old/sax/modules/detect/Monitor.pm 2007-08-28 11:42:12.000000000 +0200
+++ new/sax/modules/detect/Monitor.pm 2008-06-04 12:08:25.000000000 +0200
@@ -114,7 +114,7 @@
# ------------------------------------------
for($i=0;$i<@vsync_list;$i++) {
$vsmax = int($vsync_list[$i]);
- $vsmin = 30;
+ $vsmin = 50;
$var{Monitor}{$i}{VertRefresh} = "$vsmin-$vsmax";
}
@@ -130,7 +130,7 @@
# we did not get any VESA information therefore we set the
# sync ranges to save values to avoid any monitor damage
# ----------------------------------------------------------
- $var{Monitor}{$i}{VertRefresh} = "43-75";
+ $var{Monitor}{$i}{VertRefresh} = "50-75";
$var{Monitor}{$i}{HorizSync} = "30-40";
$var{Monitor}{$i}{VendorName} = "Unknown";
$var{Monitor}{$i}{ModelName} = "Unknown";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/svnbuild new/sax/svnbuild
--- old/sax/svnbuild 2008-06-03 16:30:59.000000000 +0200
+++ new/sax/svnbuild 2008-06-04 14:36:37.000000000 +0200
@@ -1 +1 @@
-1620
+1623
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/cfg.c new/sax/sysp/cfg.c
--- old/sax/sysp/cfg.c 2008-02-06 09:08:59.000000000 +0100
+++ new/sax/sysp/cfg.c 2008-06-04 14:34:21.000000000 +0200
@@ -114,7 +114,7 @@
section = "Section \"Monitor\"\n";
section = section + ident;
section = section + " HorizSync 30-33\n";
- section = section + " VertRefresh 43-72\n";
+ section = section + " VertRefresh 50-72\n";
section = section + "EndSection\n";
return(section);
}
@@ -331,16 +331,19 @@
//=======================================
// Call a server and open the display
//---------------------------------------
- int disp = GetDisplay();
+ //int disp = GetDisplay();
+ int disp = 99;
str scr ; sprintf(scr,":%d",disp);
str log ; sprintf(log,"/var/log/%s.%d.log",LOADER_NAME,disp);
+ str lgv ; sprintf(lgv,"255");
Display *dpy = NULL;
int spid = 0;
int hasRR12 = False;
int major, minor;
string result = "";
string proc = qx(
- XWRAPPER,STDOUT,5,"%s %s %s %s %s",XW_LOG,BLANK,CONFIG,file,scr
+ XWRAPPER,STDOUT,7,"%s %s %s %s %s %s %s",
+ XW_LOG,BLANK,VERBOSE,lgv,CONFIG,file,scr
);
spid = atoi(proc.c_str());
dpy = XOpenDisplay (scr);
@@ -446,9 +449,11 @@
// XF86ConfigFile: call XF86 loader...
//-----------------------------------------
void XF86ConfigFile::CallXF86Loader (str file) {
- int dpy = GetDisplay();
+ //int dpy = GetDisplay();
+ int dpy = 99;
str scr ; sprintf(scr,":%d",dpy);
str log ; sprintf(log,"/var/log/%s.%d.log",LOADER_NAME,dpy);
+ str lgv ; sprintf(lgv,"255");
MsgDetect *parse = NULL;
Display *disp = NULL;
int spid = 0;
@@ -456,7 +461,8 @@
if (access(log,R_OK) != 0) {
string proc = qx(
- XWRAPPER,STDOUT,5,"%s %s %s %s %s",XW_LOG,BLANK,CONFIG,file,scr
+ XWRAPPER,STDOUT,7,"%s %s %s %s %s %s %s",
+ XW_LOG,BLANK,VERBOSE,lgv,CONFIG,file,scr
);
disp = XOpenDisplay (scr);
if (disp) {
@@ -467,7 +473,7 @@
ShutdownServer (spid,dpy);
}
parse = PLogGetData(log);
- unlink(log);
+ //unlink(log);
if (parse != NULL) {
for (int i=0;i&1 | grep -i videoram);
-my $code = $? >> 8;
-if ($code != 0 ) {
- $video = qx (X $param :99 2>&1 | grep -i memory:);
+my $code = 0;
+my $logs = "/var/log/Xorg.99.log";
+my $video;
+if (! -f $logs) {
+ my $param = "-probeonly -logverbose 255 -verbose -xf86config $ARGV[0]";
+ qx (X $param :99 2>&1);
+ $code = $? >> 8;
}
-if ($video =~ /(\d+) kByte/) {
+if ($code == 0 ) {
+ $video = qx (cat $logs | grep -i videoram);
+ $code = $? >> 8;
+ if ($code != 0 ) {
+ $video = qx (cat $logs | grep -i memory);
+ }
+}
+if ($video =~ /(\d+) kB/i) {
print "$1\n";
} else {
print "0\n";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/xstuff.c new/sax/sysp/xstuff.c
--- old/sax/sysp/xstuff.c 2008-01-28 10:54:00.000000000 +0100
+++ new/sax/sysp/xstuff.c 2008-06-04 14:34:22.000000000 +0200
@@ -247,12 +247,6 @@
char* config = createProbeonlyConfig (srvmsg,card,graphics);
//======================================
- // try to detect memory size
- //--------------------------------------
- if (graphics.size() == 1) {
- VBEmem = MemorySize(config);
- }
- //======================================
// try to detect the output plugin
//--------------------------------------
if (graphics[0].module == "intel" || graphics[0].module == "radeonhd") {
@@ -261,6 +255,12 @@
rroutput = "<undefined>";
}
}
+ //======================================
+ // try to detect memory size
+ //--------------------------------------
+ if (graphics.size() == 1) {
+ VBEmem = MemorySize(config);
+ }
// .../
// it is not sure to get any server message data this depend on
// some items which you can see in the server.c code. If no server
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org