Hello community,
here is the log from the commit of package sax2
checked in at Sat Sep 6 03:32:56 CEST 2008.
--------
--- sax2/sax2.changes 2008-09-01 16:22:10.000000000 +0200
+++ sax2/sax2.changes 2008-09-04 15:31:03.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Sep 4 12:25:03 CEST 2008 - ms@suse.de
+
+- added setPrimaryChip function in init.cpp to allow setup
+ of primary chip and nobus profile in libsax (bnc #417575)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.W18042/_old 2008-09-06 03:31:31.000000000 +0200
+++ /var/tmp/diff_new_pack.W18042/_new 2008-09-06 03:31:31.000000000 +0200
@@ -47,7 +47,7 @@
PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq
Summary: SuSE advanced X Window System-configuration
Version: 8.1
-Release: 504
+Release: 507
Group: System/X11/Utilities
License: GPL v2 or later
Source: sax2.tar.bz2
@@ -522,6 +522,9 @@
%endif
%changelog
+* Thu Sep 04 2008 ms@suse.de
+- added setPrimaryChip function in init.cpp to allow setup
+ of primary chip and nobus profile in libsax (bnc #417575)
* Mon Sep 01 2008 sndirsch@suse.de
- borderless SaX2 for xres <= 800 or yres <=600; this was hardcoded
to 800x600 before and resulted in problems with famous Netbook
++++++ sax2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/libsax/init.cpp new/sax/libsax/init.cpp
--- old/sax/libsax/init.cpp 2008-06-24 03:17:53.000000000 +0200
+++ new/sax/libsax/init.cpp 2008-09-04 15:31:02.000000000 +0200
@@ -86,6 +86,58 @@
}
//====================================
+// setValidBusID...
+//------------------------------------
+void SaXInit::setValidBusID (void) {
+ // .../
+ //! apply the nobus profile if only one card has been
+ //! detected. For single card configurations the busID
+ //! should not be set
+ // ----
+ SaXProcessCall* proc = new SaXProcessCall ();
+ QString sysp = "/usr/sbin/sysp -c | wc -l";
+ proc -> addArgument ( GET_BASH );
+ proc -> addArgument ( "-c" );
+ proc -> addArgument ( sysp.ascii() );
+ if ( ! proc -> start() ) {
+ excProcessFailed();
+ qError (errorString(),EXC_PROCESSFAILED);
+ return;
+ }
+ QString optc;
+ QString data = proc->readStdout().at(0);
+ int count = data.toInt();
+ if (count < 2) {
+ mOptions.append ((const char*)"-b nobus");
+ }
+}
+
+//====================================
+// setPrimaryChip...
+//------------------------------------
+void SaXInit::setPrimaryChip (void) {
+ // .../
+ //! pass the option -c to init.pl and use only the primary
+ //! graphics chip for the configuration. In that case also
+ //! apply the nobus profile and prevent a busID to be written
+ //! on single card configuration
+ // ----
+ SaXProcessCall* proc = new SaXProcessCall ();
+ proc -> addArgument ( GET_PRIMARY );
+ if ( ! proc -> start() ) {
+ excProcessFailed();
+ qError (errorString(),EXC_PROCESSFAILED);
+ return;
+ }
+ QString optc;
+ QString data = proc->readStdout().at(0);
+ int id = data.toInt();
+ QTextOStream (&optc) << "-c " << id;
+ mOptions.append ((const char*)optc.ascii());
+ setValidBusID();
+}
+
+//====================================
// doInit...
//------------------------------------
void SaXInit::doInit (void) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/libsax/init.h new/sax/libsax/init.h
--- old/sax/libsax/init.h 2008-06-24 03:17:52.000000000 +0200
+++ new/sax/libsax/init.h 2008-09-04 15:31:02.000000000 +0200
@@ -26,6 +26,7 @@
//------------------------------------
#include