September 2009 - openSUSE Commits - openSUSE Mailing Lists

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

29 Sep '09

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Tue Sep 29 22:22:50 CEST 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-09-28 20:57:14.000000000 +0200 +++ xorg-x11-server/xorg-x11-server.changes 2009-09-29 19:54:05.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Sep 29 19:43:23 CEST 2009 - sndirsch(a)suse.de + +- dga-removal-fix.diff + * "Removing DGA ended up breaking any drivers calling into the old + xf86DiDGAInit function as it tried to see if DGA was already + enabled and ended up crashing if the VT wasn't completely + initialized. Oops." + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- dga-removal-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.E3Ig6T/_old 2009-09-29 22:22:20.000000000 +0200 +++ /var/tmp/diff_new_pack.E3Ig6T/_new 2009-09-29 22:22:20.000000000 +0200 @@ -33,7 +33,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 55 +Release: 56 License: GPL v2 or later ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -138,6 +138,7 @@ Patch190: 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch Patch191: 0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch Patch200: bug534768-prefer_local_symbols.patch +Patch201: dga-removal-fix.diff Patch532341: bug532341.diff %description @@ -281,6 +282,7 @@ %patch190 -p1 %patch191 -p1 %patch200 -p1 +%patch201 -p1 %patch532341 -p1 %build ++++++ dga-removal-fix.diff ++++++ Removing DGA ended up breaking any drivers calling into the old xf86DiDGAInit function as it tried to see if DGA was already enabled and ended up crashing if the VT wasn't completely initialized. Oops. Also, if the driver initializes DGA itself, have the DiDGA initialization overwrite that information as the DiDGA code will call ReInit on mode detect. Signed-off-by: Keith Packard <keithp(a)keithp.com> --- hw/xfree86/common/xf86DGA.c | 29 ++++++++++++++++------------- hw/xfree86/modes/xf86Crtc.c | 4 ++-- hw/xfree86/modes/xf86Crtc.h | 8 ++++++++ hw/xfree86/modes/xf86DiDGA.c | 15 ++++++++++++--- 4 files changed, 38 insertions(+), 18 deletions(-) diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 42b7c58..804fd37 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -120,8 +120,22 @@ DGAInit( DGAScreenKey = &DGAScreenKeyIndex; - if(!(pScreenPriv = (DGAScreenPtr)xalloc(sizeof(DGAScreenRec)))) - return FALSE; + pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen); + + if (!pScreenPriv) + { + if(!(pScreenPriv = (DGAScreenPtr)xalloc(sizeof(DGAScreenRec)))) + return FALSE; + dixSetPrivate(&pScreen->devPrivates, DGAScreenKey, pScreenPriv); + pScreenPriv->CloseScreen = pScreen->CloseScreen; + pScreen->CloseScreen = DGACloseScreen; + pScreenPriv->DestroyColormap = pScreen->DestroyColormap; + pScreen->DestroyColormap = DGADestroyColormap; + pScreenPriv->InstallColormap = pScreen->InstallColormap; + pScreen->InstallColormap = DGAInstallColormap; + pScreenPriv->UninstallColormap = pScreen->UninstallColormap; + pScreen->UninstallColormap = DGAUninstallColormap; + } pScreenPriv->pScrn = pScrn; pScreenPriv->numModes = num; @@ -146,17 +160,6 @@ DGAInit( modes[i].flags &= ~DGA_PIXMAP_AVAILABLE; #endif - dixSetPrivate(&pScreen->devPrivates, DGAScreenKey, pScreenPriv); - pScreenPriv->CloseScreen = pScreen->CloseScreen; - pScreen->CloseScreen = DGACloseScreen; - pScreenPriv->DestroyColormap = pScreen->DestroyColormap; - pScreen->DestroyColormap = DGADestroyColormap; - pScreenPriv->InstallColormap = pScreen->InstallColormap; - pScreen->InstallColormap = DGAInstallColormap; - pScreenPriv->UninstallColormap = pScreen->UninstallColormap; - pScreen->UninstallColormap = DGAUninstallColormap; - - return TRUE; } diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index c1e31e0..f274725 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -806,7 +806,7 @@ xf86CrtcScreenInit (ScreenPtr screen) screen->CloseScreen = xf86CrtcCloseScreen; #ifdef XFreeXDGA - xf86DiDGAInit(screen, 0); + _xf86_di_dga_init_for_reals(screen); #endif #ifdef RANDR_13_INTERFACE return RANDR_INTERFACE_VERSION; @@ -1928,7 +1928,7 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn) scrn->currentMode = scrn->modes; #ifdef XFreeXDGA if (scrn->pScreen) - xf86DiDGAReInit(scrn->pScreen); + _xf86_di_dga_reinit_for_reals(scrn->pScreen); #endif } diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h index 69afaa5..edf84d8 100644 --- a/hw/xfree86/modes/xf86Crtc.h +++ b/hw/xfree86/modes/xf86Crtc.h @@ -833,6 +833,10 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus); extern _X_EXPORT Bool xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address); +/* this is the real function, used only internally */ +_X_INTERNAL Bool +_xf86_di_dga_init_for_reals (ScreenPtr pScreen); + /** * Re-initialize dga for this screen (as when the set of modes changes) */ @@ -841,6 +845,10 @@ extern _X_EXPORT Bool xf86DiDGAReInit (ScreenPtr pScreen); #endif +/* This is the real function, used only internally */ +_X_INTERNAL Bool +_xf86_di_dga_reinit_for_reals (ScreenPtr pScreen); + /* * Set the subpixel order reported for the screen using * the information from the outputs diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c index 0f7b834..3df3754 100644 --- a/hw/xfree86/modes/xf86DiDGA.c +++ b/hw/xfree86/modes/xf86DiDGA.c @@ -175,6 +175,12 @@ static DGAFunctionRec xf86_dga_funcs = { Bool xf86DiDGAReInit (ScreenPtr pScreen) { + return TRUE; +} + +_X_INTERNAL Bool +_xf86_di_dga_reinit_for_reals (ScreenPtr pScreen) +{ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); @@ -190,12 +196,15 @@ xf86DiDGAReInit (ScreenPtr pScreen) Bool xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address) { + return TRUE; +} + +_X_INTERNAL Bool +_xf86_di_dga_init_for_reals (ScreenPtr pScreen) +{ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - if (DGAAvailable(pScreen->myNum)) - return TRUE; - xf86_config->dga_flags = 0; xf86_config->dga_address = 0; xf86_config->dga_width = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ibmrtpkgs for openSUSE:Factory
by root＠Hilbert.suse.de 29 Sep '09

29 Sep '09

Hello community, here is the log from the commit of package ibmrtpkgs for openSUSE:Factory checked in at Tue Sep 29 15:02:56 CEST 2009. -------- --- ibmrtpkgs/ibmrtpkgs.changes 2009-09-24 20:37:27.000000000 +0200 +++ ibmrtpkgs/ibmrtpkgs.changes 2009-09-28 23:44:21.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 28 15:42:28 MDT 2009 - alext(a)suse.de + +- Fix typo in postun scriptlet for irqbindall service restart. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibmrtpkgs.spec ++++++ --- /var/tmp/diff_new_pack.QsD0vs/_old 2009-09-29 15:02:39.000000000 +0200 +++ /var/tmp/diff_new_pack.QsD0vs/_new 2009-09-29 15:02:39.000000000 +0200 @@ -21,7 +21,7 @@ Url: http://www10.software.ibm.com/developerworks/opensource/linux390 Summary: IBM Utilities for SLERT Version: 2 -Release: 12 +Release: 13 PreReq: %insserv_prereq %fillup_prereq License: GPL v3 only Group: System/Management @@ -121,7 +121,7 @@ fi %postun -%{restart_on_update ibm-prtm irqbinall rtcheck set_kthread_prio} +%{restart_on_update ibm-prtm irqbindall rtcheck set_kthread_prio} %{insserv_cleanup} %clean ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kupdateapplet for openSUSE:Factory
by root＠Hilbert.suse.de 29 Sep '09

29 Sep '09

Hello community, here is the log from the commit of package kupdateapplet for openSUSE:Factory checked in at Tue Sep 29 15:02:25 CEST 2009. -------- --- KDE/kupdateapplet/kupdateapplet.changes 2009-09-24 12:12:16.000000000 +0200 +++ kupdateapplet/kupdateapplet.changes 2009-09-29 12:30:51.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 29 11:59:10 CEST 2009 - tgoettlicher(a)suse.de + +- removed check for update repos from packagekit backend +- V 0.9.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kupdateapplet-0.9.1.tar.bz2 New: ---- kupdateapplet-0.9.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kupdateapplet.spec ++++++ --- /var/tmp/diff_new_pack.UNLTQ8/_old 2009-09-29 15:01:40.000000000 +0200 +++ /var/tmp/diff_new_pack.UNLTQ8/_new 2009-09-29 15:01:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kupdateapplet (Version 0.9.1) +# spec file for package kupdateapplet (Version 0.9.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,12 +23,12 @@ License: GPL Group: System/Management Summary: openSUSE System Updater Applet (KDE4) -Version: 0.9.1 +Version: 0.9.2 Release: 1 Url: http://en.opensuse.org/KDE_Updater_Applet BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -Requires: kupdateapplet-plugin = 0.9.1 +Requires: kupdateapplet-plugin = 0.9.2 Requires: oxygen-icon-theme Requires: PolicyKit-kde Recommends: smolt @@ -42,7 +42,7 @@ #last used in 10.2 Provides: opensuse-updater <= 0.5 Obsoletes: opensuse-updater <= 0.5 -Provides: kde4-kupdateapplet = 0.9.1 +Provides: kde4-kupdateapplet = 0.9.0 Obsoletes: kde4-kupdateapplet <= 0.8.42 %description @@ -96,7 +96,6 @@ # files for the dummy plugin #%_libdir/kde4/kupdateapplet_interactive.so #/usr/share/kde4/services/kupdateapplet_interactive.desktop - ############################ %package packagekit @@ -104,8 +103,8 @@ Group: System/Management Summary: packagekit plugin for KDE updater applet Requires: PackageKit >= 0.5.1 -Provides: kupdateapplet-plugin = 0.9.1 -Provides: kde4-kupdateapplet-packagekit = 0.9.1 +Provides: kupdateapplet-plugin = 0.9.2 +Provides: kde4-kupdateapplet-packagekit = 0.9.0 Obsoletes: kde4-kupdateapplet-packagekit <= 0.8.42 Recommends: PolicyKit-kde @@ -116,7 +115,6 @@ %defattr(-,root,root) %_libdir/kde4/kupdateapplet_packagekit.so /usr/share/kde4/services/kupdateapplet_packagekit.desktop - ############################ %package zypp @@ -124,8 +122,8 @@ Group: System/Management Summary: zypp plugin for KDE updater applet Requires: zypper >= 0.12.11 -Provides: kupdateapplet-plugin = 0.9.1 -Provides: kde4-kupdateapplet-zypp = 0.9.1 +Provides: kupdateapplet-plugin = 0.9.2 +Provides: kde4-kupdateapplet-zypp = 0.9.0 Obsoletes: kde4-kupdateapplet-zypp <= 0.8.42 %description zypp ++++++ kupdateapplet-0.9.1.tar.bz2 -> kupdateapplet-0.9.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.1/VERSION.cmake new/kupdateapplet-0.9.2/VERSION.cmake --- old/kupdateapplet-0.9.1/VERSION.cmake 2009-09-21 17:40:09.000000000 +0200 +++ new/kupdateapplet-0.9.2/VERSION.cmake 2009-09-29 12:30:35.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "9") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.1/kupdateapplet.spec.in new/kupdateapplet-0.9.2/kupdateapplet.spec.in --- old/kupdateapplet-0.9.1/kupdateapplet.spec.in 2009-09-21 17:40:09.000000000 +0200 +++ new/kupdateapplet-0.9.2/kupdateapplet.spec.in 2009-09-29 12:30:35.000000000 +0200 @@ -34,7 +34,7 @@ #last used in 10.2 Provides: opensuse-updater <= 0.5 Obsoletes: opensuse-updater <= 0.5 -Provides: kde4-kupdateapplet = @VERSION@ +Provides: kde4-kupdateapplet = 0.9.0 Obsoletes: kde4-kupdateapplet <= 0.8.42 %description @@ -91,7 +91,6 @@ #%_libdir/kde4/kupdateapplet_interactive.so #/usr/share/kde4/services/kupdateapplet_interactive.desktop -%changelog ############################ @@ -100,7 +99,7 @@ Summary: packagekit plugin for KDE updater applet Requires: PackageKit >= 0.5.1 Provides: kupdateapplet-plugin = @VERSION@ -Provides: kde4-kupdateapplet-packagekit = @VERSION@ +Provides: kde4-kupdateapplet-packagekit = 0.9.0 Obsoletes: kde4-kupdateapplet-packagekit <= 0.8.42 Recommends: PolicyKit-kde @@ -112,7 +111,6 @@ %_libdir/kde4/kupdateapplet_packagekit.so /usr/share/kde4/services/kupdateapplet_packagekit.desktop -%changelog ############################ @@ -121,7 +119,7 @@ Summary: zypp plugin for KDE updater applet Requires: zypper >= 0.12.11 Provides: kupdateapplet-plugin = @VERSION@ -Provides: kde4-kupdateapplet-zypp = @VERSION@ +Provides: kde4-kupdateapplet-zypp = 0.9.0 Obsoletes: kde4-kupdateapplet-zypp <= 0.8.42 %description zypp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.1/package/kupdateapplet.changes new/kupdateapplet-0.9.2/package/kupdateapplet.changes --- old/kupdateapplet-0.9.1/package/kupdateapplet.changes 2009-09-21 17:40:09.000000000 +0200 +++ new/kupdateapplet-0.9.2/package/kupdateapplet.changes 2009-09-29 12:30:35.000000000 +0200 @@ -1,10 +1,16 @@ ------------------------------------------------------------------- +Tue Sep 29 11:59:10 CEST 2009 - tgoettlicher(a)suse.de + +- removed check for update repos from packagekit backend +- V 0.9.2 + +------------------------------------------------------------------- Mon Sep 21 17:37:36 CEST 2009 - tgoettlicher(a)suse.de - changed call "yast2 online_update_configuration" to "yast2 inst_source" - V 0.9.1 -------------------------------------------------------------------- +------------------------------------------------------------------ Fri Sep 18 13:22:24 UTC 2009 - dmacvicar(a)novell.com - sync with PackageKit 0.5.1 API @@ -24,14 +30,14 @@ - V 0.8.43 ------------------------------------------------------------------- -Tue Jul 14 10:58:34 CEST 2009 - beineri(a)opensuse.org +Thu Jul 16 10:58:53 CEST 2009 - tgoettlicher(a)suse.de -- drop kde4- package prefixes +- Changed "Name=Online Update Applet" in .desktop files ------------------------------------------------------------------- -Thu Apr 9 10:58:53 CEST 2009 - tgoettlicher(a)suse.de +Tue Jul 14 10:58:34 CEST 2009 - beineri(a)opensuse.org -- Changed "Name=Online Update Applet" in .desktop files +- drop kde4- package prefixes ------------------------------------------------------------------- Tue Apr 7 11:59:46 CEST 2009 - tgoettlicher(a)suse.de diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.1/src/packagekit/packagekit_updater.cpp new/kupdateapplet-0.9.2/src/packagekit/packagekit_updater.cpp --- old/kupdateapplet-0.9.1/src/packagekit/packagekit_updater.cpp 2009-09-21 17:40:09.000000000 +0200 +++ new/kupdateapplet-0.9.2/src/packagekit/packagekit_updater.cpp 2009-09-29 12:30:35.000000000 +0200 @@ -343,15 +343,15 @@ void PackageKitUpdater::slotUpdaterRepoSearchFinished() { kDebug() << "finished search for update repositories"; - if (!_updateRepoAvailable) - { - kDebug() << "no update repositories defined"; - emit pluginNeedsConfiguration( PLUGIN_CONFIG_NO_UPDATE_REPOS ); - } - else - { +// if (!_updateRepoAvailable) +// { + // kDebug() << "no update repositories defined"; +// emit pluginNeedsConfiguration( PLUGIN_CONFIG_NO_UPDATE_REPOS ); +// } +// else +// { doCheckForUpdates(); - } +// } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 GraphicsMagick for openSUSE:Factory
by root＠Hilbert.suse.de 29 Sep '09

29 Sep '09

Hello community, here is the log from the commit of package GraphicsMagick for openSUSE:Factory checked in at Tue Sep 29 15:01:24 CEST 2009. -------- --- GraphicsMagick/GraphicsMagick.changes 2008-10-15 11:36:30.000000000 +0200 +++ GraphicsMagick/GraphicsMagick.changes 2009-08-04 18:44:35.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Aug 4 18:38:37 CEST 2009 - pgajdos(a)suse.cz + +- updated to 1.2.7: + - Bug fixes: + * VID: Eliminate memory leak. + * montage: Eliminate use of freed memory. + * delegates.mgk: Fix hang when co-process is invoked. + * identify: Return comment text of any size. + * ConvolveImage: Correctly log the convolution kernel used. + - Feature improvements: + * Convert: Re-implement -write so that it works in a useful fashion. + - Performance improvments: + * TIFF: Ping mode ('identify') is now really fast. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- GraphicsMagick-1.2.5-CVE-2008-1097.patch GraphicsMagick-1.2.5-debian-fixed.patch GraphicsMagick-1.2.5-include.patch GraphicsMagick-1.2.5-perl.patch GraphicsMagick-1.2.5.tar.bz2 New: ---- GraphicsMagick-1.2.7-CVE-2008-1097.patch GraphicsMagick-1.2.7-debian-fixed.patch GraphicsMagick-1.2.7-include.patch GraphicsMagick-1.2.7-perl.patch GraphicsMagick-1.2.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ GraphicsMagick.spec ++++++ --- /var/tmp/diff_new_pack.ITQJUq/_old 2009-09-29 14:55:45.000000000 +0200 +++ /var/tmp/diff_new_pack.ITQJUq/_new 2009-09-29 14:55:45.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package GraphicsMagick (Version 1.2.5) +# spec file for package GraphicsMagick (Version 1.2.7) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,11 +26,11 @@ %endif # Define Quantum depth %define quant 8 -%define base_version 1.2.5 +%define base_version 1.2.7 Summary: Viewer and Converter for Images -Version: 1.2.5 -Release: 4 -License: X11/MIT +Version: 1.2.7 +Release: 1 +License: MIT License (or similar) Group: Productivity/Graphics/Convertors Source: ftp://ftp.GraphicsMagick.org/pub/%{name}/%{name}-%{version}.tar.bz2 Patch2: %{name}-%{version}-debian-fixed.patch @@ -67,7 +67,7 @@ see the AUTHORS file %package -n libGraphicsMagick2 -License: X11/MIT +License: MIT License (or similar) Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Convertors @@ -98,7 +98,7 @@ see the AUTHORS file %package -n libGraphicsMagickWand1 -License: X11/MIT +License: MIT License (or similar) Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Convertors @@ -129,7 +129,7 @@ see the AUTHORS file %package devel -License: X11/MIT +License: MIT License (or similar) Summary: Viewer and Converter for Images - files mandatory for development Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -155,7 +155,7 @@ see the AUTHORS file %package -n perl-GraphicsMagick -License: X11/MIT +License: MIT License (or similar) Summary: Viewer and Converter for Images - perl interface Group: Development/Libraries/Perl Requires: %{name} = %{version} perl = %{perl_version} @@ -181,7 +181,7 @@ see the AUTHORS file %package -n libGraphicsMagick++2 -License: X11/MIT +License: MIT License (or similar) Summary: Viewer and Converter for Images - C++ interface Group: System/Libraries @@ -206,7 +206,7 @@ see the AUTHORS file %package -n libGraphicsMagick++-devel -License: X11/MIT +License: MIT License (or similar) Summary: Viewer and Converter for Images - C++ interface - development files Group: Development/Libraries/C and C++ Provides: GraphicsMagick-C++-devel ++++++ GraphicsMagick-1.2.5-CVE-2008-1097.patch -> GraphicsMagick-1.2.7-CVE-2008-1097.patch ++++++ ++++++ GraphicsMagick-1.2.5-debian-fixed.patch -> GraphicsMagick-1.2.7-debian-fixed.patch ++++++ ++++++ GraphicsMagick-1.2.5-include.patch -> GraphicsMagick-1.2.7-include.patch ++++++ ++++++ GraphicsMagick-1.2.5-perl.patch -> GraphicsMagick-1.2.7-perl.patch ++++++ ++++++ GraphicsMagick-1.2.5.tar.bz2 -> GraphicsMagick-1.2.7.tar.bz2 ++++++ ++++ 16935 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 libbtctl for openSUSE:Factory
by root＠Hilbert.suse.de 29 Sep '09

29 Sep '09

Hello community, here is the log from the commit of package libbtctl for openSUSE:Factory checked in at Tue Sep 29 14:55:26 CEST 2009. -------- --- GNOME/libbtctl/libbtctl.changes 2009-05-18 03:13:14.000000000 +0200 +++ libbtctl/libbtctl.changes 2009-09-29 13:32:41.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 29 11:07:32 UTC 2009 - aj(a)suse.de + +- Fix requires of subpackages to require correct packagename. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libbtctl.spec ++++++ --- /var/tmp/diff_new_pack.RKJurN/_old 2009-09-29 14:55:06.000000000 +0200 +++ /var/tmp/diff_new_pack.RKJurN/_new 2009-09-29 14:55:06.000000000 +0200 @@ -43,7 +43,7 @@ Group: System/GUI/GNOME AutoReqProv: on Version: 0.11.1 -Release: 3 +Release: 4 Summary: GObject Bluetooth Controller Library Url: http://usefulinc.com/software/gnome-bluetooth/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -85,7 +85,7 @@ License: LGPL v2.1 only Summary: GObject Bluetooth Controller Library Group: System/GUI/GNOME -Requires: %{name}4 = %{version} +Requires: %{name}6 = %{version} %py_requires %description -n python-libbtctl @@ -106,7 +106,7 @@ License: GPL v2 or later Summary: .NET Bindings for GObject Bluetooth Controller Library Group: System/GUI/GNOME -Requires: %{name}4 = %{version} +Requires: %{name}6 = %{version} %description sharp This package contains .NET bindings for libbtctl - GObject Bluetooth @@ -140,7 +140,7 @@ License: GPL v2 or later Summary: Additional Package Documentation Group: System/GUI/GNOME -Requires: %{name}4 = %{version} +Requires: %{name}6 = %{version} %description doc This library is intended to provide convenient GObject-style access to ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 polkit-gnome for openSUSE:Factory
by root＠Hilbert.suse.de 29 Sep '09

29 Sep '09

Hello community, here is the log from the commit of package polkit-gnome for openSUSE:Factory checked in at Tue Sep 29 14:54:45 CEST 2009. -------- --- GNOME/polkit-gnome/polkit-gnome.changes 2009-08-14 03:57:24.000000000 +0200 +++ polkit-gnome/polkit-gnome.changes 2009-09-28 16:27:02.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 28 14:15:36 UTC 2009 - llunak(a)novell.com + +- use the authentication agent also in KDE (bnc#538897) +- use the proper button order in KDE +- fix status icon not hiding + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- alternative_button_order.diff fix_status_icon_hide.diff use_in_kde.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polkit-gnome.spec ++++++ --- /var/tmp/diff_new_pack.h3BSwG/_old 2009-09-29 14:53:03.000000000 +0200 +++ /var/tmp/diff_new_pack.h3BSwG/_new 2009-09-29 14:53:03.000000000 +0200 @@ -19,12 +19,15 @@ Name: polkit-gnome Version: 0.94 -Release: 1 +Release: 2 License: LGPL v2.1 or later Summary: PolicyKit integration for the GNOME desktop Url: http://www.freedesktop.org/wiki/Software/PolicyKit Group: System/GUI/GNOME Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2 +Patch1: use_in_kde.diff +Patch2: fix_status_icon_hide.diff +Patch3: alternative_button_order.diff BuildRequires: intltool BuildRequires: gtk2-devel BuildRequires: gtk-doc @@ -66,6 +69,9 @@ %lang_package %prep %setup -q +%patch1 +%patch2 +%patch3 %build %configure \ ++++++ alternative_button_order.diff ++++++ --- src/polkitgnomeauthenticationdialog.c.sav 2009-06-22 18:19:24.000000000 +0200 +++ src/polkitgnomeauthenticationdialog.c 2009-09-28 15:54:59.948015026 +0200 @@ -529,6 +529,7 @@ polkit_gnome_authentication_dialog_const _("_Authenticate"), GTK_RESPONSE_OK); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); ++++++ fix_status_icon_hide.diff ++++++ --- src/main.c.sav 2009-07-21 01:28:31.000000000 +0200 +++ src/main.c 2009-09-28 16:14:01.440014284 +0200 @@ -141,6 +141,7 @@ update_temporary_authorization_icon_real /* hide icon */ if (status_icon != NULL) { + gtk_status_icon_set_visible (status_icon, FALSE); g_object_unref (status_icon); status_icon = NULL; } ++++++ use_in_kde.diff ++++++ --- src/polkit-gnome-authentication-agent-1.desktop.in.in.sav 2009-07-21 01:28:31.000000000 +0200 +++ src/polkit-gnome-authentication-agent-1.desktop.in.in 2009-09-28 16:01:45.640015175 +0200 @@ -5,4 +5,4 @@ Exec=@FULL_LIBEXECDIR@/polkit-gnome-auth Terminal=false Type=Application Categories= -OnlyShowIn=GNOME; +OnlyShowIn=GNOME;KDE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 virtualbox-ose for openSUSE:Factory
by root＠Hilbert.suse.de 29 Sep '09

29 Sep '09

Hello community, here is the log from the commit of package virtualbox-ose for openSUSE:Factory checked in at Tue Sep 29 14:52:46 CEST 2009. -------- --- virtualbox-ose/virtualbox-ose.changes 2009-09-24 13:42:24.000000000 +0200 +++ virtualbox-ose/virtualbox-ose.changes 2009-09-29 14:08:49.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 29 13:58:59 CEST 2009 - mseben(a)novell.com + +- moved hal policy file 90-vboxguest.fdi to hal/fdi/policy instead + of hal/fdi/information + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox-ose.spec ++++++ --- /var/tmp/diff_new_pack.aXd7rn/_old 2009-09-29 14:51:12.000000000 +0200 +++ /var/tmp/diff_new_pack.aXd7rn/_new 2009-09-29 14:51:12.000000000 +0200 @@ -62,7 +62,7 @@ # ExclusiveArch: %ix86 x86_64 Version: 3.0.6 -Release: 4 +Release: 5 Summary: VirtualBox OSE is an Emulator License: GPL v2 or later Group: System/Emulators/PC @@ -373,8 +373,8 @@ # install script which handle dynamic display changes %__install -m 744 src/VBox/Additions/x11/Installer/VBoxRandR.sh %{buildroot}%{_bindir}/VBoxRandR # install hal policy file to autodetect the virtualbox mouse -%__install -d -m 755 %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty/ -%__install -m 644 src/VBox/Additions/linux/installer/90-vboxguest.fdi %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty/90-vboxguest.fdi +%__install -d -m 755 %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/ +%__install -m 644 src/VBox/Additions/linux/installer/90-vboxguest.fdi %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi # create rc symlinks for file in vboxdrv vboxadd; do %__ln_s %{_sysconfdir}/init.d/$file %{buildroot}%{_sbindir}/rc$file @@ -524,7 +524,7 @@ %dir %{_var}/lib/hardware %dir %{_var}/lib/hardware/ids %dir %{_libdir}/dri/ -%dir %{_datadir}/hal/fdi/information/20thirdparty/ +%dir %{_datadir}/hal/fdi/policy/20thirdparty/ %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so %{_libdir}/xorg/modules/input/vboxmouse_drv.so %{_var}/lib/hardware/ids/xorg-x11-driver-virtualbox-ose @@ -532,7 +532,7 @@ %{_datadir}/sax/sysp/maps/update/Identity.map.xorg-x11-driver-virtualbox-ose %{_libdir}/VBoxOGL*.so %{_libdir}/dri/vboxvideo_dri.so -%{_datadir}/hal/fdi/information/20thirdparty/90-vboxguest.fdi +%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi %files guest-tools %defattr(-, root, root) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gfxboot for openSUSE:Factory
by root＠Hilbert.suse.de 29 Sep '09

29 Sep '09

Hello community, here is the log from the commit of package gfxboot for openSUSE:Factory checked in at Tue Sep 29 14:50:56 CEST 2009. -------- --- gfxboot/gfxboot.changes 2009-09-28 11:50:53.000000000 +0200 +++ gfxboot/gfxboot.changes 2009-09-29 12:06:25.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 29 12:05:53 CEST 2009 - snwint(a)suse.de + +- set default install type correctly (bnc #542781) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gfxboot-4.1.27.tar.bz2 New: ---- gfxboot-4.1.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.hVmByP/_old 2009-09-29 14:50:22.000000000 +0200 +++ /var/tmp/diff_new_pack.hVmByP/_new 2009-09-29 14:50:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gfxboot (Version 4.1.27) +# spec file for package gfxboot (Version 4.1.28) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,10 +27,10 @@ Requires: coreutils cpio mktemp perl master-boot-code dosfstools mtools perl-HTML-Parser AutoReqProv: on Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX -Version: 4.1.27 +Version: 4.1.28 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: gfxboot-4.1.27.tar.bz2 +Source: gfxboot-4.1.28.tar.bz2 Source1: openSUSE.tar.bz2 Source2: SLED.tar.bz2 Source3: SLES.tar.bz2 ++++++ SLED.tar.bz2 ++++++ ++++++ SLES.tar.bz2 ++++++ ++++++ gfxboot-4.1.27.tar.bz2 -> gfxboot-4.1.28.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.1.27/Changelog new/gfxboot-4.1.28/Changelog --- old/gfxboot-4.1.27/Changelog 2009-09-28 11:48:05.000000000 +0200 +++ new/gfxboot-4.1.28/Changelog 2009-09-29 12:02:56.000000000 +0200 @@ -1,3 +1,6 @@ +29/9/2009: v4.1.28 + - set default install type correctly (bnc #542781) + 28/9/2009: v4.1.27 - updated language list - fixed grub picture (bnc #542113) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.1.27/VERSION new/gfxboot-4.1.28/VERSION --- old/gfxboot-4.1.27/VERSION 2009-09-28 11:49:09.000000000 +0200 +++ new/gfxboot-4.1.28/VERSION 2009-09-29 12:01:29.000000000 +0200 @@ -1 +1 @@ -4.1.27 +4.1.28 ++++++ openSUSE.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/common.inc new/themes/openSUSE/src/common.inc --- old/themes/openSUSE/src/common.inc 2009-09-21 13:42:18.000000000 +0200 +++ new/themes/openSUSE/src/common.inc 2009-09-29 12:00:30.000000000 +0200 @@ -1658,7 +1658,7 @@ /keymap.submenu "keymap.submenu" false gfxconfig.set.bool /keymap.default "keymap" "" gfxconfig.set.str -/install.default "install" "" gfxconfig.set.str +/install.install "install" "" gfxconfig.set.str /install.http.server "install.http.server" "" gfxconfig.set.str /install.http.path "install.http.path" "" gfxconfig.set.str diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/dia_install.inc new/themes/openSUSE/src/dia_install.inc --- old/themes/openSUSE/src/dia_install.inc 2009-09-25 12:15:01.000000000 +0200 +++ new/themes/openSUSE/src/dia_install.inc 2009-09-29 12:00:49.000000000 +0200 @@ -371,7 +371,7 @@ % ( -- ) % /install.read.config { - install.default + install.install dup "cdrom" eq { /install.default .inst_cdrom def } if dup "slp" eq { /install.default .inst_slp def } if dup "ftp" eq { /install.default .inst_ftp def } if ++++++ upstream.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 29 Sep '09

29 Sep '09

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Tue Sep 29 14:49:30 CEST 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-09-21 16:47:24.000000000 +0200 +++ xorg-x11-server/xorg-x11-server.changes 2009-09-28 20:57:14.000000000 +0200 @@ -1,0 +2,21 @@ +Mon Sep 28 20:50:34 CEST 2009 - sndirsch(a)suse.de + +- xorg-server 1.6.4 + * fbdevhw: Test for graphics:fb%d as well as graphics/fb%d + * render: return the supported version rather than just passing + the proto's version + * xfree86/modes: Remove all framebuffer support from DGA + * dri2: Don't crash if pPriv is NULL. + * Don't send events through the master if the device has + SendCoreEvents off. + * Don't reset the lastDeviceEventTime when doing DPMS actions + * dix: append "built-ins" to the font path in SetDefaultFontPath + +------------------------------------------------------------------- +Mon Sep 28 20:32:13 CEST 2009 - sndirsch(a)suse.de + +- bug532341.diff + * fixes Xserver crash when running x11perf -shmputxy10 test case + (bnc #532341, bfo #23298) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xorg-server-1.6.3.901.tar.bz2 New: ---- bug532341.diff xorg-server-1.6.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.VfTlT7/_old 2009-09-29 14:43:34.000000000 +0200 +++ /var/tmp/diff_new_pack.VfTlT7/_new 2009-09-29 14:43:34.000000000 +0200 @@ -20,7 +20,7 @@ %define moblin 0 Name: xorg-x11-server -%define dirsuffix 1.6.3.901 +%define dirsuffix 1.6.4 %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: 54 +Release: 55 License: GPL v2 or later ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -138,6 +138,7 @@ Patch190: 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch Patch191: 0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch Patch200: bug534768-prefer_local_symbols.patch +Patch532341: bug532341.diff %description This package contains the X.Org Server. @@ -280,6 +281,7 @@ %patch190 -p1 %patch191 -p1 %patch200 -p1 +%patch532341 -p1 %build pushd xorg-docs-* ++++++ bug532341.diff ++++++ diff --git a/Xext/shm.c b/Xext/shm.c index dd097e6..99bbd37 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -496,15 +496,40 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC, char *data) { PixmapPtr pPixmap; - - pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth, - BitsPerPixel(depth), - PixmapBytePad(w, depth), - data); - if (!pPixmap) - return; - pGC->ops->CopyArea((DrawablePtr)pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy); - FreeScratchPixmapHeader(pPixmap); + + if (format == ZPixmap || depth == 1) { + pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth, + BitsPerPixel(depth), + PixmapBytePad(w, depth), + data); + if (!pPixmap) + return; + pGC->ops->CopyArea((DrawablePtr)pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy); + FreeScratchPixmapHeader(pPixmap); + } else { + GCPtr putGC = GetScratchGC(depth, dst->pScreen); + + if (!putGC) + return; + + pPixmap = (*dst->pScreen->CreatePixmap)(dst->pScreen, sw, sh, depth, + CREATE_PIXMAP_USAGE_SCRATCH); + if (!pPixmap) { + FreeScratchGC(putGC); + return; + } + ValidateGC(&pPixmap->drawable, putGC); + (*putGC->ops->PutImage)(&pPixmap->drawable, putGC, depth, -sx, -sy, w, h, 0, + (format == XYPixmap) ? XYPixmap : ZPixmap, data); + FreeScratchGC(putGC); + if (format == XYBitmap) + (void)(*pGC->ops->CopyPlane)(&pPixmap->drawable, dst, pGC, 0, 0, sw, sh, + dx, dy, 1L); + else + (void)(*pGC->ops->CopyArea)(&pPixmap->drawable, dst, pGC, 0, 0, sw, sh, + dx, dy); + (*pPixmap->drawable.pScreen->DestroyPixmap)(pPixmap); + } } #ifdef PANORAMIX ++++++ xorg-server-1.6.3.901.tar.bz2 -> xorg-server-1.6.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/ChangeLog new/xorg-server-1.6.4/ChangeLog --- old/xorg-server-1.6.3.901/ChangeLog 2009-08-26 07:38:10.000000000 +0200 +++ new/xorg-server-1.6.4/ChangeLog 2009-09-28 04:22:40.000000000 +0200 @@ -1,3 +1,108 @@ +commit 8cf659f3a5914369a2137ac17b689e5a9fe9ca27 +Author: Keith Packard <keithp(a)keithp.com> +Date: Sun Sep 27 19:21:45 2009 -0700 + + Bump to version 1.6.4 + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit a26fd1a6d61507b3e69a04d6f6c192a6ec363c5c +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Sep 16 15:46:55 2009 +1000 + + Don't send events through the master if the device has SendCoreEvents off. + + In server 1.6, all devices are attached to the master device (VCP or VCK). + Sending an event through the master device means the device is sending core + events. If a device is configured as SendCoreEvents, just send through the + device, not through the master. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 507e57381fea6334f7dc8da6925e53d2c76fddcb +Author: Keith Packard <keithp(a)keithp.com> +Date: Fri Sep 18 21:12:17 2009 -0700 + + xfree86/modes: Remove all framebuffer support from DGA + + This removes all rendering and mapping code from xf86DiDGA, leaving + just mode setting and raw input device access. The mapping code didn't + have the offset within /dev/mem for the frame buffer and the pixmap + support assumed that the framebuffer was never reallocated. + (cherry picked from 0b7c6c728c2e2d8433a188315cc591308a89cd85) + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit c3d182a47902d02f9e64f933b8565ae336f73f54 +Author: Rémi Cardona <remi(a)gentoo.org> +Date: Mon Sep 14 17:09:59 2009 +0200 + + dix: append "built-ins" to the font path in SetDefaultFontPath + + 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on + a "fixed" font go away but only Xorg could use the built-ins fonts by + default. + + With this commit, all DDXs get "built-ins" appended to their FontPath, not + just Xorg. + + Tested with Xorg, Xvfb and Xnest. + (cherry picked from commit f56cbe1ef24415d0142b9a7d0ab0a031069ccb52) + + Signed-off-by: Rémi Cardona <remi(a)gentoo.org> + Signed-off-by: Jon TURNEY <jon.turney(a)dronecode.org.uk> + Tested-by: Jon TURNEY <jon.turney(a)dronecode.org.uk> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit 9bc4a69040493e589a3811ca5e085e323438996d +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Wed Sep 9 15:48:33 2009 +1000 + + fbdevhw: Test for graphics:fb%d as well as graphics/fb%d + + Apparently the kernel can't decide on an API to expose to userspace, so + let's just try both in the hope that one will work. + + Signed-off-by: Daniel Stone <daniel(a)fooishbar.org> + Acked-by: Michel Dänzer <michel(a)daenzer.net> + (cherry picked from commit f4350c66b493d63fa06be87caa958d7033232ea4) + +commit d78669c92d751464bc3c8f79f2aa21ca0951e3a9 +Author: Keith Packard <keithp(a)keithp.com> +Date: Tue Sep 22 12:09:48 2009 -0700 + + render: return the supported version rather than just passing the proto's version + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit f5d1da499c3d64f0a4ac217eb19911b8e35cb49b +Author: Michel Dänzer <daenzer(a)vmware.com> +Date: Tue Jun 23 16:45:39 2009 +0200 + + dri2: Don't crash if pPriv is NULL. + (cherry picked from commit df597709d71f47b8516e27c6fb1bfffd59de5e48) + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit 468787bdd2c34f9edf46da76b6357034c216fa7b +Author: Richard Hughes <richard(a)hughsie.com> +Date: Fri Aug 14 11:44:35 2009 +0100 + + Don't reset the lastDeviceEventTime when doing DPMS actions + + When we change the DPMS mode, don't play games with the last event time as + this breaks applications using IDLETIME to turn the backlight off after a + preset time. + + This patch fixes gnome-power-manager and xfce-power-manager + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit c1d901d723c3bee523736eacc15b44a7dff484fe) + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + commit 3044711412d0a08ba65a491bd2441c0c8980f5e2 Author: Keith Packard <keithp(a)keithp.com> Date: Tue Aug 25 22:37:16 2009 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/Xext/dpms.c new/xorg-server-1.6.4/Xext/dpms.c --- old/xorg-server-1.6.3.901/Xext/dpms.c 2009-08-26 04:25:26.000000000 +0200 +++ new/xorg-server-1.6.4/Xext/dpms.c 2009-09-22 21:03:33.000000000 +0200 @@ -219,19 +219,10 @@ if (!DPMSEnabled) return BadMatch; - if (stuff->level == DPMSModeOn) { - lastDeviceEventTime.milliseconds = - GetTimeInMillis(); - } else if (stuff->level == DPMSModeStandby) { - lastDeviceEventTime.milliseconds = - GetTimeInMillis() - DPMSStandbyTime; - } else if (stuff->level == DPMSModeSuspend) { - lastDeviceEventTime.milliseconds = - GetTimeInMillis() - DPMSSuspendTime; - } else if (stuff->level == DPMSModeOff) { - lastDeviceEventTime.milliseconds = - GetTimeInMillis() - DPMSOffTime; - } else { + if (stuff->level != DPMSModeOn && + stuff->level != DPMSModeStandby && + stuff->level != DPMSModeSuspend && + stuff->level != DPMSModeOff) { client->errorValue = stuff->level; return BadValue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/aclocal.m4 new/xorg-server-1.6.4/aclocal.m4 --- old/xorg-server-1.6.3.901/aclocal.m4 2009-08-26 07:37:44.000000000 +0200 +++ new/xorg-server-1.6.4/aclocal.m4 2009-09-28 04:22:10.000000000 +0200 @@ -9179,7 +9179,7 @@ # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.2.2]) +m4_define([vers_have], [1.3.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -9455,7 +9455,7 @@ # their AM_CFLAGS (or other appropriate *_CFLAGS) to use them. AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[ AC_ARG_ENABLE(malloc0returnsnull, - AC_HELP_STRING([--enable-malloc0returnsnull], + AS_HELP_STRING([--enable-malloc0returnsnull], [malloc(0) returns NULL (default: auto)]), [MALLOC_ZERO_RETURNS_NULL=$enableval], [MALLOC_ZERO_RETURNS_NULL=auto]) @@ -9507,7 +9507,7 @@ AC_DEFUN([XORG_WITH_LINT],[ # Allow checking code with lint, sparse, etc. -AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint], +AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint], [Use a lint-style source code checker (default: disabled)])], [use_lint=$withval], [use_lint=no]) if test "x$use_lint" = "xyes" ; then @@ -9548,7 +9548,7 @@ AC_DEFUN([XORG_LINT_LIBRARY],[ AC_REQUIRE([XORG_WITH_LINT]) # Build lint "library" for more indepth checks of programs calling this library -AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library], +AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library], [Create lint library (default: disabled)])], [make_lint_lib=$enableval], [make_lint_lib=no]) if test "x$make_lint_lib" != "xno" ; then @@ -9590,7 +9590,51 @@ fi fi AC_SUBST(CWARNFLAGS) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ]) # XORG_CWARNFLAGS + +# XORG_STRICT_OPTION +# ----------------------- +# Minimum version: 1.3.0 +# +# Add configure option to enable strict compilation +AC_DEFUN([XORG_STRICT_OPTION], [ +AC_REQUIRE([AC_PROG_CC]) +AC_REQUIRE([AC_PROG_CC_C99]) +AC_REQUIRE([XORG_CWARNFLAGS]) + +AC_ARG_ENABLE(strict-compilation, + AS_HELP_STRING([--enable-strict-compilation], + [Enable all warnings from compiler and make them errors (default: disabled)]), + [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no]) +if test "x$STRICT_COMPILE" = "xyes"; then + AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) + AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"]) + if test "x$GCC" = xyes ; then + STRICT_CFLAGS="-pedantic -Werror" + elif test "x$SUNCC" = "xyes"; then + STRICT_CFLAGS="-errwarn" + elif test "x$INTELCC" = "xyes"; then + STRICT_CFLAGS="-Werror" + fi +fi +CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" +AC_SUBST([CWARNFLAGS]) +]) # XORG_STRICT_OPTION + +# XORG_DEFAULT_OPTIONS +# -------------------- +# Minimum version: 1.3.0 +# +# Defines default options for X.Org modules. +# +AC_DEFUN([XORG_DEFAULT_OPTIONS], [ +XORG_CWARNFLAGS +XORG_STRICT_OPTION +XORG_RELEASE_VERSION +XORG_CHANGELOG +XORG_MANPAGE_SECTIONS +]) # XORG_DEFAULT_OPTIONS dnl Copyright 2005 Red Hat, Inc dnl dnl Permission to use, copy, modify, distribute, and sell this software and its @@ -9625,7 +9669,7 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ AC_ARG_WITH(release-version, - AC_HELP_STRING([--with-release-version=STRING], + AS_HELP_STRING([--with-release-version=STRING], [Use release version string in package name]), [RELEASE_VERSION="$withval"], [RELEASE_VERSION=""]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/configure new/xorg-server-1.6.4/configure --- old/xorg-server-1.6.3.901/configure 2009-08-26 07:37:46.000000000 +0200 +++ new/xorg-server-1.6.4/configure 2009-09-28 04:22:13.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for xorg-server 1.6.3.901. +# Generated by GNU Autoconf 2.64 for xorg-server 1.6.4. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -699,8 +699,8 @@ # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='1.6.3.901' -PACKAGE_STRING='xorg-server 1.6.3.901' +PACKAGE_VERSION='1.6.4' +PACKAGE_STRING='xorg-server 1.6.4' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1904,7 +1904,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.3.901 to adapt to many kinds of systems. +\`configure' configures xorg-server 1.6.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1974,7 +1974,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 1.6.3.901:";; + short | recursive ) echo "Configuration of xorg-server 1.6.4:";; esac cat <<\_ACEOF @@ -2280,7 +2280,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 1.6.3.901 +xorg-server configure 1.6.4 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2922,7 +2922,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.3.901, which was +It was created by xorg-server $as_me 1.6.4, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -3731,7 +3731,7 @@ # Define the identity of the package. PACKAGE='xorg-server' - VERSION='1.6.3.901' + VERSION='1.6.4' cat >>confdefs.h <<_ACEOF @@ -3795,7 +3795,7 @@ -RELEASE_DATE="2009-8-25" +RELEASE_DATE="2009-9-27" ac_config_headers="$ac_config_headers include/do-not-use-config.h" @@ -22148,7 +22148,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.3.901, which was +This file was extended by xorg-server $as_me 1.6.4, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22212,7 +22212,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xorg-server config.status 1.6.3.901 +xorg-server config.status 1.6.4 configured by $0, generated by GNU Autoconf 2.64, 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.3.901/configure.ac new/xorg-server-1.6.4/configure.ac --- old/xorg-server-1.6.3.901/configure.ac 2009-08-26 07:36:40.000000000 +0200 +++ new/xorg-server-1.6.4/configure.ac 2009-09-28 04:21:10.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.3.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +AC_INIT([xorg-server], 1.6.4, [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-8-25" +RELEASE_DATE="2009-9-27" dnl this gets generated by autoheader, and thus contains all the defines. we dnl don't ever actually use it, internally. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/dix/dixfonts.c new/xorg-server-1.6.4/dix/dixfonts.c --- old/xorg-server-1.6.3.901/dix/dixfonts.c 2009-08-26 04:25:26.000000000 +0200 +++ new/xorg-server-1.6.4/dix/dixfonts.c 2009-09-22 21:12:37.000000000 +0200 @@ -1815,6 +1815,9 @@ int SetDefaultFontPath(char *path) { + char *temp_path, + *start, + *end; unsigned char *cp, *pp, *nump, @@ -1825,12 +1828,31 @@ size = 0, bad; + /* ensure temp_path contains "built-ins" */ + start = path; + while (1) { + start = strstr(start, "built-ins"); + if (start == NULL) + break; + end = start + strlen("built-ins"); + if ((start == path || start[-1] == ',') && (!*end || *end == ',')) + break; + start = end; + } + if (!start) { + temp_path = Xprintf("%s%sbuilt-ins", path, *path ? "," : ""); + } else { + temp_path = Xstrdup(path); + } + if (!temp_path) + return BadAlloc; + /* get enough for string, plus values -- use up commas */ - len = strlen(path) + 1; - nump = cp = newpath = (unsigned char *) xalloc(len); + len = strlen(temp_path) + 1; + nump = cp = newpath = xalloc(len); if (!newpath) return BadAlloc; - pp = (unsigned char *) path; + pp = (unsigned char *) temp_path; cp++; while (*pp) { if (*pp == ',') { @@ -1849,6 +1871,7 @@ err = SetFontPathElements(num, newpath, &bad, TRUE); xfree(newpath); + xfree(temp_path); return err; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/dix/getevents.c new/xorg-server-1.6.4/dix/getevents.c --- old/xorg-server-1.6.3.901/dix/getevents.c 2009-08-26 04:25:26.000000000 +0200 +++ new/xorg-server-1.6.4/dix/getevents.c 2009-09-28 04:08:14.000000000 +0200 @@ -536,7 +536,7 @@ updateFromMaster(EventListPtr events, DeviceIntPtr dev, int *num_events) { DeviceIntPtr master = dev->u.master; - if (master && master->u.lastSlave != dev) + if (master && master->u.lastSlave != dev && dev->coreEvents) { updateSlaveDeviceCoords(master, dev); master->u.lastSlave = dev; @@ -674,7 +674,7 @@ * to the current screen. */ miPointerSetPosition(dev, &dev->last.valuators[0], &dev->last.valuators[1]); - if (dev->u.master) { + if (dev->u.master && dev->coreEvents) { dev->u.master->last.valuators[0] = dev->last.valuators[0]; dev->u.master->last.valuators[1] = dev->last.valuators[1]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c new/xorg-server-1.6.4/hw/xfree86/common/xf86Config.c --- old/xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c 2009-08-26 04:25:26.000000000 +0200 +++ new/xorg-server-1.6.4/hw/xfree86/common/xf86Config.c 2009-09-22 21:11:19.000000000 +0200 @@ -612,22 +612,6 @@ pathFrom = X_DEFAULT; temp_path = defaultFontPath ? defaultFontPath : ""; - /* ensure defaultFontPath contains "built-ins" */ - start = strstr(temp_path, "built-ins"); - end = start + strlen("built-ins"); - if (start == NULL || - !((start == temp_path || start[-1] == ',') && (!*end || *end == ','))) { - defaultFontPath = Xprintf("%s%sbuilt-ins", - temp_path, *temp_path ? "," : ""); - if (must_copy == TRUE) { - if (defaultFontPath != NULL) { - must_copy = FALSE; - } - } else { - /* already made a copy of the font path */ - xfree(temp_path); - } - } /* xf86ValidateFontPath modifies its argument, but returns a copy of it. */ temp_path = must_copy ? XNFstrdup(defaultFontPath) : defaultFontPath; defaultFontPath = xf86ValidateFontPath(temp_path); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/hw/xfree86/dri2/dri2.c new/xorg-server-1.6.4/hw/xfree86/dri2/dri2.c --- old/xorg-server-1.6.3.901/hw/xfree86/dri2/dri2.c 2009-08-26 04:25:26.000000000 +0200 +++ new/xorg-server-1.6.4/hw/xfree86/dri2/dri2.c 2009-09-22 21:04:27.000000000 +0200 @@ -190,10 +190,18 @@ int need_fake_front = 0; int have_fake_front = 0; int front_format = 0; - const int dimensions_match = (pDraw->width == pPriv->width) - && (pDraw->height == pPriv->height); + int dimensions_match; int i; + if (!pPriv) { + *width = pDraw->width; + *height = pDraw->height; + *out_count = 0; + return NULL; + } + + dimensions_match = (pDraw->width == pPriv->width) + && (pDraw->height == pPriv->height); buffers = xalloc((count + 1) * sizeof(buffers[0])); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/hw/xfree86/fbdevhw/fbdevhw.c new/xorg-server-1.6.4/hw/xfree86/fbdevhw/fbdevhw.c --- old/xorg-server-1.6.3.901/hw/xfree86/fbdevhw/fbdevhw.c 2009-08-26 04:25:26.000000000 +0200 +++ new/xorg-server-1.6.4/hw/xfree86/fbdevhw/fbdevhw.c 2009-09-22 21:10:41.000000000 +0200 @@ -318,7 +318,13 @@ pPci->domain, pPci->bus, pPci->dev, pPci->func, i); fd = open(filename, O_RDONLY, 0); - if (fd != -1) { + if (fd < 0) { + sprintf(filename, + "/sys/bus/pci/devices/%04x:%02x:%02x.%d/graphics:fb%d", + pPci->domain, pPci->bus, pPci->dev, pPci->func, i); + fd = open(filename, O_RDONLY, 0); + } + if (fd >= 0) { close(fd); sprintf(filename, "/dev/fb%d", i); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/hw/xfree86/modes/xf86Crtc.c new/xorg-server-1.6.4/hw/xfree86/modes/xf86Crtc.c --- old/xorg-server-1.6.3.901/hw/xfree86/modes/xf86Crtc.c 2009-08-26 04:25:26.000000000 +0200 +++ new/xorg-server-1.6.4/hw/xfree86/modes/xf86Crtc.c 2009-09-22 21:15:36.000000000 +0200 @@ -769,6 +769,9 @@ config->CloseScreen = screen->CloseScreen; screen->CloseScreen = xf86CrtcCloseScreen; +#ifdef XFreeXDGA + xf86DiDGAInit(screen, 0); +#endif #ifdef RANDR_13_INTERFACE return RANDR_INTERFACE_VERSION; #else @@ -1882,6 +1885,10 @@ } } scrn->currentMode = scrn->modes; +#ifdef XFreeXDGA + if (scrn->pScreen) + xf86DiDGAReInit(scrn->pScreen); +#endif } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/hw/xfree86/modes/xf86DiDGA.c new/xorg-server-1.6.4/hw/xfree86/modes/xf86DiDGA.c --- old/xorg-server-1.6.3.901/hw/xfree86/modes/xf86DiDGA.c 2009-08-26 04:25:26.000000000 +0200 +++ new/xorg-server-1.6.4/hw/xfree86/modes/xf86DiDGA.c 2009-09-22 21:15:36.000000000 +0200 @@ -72,8 +72,7 @@ mode = modes + num++; mode->mode = display_mode; - mode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE; - mode->flags |= DGA_FILL_RECT | DGA_BLIT_RECT; + mode->flags = DGA_CONCURRENT_ACCESS; if (display_mode->Flags & V_DBLSCAN) mode->flags |= DGA_DOUBLESCAN; if (display_mode->Flags & V_INTERLACE) @@ -91,14 +90,14 @@ mode->yViewportStep = 1; mode->viewportFlags = DGA_FLIP_RETRACE; mode->offset = 0; - mode->address = (unsigned char *) xf86_config->dga_address; - mode->bytesPerScanline = xf86_config->dga_stride; - mode->imageWidth = xf86_config->dga_width; - mode->imageHeight = xf86_config->dga_height; + mode->address = 0; + mode->imageWidth = mode->viewportWidth; + mode->imageHeight = mode->viewportHeight; + mode->bytesPerScanline = (mode->imageWidth * scrn->bitsPerPixel) >> 3; mode->pixmapWidth = mode->imageWidth; mode->pixmapHeight = mode->imageHeight; - mode->maxViewportX = mode->imageWidth - mode->viewportWidth; - mode->maxViewportY = mode->imageHeight - mode->viewportHeight; + mode->maxViewportX = 0; + mode->maxViewportY = 0; display_mode = display_mode->next; if (display_mode == scrn->modes) @@ -149,93 +148,11 @@ } static Bool -xf86_dga_get_drawable_and_gc (ScrnInfoPtr scrn, DrawablePtr *ppDrawable, GCPtr *ppGC) -{ - ScreenPtr pScreen = scrn->pScreen; - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - PixmapPtr pPixmap; - GCPtr pGC; - - pPixmap = GetScratchPixmapHeader (pScreen, xf86_config->dga_width, xf86_config->dga_height, - scrn->depth, scrn->bitsPerPixel, xf86_config->dga_stride, - (char *) scrn->memPhysBase + scrn->fbOffset); - if (!pPixmap) - return FALSE; - pGC = GetScratchGC (scrn->depth, pScreen); - if (!pGC) - { - FreeScratchPixmapHeader (pPixmap); - return FALSE; - } - *ppDrawable = &pPixmap->drawable; - *ppGC = pGC; - return TRUE; -} - -static void -xf86_dga_release_drawable_and_gc (ScrnInfoPtr scrn, DrawablePtr pDrawable, GCPtr pGC) -{ - FreeScratchGC (pGC); - FreeScratchPixmapHeader ((PixmapPtr) pDrawable); -} - -static void -xf86_dga_fill_rect(ScrnInfoPtr scrn, int x, int y, int w, int h, unsigned long color) -{ - GCPtr pGC; - DrawablePtr pDrawable; - XID vals[1]; - xRectangle r; - - if (!xf86_dga_get_drawable_and_gc (scrn, &pDrawable, &pGC)) - return; - vals[0] = color; - ChangeGC (pGC, GCForeground, vals); - ValidateGC (pDrawable, pGC); - r.x = x; - r.y = y; - r.width = w; - r.height = h; - pGC->ops->PolyFillRect (pDrawable, pGC, 1, &r); - xf86_dga_release_drawable_and_gc (scrn, pDrawable, pGC); -} - -static void -xf86_dga_sync(ScrnInfoPtr scrn) -{ - ScreenPtr pScreen = scrn->pScreen; - WindowPtr pRoot = WindowTable [pScreen->myNum]; - char buffer[4]; - - pScreen->GetImage (&pRoot->drawable, 0, 0, 1, 1, ZPixmap, ~0L, buffer); -} - -static void -xf86_dga_blit_rect(ScrnInfoPtr scrn, int srcx, int srcy, int w, int h, int dstx, int dsty) -{ - DrawablePtr pDrawable; - GCPtr pGC; - - if (!xf86_dga_get_drawable_and_gc (scrn, &pDrawable, &pGC)) - return; - ValidateGC (pDrawable, pGC); - pGC->ops->CopyArea (pDrawable, pDrawable, pGC, srcx, srcy, w, h, dstx, dsty); - xf86_dga_release_drawable_and_gc (scrn, pDrawable, pGC); -} - -static Bool xf86_dga_open_framebuffer(ScrnInfoPtr scrn, char **name, unsigned char **mem, int *size, int *offset, int *flags) { - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - - *size = xf86_config->dga_stride * xf86_config->dga_height; - *mem = (unsigned char *) (xf86_config->dga_address); - *offset = 0; - *flags = DGA_NEED_ROOT; - - return TRUE; + return FALSE; } static void @@ -249,9 +166,9 @@ xf86_dga_set_mode, xf86_dga_set_viewport, xf86_dga_get_viewport, - xf86_dga_sync, - xf86_dga_fill_rect, - xf86_dga_blit_rect, + NULL, + NULL, + NULL, NULL }; @@ -261,6 +178,9 @@ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); + if (!DGAAvailable(pScreen->myNum)) + return TRUE; + if (!xf86_dga_get_modes (pScreen)) return FALSE; @@ -273,11 +193,14 @@ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); + if (DGAAvailable(pScreen->myNum)) + return TRUE; + xf86_config->dga_flags = 0; - xf86_config->dga_address = dga_address; - xf86_config->dga_width = scrn->virtualX; - xf86_config->dga_height = scrn->virtualY; - xf86_config->dga_stride = scrn->displayWidth * scrn->bitsPerPixel >> 3; + xf86_config->dga_address = 0; + xf86_config->dga_width = 0; + xf86_config->dga_height = 0; + xf86_config->dga_stride = 0; if (!xf86_dga_get_modes (pScreen)) return FALSE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/hw/xfree86/modes/xf86RandR12.c new/xorg-server-1.6.4/hw/xfree86/modes/xf86RandR12.c --- old/xorg-server-1.6.3.901/hw/xfree86/modes/xf86RandR12.c 2009-08-26 04:25:26.000000000 +0200 +++ new/xorg-server-1.6.4/hw/xfree86/modes/xf86RandR12.c 2009-09-22 21:16:31.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright � 2002 Keith Packard, member of The XFree86 Project, Inc. + * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -460,7 +460,6 @@ { xf86ProbeOutputModes (scrp, 0, 0); xf86SetScrnInfoModes (scrp); - xf86DiDGAReInit (pScreen); } for (mode = scrp->modes; ; mode = mode->next) @@ -1481,7 +1480,6 @@ return TRUE; xf86ProbeOutputModes (pScrn, 0, 0); xf86SetScrnInfoModes (pScrn); - xf86DiDGAReInit (pScreen); return xf86RandR12SetInfo12 (pScreen); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/mi/mieq.c new/xorg-server-1.6.4/mi/mieq.c --- old/xorg-server-1.6.3.901/mi/mieq.c 2009-08-26 04:25:26.000000000 +0200 +++ new/xorg-server-1.6.4/mi/mieq.c 2009-09-28 04:08:14.000000000 +0200 @@ -446,7 +446,7 @@ NewCurrentScreen (dev, DequeueScreen(dev), x, y); } else { - if (master) { + if (master && dev->coreEvents) { /* Force a copy of the key class into the VCK so that the layout is transferred. */ if (event->u.u.type == DeviceKeyPress || @@ -473,7 +473,7 @@ /* process slave first, then master */ dev->public.processInputProc(event, dev, nevents); - if (master) + if (master && dev->coreEvents) master->public.processInputProc(masterEvents->event, master, nevents); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/render/render.c new/xorg-server-1.6.4/render/render.c --- old/xorg-server-1.6.3.901/render/render.c 2009-08-26 04:25:26.000000000 +0200 +++ new/xorg-server-1.6.4/render/render.c 2009-09-22 21:09:41.000000000 +0200 @@ -54,6 +54,9 @@ #define UINT32_MAX 0xffffffffU #endif +#define SERVER_RENDER_MAJOR 0 +#define SERVER_RENDER_MINOR 10 + static int ProcRenderQueryVersion (ClientPtr pClient); static int ProcRenderQueryPictFormats (ClientPtr pClient); static int ProcRenderQueryPictIndexValues (ClientPtr pClient); @@ -271,8 +274,8 @@ rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - rep.majorVersion = RENDER_MAJOR; - rep.minorVersion = RENDER_MINOR; + rep.majorVersion = SERVER_RENDER_MAJOR; + rep.minorVersion = SERVER_RENDER_MINOR; if (client->swapped) { swaps(&rep.sequenceNumber, n); swapl(&rep.length, n); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kernel-source for openSUSE:Factory
by root＠Hilbert.suse.de 29 Sep '09

29 Sep '09

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Tue Sep 29 11:53:47 CEST 2009. -------- --- kernel-source/kernel-debug.changes 2009-09-24 04:05:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2009-09-29 11:31:44.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 29 11:17:48 CEST 2009 - trenn(a)suse.de + +- Disabled patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch + with +trenn (bnc#542767) + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-kdump.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.JSoJ4e/_old 2009-09-29 11:47:18.000000000 +0200 +++ /var/tmp/diff_new_pack.JSoJ4e/_new 2009-09-29 11:47:18.000000000 +0200 @@ -49,7 +49,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.31 -Release: 9 +Release: 10 %if %using_buildservice %else %endif kernel-default.spec: same change kernel-desktop.spec: same change kernel-kdump.spec: same change kernel-pae.spec: same change kernel-ppc64.spec: same change kernel-ps3.spec: same change kernel-s390.spec: same change kernel-source.spec: same change ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.JSoJ4e/_old 2009-09-29 11:47:19.000000000 +0200 +++ /var/tmp/diff_new_pack.JSoJ4e/_new 2009-09-29 11:47:19.000000000 +0200 @@ -23,7 +23,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.31 -Release: 9 +Release: 10 %if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.JSoJ4e/_old 2009-09-29 11:47:19.000000000 +0200 +++ /var/tmp/diff_new_pack.JSoJ4e/_new 2009-09-29 11:47:19.000000000 +0200 @@ -49,7 +49,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel Version: 2.6.31 -Release: 9 +Release: 10 %if %using_buildservice %else %endif kernel-vanilla.spec: same change ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.JSoJ4e/_old 2009-09-29 11:47:19.000000000 +0200 +++ /var/tmp/diff_new_pack.JSoJ4e/_new 2009-09-29 11:47:19.000000000 +0200 @@ -49,7 +49,7 @@ Name: kernel-xen Summary: The Xen Kernel Version: 2.6.31 -Release: 8 +Release: 9 %if %using_buildservice %else %endif ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.JSoJ4e/_old 2009-09-29 11:47:21.000000000 +0200 +++ /var/tmp/diff_new_pack.JSoJ4e/_new 2009-09-29 11:47:21.000000000 +0200 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.JSoJ4e/_old 2009-09-29 11:47:21.000000000 +0200 +++ /var/tmp/diff_new_pack.JSoJ4e/_new 2009-09-29 11:47:21.000000000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.JSoJ4e/_old 2009-09-29 11:47:21.000000000 +0200 +++ /var/tmp/diff_new_pack.JSoJ4e/_new 2009-09-29 11:47:21.000000000 +0200 @@ -233,7 +233,7 @@ # Check resource conflicts between hwmon and ACPI OpRegs patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch - patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch ++trenn patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch patches.arch/acpi_thermal_passive_blacklist.patch patches.arch/acpi-export-hotplug_execute ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.JSoJ4e/_old 2009-09-29 11:47:22.000000000 +0200 +++ /var/tmp/diff_new_pack.JSoJ4e/_new 2009-09-29 11:47:22.000000000 +0200 @@ -1,3 +1,3 @@ -2009-09-23 13:30:39 +0200 -GIT Revision: 050bdf92965594e5fd91c21496c79511a7d6762c +2009-09-29 11:18:23 +0200 +GIT Revision: c68c243cfe6945f157ba56ca24c66c4b76ecf60c GIT Branch: master ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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