August 2009 - openSUSE Commits - openSUSE Mailing Lists

commit python-qt4 for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package python-qt4 for openSUSE:Factory checked in at Mon Aug 3 18:48:32 CEST 2009. -------- --- python-qt4/python-qt4.changes 2009-07-14 23:29:59.000000000 +0200 +++ python-qt4/python-qt4.changes 2009-07-30 04:06:40.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Jul 30 04:02:01 CEST 2009 - hpj(a)urpla.net + +- update to 4.5.4 release, bugfixes and + - Fixed a problem where None wasn't being interpreted as an invalid QVariant. + - QVariant.toPyObject() now recurses through any collections. + - Fixed the super-type of QGLContext because it takes part in parent/child + relationships. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- PyQt-x11-gpl-4.5.2.tar.bz2 New: ---- PyQt-x11-gpl-4.5.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt4.spec ++++++ --- /var/tmp/diff_new_pack.XCw17Q/_old 2009-08-03 18:42:11.000000000 +0200 +++ /var/tmp/diff_new_pack.XCw17Q/_new 2009-08-03 18:42:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-qt4 (Version 4.5.2) +# spec file for package python-qt4 (Version 4.5.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,11 +28,14 @@ Requires: dbus-1-python >= %( echo `rpm -q --queryformat '%{VERSION}' dbus-1-python`) BuildRequires: fdupes %endif +%if %sles_version == 10 +Requires: python-elementtree +%endif Requires: python-sip >= %( echo `rpm -q --queryformat '%{VERSION}' python-sip`) License: GPL v2 only Group: Development/Libraries/Python Summary: PyQt - python bindings for Qt 4 -Version: 4.5.2 +Version: 4.5.4 Release: 1 %define rversion %version Url: http://www.riverbankcomputing.com/software/pyqt/intro @@ -116,6 +119,11 @@ %if %suse_version > 1020 %{py_sitedir}/dbus/mainloop/qt.so %endif +%if %sles_version == 10 +%{py_sitedir}/PyQt4/elementtree/__init__.py +%{py_sitedir}/PyQt4/elementtree/ElementTree.py +%{py_sitedir}/PyQt4/elementtree/ElementPath.py +%endif %files devel %defattr(-,root,root) ++++++ PyQt-x11-gpl-4.5.2.tar.bz2 -> PyQt-x11-gpl-4.5.4.tar.bz2 ++++++ ++++ 11906 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit celestia for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package celestia for openSUSE:Factory checked in at Mon Aug 3 18:39:30 CEST 2009. -------- --- KDE/celestia/celestia.changes 2009-06-19 11:00:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/celestia/celestia.changes 2009-08-02 19:44:40.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Aug 2 17:43:33 UTC 2009 - tittiatcoke(a)gmail.com + +- update to 1.6.0: + + bugfixes + + enhancements + + For more details, please see the included ChangeLog + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- celestia-1.5.1-config.patch celestia-1.5.1-desktop.patch celestia-1.5.1-gcc43.patch celestia-1.5.1-gcc44.patch celestia-1.5.1-strcmp.patch celestia-1.5.1-theora.patch celestia-1.5.1.tar.bz2 New: ---- celestia-1.6.0-config.patch celestia-1.6.0-desktop.patch celestia-1.6.0-gcc44.patch celestia-1.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ celestia.spec ++++++ --- /var/tmp/diff_new_pack.oMI2YY/_old 2009-08-03 18:27:59.000000000 +0200 +++ /var/tmp/diff_new_pack.oMI2YY/_new 2009-08-03 18:27:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package celestia (Version 1.5.1) +# spec file for package celestia (Version 1.6.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: celestia Summary: OpenGL Space Simulator -Version: 1.5.1 -Release: 49 +Version: 1.6.0 +Release: 1 License: GPL v2 or later Group: Productivity/Scientific/Astronomy Url: http://celestia.sourceforge.net @@ -29,17 +29,12 @@ BuildRequires: cairo-devel BuildRequires: lua-devel BuildRequires: libtheora-devel -%if 0%{?suse_version} > 1020 BuildRequires: fdupes -%endif Source: %{name}-%{version}.tar.bz2 Source1: celestia-rpmlintrc -Patch1: celestia-1.5.1-strcmp.patch -Patch2: celestia-1.5.1-desktop.patch -Patch3: celestia-1.5.1-gcc43.patch -Patch4: celestia-1.5.1-config.patch -Patch5: celestia-1.5.1-theora.patch -Patch6: celestia-1.5.1-gcc44.patch +Patch1: celestia-1.6.0-desktop.patch +Patch2: celestia-1.6.0-config.patch +Patch3: celestia-1.6.0-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define kdedir /opt/kde3 @@ -66,12 +61,9 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 +%patch1 +%patch2 %patch3 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build # This package failed when testing with -Wl,-as-needed being default. @@ -81,15 +73,12 @@ srcdir=`pwd` CXXFLAGS="$RPM_OPT_FLAGS" \ ./configure --with-kde \ --without-gnome \ -%if 0%{suse_version} > 1010 --with-lua \ -%endif --enable-cairo \ --without-gtk \ - $configkde \ - --disable-final \ --enable-libsuffix=`/opt/kde3/bin/kde-config --libsuffix` \ - --enable-theora + --enable-theora \ + --datarootdir=/opt/kde3/share make %{?jobs:-j %jobs} %install @@ -102,16 +91,14 @@ %find_lang %name %find_lang celestia_constellations cat celestia_constellations.lang >>%name.lang -%if 0%{?suse_version} > 1020 %fdupes -s %buildroot -%endif %clean rm -rf $RPM_BUILD_ROOT %files -f %name.lang %defattr(-,root,root) -%doc AUTHORS COPYING INSTALL README TODO +%doc AUTHORS COPYING INSTALL README %{kdedir}/bin/celestia %{kdedir}/share/applications/kde/celestia.desktop %{kdedir}/share/celestia ++++++ celestia-1.5.1-config.patch -> celestia-1.6.0-config.patch ++++++ --- KDE/celestia/celestia-1.5.1-config.patch 2008-05-19 22:56:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/celestia/celestia-1.6.0-config.patch 2009-07-26 12:52:29.000000000 +0200 @@ -1,13 +1,11 @@ -Index: celestia-1.5.1/celestia.cfg -=================================================================== ---- celestia-1.5.1.orig/celestia.cfg -+++ celestia-1.5.1/celestia.cfg -@@ -189,7 +189,7 @@ StarTextures +--- celestia.cfg.orig ++++ celestia.cfg +@@ -195,7 +195,7 @@ # or # ExtrasDirectories [ "D:\\celestia-extras" ] #------------------------------------------------------------------------ -- ExtrasDirectories [ "extras" ] -+ ExtrasDirectories [ "extras" "~/.celestia" ] +- ExtrasDirectories [ "extras-standard" "extras" ] ++ ExtrasDirectories [ "extras-standard" "extras" "~/.celestia" ] #------------------------------------------------------------------------ ++++++ celestia-1.5.1-desktop.patch -> celestia-1.6.0-desktop.patch ++++++ --- KDE/celestia/celestia-1.5.1-desktop.patch 2008-05-19 22:56:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/celestia/celestia-1.6.0-desktop.patch 2009-08-02 19:44:40.000000000 +0200 @@ -1,7 +1,5 @@ -Index: celestia-1.5.1/src/celestia/kde/data/celestia.desktop -=================================================================== ---- celestia-1.5.1.orig/src/celestia/kde/data/celestia.desktop -+++ celestia-1.5.1/src/celestia/kde/data/celestia.desktop +--- src/celestia/kde/data/celestia.desktop ++++ src/celestia/kde/data/celestia.desktop @@ -3,6 +3,7 @@ Name=Celestia Comment=Celestia Exec=celestia %f ++++++ celestia-1.5.1-gcc43.patch -> celestia-1.6.0-gcc44.patch ++++++ --- KDE/celestia/celestia-1.5.1-gcc43.patch 2009-04-04 08:45:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/celestia/celestia-1.6.0-gcc44.patch 2009-08-02 18:25:51.000000000 +0200 @@ -1,292 +1,20 @@ -Index: src/celutil/formatnum.cpp -=================================================================== ---- src/celutil/formatnum.cpp.orig -+++ src/celutil/formatnum.cpp -@@ -7,6 +7,8 @@ - // as published by the Free Software Foundation; either version 2 - // of the License, or (at your option) any later version. +--- src/celengine/overlay.h ++++ src/celengine/overlay.h +@@ -12,6 +12,7 @@ -+#include <string.h> -+#include <limits.h> - #include <cmath> - #include <cstdio> #include <string> -Index: src/celengine/image.cpp -=================================================================== ---- src/celengine/image.cpp.orig -+++ src/celengine/image.cpp -@@ -8,6 +8,7 @@ - // of the License, or (at your option) any later version. - - #include <fstream> -+#include <cmath> - - #ifndef TARGET_OS_MAC - #define JPEG_SUPPORT -@@ -66,6 +67,7 @@ extern "C" { #include <iostream> - #include <algorithm> - #include <cmath> -+#include <libintl.h> - - using namespace std; - -Index: src/celengine/galaxy.cpp -=================================================================== ---- src/celengine/galaxy.cpp.orig -+++ src/celengine/galaxy.cpp -@@ -23,6 +23,8 @@ - #include "vecgl.h" - #include "render.h" - #include "texture.h" -+#include <string.h> -+#include <libintl.h> - - using namespace std; ++#include <cstdio> + #include <celtxf/texturefont.h> -@@ -380,8 +382,8 @@ void Galaxy::renderGalaxyEllipsoid(const - float discSizeInPixels = pixelSize * getRadius() / offset.length(); - unsigned int nRings = (unsigned int) (discSizeInPixels / 4.0f); - unsigned int nSlices = (unsigned int) (discSizeInPixels / 4.0f); -- nRings = max(nRings, 100); -- nSlices = max(nSlices, 100); -+ nRings = max(nRings, 100u); -+ nSlices = max(nSlices, 100u); - VertexProcessor* vproc = context.getVertexProcessor(); - if (vproc == NULL) -Index: src/celengine/overlay.cpp -=================================================================== ---- src/celengine/overlay.cpp.orig -+++ src/celengine/overlay.cpp -@@ -9,6 +9,7 @@ - - #include <cstdarg> - #include <cstdio> -+#include <cstring> - #include <celutil/utf8.h> - #include "gl.h" - #include "vecgl.h" -Index: src/celengine/stardb.cpp -=================================================================== ---- src/celengine/stardb.cpp.orig -+++ src/celengine/stardb.cpp -@@ -11,6 +11,7 @@ - #include <cstdlib> - #include <cstdio> - #include <cassert> -+#include <cstring> - #include <algorithm> +--- src/celengine/star.cpp ++++ src/celengine/star.cpp +@@ -10,6 +10,7 @@ #include <celmath/mathlib.h> - #include <celmath/plane.h> -Index: src/celestia/eclipsefinder.cpp -=================================================================== ---- src/celestia/eclipsefinder.cpp.orig -+++ src/celestia/eclipsefinder.cpp -@@ -12,6 +12,7 @@ - - #include <string> - #include <sstream> -+#include <cstring> - #include <algorithm> - #include <set> + #include <cstring> #include <cassert> -Index: src/celestia/url.cpp -=================================================================== ---- src/celestia/url.cpp.orig -+++ src/celestia/url.cpp -@@ -17,6 +17,8 @@ - - #include <string> - #include <stdio.h> -+#include <cstring> -+ - #include "celestiacore.h" - #include "celengine/astro.h" - #include "url.h" -Index: src/celutil/utf8.cpp -=================================================================== ---- src/celutil/utf8.cpp.orig -+++ src/celutil/utf8.cpp -@@ -9,6 +9,7 @@ - - #include "utf8.h" - #include <cctype> -+#include <string.h> - #include "util.h" - - unsigned int WGL4_Normalization_00[256] = { -Index: src/celutil/util.cpp -=================================================================== ---- src/celutil/util.cpp.orig -+++ src/celutil/util.cpp -@@ -12,6 +12,7 @@ - #include "util.h" - #include <sys/types.h> - #include <sys/stat.h> -+#include <libintl.h> - - using namespace std; - -Index: src/celutil/util.h -=================================================================== ---- src/celutil/util.h.orig -+++ src/celutil/util.h -@@ -21,14 +21,6 @@ - #define COMPILE_TIME_ASSERT(pred) \ - switch(0){case 0: case pred:;} - --#ifndef min --#define min(a, b) ((a) < (b) ? (a) : (b)) --#endif -- --#ifndef max --#define max(a, b) ((a) < (b) ? (b) : (a)) --#endif -- - #ifdef _WIN32 - #include "libintl.h" - #define _(string) gettext (string) -Index: src/celengine/astro.cpp -=================================================================== ---- src/celengine/astro.cpp.orig -+++ src/celengine/astro.cpp -@@ -16,6 +16,7 @@ ++#include <cstdio> #include "celestia.h" #include "astro.h" - #include <celutil/util.h> -+#include <string.h> - - #ifndef TARGET_OS_MAC - #ifdef __GNUC__ -Index: src/celengine/body.cpp -=================================================================== ---- src/celengine/body.cpp.orig -+++ src/celengine/body.cpp -@@ -18,6 +18,7 @@ - #include "meshmanager.h" - #include "body.h" - #include "frame.h" -+#include <libintl.h> - - using namespace std; - -Index: src/celengine/fragmentprog.cpp -=================================================================== ---- src/celengine/fragmentprog.cpp.orig -+++ src/celengine/fragmentprog.cpp -@@ -13,6 +13,7 @@ - #include "gl.h" - #include "glext.h" - #include "fragmentprog.h" -+#include <libintl.h> - - using namespace std; - -Index: src/celengine/meshmanager.cpp -=================================================================== ---- src/celengine/meshmanager.cpp.orig -+++ src/celengine/meshmanager.cpp -@@ -26,6 +26,7 @@ - #include "spheremesh.h" - #include "texmanager.h" - #include "meshmanager.h" -+#include <libintl.h> - - using namespace std; - -Index: src/celengine/celestia.h -=================================================================== ---- src/celengine/celestia.h.orig -+++ src/celengine/celestia.h -@@ -35,7 +35,7 @@ - #endif /* TARGET_OS_MAC */ - #endif /* _WIN32 */ - -- -+#include <libintl.h> - - #endif // _CELESTIA_H_ - -Index: src/celengine/vertexprog.cpp -=================================================================== ---- src/celengine/vertexprog.cpp.orig -+++ src/celengine/vertexprog.cpp -@@ -14,6 +14,7 @@ - #include "gl.h" - #include "glext.h" - #include "vertexprog.h" -+#include <libintl.h> - - using namespace std; - -Index: src/celengine/render.cpp -=================================================================== ---- src/celengine/render.cpp.orig -+++ src/celengine/render.cpp -@@ -1208,7 +1208,7 @@ static void computeOrbitSectionBoundingV - - // Determine the number of trajectory samples to include in each bounding volume; typically, - // the last volume will contain any leftover samples. -- unsigned int nSections = max(orbit.trajectory.size() / MinSamplesPerSection, MinOrbitSections); -+ unsigned int nSections = max((unsigned) orbit.trajectory.size() / MinSamplesPerSection, MinOrbitSections); - unsigned int samplesPerSection = orbit.trajectory.size() / nSections; - if (samplesPerSection <= 1) - { -@@ -1228,7 +1228,7 @@ static void computeOrbitSectionBoundingV - - Renderer::OrbitSection section; - section.firstSample = samplesPerSection * i; -- unsigned int lastSample = min(orbit.trajectory.size() - 1, section.firstSample + nSamples + 1); -+ unsigned int lastSample = min((unsigned) orbit.trajectory.size() - 1, section.firstSample + nSamples + 1); - - // Set the initial axis and origin of the capsule bounding volume; they will be adjusted - // to contain all points in the trajectory. The length of the axis may change, but the -Index: src/celengine/asterism.cpp -=================================================================== ---- src/celengine/asterism.cpp.orig -+++ src/celengine/asterism.cpp -@@ -19,6 +19,7 @@ - #include <celutil/debug.h> - #include "parser.h" - #include "asterism.h" -+#include <libintl.h> - - using namespace std; - -Index: src/celengine/console.cpp -=================================================================== ---- src/celengine/console.cpp.orig -+++ src/celengine/console.cpp -@@ -10,6 +10,7 @@ - #include <cstdarg> - #include <cstdio> - #include <cassert> -+#include <string.h> - #include "celutil/utf8.h" - #include "gl.h" - #include "vecgl.h" -Index: src/celengine/dsodb.cpp -=================================================================== ---- src/celengine/dsodb.cpp.orig -+++ src/celengine/dsodb.cpp -@@ -28,6 +28,7 @@ - #include "multitexture.h" - #include "meshmanager.h" - #include <celutil/debug.h> -+#include <libintl.h> - - #include <celengine/galaxy.h> - #include <celengine/opencluster.h> -Index: src/celengine/location.cpp -=================================================================== ---- src/celengine/location.cpp.orig -+++ src/celengine/location.cpp -@@ -11,6 +11,7 @@ - #include <celengine/location.h> - #include <celengine/body.h> - #include <celutil/util.h> -+#include <libintl.h> - - using namespace std; - + #include "orbit.h" ++++++ celestia-1.5.1.tar.bz2 -> celestia-1.6.0.tar.bz2 ++++++ KDE/celestia/celestia-1.5.1.tar.bz2 /mounts/work_src_done/STABLE/celestia/celestia-1.6.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libxklavier for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package libxklavier for openSUSE:Factory checked in at Mon Aug 3 18:39:19 CEST 2009. -------- --- GNOME/libxklavier/libxklavier.changes 2009-03-19 04:56:06.000000000 +0100 +++ libxklavier/libxklavier.changes 2009-08-02 17:28:13.000000000 +0200 @@ -1,0 +2,15 @@ +Sun Aug 2 17:27:41 CEST 2009 - coolo(a)novell.com + +- remove the obsolete to the old library, shared libraries are supposed + to be installable in parallel + +------------------------------------------------------------------- +Mon Jul 20 12:43:57 CEST 2009 - vuntz(a)novell.com + +- Update to version 4.0: + + Support for "extras" in xkeyboard-config, small bugfixes and + build fixes. +- Rename libxklavier12 to libxklavier15 and make it Obsolete + libxklavier12. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libxklavier-3.9.tar.bz2 New: ---- libxklavier-4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxklavier.spec ++++++ --- /var/tmp/diff_new_pack.YcfpZC/_old 2009-08-03 18:37:48.000000000 +0200 +++ /var/tmp/diff_new_pack.YcfpZC/_new 2009-08-03 18:37:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libxklavier (Version 3.9) +# spec file for package libxklavier (Version 4.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,9 +20,9 @@ Name: libxklavier BuildRequires: doxygen glib2-devel gtk-doc iso-codes-devel libxml2-devel pkg-config xorg-x11-devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Group: Development/Libraries/X11 -Version: 3.9 +Version: 4.0 Release: 1 Summary: Library with X keyboard related functions Source: %{name}-%{version}.tar.bz2 @@ -32,14 +32,8 @@ %description This library allows you to simplify XKB-related development. - - -Authors: --------- - Sergey V. Udaltsov <svu(a)users.sourceforge.net> - %package devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/X11 Requires: %{name} = %{version} glib2-devel libxml2-devel glibc-devel %(rpm -q --whatprovides XFree86-devel --queryformat '%{NAME}') @@ -48,30 +42,18 @@ This package contains all necessary include files and libraries needed to develop applications that require these. - - -Authors: --------- - Sergey V. Udaltsov <svu(a)users.sourceforge.net> - -%package -n libxklavier12 -License: GPL v2 or later; LGPL v2.1 or later +%package -n libxklavier15 +License: GPL v2 or later ; LGPL v2.1 or later Summary: Library with X keyboard related functions Group: Development/Libraries/X11 Provides: %{name} = %{version} Obsoletes: %{name} < %{version} -%description -n libxklavier12 +%description -n libxklavier15 This library allows you to simplify XKB-related development. - - -Authors: --------- - Sergey V. Udaltsov <svu(a)users.sourceforge.net> - %package doc -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Summary: Additional Package Documentation for libxklavier Group: Development/Libraries/X11 Requires: %{name} = %{version} @@ -79,12 +61,6 @@ %description doc This library allows you to simplify XKB-related development. - - -Authors: --------- - Sergey V. Udaltsov <svu(a)users.sourceforge.net> - %prep %setup -q @@ -98,14 +74,14 @@ %makeinstall %{__rm} -vf %{buildroot}%{_libdir}/*.la -%post -n libxklavier12 -p /sbin/ldconfig +%post -n libxklavier15 -p /sbin/ldconfig -%postun -n libxklavier12 -p /sbin/ldconfig +%postun -n libxklavier15 -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT -%files -n libxklavier12 +%files -n libxklavier15 %defattr(-,root,root) %doc AUTHORS COPYING.LIB CREDITS ChangeLog NEWS README %{_libdir}/*.so.* ++++++ libxklavier-3.9.tar.bz2 -> libxklavier-4.0.tar.bz2 ++++++ ++++ 24107 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Mon Aug 3 18:37:33 CEST 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-07-08 03:00:55.000000000 +0200 +++ xorg-x11-server/xorg-x11-server.changes 2009-08-01 11:08:34.000000000 +0200 @@ -1,0 +2,15 @@ +Sat Aug 1 10:47:53 CEST 2009 - sndirsch(a)suse.de + +- xorg-server 1.6.3 + * This mostly just collects a bunch of minor fixes since 1.6.2. + Two notable inclusions are: + - Replacing dixLookupResource with dixLookupResourceByType, + dixLookupResourceByClass. This returns us to having two + resource lookup functions, but this time we have a more + sensible name and argument set. + - Fixing RandR transforms for drivers providing set_mode_major. + These patches were originally slated to land in 1.6.2 but + I missed them somehow. +- obsoletes commit-cadf65a.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- commit-cadf65a.diff xorg-server-1.6.2.tar.bz2 New: ---- xorg-server-1.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.bWXON7/_old 2009-08-03 18:36:46.000000000 +0200 +++ /var/tmp/diff_new_pack.bWXON7/_new 2009-08-03 18:36:46.000000000 +0200 @@ -20,7 +20,7 @@ %define moblin 0 Name: xorg-x11-server -%define dirsuffix 1.6.2 +%define dirsuffix 1.6.3 %define fglrx_driver_hack 0 ### FIXME %define vnc 1 @@ -33,7 +33,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 46 +Release: 47 License: GPL v2 or later ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -109,7 +109,6 @@ Patch127: dpms_screensaver.diff Patch128: pci-legacy-mem-fallback.diff Patch129: bug474071-fix1.diff -Patch131: commit-cadf65a.diff Patch132: fixed-SYNC-extension-trigger-BlockHandler-test.diff Patch140: fbdev_fallback_fail_fix.diff Patch142: bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff @@ -238,7 +237,6 @@ pushd hw/xfree86/os-support/bus %patch129 -p0 popd -%patch131 -p1 %patch132 -p1 %patch140 -p1 %patch142 -p1 ++++++ xorg-server-1.6.2.tar.bz2 -> xorg-server-1.6.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/ChangeLog new/xorg-server-1.6.3/ChangeLog --- old/xorg-server-1.6.2/ChangeLog 2009-07-08 00:15:34.000000000 +0200 +++ new/xorg-server-1.6.3/ChangeLog 2009-08-01 08:34:30.000000000 +0200 @@ -1,3 +1,232 @@ +commit 55dcfdbbd6a2a4debb717b104c4b54f4a2c76fff +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Tue Jul 28 15:02:37 2009 -0700 + + Remove hardcoded gcc -Wall option from configure.ac + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + (cherry picked from commit 442967c90dd9d8483a56bdc9237c49e33d619126) + +commit 4d349b6c333449517913a5e981b4fc3155da4855 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Fri Mar 27 15:56:15 2009 -0400 + + selinux: Only activate if policy says to be an object manager + (cherry picked from commit 283a081572d8db787c77d09e5ba6bcadebf4f7fe) + +commit d0875154f4f4b751264a2f6781500e97409a499b +Author: Ben Skeggs <bskeggs(a)redhat.com> +Date: Wed May 27 15:24:34 2009 +1000 + + quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359) + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 048697ccfa31cf7f7a29afa90a2f702d43efb7d4) + +commit c941479ecc2dead9c3deaee2620c9b9518c3da9a +Author: Rémi Cardona <remi(a)gentoo.org> +Date: Mon Jul 27 12:07:51 2009 +0200 + + config: add HAL error checks + + This patch simplifies error handling in the HAL code and fixes a + segfault if libhal_find_device_by_capability() failed. + + Fixes http://bugs.gentoo.org/278760 + + Based on a patch by Martin von Gagern <Martin.vGagern(a)gmx.net> + + Signed-off-by: Rémi Cardona <remi(a)gentoo.org> + Acked-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit b1c3dc6ae226db178420e3b5f297b94afc87c94c) + +commit 546f913ff5461dd93d4a0b29b24d2267557326c7 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Fri May 8 21:31:01 2009 -0700 + + Don't printf NULL pointers on HAL connection error + + Fixes Solaris bug 6801386 Xorg core dumps on startup if hald not running + http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6801386 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + (cherry picked from commit 1e816065e5ec3b9394dc1fa5815457a664e15fd9) + +commit 155cb2f9a376d40b699a72ac3bdede71af1b518f +Author: Keith Packard <keithp(a)keithp.com> +Date: Sun Jul 26 14:22:35 2009 -0700 + + Bump to version 1.6.2.901 (1.6.3 RC1) + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit 87900645c22d6066fe70190ab838a687808db5c3 +Author: Dave Airlie <airlied(a)redhat.com> +Date: Thu Jun 11 14:21:53 2009 +1000 + + xfree86: move didLock assignment down to where the function pointer is valid. + + crtc->funcs->lock is NULL, so it's no use calling it here. Move it down so + it's actually defined before we use it. + + Introduced with 6f59a8160042ea145514fdcb410f17f33fd437c2. + + Tested-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 0de58c88aba7ddd69b04f24ab5b2967c359aa69e) + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit 72c9bc64ff86999a4643663e5699a6547a9e2997 +Author: Benjamin Defnet <benjamin.r.defnet(a)intel.com> +Date: Wed Jun 10 21:35:48 2009 -0700 + + randr: fix operation order so that rotation+transform works + + The matrix multiply to combine rotation and projective transforms was being + done in the wrong order. + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + (cherry picked from commit b2bf67b61c564a4b92a429ca9ad455403161f33a) + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit 7f95d18397757facafcba39e4613b2ed5047c5c4 +Author: Benjamin Defnet <benjamin.r.defnet(a)intel.com> +Date: Mon Jun 8 21:45:42 2009 -0700 + + hw/xf86/modes: Set crtc mode/rotation/transform before calling set_mode_major + + This moves code out of each implementation of set_mode_major and back into + the X server. The real feature here is that the transform is now available + in the crtc for use by either xf86CrtcRotate or whatever the driver wants to + do. Without this change, the transform was lost for drivers providing the + set_mode_major interface. + + Note that users of this API will want to stop smashing the transformPresent + field, and could also stop setting mode/x/y/rotation for new enough X servers, + but there's no reason to make that change as it will break things when + running against older X servers. + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + Acked-by: Daniel Stone <daniel(a)fooishbar.org> + (cherry picked from commit 6f59a8160042ea145514fdcb410f17f33fd437c2) + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit abc89e2c48a88c29f49fe44d03778deab4b1a3b9 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Tue Mar 10 15:49:49 2009 +0100 + + randr: Nuke broken set_origin shortcut + + Shortcut is impossible to implement this way, because we don't know for sure + whether the crtc of an output has changed or not. + (cherry picked from commit cadf65a6e190a8952ad3cc216dc9ea55241de91a) + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit b1eed8970f7c5b07152dbc6b7dcc4c8504aeb67c +Author: Julien Cristau <jcristau(a)debian.org> +Date: Fri May 22 09:54:38 2009 +0200 + + randr: fix server crash in RRGetScreenInfo + + We don't return rates to randr < 1.1 clients, so don't allocate space + for them. This fixes a FatalError due to not all allocated space being + used. + + X.Org bug#21861 <http://bugs.freedesktop.org/show_bug.cgi?id=21861> + + Reported-by: Guillaume Quintin <coincoin169g(a)gmail.com> + Signed-off-by: Julien Cristau <jcristau(a)debian.org> + (cherry picked from commit 12e725d08b4cf7dbb7f09b9ec09fa1b621156ea9) + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit 1addf6fe235f8537024140aff56dffb4738701a7 +Author: Keith Packard <keithp(a)keithp.com> +Date: Wed Aug 6 15:26:24 2008 -0700 + + Replace dixLookupResource by dixLookupResourceBy{Type,Class} + + dixLookupResource attempted to automatically detect whether the caller + wanted a lookup by-type or by-class, unfortunately, it guessed wrong for + RT_NONE. Instead of trying to make the guess better, this patch just reverts + the unification and creates separate functions for each operation. + (cherry picked from commit f8dd80d13bb5313a11b38b280f8ad3e22f0a6300) + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit c838a03e891a6fcd2f7b71f727c1b93f7c26e7a7 +Author: Robert Noland <rnoland(a)2hip.net> +Date: Wed Apr 15 12:06:19 2009 -0500 + + One = is more than adequate here. Make is sh safe. + (cherry picked from commit b3e3154cce47add97f5561088036ce3b9e7dc937) + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit 68cb38bed65c49716104eeb345c4b1b85a4b15bc +Author: Rémi Cardona <remi(a)gentoo.org> +Date: Fri Jul 3 10:51:50 2009 +0200 + + configure: libXinerama isn't needed anymore + + since libXinerama commit 90d4d23bf2e94721149ddc0a80093b10a82e8845 and + xineramaproto commit 21477147613c28c968b5e1eb9d8aea7017dd399d, the + server no longer needs libXinerama. + + Signed-off-by: Rémi Cardona <remi(a)gentoo.org> + (cherry picked from commit 2c69deb92e11542f615df0f24fdc03e3b4415475) + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit ec60f4ca65dbc25f9a40636f5280b1a1ec68407f +Author: Michel Dänzer <daenzer(a)vmware.com> +Date: Fri Jul 10 20:06:02 2009 +0200 + + EXA: Only pass CT_YXBANDED to RECTS_TO_REGION() if that is really true. + + Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22642 . + (cherry picked from commit 35758544813f156eaac28844e693b2a28f6de316) + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit b10c4fe343d2339bae4736793939e44a6befaf88 +Author: Kim Woelders <kim(a)woelders.dk> +Date: Sat Jul 11 18:55:17 2009 +0200 + + Fix key repeat problem. + + Signed-off-by: Kim Woelders <kim(a)woelders.dk> + +commit 606f6dba16d42e3546a82a386d5a01087467b511 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Tue Apr 14 10:54:25 2009 -0400 + + xdmcp: Don't crash on X -query with more than 255 IP addresses. (#20675) + + You could be more clever than this, but the wire protocol says this + really is an array of not more than 255 ARRAY8, so it's not just a + matter of changing the types. + + (cherry picked from commit 0eb19f9437b7d8c19592e49eedb028771d300d80) + +commit 396d3a7762abd0dd84042833b75f2ebf9d100bb0 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Wed Jul 8 11:26:46 2009 -0700 + + Fix build of drivers with 1.6.2 when not using --install-libxf86config + + c859b736d1d23c5dc2f53958b1e76660e6d45018 removed duplicate entries for + these from the Makefile, but removed a different set than was done in + master branch, causing xf86Parser.h to not be installed, which in turn + breaks the build of drivers like -ati, -intel & -nv that use xf86Modes.h, + which includes xf86Parser.h + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + Signed-off-by: Keith Packard <keithp(a)keithp.com> + commit 6f1aff5a2b45bc2985081abc240a8fed37170386 Author: Keith Packard <keithp(a)keithp.com> Date: Mon Jul 6 14:08:31 2009 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xext/saver.c new/xorg-server-1.6.3/Xext/saver.c --- old/xorg-server-1.6.2/Xext/saver.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/Xext/saver.c 2009-07-26 22:56:57.000000000 +0200 @@ -1054,7 +1054,7 @@ } else { - ret = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP, + ret = dixLookupResourceByType((pointer *)&pPixmap, pixID, RT_PIXMAP, client, DixReadAccess); if (ret == Success) { @@ -1092,7 +1092,7 @@ } else { - ret = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP, + ret = dixLookupResourceByType((pointer *)&pPixmap, pixID, RT_PIXMAP, client, DixReadAccess); if (ret == Success) { @@ -1186,7 +1186,7 @@ break; case CWColormap: cmap = (Colormap) *pVlist; - ret = dixLookupResource((pointer *)&pCmap, cmap, RT_COLORMAP, + ret = dixLookupResourceByType((pointer *)&pCmap, cmap, RT_COLORMAP, client, DixUseAccess); if (ret != Success) { @@ -1210,7 +1210,7 @@ } else { - ret = dixLookupResource((pointer *)&pCursor, cursorID, + ret = dixLookupResourceByType((pointer *)&pCursor, cursorID, RT_CURSOR, client, DixUseAccess); if (ret != Success) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xext/security.c new/xorg-server-1.6.3/Xext/security.c --- old/xorg-server-1.6.2/Xext/security.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/Xext/security.c 2009-07-26 22:56:57.000000000 +0200 @@ -1023,7 +1023,7 @@ case ClientStateRunning: state->authId = AuthorizationIDOfClient(pci->client); - rc = dixLookupResource((pointer *)&pAuth, state->authId, + rc = dixLookupResourceByType((pointer *)&pAuth, state->authId, SecurityAuthorizationResType, serverClient, DixGetAttrAccess); if (rc == Success) { @@ -1038,7 +1038,7 @@ case ClientStateGone: case ClientStateRetained: - rc = dixLookupResource((pointer *)&pAuth, state->authId, + rc = dixLookupResourceByType((pointer *)&pAuth, state->authId, SecurityAuthorizationResType, serverClient, DixGetAttrAccess); if (rc == Success) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xext/shape.c new/xorg-server-1.6.3/Xext/shape.c --- old/xorg-server-1.6.2/Xext/shape.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/Xext/shape.c 2009-07-26 22:56:57.000000000 +0200 @@ -428,7 +428,7 @@ if (stuff->src == None) srcRgn = 0; else { - rc = dixLookupResource((pointer *)&pPixmap, stuff->src, RT_PIXMAP, + rc = dixLookupResourceByType((pointer *)&pPixmap, stuff->src, RT_PIXMAP, client, DixReadAccess); if (rc != Success) return (rc == BadValue) ? BadPixmap : rc; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xext/sync.c new/xorg-server-1.6.3/Xext/sync.c --- old/xorg-server-1.6.2/Xext/sync.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/Xext/sync.c 2009-07-26 22:56:57.000000000 +0200 @@ -440,7 +440,7 @@ { if (counter == None) pCounter = NULL; - else if (Success != (rc = dixLookupResource((pointer *)&pCounter, + else if (Success != (rc = dixLookupResourceByType ((pointer *)&pCounter, counter, RTCounter, client, DixReadAccess))) { client->errorValue = counter; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xext/xselinux.c new/xorg-server-1.6.3/Xext/xselinux.c --- old/xorg-server-1.6.2/Xext/xselinux.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/Xext/xselinux.c 2009-07-30 00:50:06.000000000 +0200 @@ -557,7 +557,7 @@ SELinuxScreen(NULL, NULL, &srec); /* Do the default colormap */ - dixLookupResource(&unused, screenInfo.screens[i]->defColormap, + dixLookupResourceByType(&unused, screenInfo.screens[i]->defColormap, RT_COLORMAP, serverClient, DixCreateAccess); } } @@ -1989,6 +1989,10 @@ return; } + /* Don't init unless there's something to do */ + if (!security_get_boolean_active("xserver_object_manager")) + return; + /* Check SELinux mode in configuration file */ switch(selinuxEnforcingState) { case SELINUX_MODE_DISABLED: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xext/xtest.c new/xorg-server-1.6.3/Xext/xtest.c --- old/xorg-server-1.6.2/Xext/xtest.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/Xext/xtest.c 2009-07-26 22:56:57.000000000 +0200 @@ -124,8 +124,8 @@ else if (stuff->cursor == XTestCurrentCursor) pCursor = GetSpriteCursor(ptr); else { - rc = dixLookupResource((pointer *)&pCursor, stuff->cursor, RT_CURSOR, - client, DixReadAccess); + rc = dixLookupResourceByType((pointer *)&pCursor, stuff->cursor, RT_CURSOR, + client, DixReadAccess); if (rc != Success) { client->errorValue = stuff->cursor; @@ -158,7 +158,7 @@ int numValuators = 0; int firstValuator = 0; EventListPtr events; - int nevents; + int nevents = 0; int i; int base = 0; int flags = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xi/exevents.c new/xorg-server-1.6.3/Xi/exevents.c --- old/xorg-server-1.6.2/Xi/exevents.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/Xi/exevents.c 2009-07-26 22:56:57.000000000 +0200 @@ -1349,7 +1349,7 @@ if (rcursor == None) cursor = NullCursor; else { - rc = dixLookupResource((pointer *)&cursor, rcursor, RT_CURSOR, + rc = dixLookupResourceByType((pointer *)&cursor, rcursor, RT_CURSOR, client, DixUseAccess); if (rc != Success) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/composite/compext.c new/xorg-server-1.6.3/composite/compext.c --- old/xorg-server-1.6.2/composite/compext.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/composite/compext.c 2009-07-26 22:56:57.000000000 +0200 @@ -144,7 +144,7 @@ REQUEST(xCompositeRedirectWindowReq); REQUEST_SIZE_MATCH(xCompositeRedirectWindowReq); - rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client, + rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client, DixSetAttrAccess|DixManageAccess|DixBlendAccess); if (rc != Success) { @@ -162,7 +162,7 @@ REQUEST(xCompositeRedirectSubwindowsReq); REQUEST_SIZE_MATCH(xCompositeRedirectSubwindowsReq); - rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client, + rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client, DixSetAttrAccess|DixManageAccess|DixBlendAccess); if (rc != Success) { @@ -214,7 +214,7 @@ REQUEST(xCompositeCreateRegionFromBorderClipReq); REQUEST_SIZE_MATCH(xCompositeCreateRegionFromBorderClipReq); - rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client, + rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client, DixGetAttrAccess); if (rc != Success) { @@ -250,7 +250,7 @@ REQUEST(xCompositeNameWindowPixmapReq); REQUEST_SIZE_MATCH(xCompositeNameWindowPixmapReq); - rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client, + rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client, DixGetAttrAccess); if (rc != Success) { @@ -298,7 +298,7 @@ int rc; REQUEST_SIZE_MATCH(xCompositeGetOverlayWindowReq); - rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client, + rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client, DixGetAttrAccess); if (rc != Success) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/config/hal.c new/xorg-server-1.6.3/config/hal.c --- old/xorg-server-1.6.2/config/hal.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/config/hal.c 2009-07-30 00:49:36.000000000 +0200 @@ -474,13 +474,13 @@ char **devices; int num_devices, i; + if (info->hal_ctx) + return TRUE; /* already registered, pretend we did something */ + info->system_bus = connection; dbus_error_init(&error); - if (info->hal_ctx) - return TRUE; /* already registered, pretend we did something */ - info->hal_ctx = libhal_ctx_new(); if (!info->hal_ctx) { LogMessage(X_ERROR, "config/hal: couldn't create HAL context\n"); @@ -493,13 +493,15 @@ } if (!libhal_ctx_init(info->hal_ctx, &error)) { LogMessage(X_ERROR, "config/hal: couldn't initialise context: %s (%s)\n", - error.name, error.message); + error.name ? error.name : "unknown error", + error.message ? error.message : "null"); goto out_ctx; } if (!libhal_device_property_watch_all(info->hal_ctx, &error)) { LogMessage(X_ERROR, "config/hal: couldn't watch all properties: %s (%s)\n", - error.name, error.message); - goto out_ctx2; + error.name ? error.name : "unknown error", + error.message ? error.message : "null"); + goto out_ctx; } libhal_ctx_set_device_added(info->hal_ctx, device_added); libhal_ctx_set_device_removed(info->hal_ctx, device_removed); @@ -507,6 +509,12 @@ devices = libhal_find_device_by_capability(info->hal_ctx, "input", &num_devices, &error); /* FIXME: Get default devices if error is set. */ + if (dbus_error_is_set(&error)) { + LogMessage(X_ERROR, "config/hal: couldn't find input device: %s (%s)\n", + error.name ? error.name : "unknown error", + error.message ? error.message : "null"); + goto out_ctx; + } for (i = 0; i < num_devices; i++) device_added(info->hal_ctx, devices[i]); libhal_free_string_array(devices); @@ -515,12 +523,19 @@ return TRUE; -out_ctx2: - if (!libhal_ctx_shutdown(info->hal_ctx, &error)) - LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n", - error.name, error.message); out_ctx: - libhal_ctx_free(info->hal_ctx); + dbus_error_free(&error); + + if (info->hal_ctx) { + if (!libhal_ctx_shutdown(info->hal_ctx, &error)) { + LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n", + error.name ? error.name : "unknown error", + error.message ? error.message : "null"); + dbus_error_free(&error); + } + libhal_ctx_free(info->hal_ctx); + } + out_err: dbus_error_free(&error); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/configure new/xorg-server-1.6.3/configure --- old/xorg-server-1.6.2/configure 2009-07-08 00:15:09.000000000 +0200 +++ new/xorg-server-1.6.3/configure 2009-08-01 08:34:08.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for xorg-server 1.6.2. +# Generated by GNU Autoconf 2.63 for xorg-server 1.6.3. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='1.6.2' -PACKAGE_STRING='xorg-server 1.6.2' +PACKAGE_VERSION='1.6.3' +PACKAGE_STRING='xorg-server 1.6.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1957,7 +1957,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorg-server 1.6.2 to adapt to many kinds of systems. +\`configure' configures xorg-server 1.6.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2027,7 +2027,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 1.6.2:";; + short | recursive ) echo "Configuration of xorg-server 1.6.3:";; esac cat <<\_ACEOF @@ -2333,7 +2333,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 1.6.2 +xorg-server configure 1.6.3 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2347,7 +2347,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorg-server $as_me 1.6.2, which was +It was created by xorg-server $as_me 1.6.3, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -3064,7 +3064,7 @@ # Define the identity of the package. PACKAGE='xorg-server' - VERSION='1.6.2' + VERSION='1.6.3' cat >>confdefs.h <<_ACEOF @@ -3229,7 +3229,7 @@ -RELEASE_DATE="2009-7-7" +RELEASE_DATE="2009-7-31" ac_config_headers="$ac_config_headers include/do-not-use-config.h" @@ -22497,7 +22497,7 @@ DRI2=yes ;; esac - if test "x$DRI2" == xyes; then + if test "x$DRI2" = xyes; then DRI2_TRUE= DRI2_FALSE='#' else @@ -22626,7 +22626,7 @@ if test "x$DRI2" = xyes; then save_CFLAGS=$CFLAGS - CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS -Wall" + CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22680,7 +22680,7 @@ DRI2_AIGLX=no fi fi - if test "x$DRI2_AIGLX" == xyes; then + if test "x$DRI2_AIGLX" = xyes; then DRI2_AIGLX_TRUE= DRI2_AIGLX_FALSE='#' else @@ -22709,7 +22709,7 @@ #define PANORAMIX 1 _ACEOF - REQUIRED_MODULES="$REQUIRED_MODULES xineramaproto xinerama" + REQUIRED_MODULES="$REQUIRED_MODULES xineramaproto" fi if test "x$XACE" = xyes; then @@ -30753,7 +30753,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorg-server $as_me 1.6.2, which was +This file was extended by xorg-server $as_me 1.6.3, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30816,7 +30816,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xorg-server config.status 1.6.2 +xorg-server config.status 1.6.3 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/configure.ac new/xorg-server-1.6.3/configure.ac --- old/xorg-server-1.6.2/configure.ac 2009-07-08 00:14:36.000000000 +0200 +++ new/xorg-server-1.6.3/configure.ac 2009-08-01 08:33:54.000000000 +0200 @@ -26,12 +26,12 @@ dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([xorg-server], 1.6.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xorg-server) +AC_INIT([xorg-server], 1.6.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xorg-server) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE -RELEASE_DATE="2009-7-7" +RELEASE_DATE="2009-7-31" dnl this gets generated by autoheader, and thus contains all the defines. we dnl don't ever actually use it, internally. @@ -870,7 +870,7 @@ DRI2=yes ;; esac -AM_CONDITIONAL(DRI2, test "x$DRI2" == xyes) +AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes) if test "x$DRI" = xyes || test "x$DRI2" = xyes; then PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.0]) @@ -880,7 +880,7 @@ if test "x$DRI2" = xyes; then save_CFLAGS=$CFLAGS - CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS -Wall" + CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS" AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <GL/gl.h> #include <GL/internal/dri_interface.h> #ifndef __DRI_DRI2 @@ -897,14 +897,14 @@ DRI2_AIGLX=no fi fi -AM_CONDITIONAL(DRI2_AIGLX, test "x$DRI2_AIGLX" == xyes) +AM_CONDITIONAL(DRI2_AIGLX, test "x$DRI2_AIGLX" = xyes) AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes]) if test "x$XINERAMA" = xyes; then AC_DEFINE(XINERAMA, 1, [Support Xinerama extension]) AC_DEFINE(PANORAMIX, 1, [Internal define for Xinerama]) - REQUIRED_MODULES="$REQUIRED_MODULES xineramaproto xinerama" + REQUIRED_MODULES="$REQUIRED_MODULES xineramaproto" fi AM_CONDITIONAL(XACE, [test "x$XACE" = xyes]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/cursor.c new/xorg-server-1.6.3/dix/cursor.c --- old/xorg-server-1.6.2/dix/cursor.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/dix/cursor.c 2009-07-26 22:56:57.000000000 +0200 @@ -298,15 +298,15 @@ GlyphSharePtr pShare; DeviceIntPtr pDev; - rc = dixLookupResource((pointer *)&sourcefont, source, RT_FONT, client, - DixUseAccess); + rc = dixLookupResourceByType((pointer *)&sourcefont, source, RT_FONT, client, + DixUseAccess); if (rc != Success) { client->errorValue = source; return (rc == BadValue) ? BadFont : rc; } - rc = dixLookupResource((pointer *)&maskfont, mask, RT_FONT, client, - DixUseAccess); + rc = dixLookupResourceByType((pointer *)&maskfont, mask, RT_FONT, client, + DixUseAccess); if (rc != Success && mask != None) { client->errorValue = mask; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/deprecated.c new/xorg-server-1.6.3/dix/deprecated.c --- old/xorg-server-1.6.2/dix/deprecated.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/dix/deprecated.c 2009-07-26 22:56:57.000000000 +0200 @@ -115,48 +115,66 @@ return (i == Success) ? pClient : NULL; } -/* replaced by dixLookupResource */ +/* replaced by dixLookupResourceByType */ _X_EXPORT pointer SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype, Mask access_mode) { pointer retval; - int i = dixLookupResource(&retval, id, rtype, client, access_mode); + int i = dixLookupResourceByType(&retval, id, rtype, client, access_mode); static int warn = 1; if (warn > 0 && --warn) ErrorF("Warning: LookupIDByType()/SecurityLookupIDByType() " "are deprecated. Please convert your driver/module " - "to use dixLookupResource().\n"); + "to use dixLookupResourceByType().\n"); return (i == Success) ? retval : NULL; } -/* replaced by dixLookupResource */ +/* replaced by dixLookupResourceByClass */ _X_EXPORT pointer SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes, Mask access_mode) { pointer retval; - int i = dixLookupResource(&retval, id, classes, client, access_mode); + int i = dixLookupResourceByClass(&retval, id, classes, client, access_mode); static int warn = 1; if (warn > 0 && --warn) ErrorF("Warning: LookupIDByClass()/SecurityLookupIDByClass() " "are deprecated. Please convert your driver/module " - "to use dixLookupResource().\n"); + "to use dixLookupResourceByClass().\n"); return (i == Success) ? retval : NULL; } -/* replaced by dixLookupResource */ +/* replaced by dixLookupResourceByType */ _X_EXPORT pointer LookupIDByType(XID id, RESTYPE rtype) { return SecurityLookupIDByType(NullClient, id, rtype, DixUnknownAccess); } -/* replaced by dixLookupResource */ +/* replaced by dixLookupResourceByClass */ _X_EXPORT pointer LookupIDByClass(XID id, RESTYPE classes) { return SecurityLookupIDByClass(NullClient, id, classes, DixUnknownAccess); } +/* replaced by dixLookupResourceBy{Type,Class} */ +_X_EXPORT int +dixLookupResource (pointer *result, XID id, RESTYPE rtype, + ClientPtr client, Mask mode) +{ + Bool istype = ((rtype & TypeMask) && (rtype != RC_ANY)) || (rtype == RT_NONE); + + static int warn = 1; + if (warn > 0 && --warn) + ErrorF("Warning: dixLookupResource() " + "is deprecated. Please convert your driver/module " + "to use dixLookupResourceByType/dixLookupResourceByClass().\n"); + if (istype) + return dixLookupResourceByType (result, id, rtype, client, mode); + else + return dixLookupResourceByClass (result, id, rtype, client, mode); +} + /* end deprecated functions */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/dispatch.c new/xorg-server-1.6.3/dix/dispatch.c --- old/xorg-server-1.6.2/dix/dispatch.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/dix/dispatch.c 2009-07-26 22:56:57.000000000 +0200 @@ -1119,11 +1119,11 @@ REQUEST_SIZE_MATCH(xResourceReq); client->errorValue = stuff->id; /* EITHER font or gc */ - rc = dixLookupResource((pointer *)&pFont, stuff->id, RT_FONT, client, - DixGetAttrAccess); + rc = dixLookupResourceByType((pointer *)&pFont, stuff->id, RT_FONT, client, + DixGetAttrAccess); if (rc == BadValue) { - rc = dixLookupResource((pointer *)&pGC, stuff->id, RT_GC, client, - DixGetAttrAccess); + rc = dixLookupResourceByType((pointer *)&pGC, stuff->id, RT_GC, client, + DixGetAttrAccess); if (rc == Success) pFont = pGC->font; } @@ -1177,10 +1177,10 @@ REQUEST_AT_LEAST_SIZE(xQueryTextExtentsReq); client->errorValue = stuff->fid; /* EITHER font or gc */ - rc = dixLookupResource((pointer *)&pFont, stuff->fid, RT_FONT, client, - DixGetAttrAccess); + rc = dixLookupResourceByType((pointer *)&pFont, stuff->fid, RT_FONT, client, + DixGetAttrAccess); if (rc == BadValue) { - rc = dixLookupResource((pointer *)&pGC, stuff->fid, RT_GC, client, + rc = dixLookupResourceByType((pointer *)&pGC, stuff->fid, RT_GC, client, DixGetAttrAccess); if (rc == Success) pFont = pGC->font; @@ -1325,7 +1325,7 @@ REQUEST(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupResource((pointer *)&pMap, stuff->id, RT_PIXMAP, client, + rc = dixLookupResourceByType((pointer *)&pMap, stuff->id, RT_PIXMAP, client, DixDestroyAccess); if (rc == Success) { @@ -2271,7 +2271,7 @@ REQUEST(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupResource((pointer *)&pmap, stuff->id, RT_COLORMAP, client, + rc = dixLookupResourceByType((pointer *)&pmap, stuff->id, RT_COLORMAP, client, DixDestroyAccess); if (rc == Success) { @@ -2299,7 +2299,7 @@ REQUEST_SIZE_MATCH(xCopyColormapAndFreeReq); mid = stuff->mid; LEGAL_NEW_RESOURCE(mid, client); - rc = dixLookupResource((pointer *)&pSrcMap, stuff->srcCmap, RT_COLORMAP, + rc = dixLookupResourceByType((pointer *)&pSrcMap, stuff->srcCmap, RT_COLORMAP, client, DixReadAccess|DixRemoveAccess); if (rc == Success) { @@ -2324,7 +2324,7 @@ REQUEST(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupResource((pointer *)&pcmp, stuff->id, RT_COLORMAP, client, + rc = dixLookupResourceByType((pointer *)&pcmp, stuff->id, RT_COLORMAP, client, DixInstallAccess); if (rc != Success) goto out; @@ -2349,7 +2349,7 @@ REQUEST(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupResource((pointer *)&pcmp, stuff->id, RT_COLORMAP, client, + rc = dixLookupResourceByType((pointer *)&pcmp, stuff->id, RT_COLORMAP, client, DixUninstallAccess); if (rc != Success) goto out; @@ -2416,7 +2416,7 @@ REQUEST(xAllocColorReq); REQUEST_SIZE_MATCH(xAllocColorReq); - rc = dixLookupResource((pointer *)&pmap, stuff->cmap, RT_COLORMAP, client, + rc = dixLookupResourceByType((pointer *)&pmap, stuff->cmap, RT_COLORMAP, client, DixAddAccess); if (rc == Success) { @@ -2457,7 +2457,7 @@ REQUEST(xAllocNamedColorReq); REQUEST_FIXED_SIZE(xAllocNamedColorReq, stuff->nbytes); - rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, + rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, DixAddAccess); if (rc == Success) { @@ -2508,7 +2508,7 @@ REQUEST(xAllocColorCellsReq); REQUEST_SIZE_MATCH(xAllocColorCellsReq); - rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, + rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, DixAddAccess); if (rc == Success) { @@ -2575,7 +2575,7 @@ REQUEST(xAllocColorPlanesReq); REQUEST_SIZE_MATCH(xAllocColorPlanesReq); - rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, + rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, DixAddAccess); if (rc == Success) { @@ -2640,7 +2640,7 @@ REQUEST(xFreeColorsReq); REQUEST_AT_LEAST_SIZE(xFreeColorsReq); - rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, + rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, DixRemoveAccess); if (rc == Success) { @@ -2675,7 +2675,7 @@ REQUEST(xStoreColorsReq); REQUEST_AT_LEAST_SIZE(xStoreColorsReq); - rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, + rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, DixWriteAccess); if (rc == Success) { @@ -2709,7 +2709,7 @@ REQUEST(xStoreNamedColorReq); REQUEST_FIXED_SIZE(xStoreNamedColorReq, stuff->nbytes); - rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, + rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, DixWriteAccess); if (rc == Success) { @@ -2743,7 +2743,7 @@ REQUEST(xQueryColorsReq); REQUEST_AT_LEAST_SIZE(xQueryColorsReq); - rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, + rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, DixReadAccess); if (rc == Success) { @@ -2795,7 +2795,7 @@ REQUEST(xLookupColorReq); REQUEST_FIXED_SIZE(xLookupColorReq, stuff->nbytes); - rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, + rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client, DixReadAccess); if (rc == Success) { @@ -2844,14 +2844,14 @@ REQUEST_SIZE_MATCH(xCreateCursorReq); LEGAL_NEW_RESOURCE(stuff->cid, client); - rc = dixLookupResource((pointer *)&src, stuff->source, RT_PIXMAP, client, + rc = dixLookupResourceByType((pointer *)&src, stuff->source, RT_PIXMAP, client, DixReadAccess); if (rc != Success) { client->errorValue = stuff->source; return (rc == BadValue) ? BadPixmap : rc; } - rc = dixLookupResource((pointer *)&msk, stuff->mask, RT_PIXMAP, client, + rc = dixLookupResourceByType((pointer *)&msk, stuff->mask, RT_PIXMAP, client, DixReadAccess); if (rc != Success) { @@ -2949,7 +2949,7 @@ REQUEST(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupResource((pointer *)&pCursor, stuff->id, RT_CURSOR, client, + rc = dixLookupResourceByType((pointer *)&pCursor, stuff->id, RT_CURSOR, client, DixDestroyAccess); if (rc == Success) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/dixutils.c new/xorg-server-1.6.3/dix/dixutils.c --- old/xorg-server-1.6.2/dix/dixutils.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/dix/dixutils.c 2009-07-26 22:56:57.000000000 +0200 @@ -216,7 +216,7 @@ if (id == INVALID) return BadDrawable; - rc = dixLookupResource((pointer *)&pTmp, id, RC_DRAWABLE, client, access); + rc = dixLookupResourceByClass((pointer *)&pTmp, id, RC_DRAWABLE, client, access); if (rc == BadValue) return BadDrawable; @@ -259,7 +259,7 @@ if (!clientIndex || !clients[clientIndex] || (rid & SERVER_BIT)) goto bad; - rc = dixLookupResource(&pRes, rid, RC_ANY, client, DixGetAttrAccess); + rc = dixLookupResourceByClass(&pRes, rid, RC_ANY, client, DixGetAttrAccess); if (rc != Success) goto bad; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/events.c new/xorg-server-1.6.3/dix/events.c --- old/xorg-server-1.6.2/dix/events.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/dix/events.c 2009-07-26 22:56:57.000000000 +0200 @@ -1161,7 +1161,7 @@ #ifdef XKB /* Fix for key repeating bug. */ if (device->key != NULL && device->key->xkbInfo != NULL && - xE->u.u.type == KeyRelease) + (xE->u.u.type == KeyRelease || xE->u.u.type == DeviceKeyRelease)) AccessXCancelRepeatKey(device->key->xkbInfo, xE->u.u.detail); #endif @@ -4445,7 +4445,7 @@ cursor = NullCursor; else { - rc = dixLookupResource((pointer *)&cursor, stuff->cursor, RT_CURSOR, + rc = dixLookupResourceByType((pointer *)&cursor, stuff->cursor, RT_CURSOR, client, DixUseAccess); if (rc != Success) { @@ -4545,8 +4545,8 @@ newCursor = NullCursor; else { - int rc = dixLookupResource((pointer *)&newCursor, stuff->cursor, - RT_CURSOR, client, DixUseAccess); + int rc = dixLookupResourceByType((pointer *)&newCursor, stuff->cursor, + RT_CURSOR, client, DixUseAccess); if (rc != Success) { client->errorValue = stuff->cursor; @@ -5146,7 +5146,7 @@ cursor = NullCursor; else { - rc = dixLookupResource((pointer *)&cursor, stuff->cursor, RT_CURSOR, + rc = dixLookupResourceByType((pointer *)&cursor, stuff->cursor, RT_CURSOR, client, DixUseAccess); if (rc != Success) if (!cursor) @@ -5396,7 +5396,7 @@ REQUEST(xRecolorCursorReq); REQUEST_SIZE_MATCH(xRecolorCursorReq); - rc = dixLookupResource((pointer *)&pCursor, stuff->cursor, RT_CURSOR, + rc = dixLookupResourceByType((pointer *)&pCursor, stuff->cursor, RT_CURSOR, client, DixWriteAccess); if (rc != Success) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/gc.c new/xorg-server-1.6.3/dix/gc.c --- old/xorg-server-1.6.2/dix/gc.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/dix/gc.c 2009-07-26 22:56:57.000000000 +0200 @@ -273,7 +273,7 @@ else { NEXTVAL(XID, newpix); - rc = dixLookupResource((pointer *)&pPixmap, newpix, + rc = dixLookupResourceByType((pointer *)&pPixmap, newpix, RT_PIXMAP, client, DixReadAccess); } if (rc == Success) @@ -310,7 +310,7 @@ else { NEXTVAL(XID, newstipple) - rc = dixLookupResource((pointer *)&pPixmap, newstipple, + rc = dixLookupResourceByType((pointer *)&pPixmap, newstipple, RT_PIXMAP, client, DixReadAccess); } if (rc == Success) @@ -353,7 +353,7 @@ else { NEXTVAL(XID, newfont) - rc = dixLookupResource((pointer *)&pFont, newfont, + rc = dixLookupResourceByType((pointer *)&pFont, newfont, RT_FONT, client, DixUseAccess); } if (rc == Success) @@ -420,7 +420,7 @@ pPixmap = NullPixmap; } else { - rc = dixLookupResource((pointer *)&pPixmap, pid, + rc = dixLookupResourceByType((pointer *)&pPixmap, pid, RT_PIXMAP, client, DixReadAccess); if (rc != Success) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/resource.c new/xorg-server-1.6.3/dix/resource.c --- old/xorg-server-1.6.2/dix/resource.c 2009-07-07 19:48:57.000000000 +0200 +++ new/xorg-server-1.6.3/dix/resource.c 2009-07-26 22:56:57.000000000 +0200 @@ -846,11 +846,10 @@ } _X_EXPORT int -dixLookupResource(pointer *result, XID id, RESTYPE rtype, - ClientPtr client, Mask mode) +dixLookupResourceByType(pointer *result, XID id, RESTYPE rtype, + ClientPtr client, Mask mode) { int cid = CLIENT_ID(id); - int istype = (rtype & TypeMask) && (rtype != RC_ANY); ResourcePtr res = NULL; *result = NULL; @@ -859,8 +858,38 @@ res = clientTable[cid].resources[Hash(cid, id)]; for (; res; res = res->next) - if ((res->id == id) && ((istype && res->type == rtype) || - (!istype && res->type & rtype))) + if (res->id == id && res->type == rtype) + break; + } + if (!res) + return BadValue; + + if (client) { + client->errorValue = id; + cid = XaceHook(XACE_RESOURCE_ACCESS, client, id, res->type, + res->value, RT_NONE, NULL, mode); + if (cid != Success) + return cid; + } + + *result = res->value; + return Success; +} + +_X_EXPORT int +dixLookupResourceByClass(pointer *result, XID id, RESTYPE rclass, + ClientPtr client, Mask mode) +{ + int cid = CLIENT_ID(id); + ResourcePtr res = NULL; + + *result = NULL; + + if ((cid < MAXCLIENTS) && clientTable[cid].buckets) { + res = clientTable[cid].resources[Hash(cid, id)]; + + for (; res; res = res->next) + if (res->id == id && (res->type & rclass)) break; } if (!res) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/window.c new/xorg-server-1.6.3/dix/window.c --- old/xorg-server-1.6.2/dix/window.c 2009-07-07 19:48:58.000000000 +0200 +++ new/xorg-server-1.6.3/dix/window.c 2009-07-26 22:56:57.000000000 +0200 @@ -1068,7 +1068,7 @@ } else { - rc = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP, + rc = dixLookupResourceByType((pointer *)&pPixmap, pixID, RT_PIXMAP, client, DixReadAccess); if (rc == Success) { @@ -1128,7 +1128,7 @@ pixID = pWin->parent->border.pixmap->drawable.id; } } - rc = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP, + rc = dixLookupResourceByType((pointer *)&pPixmap, pixID, RT_PIXMAP, client, DixReadAccess); if (rc == Success) { @@ -1290,7 +1290,7 @@ error = BadMatch; goto PatchUp; } - rc = dixLookupResource((pointer *)&pCmap, cmap, RT_COLORMAP, + rc = dixLookupResourceByType((pointer *)&pCmap, cmap, RT_COLORMAP, client, DixUseAccess); if (rc != Success) { @@ -1366,7 +1366,7 @@ } else { - rc = dixLookupResource((pointer *)&pCursor, cursorID, + rc = dixLookupResourceByType((pointer *)&pCursor, cursorID, RT_CURSOR, client, DixUseAccess); if (rc != Success) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/exa/exa_accel.c new/xorg-server-1.6.3/exa/exa_accel.c --- old/xorg-server-1.6.2/exa/exa_accel.c 2009-07-07 19:48:58.000000000 +0200 +++ new/xorg-server-1.6.3/exa/exa_accel.c 2009-07-26 22:56:56.000000000 +0200 @@ -415,6 +415,7 @@ if (rects) { int i; + int ordering; for (i = 0; i < nbox; i++) { rects[i].x = pbox[i].x1 + dx + src_off_x; @@ -423,7 +424,16 @@ rects[i].height = pbox[i].y2 - pbox[i].y1; } - srcregion = RECTS_TO_REGION(pScreen, nbox, rects, CT_YXBANDED); + /* This must match the miRegionCopy() logic for reversing rect order */ + if (nbox == 1 || (dx > 0 && dy > 0) || + (pDstDrawable != pSrcDrawable && + (pDstDrawable->type != DRAWABLE_WINDOW || + pSrcDrawable->type != DRAWABLE_WINDOW))) + ordering = CT_YXBANDED; + else + ordering = CT_UNSORTED; + + srcregion = RECTS_TO_REGION(pScreen, nbox, rects, ordering); xfree(rects); if (!pGC || !exaGCReadsDestination(pDstDrawable, pGC->planemask, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/hw/xfree86/modes/xf86Crtc.c new/xorg-server-1.6.3/hw/xfree86/modes/xf86Crtc.c --- old/xorg-server-1.6.2/hw/xfree86/modes/xf86Crtc.c 2009-07-07 19:48:58.000000000 +0200 +++ new/xorg-server-1.6.3/hw/xfree86/modes/xf86Crtc.c 2009-07-26 22:56:57.000000000 +0200 @@ -255,9 +255,6 @@ RRTransformRec saved_transform; Bool saved_transform_present; - if (crtc->funcs->set_mode_major) - return crtc->funcs->set_mode_major(crtc, mode, rotation, x, y); - crtc->enabled = xf86CrtcInUse (crtc); if (!crtc->enabled) @@ -268,7 +265,6 @@ adjusted_mode = xf86DuplicateMode(mode); - didLock = crtc->funcs->lock (crtc); saved_mode = crtc->mode; saved_x = crtc->x; @@ -293,19 +289,12 @@ } else crtc->transformPresent = FALSE; - if (crtc->funcs->set_origin && - memcmp (mode, &saved_mode, sizeof(saved_mode)) == 0 && - saved_rotation == rotation && - saved_transform_present == crtc->transformPresent && - (!crtc->transformPresent || RRTransformEqual(&saved_transform, &crtc->transform))) - { - if (!xf86CrtcRotate (crtc)) - goto done; - crtc->funcs->set_origin (crtc, crtc->x, crtc->y); - ret = TRUE; + if (crtc->funcs->set_mode_major) { + ret = crtc->funcs->set_mode_major(crtc, mode, rotation, x, y); goto done; } + didLock = crtc->funcs->lock (crtc); /* Pass our mode to the outputs and the CRTC to give them a chance to * adjust it according to limitations or output properties, and also * a chance to reject the mode entirely. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/hw/xfree86/modes/xf86EdidModes.c new/xorg-server-1.6.3/hw/xfree86/modes/xf86EdidModes.c --- old/xorg-server-1.6.2/hw/xfree86/modes/xf86EdidModes.c 2009-07-07 19:48:58.000000000 +0200 +++ new/xorg-server-1.6.3/hw/xfree86/modes/xf86EdidModes.c 2009-07-30 00:49:52.000000000 +0200 @@ -205,6 +205,11 @@ DDC->vendor.prod_id == 2423) return TRUE; + /* Peacock Ergovision 19. See rh#492359 */ + if (memcmp (DDC->vendor.name, "PEA", 4) == 0 && + DDC->vendor.prod_id == 9003) + return TRUE; + return FALSE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/hw/xfree86/parser/Makefile.am new/xorg-server-1.6.3/hw/xfree86/parser/Makefile.am --- old/xorg-server-1.6.2/hw/xfree86/parser/Makefile.am 2009-07-07 19:48:58.000000000 +0200 +++ new/xorg-server-1.6.3/hw/xfree86/parser/Makefile.am 2009-07-08 22:36:08.000000000 +0200 @@ -1,8 +1,5 @@ if INSTALL_LIBXF86CONFIG lib_LIBRARIES = libxf86config.a -LIBHEADERS = \ - xf86Optrec.h \ - xf86Parser.h else noinst_LIBRARIES = libxf86config.a endif @@ -30,9 +27,8 @@ EXTRA_DIST = \ Configint.h \ configProcs.h \ - xf86Optrec.h \ - xf86Parser.h \ xf86tokens.h sdk_HEADERS = \ - $(LIBHEADERS) + xf86Optrec.h \ + xf86Parser.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/hw/xfree86/parser/Makefile.in new/xorg-server-1.6.3/hw/xfree86/parser/Makefile.in --- old/xorg-server-1.6.2/hw/xfree86/parser/Makefile.in 2009-07-08 00:15:19.000000000 +0200 +++ new/xorg-server-1.6.3/hw/xfree86/parser/Makefile.in 2009-08-01 08:34:15.000000000 +0200 @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = hw/xfree86/parser -DIST_COMMON = $(am__sdk_HEADERS_DIST) $(srcdir)/Makefile.am \ +DIST_COMMON = $(sdk_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -80,7 +80,6 @@ $(LDFLAGS) -o $@ SOURCES = $(libxf86config_a_SOURCES) DIST_SOURCES = $(libxf86config_a_SOURCES) -am__sdk_HEADERS_DIST = xf86Optrec.h xf86Parser.h sdkHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(sdk_HEADERS) ETAGS = etags @@ -364,10 +363,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @INSTALL_LIBXF86CONFIG_TRUE@lib_LIBRARIES = libxf86config.a -@INSTALL_LIBXF86CONFIG_TRUE@LIBHEADERS = \ -@INSTALL_LIBXF86CONFIG_TRUE@ xf86Optrec.h \ -@INSTALL_LIBXF86CONFIG_TRUE@ xf86Parser.h - @INSTALL_LIBXF86CONFIG_FALSE@noinst_LIBRARIES = libxf86config.a libxf86config_a_SOURCES = \ Device.c \ @@ -391,12 +386,11 @@ EXTRA_DIST = \ Configint.h \ configProcs.h \ - xf86Optrec.h \ - xf86Parser.h \ xf86tokens.h sdk_HEADERS = \ - $(LIBHEADERS) + xf86Optrec.h \ + xf86Parser.h all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/include/resource.h new/xorg-server-1.6.3/include/resource.h --- old/xorg-server-1.6.2/include/resource.h 2009-07-07 19:48:58.000000000 +0200 +++ new/xorg-server-1.6.3/include/resource.h 2009-07-26 22:56:57.000000000 +0200 @@ -218,13 +218,20 @@ FindComplexResType func, pointer cdata); -extern int dixLookupResource( +extern int dixLookupResourceByType( pointer *result, XID id, RESTYPE rtype, ClientPtr client, Mask access_mode); +extern int dixLookupResourceByClass( + pointer *result, + XID id, + RESTYPE rclass, + ClientPtr client, + Mask access_mode); + extern void GetXIDRange( int /*client*/, Bool /*server*/, @@ -244,29 +251,42 @@ * Please use the noted replacements instead. */ -/* replaced by dixLookupResource */ +#ifdef __GNUC__ +#define X_DEPRECATED __attribute__((deprecated)) +#else +#define X_DEPRECATED +#endif + +/* replaced by dixLookupResourceByType or dixLookupResourceByClass */ +extern int dixLookupResource( + pointer *result, + XID id, + RESTYPE rtype, + ClientPtr client, + Mask access_mode) X_DEPRECATED; + extern pointer SecurityLookupIDByType( ClientPtr client, XID id, RESTYPE rtype, - Mask access_mode); + Mask access_mode) X_DEPRECATED; -/* replaced by dixLookupResource */ +/* replaced by dixLookupResourceByClass */ extern pointer SecurityLookupIDByClass( ClientPtr client, XID id, RESTYPE classes, - Mask access_mode); + Mask access_mode) X_DEPRECATED; -/* replaced by dixLookupResource */ +/* replaced by dixLookupResourceByType */ extern pointer LookupIDByType( XID id, - RESTYPE rtype); + RESTYPE rtype) X_DEPRECATED; -/* replaced by dixLookupResource */ +/* replaced by dixLookupResourceByClass */ extern pointer LookupIDByClass( XID id, - RESTYPE classes); + RESTYPE classes) X_DEPRECATED; #endif /* RESOURCE_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/os/xdmcp.c new/xorg-server-1.6.3/os/xdmcp.c --- old/xorg-server-1.6.2/os/xdmcp.c 2009-07-07 19:48:58.000000000 +0200 +++ new/xorg-server-1.6.3/os/xdmcp.c 2009-07-26 22:56:56.000000000 +0200 @@ -491,7 +491,9 @@ return; } } - newAddress = (CARD8 *) xalloc (addrlen * sizeof (CARD8)); + if (ConnectionAddresses.length + 1 == 256) + return; + newAddress = xalloc (addrlen * sizeof (CARD8)); if (!newAddress) return; if (!XdmcpReallocARRAY16 (&ConnectionTypes, ConnectionTypes.length + 1)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/randr/rrscreen.c new/xorg-server-1.6.3/randr/rrscreen.c --- old/xorg-server-1.6.2/randr/rrscreen.c 2009-07-07 19:48:58.000000000 +0200 +++ new/xorg-server-1.6.3/randr/rrscreen.c 2009-07-26 22:56:57.000000000 +0200 @@ -664,8 +664,9 @@ rep.sizeID = pData->size; rep.rate = pData->refresh; - extraLen = (rep.nSizes * sizeof (xScreenSizes) + - rep.nrateEnts * sizeof (CARD16)); + extraLen = rep.nSizes * sizeof (xScreenSizes); + if (has_rate) + extraLen += rep.nrateEnts * sizeof (CARD16); if (extraLen) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/randr/rrtransform.c new/xorg-server-1.6.3/randr/rrtransform.c --- old/xorg-server-1.6.2/randr/rrtransform.c 2009-07-07 19:48:58.000000000 +0200 +++ new/xorg-server-1.6.3/randr/rrtransform.c 2009-07-26 22:56:57.000000000 +0200 @@ -251,10 +251,10 @@ #ifdef RANDR_12_INTERFACE if (rr_transform) { - if (!pixman_transform_multiply (transform, transform, &rr_transform->transform)) + if (!pixman_transform_multiply (transform, &rr_transform->transform, transform)) overflow = TRUE; - pixman_f_transform_multiply (f_transform, f_transform, &rr_transform->f_transform); - pixman_f_transform_multiply (f_inverse, &rr_transform->f_inverse, f_inverse); + pixman_f_transform_multiply (f_transform, &rr_transform->f_transform, f_transform); + pixman_f_transform_multiply (f_inverse, f_inverse, &rr_transform->f_inverse); } #endif /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/render/picture.c new/xorg-server-1.6.3/render/picture.c --- old/xorg-server-1.6.2/render/picture.c 2009-07-07 19:48:58.000000000 +0200 +++ new/xorg-server-1.6.3/render/picture.c 2009-07-26 22:56:57.000000000 +0200 @@ -1070,7 +1070,7 @@ pAlpha = 0; else { - error = dixLookupResource((pointer *)&pAlpha, pid, + error = dixLookupResourceByType((pointer *)&pAlpha, pid, PictureType, client, DixReadAccess); if (error != Success) @@ -1131,7 +1131,7 @@ else { clipType = CT_PIXMAP; - error = dixLookupResource((pointer *)&pPixmap, pid, + error = dixLookupResourceByType((pointer *)&pPixmap, pid, RT_PIXMAP, client, DixReadAccess); if (error != Success) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/render/render.c new/xorg-server-1.6.3/render/render.c --- old/xorg-server-1.6.2/render/render.c 2009-07-07 19:48:58.000000000 +0200 +++ new/xorg-server-1.6.3/render/render.c 2009-07-26 22:56:57.000000000 +0200 @@ -1009,7 +1009,7 @@ LEGAL_NEW_RESOURCE(stuff->gsid, client); - rc = dixLookupResource((pointer *)&glyphSet, stuff->existing, GlyphSetType, + rc = dixLookupResourceByType((pointer *)&glyphSet, stuff->existing, GlyphSetType, client, DixGetAttrAccess); if (rc != Success) { @@ -1033,7 +1033,7 @@ REQUEST(xRenderFreeGlyphSetReq); REQUEST_SIZE_MATCH(xRenderFreeGlyphSetReq); - rc = dixLookupResource((pointer *)&glyphSet, stuff->glyphset, GlyphSetType, + rc = dixLookupResourceByType((pointer *)&glyphSet, stuff->glyphset, GlyphSetType, client, DixDestroyAccess); if (rc != Success) { @@ -1072,7 +1072,7 @@ CARD32 component_alpha; REQUEST_AT_LEAST_SIZE(xRenderAddGlyphsReq); - err = dixLookupResource((pointer *)&glyphSet, stuff->glyphset, GlyphSetType, + err = dixLookupResourceByType((pointer *)&glyphSet, stuff->glyphset, GlyphSetType, client, DixAddAccess); if (err != Success) { @@ -1262,7 +1262,7 @@ CARD32 glyph; REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq); - rc = dixLookupResource((pointer *)&glyphSet, stuff->glyphset, GlyphSetType, + rc = dixLookupResourceByType((pointer *)&glyphSet, stuff->glyphset, GlyphSetType, client, DixRemoveAccess); if (rc != Success) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/xfixes/cursor.c new/xorg-server-1.6.3/xfixes/cursor.c --- old/xorg-server-1.6.2/xfixes/cursor.c 2009-07-07 19:48:58.000000000 +0200 +++ new/xorg-server-1.6.3/xfixes/cursor.c 2009-07-26 22:56:57.000000000 +0200 @@ -863,7 +863,7 @@ REQUEST_SIZE_MATCH (xXFixesHideCursorReq); - ret = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, + ret = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client, DixGetAttrAccess); if (ret != Success) { client->errorValue = stuff->window; @@ -921,7 +921,7 @@ REQUEST_SIZE_MATCH (xXFixesShowCursorReq); - rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, + rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client, DixGetAttrAccess); if (rc != Success) { client->errorValue = stuff->window; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/xfixes/region.c new/xorg-server-1.6.3/xfixes/region.c --- old/xorg-server-1.6.2/xfixes/region.c 2009-07-07 19:48:58.000000000 +0200 +++ new/xorg-server-1.6.3/xfixes/region.c 2009-07-26 22:56:57.000000000 +0200 @@ -115,7 +115,7 @@ REQUEST_SIZE_MATCH (xXFixesCreateRegionFromBitmapReq); LEGAL_NEW_RESOURCE (stuff->region, client); - rc = dixLookupResource((pointer *)&pPixmap, stuff->bitmap, RT_PIXMAP, + rc = dixLookupResourceByType((pointer *)&pPixmap, stuff->bitmap, RT_PIXMAP, client, DixReadAccess); if (rc != Success) { @@ -160,7 +160,7 @@ REQUEST_SIZE_MATCH (xXFixesCreateRegionFromWindowReq); LEGAL_NEW_RESOURCE (stuff->region, client); - rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, + rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client, DixGetAttrAccess); if (rc != Success) { @@ -682,7 +682,7 @@ REQUEST(xXFixesSetWindowShapeRegionReq); REQUEST_SIZE_MATCH(xXFixesSetWindowShapeRegionReq); - rc = dixLookupResource((pointer *)&pWin, stuff->dest, RT_WINDOW, + rc = dixLookupResourceByType((pointer *)&pWin, stuff->dest, RT_WINDOW, client, DixSetAttrAccess); if (rc != Success) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hwinfo for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at Mon Aug 3 18:36:11 CEST 2009. -------- --- hwinfo/hwinfo.changes 2009-07-29 12:42:25.000000000 +0200 +++ hwinfo/hwinfo.changes 2009-08-03 14:26:50.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 3 14:26:39 CEST 2009 - snwint(a)suse.de + +- revert --log patch from v16.3; leads to all kinds of + problems (bnc #525223) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- hwinfo-16.4.tar.bz2 New: ---- hwinfo-16.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.wLhKY2/_old 2009-08-03 18:35:21.000000000 +0200 +++ /var/tmp/diff_new_pack.wLhKY2/_new 2009-08-03 18:35:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 16.4) +# spec file for package hwinfo (Version 16.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,9 +31,9 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Hardware Library -Version: 16.4 +Version: 16.5 Release: 1 -Source: hwinfo-16.4.tar.bz2 +Source: hwinfo-16.5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ hwinfo-16.4.tar.bz2 -> hwinfo-16.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-16.4/Changelog new/hwinfo-16.5/Changelog --- old/hwinfo-16.4/Changelog 2009-07-29 12:36:17.000000000 +0200 +++ new/hwinfo-16.5/Changelog 2009-08-03 14:10:28.000000000 +0200 @@ -1,3 +1,7 @@ +3/8/2009: v16.5 + - revert --log patch from v16.3; leads to all kinds of + problems (bnc #525223) + 29/7/2009: v16.4 - support NPIV (bnc #501312) - added some ISDN devices (bnc #234529) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-16.4/VERSION new/hwinfo-16.5/VERSION --- old/hwinfo-16.4/VERSION 2009-07-29 12:35:41.000000000 +0200 +++ new/hwinfo-16.5/VERSION 2009-08-03 14:10:32.000000000 +0200 @@ -1 +1 @@ -16.4 +16.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-16.4/hwinfo.c new/hwinfo-16.5/hwinfo.c --- old/hwinfo-16.4/hwinfo.c 2009-07-27 11:40:59.000000000 +0200 +++ new/hwinfo-16.5/hwinfo.c 2009-08-03 14:13:49.000000000 +0200 @@ -339,7 +339,7 @@ } } - if(!hw_items) hw_item[hw_items++] = 2000; /* all */ + if(!hw_items && is_short) hw_item[hw_items++] = 2000; /* all */ if(hw_items >= 0 || showconfig || saveconfig) { if(*log_file) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-core for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package yast2-core for openSUSE:Factory checked in at Mon Aug 3 18:34:58 CEST 2009. -------- --- yast2-core/yast2-core.changes 2009-07-10 16:00:59.000000000 +0200 +++ yast2-core/yast2-core.changes 2009-08-03 10:21:11.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 3 10:04:21 CEST 2009 - lslezak(a)suse.cz + +- the DBus code has been moved to separate packages + (yast2-dbus-client and yast2-dbus-server) (bnc#431208) +- 2.18.17 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-core-2.18.16.tar.bz2 New: ---- yast2-core-2.18.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.MMXfqc/_old 2009-08-03 18:34:01.000000000 +0200 +++ /var/tmp/diff_new_pack.MMXfqc/_new 2009-08-03 18:34:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-core (Version 2.18.16) +# spec file for package yast2-core (Version 2.18.17) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-core -Version: 2.18.16 +Version: 2.18.17 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-core-2.18.16.tar.bz2 +Source0: yast2-core-2.18.17.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -45,10 +45,6 @@ BuildRequires: libblocxx-devel # libycp includes crypto built-ins BuildRequires: libxcrypt-devel -# for SCR DBus service -BuildRequires: PolicyKit-devel dbus-1-devel -# for DBus testing -BuildRecommends: python-base dbus-1-python Summary: YaST2 - Core Libraries Requires: perl = %{perl_version} Provides: liby2util = 2.16.1 @@ -68,7 +64,6 @@ Requires: libxcrypt-devel hwinfo-devel Requires: glibc-devel libstdc++-devel pcre-devel libblocxx-devel sysfsutils # required for libscr -Requires: PolicyKit-devel dbus-1-devel # for FlexLexer.h; I think that this dependency could be made # private but it seems not worth the effort Requires: flex @@ -78,7 +73,7 @@ applications using the YaST2 YCP interpreter. %prep -%setup -n yast2-core-2.18.16 +%setup -n yast2-core-2.18.17 %build export SUSE_ASNEEDED=0 # disable --as-needed until this package is fixed @@ -150,18 +145,6 @@ # .packlist %{perl_vendorarch}/auto/ycp /var/adm/perl-modules/%name -# DBus service -%{prefix}/lib/YaST2/bin/SCR_dbus_server -# DBus service config -/usr/share/dbus-1/system-services/org.opensuse.yast.SCR.service -%config /etc/dbus-1/system.d/org.opensuse.yast.SCR.conf -# PolicyKit default policies -/usr/share/PolicyKit/policy/org.opensuse.yast.scr.policy -# DBus namespace service -%{prefix}/lib/YaST2/bin/yast_modules_dbus_server -/usr/share/dbus-1/system-services/org.opensuse.YaST.modules.service -%config /etc/dbus-1/system.d/org.opensuse.YaST.modules.conf -/usr/share/PolicyKit/policy/org.opensuse.yast.module-manager.policy %files devel %defattr(-,root,root) ++++++ yast2-core-2.18.16.tar.bz2 -> yast2-core-2.18.17.tar.bz2 ++++++ ++++ 24897 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit btrfsprogs for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at Mon Aug 3 18:27:46 CEST 2009. -------- --- btrfsprogs/btrfsprogs.changes 2009-07-27 13:12:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/btrfsprogs/btrfsprogs.changes 2009-08-03 14:04:20.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 03 14:00:55 CEST 2009 - aschnell(a)suse.de + +- added Supplements + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.uagJSE/_old 2009-08-03 18:25:04.000000000 +0200 +++ /var/tmp/diff_new_pack.uagJSE/_new 2009-08-03 18:25:04.000000000 +0200 @@ -20,10 +20,11 @@ Name: btrfsprogs Url: http://oss.oracle.com/~mason/btrfs/ Version: 0.19 -Release: 2 +Release: 3 Summary: Btrfs File System Utilities License: GNU General Public License (GPL) Group: System/Filesystems +Supplements: filesystem(btrfs) Source: http://ftp.kernel.org/pub/linux/kernel/people/mason/btrfs/btrfs-progs-%{ver… Patch0: memleak-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit b43-fwcutter for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package b43-fwcutter for openSUSE:Factory checked in at Mon Aug 3 18:24:51 CEST 2009. -------- --- b43-fwcutter/b43-fwcutter.changes 2009-02-09 13:55:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/b43-fwcutter/b43-fwcutter.changes 2009-08-03 14:04:35.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 3 11:56:39 UTC 2009 - cstender(a)novell.com + +- updated to version 012 + * don't extract core 4 firmware from V4 drivers + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- b43-fwcutter-011.tar.bz2 New: ---- b43-fwcutter-012.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ b43-fwcutter.spec ++++++ --- /var/tmp/diff_new_pack.yIiFSx/_old 2009-08-03 18:19:05.000000000 +0200 +++ /var/tmp/diff_new_pack.yIiFSx/_new 2009-08-03 18:19:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package b43-fwcutter (Version 011) +# spec file for package b43-fwcutter (Version 012) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,13 +22,13 @@ Group: Hardware/Wifi AutoReqProv: on Summary: Tool for extracting firmware from newer Broadcom WLAN drivers -Version: 011 -Release: 36 +Version: 012 +Release: 1 Source: %{name}-%{version}.tar.bz2 Patch0: %{name}.diff Source1: install_bcm43xx_firmware Url: http://linuxwireless.org/en/users/Drivers/b43 -License: BSD 3-Clause; BSD 4-Clause +License: BSD 3-clause (or similar) ; BSD 4-clause (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: curl Obsoletes: bcm43xx-fwcutter ++++++ b43-fwcutter-011.tar.bz2 -> b43-fwcutter-012.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/b43-fwcutter-011/Makefile new/b43-fwcutter-012/Makefile --- old/b43-fwcutter-011/Makefile 2008-02-13 18:46:26.000000000 +0100 +++ new/b43-fwcutter-012/Makefile 2009-06-02 17:52:55.000000000 +0200 @@ -1,4 +1,4 @@ -VERSION = 011 +VERSION = 012 CC ?= cc PREFIX ?= /usr/local diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/b43-fwcutter-011/fwcutter_list.h new/b43-fwcutter-012/fwcutter_list.h --- old/b43-fwcutter-011/fwcutter_list.h 2008-02-13 18:46:26.000000000 +0100 +++ new/b43-fwcutter-012/fwcutter_list.h 2009-06-02 17:52:55.000000000 +0200 @@ -1,3 +1,10 @@ +/* + * Extraction of core 4 firmware from V4 drivers has been commented out as these + * cores will not work with driver b43. + * + * In contrast, extraction of core 5 firmware from V3 drivers should be retained + * as those devices will work with b43legacy and are useful for testing. + */ /* file member lists */ static struct extract _e08665c5c5b66beb9c3b2dd54aa80cb3[] = @@ -23,16 +30,22 @@ static struct extract _9207bc565c2fc9fa1591f6c7911d3fc0[] = { - { .name = "ucode4", .offset = 0x66220 + 0x7ad8, .length = 0x4e68, .type = EXT_UCODE_1, }, +/* + * { .name = "ucode4", .offset = 0x66220 + 0x7ad8, .length = 0x4e68, .type = EXT_UCODE_1, }, + */ { .name = "ucode5", .offset = 0x66220 + 0xc944, .length = 0x5640, .type = EXT_UCODE_2, }, { .name = "ucode11", .offset = 0x66220 + 0x11f90, .length = 0x67e0, .type = EXT_UCODE_2, }, { .name = "ucode13", .offset = 0x66220 + 0x18774, .length = 0x5f60, .type = EXT_UCODE_2, }, - { .name = "pcm4", .offset = 0x66220 + 0x1e6d8, .length = 0x520, .type = EXT_PCM, }, +/* + * { .name = "pcm4", .offset = 0x66220 + 0x1e6d8, .length = 0x520, .type = EXT_PCM, }, + */ { .name = "pcm5", .offset = 0x66220 + 0x1ebfc, .length = 0x520, .type = EXT_PCM, }, - { .name = "b0g0initvals4", .offset = 0x66220 + 0x1710, .length = 0xe90 - 8, .type = EXT_IV, }, - { .name = "b0g0bsinitvals4", .offset = 0x66220 + 0x25a0, .length = 0x18 - 8, .type = EXT_IV, }, - { .name = "a0g0initvals4", .offset = 0x66220 + 0x25b8, .length = 0xe90 - 8, .type = EXT_IV, }, - { .name = "a0g0bsinitvals4", .offset = 0x66220 + 0x3448, .length = 0x18 - 8, .type = EXT_IV, }, +/* + * { .name = "b0g0initvals4", .offset = 0x66220 + 0x1710, .length = 0xe90 - 8, .type = EXT_IV, }, + * { .name = "b0g0bsinitvals4", .offset = 0x66220 + 0x25a0, .length = 0x18 - 8, .type = EXT_IV, }, + * { .name = "a0g0initvals4", .offset = 0x66220 + 0x25b8, .length = 0xe90 - 8, .type = EXT_IV, }, + * { .name = "a0g0bsinitvals4", .offset = 0x66220 + 0x3448, .length = 0x18 - 8, .type = EXT_IV, }, + */ { .name = "b0g0initvals5", .offset = 0x66220 + 0x3460, .length = 0xa28 - 8, .type = EXT_IV, }, { .name = "b0g0bsinitvals5", .offset = 0x66220 + 0x3e88, .length = 0x100 - 8, .type = EXT_IV, }, { .name = "a0g0initvals5", .offset = 0x66220 + 0x3f88, .length = 0xa28 - 8, .type = EXT_IV, }, @@ -50,16 +63,22 @@ static struct extract _722e2e0d8cc04b8f118bb5afe6829ff9[] = { - { .name = "ucode4", .offset = 0x76a10 + 0x8960, .length = 0x4e68, .type = EXT_UCODE_1, }, +/* + * { .name = "ucode4", .offset = 0x76a10 + 0x8960, .length = 0x4e68, .type = EXT_UCODE_1, }, + */ { .name = "ucode5", .offset = 0x76a10 + 0xd7cc, .length = 0x5640, .type = EXT_UCODE_2, }, { .name = "ucode11", .offset = 0x76a10 + 0x12e18, .length = 0x67e0, .type = EXT_UCODE_2, }, { .name = "ucode13", .offset = 0x76a10 + 0x195fc, .length = 0x5f60, .type = EXT_UCODE_2, }, - { .name = "pcm4", .offset = 0x76a10 + 0x1f560, .length = 0x520, .type = EXT_PCM, }, +/* + * { .name = "pcm4", .offset = 0x76a10 + 0x1f560, .length = 0x520, .type = EXT_PCM, }, + */ { .name = "pcm5", .offset = 0x76a10 + 0x1fa84, .length = 0x520, .type = EXT_PCM, }, - { .name = "b0g0initvals4", .offset = 0x76a10 + 0x1840, .length = 0xe90 - 8, .type = EXT_IV, }, - { .name = "b0g0bsinitvals4", .offset = 0x76a10 + 0x26d0, .length = 0x18 - 8, .type = EXT_IV, }, - { .name = "a0g0initvals4", .offset = 0x76a10 + 0x26e8, .length = 0xe90 - 8, .type = EXT_IV, }, - { .name = "a0g0bsinitvals4", .offset = 0x76a10 + 0x3578, .length = 0x18 - 8, .type = EXT_IV, }, +/* + * { .name = "b0g0initvals4", .offset = 0x76a10 + 0x1840, .length = 0xe90 - 8, .type = EXT_IV, }, + * { .name = "b0g0bsinitvals4", .offset = 0x76a10 + 0x26d0, .length = 0x18 - 8, .type = EXT_IV, }, + * { .name = "a0g0initvals4", .offset = 0x76a10 + 0x26e8, .length = 0xe90 - 8, .type = EXT_IV, }, + * { .name = "a0g0bsinitvals4", .offset = 0x76a10 + 0x3578, .length = 0x18 - 8, .type = EXT_IV, }, + */ { .name = "b0g0initvals5", .offset = 0x76a10 + 0x3590, .length = 0xa28 - 8, .type = EXT_IV, }, { .name = "b0g0bsinitvals5", .offset = 0x76a10 + 0x3fb8, .length = 0x100 - 8, .type = EXT_IV, }, { .name = "a0g0initvals5", .offset = 0x76a10 + 0x40b8, .length = 0xa28 - 8, .type = EXT_IV, }, @@ -116,14 +135,18 @@ static struct extract _cb8d70972b885b1f8883b943c0261a3c[] = { { .name = "pcm5", .offset = 0x8e554, .type = EXT_PCM, .length = 0x520 }, - { .name = "pcm4", .offset = 0x8ea78, .type = EXT_PCM, .length = 0x520 }, +/* + * { .name = "pcm4", .offset = 0x8ea78, .type = EXT_PCM, .length = 0x520 }, + */ { .name = "ucode15", .offset = 0x8ef9c, .type = EXT_UCODE_3, .length = 0x7710 }, { .name = "ucode14", .offset = 0x966b0, .type = EXT_UCODE_2, .length = 0x7a90 }, { .name = "ucode13", .offset = 0x9e144, .type = EXT_UCODE_2, .length = 0x7de0 }, { .name = "ucode11", .offset = 0xa5f28, .type = EXT_UCODE_2, .length = 0x74a0 }, { .name = "ucode9", .offset = 0xad3cc, .type = EXT_UCODE_2, .length = 0x6240 }, { .name = "ucode5", .offset = 0xb3610, .type = EXT_UCODE_2, .length = 0x5768 }, - { .name = "ucode4", .offset = 0xb8d7c, .type = EXT_UCODE_1, .length = 0x4ec8 }, +/* + * { .name = "ucode4", .offset = 0xb8d7c, .type = EXT_UCODE_1, .length = 0x4ec8 }, + */ { .name = "lp0bsinitvals15", .offset = 0xbdc44, .type = EXT_IV, .length = 0xf8 }, { .name = "lp0initvals15", .offset = 0xbdd44, .type = EXT_IV, .length = 0xb30 }, { .name = "lp0bsinitvals14", .offset = 0xbe87c, .type = EXT_IV, .length = 0xf8 }, @@ -149,13 +172,71 @@ { .name = "a0g0initvals5", .offset = 0xc5f24, .type = EXT_IV, .length = 0xa08 }, { .name = "b0g0bsinitvals5", .offset = 0xc6934, .type = EXT_IV, .length = 0xf8 }, { .name = "b0g0initvals5", .offset = 0xc6a34, .type = EXT_IV, .length = 0xa08 }, - { .name = "a0g0bsinitvals4", .offset = 0xc7444, .type = EXT_IV, .length = 0x10 }, - { .name = "a0g0initvals4", .offset = 0xc745c, .type = EXT_IV, .length = 0xe88 }, - { .name = "b0g0bsinitvals4", .offset = 0xc82ec, .type = EXT_IV, .length = 0x10 }, - { .name = "b0g0initvals4", .offset = 0xc8304, .type = EXT_IV, .length = 0xe8c }, +/* + * { .name = "a0g0bsinitvals4", .offset = 0xc7444, .type = EXT_IV, .length = 0x10 }, + * { .name = "a0g0initvals4", .offset = 0xc745c, .type = EXT_IV, .length = 0xe88 }, + * { .name = "b0g0bsinitvals4", .offset = 0xc82ec, .type = EXT_IV, .length = 0x10 }, + * { .name = "b0g0initvals4", .offset = 0xc8304, .type = EXT_IV, .length = 0xe8c }, + */ EXTRACT_LIST_END }; +static struct extract _2dd738b8feb8b3559fd9d8fbaf3bfffc[] = +{ + { .name = "lp0initvals14", .offset = 0x982B0, .type = EXT_IV, .length = 0xB80 }, + { .name = "lp0bsinitvals14", .offset = 0x98E38, .type = EXT_IV, .length = 0x118 }, + { .name = "b0g0initvals9", .offset = 0x92218, .type = EXT_IV, .length = 0xAF0 }, + { .name = "a0g1bsinitvals9", .offset = 0x94540, .type = EXT_IV, .length = 0x118 }, + { .name = "b0g0bsinitvals13", .offset = 0x974D0, .type = EXT_IV, .length = 0x118 }, + { .name = "b0g0bsinitvals5", .offset = 0x90A78, .type = EXT_IV, .length = 0x118 }, + { .name = "ucode4", .offset = 0x9B868, .type = EXT_UCODE_1, .length = 0x4EA0 }, + { .name = "b0g0initvals4", .offset = 0x8E2D8, .type = EXT_IV, .length = 0xE80 }, + { .name = "b0g0initvals13", .offset = 0x96930, .type = EXT_IV, .length = 0xB98 }, + { .name = "ucode14", .offset = 0xBBB1C, .type = EXT_UCODE_2, .length = 0x7910 }, + { .name = "a0g0initvals5", .offset = 0x90B98, .type = EXT_IV, .length = 0xA18 }, + { .name = "lp0bsinitvals16", .offset = 0x9B748, .type = EXT_IV, .length = 0x118 }, + { .name = "pcm4", .offset = 0xD4A40, .type = EXT_PCM, .length = 0x520 }, + { .name = "a0g1bsinitvals5", .offset = 0x920F8, .type = EXT_IV, .length = 0x118 }, + { .name = "n0bsinitvals11", .offset = 0x95230, .type = EXT_IV, .length = 0x118 }, + { .name = "n0absinitvals11", .offset = 0x95350, .type = EXT_IV, .length = 0x118 }, + /* ERROR: Could not guess data type for: ucode_bomminor */ + { .name = "a0g1bsinitvals13", .offset = 0x98190, .type = EXT_IV, .length = 0x118 }, + { .name = "pcm5", .offset = 0xD4F64, .type = EXT_PCM, .length = 0x520 }, + /* ERROR: Could not guess data type for: ucode_2w_bomminor */ + { .name = "ucode9", .offset = 0xA5E00, .type = EXT_UCODE_2, .length = 0x6248 }, + { .name = "a0g0bsinitvals9", .offset = 0x94420, .type = EXT_IV, .length = 0x118 }, + { .name = "a0g0bsinitvals4", .offset = 0x90020, .type = EXT_IV, .length = 0x30 }, + { .name = "a0g1initvals5", .offset = 0x915B8, .type = EXT_IV, .length = 0xA18 }, + { .name = "n0bsinitvals16", .offset = 0x9A980, .type = EXT_IV, .length = 0x118 }, + { .name = "ucode16", .offset = 0xCBB9C, .type = EXT_UCODE_3, .length = 0x8EA0 }, + { .name = "b0g0bsinitvals4", .offset = 0x8F160, .type = EXT_IV, .length = 0x30 }, + { .name = "lp0initvals15", .offset = 0x98F58, .type = EXT_IV, .length = 0xC68 }, + { .name = "b0g0initvals5", .offset = 0x90058, .type = EXT_IV, .length = 0xA18 }, + { .name = "a0g0initvals4", .offset = 0x8F198, .type = EXT_IV, .length = 0xE80 }, + { .name = "sslpn0initvals16", .offset = 0x9AAA0, .type = EXT_IV, .length = 0x0 }, + { .name = "a0g1initvals13", .offset = 0x975F0, .type = EXT_IV, .length = 0xB98 }, + /* ERROR: Could not guess data type for: ucode_2w11 */ + /* ERROR: Could not guess data type for: ucode_bommajor */ + { .name = "a0g1initvals9", .offset = 0x93928, .type = EXT_IV, .length = 0xAF0 }, + { .name = "ucode5", .offset = 0xA070C, .type = EXT_UCODE_2, .length = 0x56F0 }, + { .name = "lp0bsinitvals13", .offset = 0x96810, .type = EXT_IV, .length = 0x118 }, + { .name = "n0initvals16", .offset = 0x99CE8, .type = EXT_IV, .length = 0xC90 }, + /* ERROR: Could not guess data type for: ucode_2w_bommajor */ + { .name = "b0g0bsinitvals9", .offset = 0x92D10, .type = EXT_IV, .length = 0x118 }, + { .name = "ucode11", .offset = 0xAC04C, .type = EXT_UCODE_2, .length = 0x8000 }, + { .name = "lp0initvals16", .offset = 0x9AAB0, .type = EXT_IV, .length = 0xC90 }, + /* ERROR: Could not guess data type for: ucode_2w15 */ + { .name = "a0g0initvals9", .offset = 0x92E30, .type = EXT_IV, .length = 0xAF0 }, + { .name = "lp0initvals13", .offset = 0x95470, .type = EXT_IV, .length = 0x1398 }, + { .name = "a0g0bsinitvals5", .offset = 0x91FD8, .type = EXT_IV, .length = 0x118 }, + { .name = "ucode13", .offset = 0xB4050, .type = EXT_UCODE_2, .length = 0x7AC8 }, + /* ERROR: Could not guess data type for: ucode_2w13 */ + { .name = "ucode15", .offset = 0xC3430, .type = EXT_UCODE_3, .length = 0x8768 }, + { .name = "lp0bsinitvals15", .offset = 0x99BC8, .type = EXT_IV, .length = 0x118 }, + { .name = "n0initvals11", .offset = 0x94660, .type = EXT_IV, .length = 0xBC8 }, + { .name = "sslpn0bsinitvals16", .offset = 0x9AAA8, .type = EXT_IV, .length = 0x0 }, + EXTRACT_LIST_END +}; /* * Links change, so let's not put them into the README. @@ -209,6 +290,16 @@ .flags = FW_FLAG_LE | FW_FLAG_V4, .extract = _cb8d70972b885b1f8883b943c0261a3c, }, + { + /* ftp://ftp.linksys.com/opensourcecode/wrt610n/1.00.00.018/wrt610n_v1.00.00.0… */ + .name = "wl.o", + .id = "FW14", + .ucode_version = "478.104", + .md5 = "2dd738b8feb8b3559fd9d8fbaf3bfffc", + .flags = FW_FLAG_LE | FW_FLAG_V4 | FW_FLAG_UNSUPPORTED, + .extract = _2dd738b8feb8b3559fd9d8fbaf3bfffc, + }, }; #define FILES (sizeof(files) / sizeof(files[0])) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/b43-fwcutter-011/mklist.py new/b43-fwcutter-012/mklist.py --- old/b43-fwcutter-011/mklist.py 1970-01-01 01:00:00.000000000 +0100 +++ new/b43-fwcutter-012/mklist.py 2009-06-02 17:52:55.000000000 +0200 @@ -0,0 +1,98 @@ +#!/usr/bin/env python +# +# Script for creating a "struct extract" list for fwcutter_list.h +# +# Copyright (c) 2008 Michael Buesch <mb(a)bu3sch.de> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import sys +import os +import re +import md5 + +if len(sys.argv) != 2: + print "Usage: %s path/to/wl.o" % sys.argv[0] + sys.exit(1) +fn = sys.argv[1] + +pipe = os.popen("objdump -t %s" % fn) +syms = pipe.readlines() +pipe = os.popen("objdump --headers %s" % fn) +headers = pipe.readlines() + +# Get the .rodata fileoffset +rodata_fileoffset = None +rofileoff_re = re.compile(r"\d+\s+\.rodata\s+[0-9a-fA-F]+\s+[0-9a-fA-F]+\s+[0-9a-fA-F]+\s+([0-9a-fA-F]+)\s+.") +for line in headers: + line = line.strip() + m = rofileoff_re.match(line) + if m: + rodata_fileoffset = int(m.group(1), 16) + break +if rodata_fileoffset == None: + print "ERROR: Could not find .rodata fileoffset" + sys.exit(1) + +md5sum = md5.md5(file(fn, "r").read()) + +print "static struct extract _%s[] =" % md5sum.hexdigest() +print "{" + +sym_re = re.compile(r"([0-9a-fA-F]+)\s+g\s+O\s+\.rodata\s+([0-9a-fA-F]+) d11([-_\s\w0-9]+)") +ucode_re = re.compile(r"ucode(\d+)") + +for sym in syms: + sym = sym.strip() + m = sym_re.match(sym) + if not m: + continue + pos = int(m.group(1), 16) + rodata_fileoffset + size = int(m.group(2), 16) + name = m.group(3) + if name[-2:] == "sz": + continue + + type = None + if "initvals" in name: + type = "EXT_IV" + size -= 8 + if "pcm" in name: + type = "EXT_PCM" + m = ucode_re.match(name) + if m: + corerev = int(m.group(1)) + if corerev <= 4: + type = "EXT_UCODE_1" + elif corerev >= 5 and corerev <= 14: + type = "EXT_UCODE_2" + else: + type = "EXT_UCODE_3" + if not type: + print "\t/* ERROR: Could not guess data type for: %s */" % name + continue + + print "\t{ .name = \"%s\", .offset = 0x%X, .type = %s, .length = 0x%X }," % (name, pos, type, size) +print "\tEXTRACT_LIST_END" +print "};" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa-plugins for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package alsa-plugins for openSUSE:Factory checked in at Mon Aug 3 18:16:06 CEST 2009. -------- --- alsa-plugins/alsa-plugins.changes 2009-07-30 17:06:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins.changes 2009-08-03 12:39:57.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Aug 3 12:38:48 CEST 2009 - tiwai(a)suse.de + +- update pulse plugin: + * get rid of a number of assert()s + * unify destruction of snd_pulse_t + * use PA_CONTEXT_IS_GOOD where applicable + * call pa_threaded_mainloop_wait() to handle spurious wakeups + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-plugins.spec ++++++ --- /var/tmp/diff_new_pack.Nmvfpl/_old 2009-08-03 18:13:14.000000000 +0200 +++ /var/tmp/diff_new_pack.Nmvfpl/_new 2009-08-03 18:13:14.000000000 +0200 @@ -38,7 +38,7 @@ Url: http://www.alsa-project.org/ Summary: Extra Plug-Ins for the ALSA Library Version: 1.0.20 -Release: 5 +Release: 6 License: BSD 3-clause (or similar) ; GPL v2 or later ; LGPL v2.1 or later Group: System/Libraries AutoReqProv: on ++++++ alsa-plugins-git-fixes.diff ++++++ --- /var/tmp/diff_new_pack.Nmvfpl/_old 2009-08-03 18:13:14.000000000 +0200 +++ /var/tmp/diff_new_pack.Nmvfpl/_new 2009-08-03 18:13:14.000000000 +0200 @@ -1,3 +1,16 @@ +diff --git a/configure.in b/configure.in +index 36740e9..f8bc669 100644 +--- a/configure.in ++++ b/configure.in +@@ -30,7 +30,7 @@ AC_ARG_ENABLE([pulseaudio], + AS_HELP_STRING([--disable-pulseaudio], [Disable building of pulseaudio plugin])) + + if test "x$enable_pulseaudio" != "xno"; then +- PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.2], [HAVE_PULSE=yes], [HAVE_PULSE=no]) ++ PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.11], [HAVE_PULSE=yes], [HAVE_PULSE=no]) + fi + AM_CONDITIONAL(HAVE_PULSE, test x$HAVE_PULSE = xyes) + diff --git a/doc/speexdsp.txt b/doc/speexdsp.txt index 875fc19..5b5e5a0 100644 --- a/doc/speexdsp.txt @@ -109,11 +122,302 @@ return 0; } +diff --git a/pulse/ctl_pulse.c b/pulse/ctl_pulse.c +index c6cf9e2..2caa29b 100644 +--- a/pulse/ctl_pulse.c ++++ b/pulse/ctl_pulse.c +@@ -125,8 +125,9 @@ static void event_cb(pa_context * c, pa_subscription_event_type_t t, + pa_operation *o; + + assert(ctl); +- assert(ctl->p); +- assert(ctl->p->context); ++ ++ if (!ctl->p || !ctl->p->mainloop || !ctl->p->context) ++ return; + + o = pa_context_get_sink_info_by_name(ctl->p->context, ctl->sink, + sink_info_cb, ctl); +@@ -148,8 +149,9 @@ static int pulse_update_volume(snd_ctl_pulse_t * ctl) + pa_operation *o; + + assert(ctl); +- assert(ctl->p); +- assert(ctl->p->context); ++ ++ if (!ctl->p || !ctl->p->mainloop || !ctl->p->context) ++ return -EBADFD; + + o = pa_context_get_sink_info_by_name(ctl->p->context, ctl->sink, + sink_info_cb, ctl); +@@ -203,6 +205,9 @@ static int pulse_elem_list(snd_ctl_ext_t * ext, unsigned int offset, + + assert(ctl); + ++ if (!ctl->p || !ctl->p->mainloop || !ctl->p->context) ++ return -EBADFD; ++ + snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_MIXER); + + pa_threaded_mainloop_lock(ctl->p->mainloop); +@@ -260,7 +265,9 @@ static int pulse_get_attribute(snd_ctl_ext_t * ext, snd_ctl_ext_key_t key, + return -EINVAL; + + assert(ctl); +- assert(ctl->p); ++ ++ if (!ctl->p || !ctl->p->mainloop || !ctl->p->context) ++ return -EBADFD; + + pa_threaded_mainloop_lock(ctl->p->mainloop); + +@@ -311,7 +318,9 @@ static int pulse_read_integer(snd_ctl_ext_t * ext, snd_ctl_ext_key_t key, + pa_cvolume *vol = NULL; + + assert(ctl); +- assert(ctl->p); ++ ++ if (!ctl->p || !ctl->p->mainloop || !ctl->p->context) ++ return -EBADFD; + + pa_threaded_mainloop_lock(ctl->p->mainloop); + +@@ -361,7 +370,9 @@ static int pulse_write_integer(snd_ctl_ext_t * ext, snd_ctl_ext_key_t key, + pa_cvolume *vol = NULL; + + assert(ctl); +- assert(ctl->p && ctl->p->context); ++ ++ if (!ctl->p || !ctl->p->mainloop || !ctl->p->context) ++ return -EBADFD; + + pa_threaded_mainloop_lock(ctl->p->mainloop); + +@@ -465,6 +476,9 @@ static void pulse_subscribe_events(snd_ctl_ext_t * ext, int subscribe) + + assert(ctl); + ++ if (!ctl->p || !ctl->p->mainloop || !ctl->p->context) ++ return; ++ + pa_threaded_mainloop_lock(ctl->p->mainloop); + + ctl->subscribed = !!(subscribe & SND_CTL_EVENT_MASK_VALUE); +@@ -481,6 +495,9 @@ static int pulse_read_event(snd_ctl_ext_t * ext, snd_ctl_elem_id_t * id, + + assert(ctl); + ++ if (!ctl->p || !ctl->p->mainloop || !ctl->p->context) ++ return -EBADFD; ++ + pa_threaded_mainloop_lock(ctl->p->mainloop); + + if (!ctl->updated || !ctl->subscribed) +@@ -526,7 +543,9 @@ static int pulse_ctl_poll_revents(snd_ctl_ext_t * ext, struct pollfd *pfd, + int err = 0; + + assert(ctl); +- assert(ctl->p); ++ ++ if (!ctl->p || !ctl->p->mainloop || !ctl->p->context) ++ return -EBADFD; + + pa_threaded_mainloop_lock(ctl->p->mainloop); + diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c -index db8d1e1..c276839 100644 +index db8d1e1..24347f9 100644 --- a/pulse/pcm_pulse.c +++ b/pulse/pcm_pulse.c -@@ -739,6 +739,30 @@ static int pulse_close(snd_pcm_ioplug_t * io) +@@ -106,6 +106,9 @@ static int update_active(snd_pcm_pulse_t *pcm) { + + assert(pcm); + ++ if (!pcm->p) ++ return -EBADFD; ++ + ret = check_active(pcm); + if (ret < 0) + return ret; +@@ -125,7 +128,9 @@ static int pulse_start(snd_pcm_ioplug_t * io) + int err = 0, err_o = 0, err_u = 0; + + assert(pcm); +- assert(pcm->p); ++ ++ if (!pcm->p) ++ return -EBADFD; + + pa_threaded_mainloop_lock(pcm->p->mainloop); + +@@ -174,7 +179,9 @@ static int pulse_stop(snd_pcm_ioplug_t * io) + int err = 0, err_o = 0, err_u = 0; + + assert(pcm); +- assert(pcm->p); ++ ++ if (!pcm->p) ++ return -EBADFD; + + pa_threaded_mainloop_lock(pcm->p->mainloop); + +@@ -224,7 +231,9 @@ static int pulse_drain(snd_pcm_ioplug_t * io) + int err = 0; + + assert(pcm); +- assert(pcm->p); ++ ++ if (!pcm->p) ++ return -EBADFD; + + pa_threaded_mainloop_lock(pcm->p->mainloop); + +@@ -259,7 +268,9 @@ static snd_pcm_sframes_t pulse_pointer(snd_pcm_ioplug_t * io) + snd_pcm_sframes_t ret = 0; + + assert(pcm); +- assert(pcm->p); ++ ++ if (!pcm->p) ++ return -EBADFD; + + if (io->state == SND_PCM_STATE_XRUN) + return -EPIPE; +@@ -269,7 +280,10 @@ static snd_pcm_sframes_t pulse_pointer(snd_pcm_ioplug_t * io) + + pa_threaded_mainloop_lock(pcm->p->mainloop); + +- assert(pcm->stream); ++ if (!pcm->stream) { ++ ret = -EBADFD; ++ goto finish; ++ } + + ret = pulse_check_connection(pcm->p); + if (ret < 0) +@@ -305,11 +319,16 @@ static int pulse_delay(snd_pcm_ioplug_t * io, snd_pcm_sframes_t * delayp) + pa_usec_t lat = 0; + + assert(pcm); +- assert(pcm->p); ++ ++ if (!pcm->p) ++ return -EBADFD; + + pa_threaded_mainloop_lock(pcm->p->mainloop); + +- assert(pcm->stream); ++ if (!pcm->stream) { ++ err = -EBADFD; ++ goto finish; ++ } + + for (;;) { + err = pulse_check_connection(pcm->p); +@@ -354,11 +373,16 @@ static snd_pcm_sframes_t pulse_write(snd_pcm_ioplug_t * io, + snd_pcm_sframes_t ret = 0; + + assert(pcm); +- assert(pcm->p); ++ ++ if (!pcm->p) ++ return -EBADFD; + + pa_threaded_mainloop_lock(pcm->p->mainloop); + +- assert(pcm->stream); ++ if (!pcm->stream) { ++ ret = -EBADFD; ++ goto finish; ++ } + + ret = pulse_check_connection(pcm->p); + if (ret < 0) +@@ -409,11 +433,16 @@ static snd_pcm_sframes_t pulse_read(snd_pcm_ioplug_t * io, + snd_pcm_sframes_t ret = 0; + + assert(pcm); +- assert(pcm->p); ++ ++ if (!pcm->p) ++ return -EBADFD; + + pa_threaded_mainloop_lock(pcm->p->mainloop); + +- assert(pcm->stream); ++ if (!pcm->stream) { ++ ret = -EBADFD; ++ goto finish; ++ } + + ret = pulse_check_connection(pcm->p); + if (ret < 0) +@@ -480,7 +509,9 @@ static void stream_request_cb(pa_stream * p, size_t length, void *userdata) + snd_pcm_pulse_t *pcm = userdata; + + assert(pcm); +- assert(pcm->p); ++ ++ if (!pcm->p) ++ return; + + update_active(pcm); + } +@@ -490,7 +521,9 @@ static void stream_underrun_cb(pa_stream * p, void *userdata) + snd_pcm_pulse_t *pcm = userdata; + + assert(pcm); +- assert(pcm->p); ++ ++ if (!pcm->p) ++ return; + + pcm->underrun = 1; + } +@@ -499,7 +532,9 @@ static void stream_latency_cb(pa_stream *p, void *userdata) { + snd_pcm_pulse_t *pcm = userdata; + + assert(pcm); +- assert(pcm->p); ++ ++ if (!pcm->p) ++ return; + + pa_threaded_mainloop_signal(pcm->p->mainloop, 0); + } +@@ -512,7 +547,9 @@ static int pulse_pcm_poll_revents(snd_pcm_ioplug_t * io, + snd_pcm_pulse_t *pcm = io->private_data; + + assert(pcm); +- assert(pcm->p); ++ ++ if (!pcm->p) ++ return -EBADFD; + + pa_threaded_mainloop_lock(pcm->p->mainloop); + +@@ -541,7 +578,9 @@ static int pulse_prepare(snd_pcm_ioplug_t * io) + unsigned c, d; + + assert(pcm); +- assert(pcm->p); ++ ++ if (!pcm->p) ++ return -EBADFD; + + pa_threaded_mainloop_lock(pcm->p->mainloop); + +@@ -645,7 +684,9 @@ static int pulse_hw_params(snd_pcm_ioplug_t * io, + int err = 0; + + assert(pcm); +- assert(pcm->p); ++ ++ if (!pcm->p) ++ return -EBADFD; + + pa_threaded_mainloop_lock(pcm->p->mainloop); + +@@ -739,6 +780,32 @@ static int pulse_close(snd_pcm_ioplug_t * io) return 0; } @@ -123,7 +427,9 @@ + int err = 0; + + assert (pcm); -+ assert (pcm->p); ++ ++ if (!pcm->p) ++ return -EBADFD; + + pa_threaded_mainloop_lock(pcm->p->mainloop); + @@ -144,7 +450,7 @@ static const snd_pcm_ioplug_callback_t pulse_playback_callback = { .start = pulse_start, .stop = pulse_stop, -@@ -750,6 +774,7 @@ static const snd_pcm_ioplug_callback_t pulse_playback_callback = { +@@ -750,6 +817,7 @@ static const snd_pcm_ioplug_callback_t pulse_playback_callback = { .prepare = pulse_prepare, .hw_params = pulse_hw_params, .close = pulse_close, @@ -152,6 +458,164 @@ }; +diff --git a/pulse/pulse.c b/pulse/pulse.c +index 3940238..6f58a7e 100644 +--- a/pulse/pulse.c ++++ b/pulse/pulse.c +@@ -32,12 +32,13 @@ int pulse_check_connection(snd_pulse_t * p) + pa_context_state_t state; + + assert(p); +- assert(p->context); +- assert(p->mainloop); ++ ++ if (!p->context || !p->mainloop) ++ return -EBADFD; + + state = pa_context_get_state(p->context); + +- if (state != PA_CONTEXT_READY) ++ if (!PA_CONTEXT_IS_GOOD(state)) + return -EIO; + + return 0; +@@ -77,8 +78,12 @@ int pulse_wait_operation(snd_pulse_t * p, pa_operation * o) + { + assert(p); + assert(o); +- assert(p->state == PULSE_STATE_READY); +- assert(p->mainloop); ++ ++ if (p->state != PULSE_STATE_READY) ++ return -EBADFD; ++ ++ if (!p->mainloop) ++ return -EBADFD; + + for (;;) { + int err; +@@ -103,8 +108,12 @@ int pulse_wait_stream_state(snd_pulse_t * p, pa_stream * stream, + + assert(p); + assert(stream); +- assert(p->state == PULSE_STATE_READY); +- assert(p->mainloop); ++ ++ if (p->state != PULSE_STATE_READY) ++ return -EBADFD; ++ ++ if (!p->mainloop) ++ return -EBADFD; + + for (;;) { + int err; +@@ -118,8 +127,7 @@ int pulse_wait_stream_state(snd_pulse_t * p, pa_stream * stream, + if (state == target) + break; + +- if (state == PA_STREAM_FAILED || +- state == PA_STREAM_TERMINATED) ++ if (!PA_STREAM_IS_GOOD(state)) + return -EIO; + + pa_threaded_mainloop_wait(p->mainloop); +@@ -197,7 +205,9 @@ snd_pulse_t *pulse_new(void) + + p->context = + pa_context_new(pa_threaded_mainloop_get_api(p->mainloop), buf); +- assert(p->context); ++ ++ if (!p->context) ++ goto fail; + + pa_context_set_state_callback(p->context, context_state_cb, p); + +@@ -207,36 +217,29 @@ snd_pulse_t *pulse_new(void) + return p; + + fail: ++ pulse_free(p); ++ ++ return NULL; ++} ++ ++void pulse_free(snd_pulse_t * p) ++{ + if (p->mainloop) + pa_threaded_mainloop_stop(p->mainloop); + +- if (p->context) ++ if (p->context) { ++ pa_context_disconnect(p->context); + pa_context_unref(p->context); ++ } + + if (p->mainloop) + pa_threaded_mainloop_free(p->mainloop); + +- if (p->main_fd >= 0) +- close(p->main_fd); +- + if (p->thread_fd >= 0) + close(p->thread_fd); + +- free(p); +- +- return NULL; +-} +- +-void pulse_free(snd_pulse_t * p) +-{ +- pa_threaded_mainloop_stop(p->mainloop); +- +- pa_context_disconnect(p->context); +- pa_context_unref(p->context); +- pa_threaded_mainloop_free(p->mainloop); +- +- close(p->thread_fd); +- close(p->main_fd); ++ if (p->main_fd >= 0) ++ close(p->main_fd); + + free(p); + } +@@ -246,9 +249,12 @@ int pulse_connect(snd_pulse_t * p, const char *server) + int err; + + assert(p); +- assert(p->context); +- assert(p->mainloop); +- assert(p->state == PULSE_STATE_INIT); ++ ++ if (!p->context || !p->mainloop) ++ return -EBADFD; ++ ++ if (p->state != PULSE_STATE_INIT) ++ return -EBADFD; + + pa_threaded_mainloop_lock(p->mainloop); + +@@ -256,10 +262,17 @@ int pulse_connect(snd_pulse_t * p, const char *server) + if (err < 0) + goto error; + +- pa_threaded_mainloop_wait(p->mainloop); ++ for (;;) { ++ pa_context_state_t state = pa_context_get_state(p->context); + +- if (pa_context_get_state(p->context) != PA_CONTEXT_READY) +- goto error; ++ if (!PA_CONTEXT_IS_GOOD(state)) ++ goto error; ++ ++ if (state == PA_CONTEXT_READY) ++ break; ++ ++ pa_threaded_mainloop_wait(p->mainloop); ++ } + + pa_threaded_mainloop_unlock(p->mainloop); + diff --git a/rate-lavc/rate_lavcrate.c b/rate-lavc/rate_lavcrate.c index ea2e2f5..14a2198 100644 --- a/rate-lavc/rate_lavcrate.c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit schedtop for openSUSE:Factory
by root＠Hilbert.suse.de 03 Aug '09

03 Aug '09

Hello community, here is the log from the commit of package schedtop for openSUSE:Factory checked in at Mon Aug 3 16:57:58 CEST 2009. -------- --- schedtop/schedtop.changes 2009-06-04 01:07:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/schedtop/schedtop.changes 2009-08-02 17:14:20.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Aug 2 16:55:57 CEST 2009 - coolo(a)novell.com + +- boost-devel requires everything needed +- fix rpmlint errors + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ schedtop.spec ++++++ --- /var/tmp/diff_new_pack.JuSf59/_old 2009-08-03 16:57:08.000000000 +0200 +++ /var/tmp/diff_new_pack.JuSf59/_new 2009-08-03 16:57:08.000000000 +0200 @@ -17,25 +17,23 @@ %define rpmrel 1 -%if 0%{?suse_version} == 1110 -%define boostver 1_36_0 -%endif -%if 0%{?suse_version} > 1110 -%define boostver 1_38_0 -%endif %if 0%{?suse_version} > 1100 -%define boostdeps libboost_regex%{boostver} libboost_program_options%{boostver} libboost_filesystem%{boostver} +%define boostdeps boost-devel +%else +%if 0%{?suse_version} == 1110 +%define boostdeps boost-devel libboost_regex1_36 libboost_program_options1_36 libboost_filesystem1_36 %else %define boostdeps boost %endif -BuildRequires: %{boostdeps} boost-devel gcc-c++ ncurses-devel -Summary: schedtop: displays scheduler statistics +%endif +BuildRequires: %{boostdeps} gcc-c++ ncurses-devel +Summary: Displays Scheduler Statistics Name: schedtop Version: 1.1 -Release: 2 +Release: 3 License: GPL -Requires: %{boostdeps} ncurses +Requires: ncurses Group: System/Monitoring Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0