openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
March 2009
- 1 participants
- 910 discussions
Hello community,
here is the log from the commit of package OpenOffice_org for openSUSE:Factory
checked in at Fri Mar 20 20:55:07 CET 2009.
--------
--- OpenOffice_org/OpenOffice_org.changes 2009-03-10 12:20:34.000000000 +0100
+++ OpenOffice_org/OpenOffice_org.changes 2009-03-20 16:11:53.000000000 +0100
@@ -1,0 +2,27 @@
+Fri Mar 20 16:09:23 CET 2009 - pmladek(a)suse.cz
+
+- updated to the milestone ooo310-m6
+- updated ooo-build to version 3.0.99.2 (3.1-beta2):
+ * symbol visibility in comphelper, svg
+ * startup performance problem in the migration code
+ * allow to specify lang on HTML import into Calc (bnc#484272)
+ * datapilot output and new sheet destination (bnc#483446)
+ * merge flags when a new row is inserted (bnc#484599)
+ * more on multiline formula reference (i#35913)
+ * autocorrection in Calc (bnc#472395, lp#271774)
+ * custom name of datapilot table (bnc#484157)
+ * cairocanvas colorspace miscalculation
+ * Sun Report Builder fixes (i#100249)
+ * backported some fixes
+ * lock renewal code
+ * many DOCX import fixes
+ * crash on startup with the GTK+ plugin
+ * placeholder layout fix (bnc#485316, bnc#480223)
+ * user friendly migration of java settings (i#99619)
+ * tabs export problem causing broken TOC (bnc#479068)
+ * VBA bits:
+ * apply imported image for all image sizes
+ * worksheet events rework
+ * template name API fix
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
minmem
ooo310-m4-postprocess.tar.bz2
New:
----
ooo310-m6-postprocess.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenOffice_org.spec ++++++
--- /var/tmp/diff_new_pack.x25183/_old 2009-03-20 20:54:53.000000000 +0100
+++ /var/tmp/diff_new_pack.x25183/_new 2009-03-20 20:54:53.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package OpenOffice_org (Version 3.0.99.1)
+# spec file for package OpenOffice_org (Version 3.0.99.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,9 +19,9 @@
Name: OpenOffice_org
-Version: 3.0.99.1
+Version: 3.0.99.2
Release: 1
-%define ooo_build_version 3.0.99.1
+%define ooo_build_version 3.0.99.2
%define piece postprocess
BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib postgresql-devel python-devel python-xml recode unixODBC-devel unzip update-desktop-files xml-commons-apis xorg-x11 zip
# mozilla stuff
@@ -74,7 +74,7 @@
BuildRequires: OpenOffice_org-filters-devel = %version
%define ooo_prefix %_libdir
%define ooo_home ooo3
-%define ooo_build_tag ooo310-m4
+%define ooo_build_tag ooo310-m6
License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
Group: Productivity/Office/Suite
AutoReqProv: on
@@ -292,6 +292,30 @@
%defattr(-,root,root)
%changelog
+* Fri Mar 20 2009 pmladek(a)suse.cz
+- updated to the milestone ooo310-m6
+- updated ooo-build to version 3.0.99.2 (3.1-beta2):
+ * symbol visibility in comphelper, svg
+ * startup performance problem in the migration code
+ * allow to specify lang on HTML import into Calc (bnc#484272)
+ * datapilot output and new sheet destination (bnc#483446)
+ * merge flags when a new row is inserted (bnc#484599)
+ * more on multiline formula reference (i#35913)
+ * autocorrection in Calc (bnc#472395, lp#271774)
+ * custom name of datapilot table (bnc#484157)
+ * cairocanvas colorspace miscalculation
+ * Sun Report Builder fixes (i#100249)
+ * backported some fixes
+ * lock renewal code
+ * many DOCX import fixes
+ * crash on startup with the GTK+ plugin
+ * placeholder layout fix (bnc#485316, bnc#480223)
+ * user friendly migration of java settings (i#99619)
+ * tabs export problem causing broken TOC (bnc#479068)
+ * VBA bits:
+ * apply imported image for all image sizes
+ * worksheet events rework
+ * template name API fix
* Tue Mar 10 2009 pmladek(a)suse.cz
- updated to the milestone ooo310-m4
- updated ooo-build to version 3.0.99.1 (3.1-beta1)
++++++ ooo310-m4-postprocess.tar.bz2 -> ooo310-m6-postprocess.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
Hello community,
here is the log from the commit of package xrdp for openSUSE:Factory
checked in at Fri Mar 20 20:54:01 CET 2009.
--------
--- xrdp/xrdp.changes 2009-03-17 17:26:50.000000000 +0100
+++ xrdp/xrdp.changes 2009-03-20 20:10:33.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Mar 18 18:38:47 EDT 2009 - davidr(a)novell.com
+
+- Send complete login info requests to sesman. (bnc#486632)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xrdp.spec ++++++
--- /var/tmp/diff_new_pack.Z20222/_old 2009-03-20 20:52:28.000000000 +0100
+++ /var/tmp/diff_new_pack.Z20222/_new 2009-03-20 20:52:28.000000000 +0100
@@ -21,7 +21,7 @@
Name: xrdp
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
Version: 0.4.1
-Release: 30
+Release: 31
License: GPL v2 or later
Requires: dbus-1 xorg-x11-libXau xorg-x11-libxcb xorg-x11-server-dmx xorg-x11-server-rdp
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -97,6 +97,8 @@
%config %{_fwdefdir}/xrdp
%changelog
+* Wed Mar 18 2009 davidr(a)novell.com
+- Send complete login info requests to sesman. (bnc#486632)
* Tue Mar 17 2009 davidr(a)novell.com
- Use correct X11 rdp port number when display number is
greater than 99. (bnc#484086)
++++++ xrdp-NOMAD.diff ++++++
--- /var/tmp/diff_new_pack.Z20222/_old 2009-03-20 20:52:28.000000000 +0100
+++ /var/tmp/diff_new_pack.Z20222/_new 2009-03-20 20:52:28.000000000 +0100
@@ -7130,7 +7130,7 @@
/* labels and edits */
xrdp_wm_show_edits(self, combo);
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c
-index cec7177..23e31bb 100644
+index cec7177..70fa02a 100644
--- a/xrdp/xrdp_mm.c
+++ b/xrdp/xrdp_mm.c
@@ -200,12 +200,14 @@ xrdp_mm_send_login(struct xrdp_mm* self)
@@ -7168,7 +7168,7 @@
(g_strcasecmp(value, "xup.dll") == 0))
{
self->code = 10;
-@@ -245,9 +256,13 @@ xrdp_mm_send_login(struct xrdp_mm* self)
+@@ -245,15 +256,19 @@ xrdp_mm_send_login(struct xrdp_mm* self)
index = g_strlen(password);
out_uint16_be(s, index);
out_uint8a(s, password, index);
@@ -7182,6 +7182,13 @@
s_mark_end(s);
s_pop_layer(s, channel_hdr);
out_uint32_be(s, 0); /* version */
+ index = s->end - s->data;
+ out_uint32_be(s, index); /* size */
+- rv = xrdp_mm_send(self, s->data, index);
++ rv = xrdp_mm_send(self, s->data, s->end - s->data);
+ free_stream(s);
+ return rv;
+ }
@@ -382,6 +397,7 @@ xrdp_mm_setup_mod1(struct xrdp_mm* self)
self->mod->server_query_channel = server_query_channel;
self->mod->server_get_channel_id = server_get_channel_id;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package stardict-tools for openSUSE:Factory
checked in at Fri Mar 20 20:52:22 CET 2009.
--------
--- stardict-tools/stardict-tools.changes 2008-10-08 22:35:06.000000000 +0200
+++ stardict-tools/stardict-tools.changes 2009-03-20 20:36:12.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Mar 20 20:36:05 CET 2009 - crrodriguez(a)suse.de
+
+- fix build with gcc 44
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
stardict-tools-3.0.1-gcc44.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ stardict-tools.spec ++++++
--- /var/tmp/diff_new_pack.x18950/_old 2009-03-20 20:51:54.000000000 +0100
+++ /var/tmp/diff_new_pack.x18950/_new 2009-03-20 20:51:54.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package stardict-tools (Version 3.0.1)
#
-# 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
@@ -21,7 +21,7 @@
Name: stardict-tools
Summary: StarDict Editor
Version: 3.0.1
-Release: 56
+Release: 57
License: GPL v2 or later
Url: http://stardict.sourceforge.net
Group: Productivity/Office/Dictionary
@@ -31,6 +31,7 @@
Source3: stardict-tools-rpmlintrc
Patch1: stardict-tools-3.0.1-includes.patch
Patch2: stardict-tools-3.0.1-destbufferoverflow.patch
+Patch3: stardict-tools-3.0.1-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gtk2-devel >= 2.6.0
%if 0%{?suse_version} < 1010
@@ -60,6 +61,7 @@
%setup -q
%patch1 -p1
%patch2
+%patch3
%build
%configure --with-pic --disable-static
@@ -114,7 +116,9 @@
%{_datadir}/applications/stardict-editor.desktop
%changelog
-* Thu Oct 09 2008 crrodriguez(a)suse.de
+* Fri Mar 20 2009 crrodriguez(a)suse.de
+- fix build with gcc 44
+* Wed Oct 08 2008 crrodriguez(a)suse.de
- fix buffer overflow
* Mon Apr 28 2008 lrupp(a)suse.de
- update to 3.0.1:
++++++ stardict-tools-3.0.1-gcc44.patch ++++++
Index: src/bgl2txt.cpp
===================================================================
--- src/bgl2txt.cpp.orig 2009-03-20 20:14:47.000000000 +0100
+++ src/bgl2txt.cpp 2009-03-20 20:15:33.000000000 +0100
@@ -1,3 +1,4 @@
+#include <cstdio>
#include <cstring>
#include "libbgl2txt.h"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package stardict for openSUSE:Factory
checked in at Fri Mar 20 20:51:48 CET 2009.
--------
--- stardict/stardict.changes 2009-01-14 03:10:24.000000000 +0100
+++ stardict/stardict.changes 2009-03-20 20:11:15.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Mar 20 20:11:07 CET 2009 - crrodriguez(a)suse.de
+
+- fix build with GCC 4.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
stardict-3.0.1-gcc44.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ stardict.spec ++++++
--- /var/tmp/diff_new_pack.z17986/_old 2009-03-20 20:51:29.000000000 +0100
+++ /var/tmp/diff_new_pack.z17986/_new 2009-03-20 20:51:29.000000000 +0100
@@ -21,7 +21,7 @@
Name: stardict
Summary: A cross-platform and internationalized dictionary
Version: 3.0.1
-Release: 60
+Release: 61
License: GPL v2 or later
Group: Productivity/Office/Dictionary
Url: http://stardict.sourceforge.net
@@ -35,6 +35,7 @@
Patch4: configure-festival.diff
Patch5: stardict-gucharmap.patch
Patch6: fix_gethostbynamer.patch
+Patch7: stardict-3.0.1-gcc44.patch
Requires: enchant festival espeak
BuildRequires: gcc-c++ gnome-common intltool libgnomeui-devel perl-XML-Parser scrollkeeper sgml-skel
BuildRequires: gucharmap-devel update-desktop-files
@@ -79,6 +80,7 @@
%patch4 -p1
%patch5
%patch6 -p1
+%patch7
# Remove unneeded sigc++ header files to make it sure
# that we are using system-wide libsigc++
find src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f
@@ -157,6 +159,8 @@
%endif
%changelog
+* Fri Mar 20 2009 crrodriguez(a)suse.de
+- fix build with GCC 4.4
* Wed Jan 14 2009 xwhu(a)suse.de
- bnc#465161, stardict crashes when gethostbyname_r failes.
* Mon Sep 29 2008 lrupp(a)suse.de
@@ -169,7 +173,7 @@
gucharmap functionality.
* Thu Jul 10 2008 xwhu(a)suse.de
- fix configure.in for festival
-* Fri Jun 27 2008 xwhu(a)suse.de
+* Sat Jun 28 2008 xwhu(a)suse.de
- disable gucharmap due to API change
* Tue Jan 29 2008 lrupp(a)suse.de
- fix some compiler issues with gcc4.3:
@@ -199,7 +203,7 @@
+ Babylon dictionaries convertion.
+ Many other changes.
- removed upstreamed stardict-2.4.8-private_function.patch
-* Sun Oct 28 2007 xwhu(a)novell.com
+* Mon Oct 29 2007 xwhu(a)novell.com
- Fix header files compatibility issues with gcc 4.3
* Thu Oct 11 2007 sbrabec(a)suse.cz
- Removed bogus dependency on mDNSResponder.
@@ -231,9 +235,9 @@
- Fixed schemas installation, spec file cleanup (#254850).
* Mon Mar 12 2007 anonymous@anonymous
- Use gconf_schemas_prereq
-* Sun Jan 07 2007 ro(a)suse.de
+* Mon Jan 08 2007 ro(a)suse.de
- fix localstatedir
-* Sun Jan 07 2007 ro(a)suse.de
+* Mon Jan 08 2007 ro(a)suse.de
- GNOME moved to /usr
* Sat Oct 07 2006 aj(a)suse.de
- Cleanup BuildRequires.
++++++ stardict-3.0.1-gcc44.patch ++++++
Index: src/lib/data.cpp
===================================================================
--- src/lib/data.cpp.orig 2009-03-20 20:00:57.000000000 +0100
+++ src/lib/data.cpp 2009-03-20 20:02:56.000000000 +0100
@@ -21,7 +21,7 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-
+#include <cstdio>
#include <cstring>
#include "kmp.h"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package pcsc-cyberjack for openSUSE:Factory
checked in at Fri Mar 20 20:51:22 CET 2009.
--------
--- pcsc-cyberjack/pcsc-cyberjack.changes 2009-01-06 19:42:32.000000000 +0100
+++ pcsc-cyberjack/pcsc-cyberjack.changes 2009-03-20 19:56:56.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Mar 20 19:56:23 CET 2009 - crrodriguez(a)suse.de
+
+- fix build with GCC 4.4
+- fix Requires
+- fix buildrequires
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
ctapi-cyberjack-3.3.0-gcc44.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcsc-cyberjack.spec ++++++
--- /var/tmp/diff_new_pack.t16841/_old 2009-03-20 20:50:50.000000000 +0100
+++ /var/tmp/diff_new_pack.t16841/_new 2009-03-20 20:50:50.000000000 +0100
@@ -20,7 +20,7 @@
Name: pcsc-cyberjack
%define _name ctapi-cyberjack
-BuildRequires: gcc-c++ hal hal-devel pcsc-lite-devel pkg-config readline-devel
+BuildRequires: gcc-c++ hal-devel pcsc-lite-devel pkg-config readline-devel
%if %suse_version > 1020
BuildRequires: libusb-devel licenses sysfsutils
%endif
@@ -30,7 +30,7 @@
BuildRequires: openSUSE-release
%endif
Version: 3.3.0
-Release: 4
+Release: 5
Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE)
Group: Productivity/Security
License: LGPL v2.1 or later
@@ -40,7 +40,9 @@
Patch1: configure.patch
Patch2: pcsc-cyberjack-libpath.patch
Patch3: ctapi-cyberjack-overflow.patch
+Patch4: ctapi-cyberjack-3.3.0-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: licenses
%if %suse_version > 1020
%define ifddir %(pkg-config --variable=usbdropdir libpcsclite)
%else
@@ -69,6 +71,7 @@
License: LGPL v2.1 or later
Group: System/Libraries
Summary: CT-API and tools for Reiner SCT Cyberjack USB-SmartCard Reader
+Requires: licenses
# Modules: cyberjack.ko
Supplements: modalias(usb:v0C4Bp0100d*dc*dsc*dp*ic*isc*ip*)
# Generated with: extract-modaliases -i cyberjack kernel-default.rpm
@@ -95,6 +98,7 @@
%patch1
%patch2
%patch3
+%patch4
%if %suse_version > 1030
sed -i 's/key="info.category" string="usbraw"/key="info.subsystem" string="usb_device"/;s/@info.parent://;' etc/hal/80-cyberjack.fdi
%endif
@@ -153,6 +157,10 @@
%dir %{_sysconfdir}/hal/fdi/policy/10osvendor
%changelog
+* Fri Mar 20 2009 crrodriguez(a)suse.de
+- fix build with GCC 4.4
+- fix Requires
+- fix buildrequires
* Tue Jan 06 2009 sbrabec(a)suse.cz
- Signed-off.
* Sun Dec 07 2008 wr(a)opensuse.org
++++++ ctapi-cyberjack-3.3.0-gcc44.patch ++++++
Index: ctapi/ctapi.cpp
===================================================================
--- ctapi/ctapi.cpp.orig 2008-06-04 22:36:35.000000000 +0200
+++ ctapi/ctapi.cpp 2009-03-20 19:43:42.000000000 +0100
@@ -42,6 +42,7 @@
#include "ausb_l.h"
#include "usbdev_l.h"
+#include <cstdio>
#include <stdarg.h>
#include <list>
#include <string>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package xorg-x11-server-dmx for openSUSE:Factory
checked in at Fri Mar 20 20:50:04 CET 2009.
--------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server-dmx.spec ++++++
--- /var/tmp/diff_new_pack.JF9137/_old 2009-03-20 20:45:43.000000000 +0100
+++ /var/tmp/diff_new_pack.JF9137/_new 2009-03-20 20:45:43.000000000 +0100
@@ -38,7 +38,7 @@
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.3.99
-Release: 20
+Release: 21
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
++++++ xserver-dmx-be-timeout-handling.diff ++++++
--- /var/tmp/diff_new_pack.JF9137/_old 2009-03-20 20:45:49.000000000 +0100
+++ /var/tmp/diff_new_pack.JF9137/_new 2009-03-20 20:45:49.000000000 +0100
@@ -204,8 +204,6 @@
if (reply)
{
-diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
-index abf2770..10bf039 100644
--- a/hw/dmx/dmxscrinit.c
+++ b/hw/dmx/dmxscrinit.c
@@ -245,9 +245,10 @@ dmxScreenGetSelectionOwner (ScreenPtr pScreen)
@@ -222,60 +220,39 @@
if (!reply)
break;
-@@ -832,39 +833,7 @@ dmxBEDispatch (ScreenPtr pScreen)
- dmxScreen->inDispatch = TRUE;
+@@ -820,38 +821,37 @@ dmxScreenEventCheckManageRoot (ScreenPtr pScreen,
+ return TRUE;
+ }
- while ((event = xcb_poll_for_event (dmxScreen->connection)))
-- {
+-void
+-dmxBEDispatch (ScreenPtr pScreen)
++static void
++dmxBEProcessEvents (ScreenPtr pScreen,
++ unsigned int sequence)
+ {
+- DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+- xcb_generic_event_t *event;
+- xcb_generic_error_t *error;
+- void *reply;
+-
+- assert (dmxScreen->inDispatch == FALSE);
+- dmxScreen->inDispatch = TRUE;
++ DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+
+- while ((event = xcb_poll_for_event (dmxScreen->connection)))
++ while (dmxScreen->event.head &&
++ dmxScreen->event.head->sequence <= sequence)
+ {
- if (!dmxScreenEventCheckInput (pScreen, event) &&
- !dmxScreenEventCheckSelection (pScreen, event) &&
- !dmxScreenEventCheckDnD (pScreen, event) &&
- !dmxScreenEventCheckOutputWindow (pScreen, event) &&
- !dmxScreenEventCheckManageRoot (pScreen, event) &&
--
++ DMXEvent *head = (DMXEvent *) dmxScreen->event.head;
+
-#ifdef MITSHM
- !dmxScreenEventCheckShm (pScreen, event) &&
-#endif
--
--#ifdef RANDR
-- !dmxScreenEventCheckRR (pScreen, event) &&
--#endif
--
-- !dmxScreenEventCheckExpose (pScreen, event))
-- {
-- if (event->response_type == 0)
-- {
-- xcb_generic_error_t *error = (xcb_generic_error_t *) event;
--
-- dmxLogOutput (dmxScreen, "unhandled error type %d\n",
-- error->error_code);
-- }
-- else
-- {
-- dmxLogOutput (dmxScreen, "unhandled event type %d\n",
-- event->response_type);
-- }
-- }
--
-- free (event);
-- }
-+ dmxAddEvent (&dmxScreen->event, event);
-
- while (dmxScreen->request.head &&
- xcb_poll_for_reply (dmxScreen->connection,
-@@ -920,6 +889,51 @@ dmxBEDispatch (ScreenPtr pScreen)
- dmxScreen->inDispatch = FALSE;
- }
-
-+void
-+dmxBEProcessEvents (ScreenPtr pScreen)
-+{
-+ DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-+
-+ while (dmxScreen->event.head)
-+ {
-+ DMXEvent *head = (DMXEvent *) dmxScreen->event.head;
-+
+ dmxScreen->event.head = head->base.next;
+ if (!dmxScreen->event.head)
+ dmxScreen->event.tail = &dmxScreen->event.head;
@@ -285,46 +262,108 @@
+ !dmxScreenEventCheckDnD (pScreen, head->event) &&
+ !dmxScreenEventCheckOutputWindow (pScreen, head->event) &&
+ !dmxScreenEventCheckManageRoot (pScreen, head->event) &&
-+
-+#ifdef RANDR
+
+ #ifdef RANDR
+- !dmxScreenEventCheckRR (pScreen, event) &&
+ !dmxScreenEventCheckRR (pScreen, head->event) &&
-+#endif
-+
+ #endif
+
+- !dmxScreenEventCheckExpose (pScreen, event))
+ !dmxScreenEventCheckExpose (pScreen, head->event))
-+ {
+ {
+- if (event->response_type == 0)
+ if (head->event->response_type == 0)
-+ {
+ {
+- xcb_generic_error_t *error = (xcb_generic_error_t *) event;
+ xcb_generic_error_t *error = (xcb_generic_error_t *)
+ head->event;
-+
-+ dmxLogOutput (dmxScreen, "unhandled error type %d\n",
-+ error->error_code);
-+ }
-+ else
-+ {
-+ dmxLogOutput (dmxScreen, "unhandled event type %d\n",
+
+ dmxLogOutput (dmxScreen, "unhandled error type %d\n",
+ error->error_code);
+@@ -859,12 +859,24 @@ dmxBEDispatch (ScreenPtr pScreen)
+ else
+ {
+ dmxLogOutput (dmxScreen, "unhandled event type %d\n",
+- event->response_type);
+ head->event->response_type);
-+ }
-+ }
-+
+ }
+ }
+
+- free (event);
+ free (head->event);
+ free (head);
-+ }
+ }
+}
+
- static void
- dmxScreenCheckForIOError (ScreenPtr pScreen)
- {
-@@ -959,6 +973,8 @@ dmxScreenBlockHandler (pointer blockData,
++void
++dmxBEDispatch (ScreenPtr pScreen)
++{
++ DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
++ xcb_generic_error_t *error;
++ void *reply;
++
++ assert (dmxScreen->inDispatch == FALSE);
++ dmxScreen->inDispatch = TRUE;
+
+ while (dmxScreen->request.head &&
+ xcb_poll_for_reply (dmxScreen->connection,
+@@ -878,20 +890,27 @@ dmxBEDispatch (ScreenPtr pScreen)
+ if (!dmxScreen->request.head)
+ dmxScreen->request.tail = &dmxScreen->request.head;
+
++ /* process all events generated before reply */
++ dmxBEProcessEvents (pScreen, head->base.sequence);
++
+ (*head->reply) (pScreen,
+ head->base.sequence,
+ reply,
+ error,
+ head->data);
+
+- if (reply)
++ if (reply)
+ free (reply);
+- if (error)
+- free (error);
++ if (error)
++ free (error);
+
+ free (head);
+ }
+
++ /* process remaining events */
++ while (dmxScreen->event.head)
++ dmxBEProcessEvents (pScreen, dmxScreen->event.head->sequence);
++
+ if (!dmxScreen->scrnWin ||
+ xcb_connection_has_error (dmxScreen->connection))
+ {
+@@ -959,6 +978,9 @@ dmxScreenBlockHandler (pointer blockData,
ScreenPtr pScreen = (ScreenPtr) blockData;
DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
-+ dmxBEProcessEvents (pScreen);
++ while (dmxScreen->event.head)
++ dmxBEDispatch (pScreen);
+
if (dmxScreen->alive)
xcb_flush (dmxScreen->connection);
-@@ -1036,6 +1052,9 @@ Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[])
+@@ -975,7 +997,14 @@ dmxScreenWakeupHandler (pointer blockData,
+ DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+
+ if (dmxScreen->alive)
++ {
++ xcb_generic_event_t *event;
++
++ while ((event = xcb_poll_for_event (dmxScreen->connection)))
++ dmxAddEvent (&dmxScreen->event, event);
++
+ dmxBEDispatch (pScreen);
++ }
+ }
+
+ static void
+@@ -1036,6 +1065,9 @@ Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[])
dmxScreen->request.head = NULL;
dmxScreen->request.tail = &dmxScreen->request.head;
@@ -334,7 +373,7 @@
dmxScreen->scrnEventMask = 0;
dmxScreen->rootEventMask = ExposureMask | StructureNotifyMask |
-@@ -1309,6 +1328,7 @@ void dmxBECloseScreen(ScreenPtr pScreen)
+@@ -1309,6 +1341,7 @@ void dmxBECloseScreen(ScreenPtr pScreen)
xfree(dmxScreen->beDefColormaps);
dmxScreen->beDefColormaps = NULL;
@@ -342,7 +381,7 @@
dmxClearQueue (&dmxScreen->request);
dmxClearQueue (&dmxScreen->ignore);
}
-@@ -1496,3 +1516,35 @@ dmxAddRequest (DMXQueue *q,
+@@ -1496,3 +1529,35 @@ dmxAddRequest (DMXQueue *q,
return TRUE;
}
@@ -356,7 +395,7 @@
+ if (!e)
+ return FALSE;
+
-+ e->base.sequence = 0;
++ e->base.sequence = event->sequence;
+ e->base.next = 0;
+ e->event = event;
+
@@ -379,18 +418,10 @@
+ *((int *) data) = -1;
+}
diff --git a/hw/dmx/dmxscrinit.h b/hw/dmx/dmxscrinit.h
-index 5ac4c36..c272acd 100644
+index 5ac4c36..91cce20 100644
--- a/hw/dmx/dmxscrinit.h
+++ b/hw/dmx/dmxscrinit.h
-@@ -48,6 +48,7 @@ extern Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[]);
- extern void dmxBEScreenInit(ScreenPtr pScreen);
- extern void dmxBECloseScreen(ScreenPtr pScreen);
- extern void dmxBEDispatch (ScreenPtr pScreen);
-+extern void dmxBEProcessEvents (ScreenPtr pScreen);
-
- extern Bool dmxAddSequence (DMXQueue *q, unsigned long sequence);
- extern void dmxClearQueue (DMXQueue *q);
-@@ -57,4 +58,13 @@ extern Bool dmxAddRequest (DMXQueue *q,
+@@ -57,4 +57,13 @@ extern Bool dmxAddRequest (DMXQueue *q,
unsigned long sequence,
void *data);
@@ -656,7 +687,7 @@
extern void dmxInitShm (void);
diff --git a/hw/dmx/dmxsync.c b/hw/dmx/dmxsync.c
-index 98c3810..dc5f48c 100644
+index 98c3810..46036a7 100644
--- a/hw/dmx/dmxsync.c
+++ b/hw/dmx/dmxsync.c
@@ -56,7 +56,7 @@
@@ -677,7 +708,7 @@
/* dispatch all pending back-end server responses */
void
dmxDispatch (void)
-@@ -73,23 +71,39 @@ dmxDispatch (void)
+@@ -73,23 +71,30 @@ dmxDispatch (void)
int i;
for (i = 0; i < dmxNumScreens; i++)
@@ -685,15 +716,6 @@
- dmxBEDispatch (screenInfo.screens[i]);
+ if (dmxScreens[i].alive)
+ dmxBEDispatch (screenInfo.screens[i]);
-+}
-+
-+void
-+dmxProcessEvents (void)
-+{
-+ int i;
-+
-+ for (i = 0; i < dmxNumScreens; i++)
-+ dmxBEProcessEvents (screenInfo.screens[i]);
}
/* non-blocking wait for back-end server response. returns 0 when no
@@ -725,7 +747,7 @@
if (dmxScreens[i].alive)
{
xcb_flush (dmxScreens[i].connection);
-@@ -105,29 +119,66 @@ dmxWaitForResponse (void)
+@@ -105,29 +110,72 @@ dmxWaitForResponse (void)
if (dmxScreens[i].fd > nfd)
nfd = dmxScreens[i].fd;
@@ -747,13 +769,13 @@
+
+ do {
+ struct timeval tv1, tv2, delta = left;
-+
-+ gettimeofday (&tv1, NULL);
-+ ret = select (nfd + 1, &rfds, 0, 0, &delta);
-+ gettimeofday (&tv2, NULL);
- timeout.tv_sec = DMX_SELECT_TIMEOUT_SECS;
- timeout.tv_usec = 0;
++ gettimeofday (&tv1, NULL);
++ ret = select (nfd + 1, &rfds, 0, 0, &delta);
++ gettimeofday (&tv2, NULL);
++
+ timersub (&tv2, &tv1, &delta);
+ if (timercmp (&left, &delta, < ))
+ {
@@ -779,14 +801,20 @@
{
- if (dmxScreens[i].alive && dmxScreens[i].request.head)
+ if (FD_ISSET (dmxScreens[i].fd, &rfds))
- {
-- xcb_disconnect (dmxScreens[i].connection);
-- dmxScreens[i].alive = FALSE;
++ {
++ xcb_connection_t *c = dmxScreens[i].connection;
++ xcb_generic_event_t *event;
++
+ dmxScreens[i].repTimer.tv_sec = dmxScreens[i].repTimeout;
+ dmxScreens[i].repTimer.tv_usec = 0;
++
++ while ((event = xcb_poll_for_event (c)))
++ dmxAddEvent (&dmxScreens[i].event, event);
+ }
+ else if (dmxScreens[i].request.head || screen == i)
-+ {
+ {
+- xcb_disconnect (dmxScreens[i].connection);
+- dmxScreens[i].alive = FALSE;
+ timersub (&dmxScreens[i].repTimer, &timeout,
+ &dmxScreens[i].repTimer);
+
@@ -802,7 +830,7 @@
}
}
}
-@@ -139,6 +190,51 @@ dmxWaitForResponse (void)
+@@ -139,6 +187,47 @@ dmxWaitForResponse (void)
return nfd;
}
@@ -817,16 +845,12 @@
+ unsigned int sequence,
+ xcb_generic_error_t **e)
+{
-+ xcb_generic_event_t *event;
+ xcb_generic_error_t *error = NULL;
+ void *reply = NULL;
+
+ if (sequence)
+ {
+ do {
-+ while ((event = xcb_poll_for_event (dmxScreen->connection)))
-+ dmxAddEvent (&dmxScreen->event, event);
-+
+ if (xcb_poll_for_reply (dmxScreen->connection,
+ sequence,
+ &reply,
@@ -854,15 +878,7 @@
static void dmxDoSync(DMXScreenInfo *dmxScreen)
{
dmxScreen->needsSync = FALSE;
-@@ -168,6 +264,7 @@ static CARD32 dmxSyncCallback(OsTimerPtr timer, CARD32 time, pointer arg)
- /* wait for all pending sync replies */
- do {
- dmxDispatch ();
-+ dmxProcessEvents ();
- } while (dmxSyncRequest && dmxWaitForResponse ());
-
- if (dmxSyncPending)
-@@ -250,12 +347,18 @@ void dmxSync(DMXScreenInfo *dmxScreen, Bool now)
+@@ -250,12 +339,18 @@ void dmxSync(DMXScreenInfo *dmxScreen, Bool now)
if (dmxScreen) {
if (now && dmxScreen->inDispatch)
{
@@ -886,15 +902,14 @@
}
dmxScreen->needsSync = TRUE;
diff --git a/hw/dmx/dmxsync.h b/hw/dmx/dmxsync.h
-index 0d48a43..58743b6 100644
+index 0d48a43..fe10fe2 100644
--- a/hw/dmx/dmxsync.h
+++ b/hw/dmx/dmxsync.h
-@@ -38,7 +38,12 @@
+@@ -38,7 +38,11 @@
#define _DMXSYNC_H_
extern void dmxDispatch (void);
-extern int dmxWaitForResponse (void);
-+extern void dmxProcessEvents (void);
+extern int dmxWaitForScreenResponse (int screen);
+extern int dmxWaitForResponse (void);
+extern xcb_generic_reply_t *dmxGetReply (DMXScreenInfo *dmxScreen,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory
checked in at Fri Mar 20 20:45:33 CET 2009.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-03-14 03:53:25.000000000 +0100
+++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-03-20 03:26:05.744951064 +0100
@@ -1,0 +2,14 @@
+Fri Mar 20 03:24:25 CET 2009 - sndirsch(a)suse.de
+
+- xf86-video-i740 1.3.0
+ * Uncomment DDC2 code, move it before mode validation so DDC has
+ some effect.
+
+-------------------------------------------------------------------
+Thu Mar 19 03:25:21 CET 2009 - sndirsch(a)suse.de
+
+- xf86-video-ati 6.12.1
+ * Fix some fall out from the r6xx/r7xx merge and fix load
+ detection on avivo chips.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-video-ati-6.12.0.tar.bz2
xf86-video-i740-1.2.0.tar.bz2
New:
----
xf86-video-ati-6.12.1.tar.bz2
xf86-video-i740-1.3.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.oT5290/_old 2009-03-20 20:44:39.000000000 +0100
+++ /var/tmp/diff_new_pack.oT5290/_new 2009-03-20 20:44:39.000000000 +0100
@@ -22,7 +22,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 49
+Release: 50
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -42,7 +42,7 @@
Source8: xf86-video-fbdev-0.4.0.tar.bz2
Source9: xf86-video-glint-1.2.2.tar.bz2
Source10: xf86-video-i128-1.3.1.tar.bz2
-Source11: xf86-video-i740-1.2.0.tar.bz2
+Source11: xf86-video-i740-1.3.0.tar.bz2
Source14: xf86-video-mga-1.4.9.tar.bz2
Source15: xf86-video-neomagic-1.2.2.tar.bz2
Source16: xf86-video-newport-0.2.1.tar.bz2
@@ -67,7 +67,7 @@
Source43: xf86-video-impact-0.2.0.tar.bz2
Source44: HALlib-4.1.tar.gz
Source45: xf86-video-intel-2.6.99.901.tar.bz2
-Source46: xf86-video-ati-6.12.0.tar.bz2
+Source46: xf86-video-ati-6.12.1.tar.bz2
Source48: xf86-video-mga-1.9.100.tar.bz2
Source50: xf86-video-xgi-1.5.0.tar.bz2
Source51: xf86-video-geode-2.11.1.tar.bz2
@@ -271,6 +271,14 @@
/var/lib/hardware/ids/20.%{name}
%changelog
+* Fri Mar 20 2009 sndirsch(a)suse.de
+- xf86-video-i740 1.3.0
+ * Uncomment DDC2 code, move it before mode validation so DDC has
+ some effect.
+* Thu Mar 19 2009 sndirsch(a)suse.de
+- xf86-video-ati 6.12.1
+ * Fix some fall out from the r6xx/r7xx merge and fix load
+ detection on avivo chips.
* Sat Mar 14 2009 sndirsch(a)suse.de
- xf86-video-ati 6.12.0
* Big changes here are EXA and Xv support for R6xx/R7xx chips.
++++++ xf86-video-ati-6.12.0.tar.bz2 -> xf86-video-ati-6.12.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/ChangeLog new/xf86-video-ati-6.12.1/ChangeLog
--- old/xf86-video-ati-6.12.0/ChangeLog 2009-03-14 00:22:07.000000000 +0100
+++ new/xf86-video-ati-6.12.1/ChangeLog 2009-03-19 01:47:06.000000000 +0100
@@ -1,3 +1,95 @@
+commit 537da7018b0fd2ad263fc5cdc55b3b85cf8e9205
+Author: Alex Deucher <alexdeucher(a)gmail.com>
+Date: Wed Mar 18 19:22:55 2009 -0400
+
+ ATOM: fix up tv-out support
+
+ - fix purple hue when using ATOMTvOut option
+ - fix TV load detection on newer r6xx/r7xx chips
+ - disable CV for now
+
+commit c0e2513ab128ddd5be0ed626d9e31777a98983ef
+Author: Alex Deucher <alexdeucher(a)gmail.com>
+Date: Wed Mar 18 14:08:30 2009 -0400
+
+ R6xx/R7xx AGP: disable gart data transfers
+
+ UTS/DFS/Xv
+
+ Doesn't seem to be reliable on AGP.
+
+ fixes bugs: 20436, 20236, several reports on ML and IRC
+
+commit e3e1f0c7b892b094b292081021a0e97932b8e079
+Author: Fabio <fabio.ped(a)libero.it>
+Date: Wed Mar 18 12:13:53 2009 -0400
+
+ man page update
+
+commit 6ae54d3ea023968887bf0cb0ec1be2115621d554
+Author: Alex Deucher <alexdeucher(a)gmail.com>
+Date: Wed Mar 18 11:50:22 2009 -0400
+
+ AVIVO: Fix dac load detection
+
+commit 04e36b794c216e4fa77c780fd989df1ef1c7f0d9
+Author: Fabio <fabio.ped(a)libero.it>
+Date: Tue Mar 17 11:29:26 2009 -0400
+
+ man page updates
+
+ from bug 20648
+
+commit a6855c370194b6df307ea33724fe17a85d67607e
+Author: Alex Deucher <alexdeucher(a)gmail.com>
+Date: Mon Mar 16 13:52:42 2009 -0400
+
+ radeon: add another AGP quirk
+
+ bug 20647
+
+commit a55ced5ee20c07e743c7c0978803fd10589c1531
+Author: Alex Deucher <alexdeucher(a)gmail.com>
+Date: Sun Mar 15 12:08:04 2009 -0400
+
+ Fix fallout from r6xx/r7xx EXA merge in IB handling
+
+ Noticed Christiaan van Dijk.
+ Should fix bug 20510
+
+commit a065eeb9b301ab452cc8fbd3cac1fd9a3841c4e1
+Author: Alex Deucher <alexdeucher(a)gmail.com>
+Date: Sat Mar 14 18:40:28 2009 -0400
+
+ atom: fix up bios scartch register usage
+
+ the bios scratch registers keep 3 types of state for each output:
+ 1. dpms
+ 2. active
+ 3. connected
+
+ some of the command tables use the active flags. We used to set the active
+ flags based on dpms state, but instead set them based on whether they are
+ connected or not.
+
+commit 5c4ef924d082fd3b279f62fda7a97f563b009d38
+Author: Alex Deucher <alexdeucher(a)gmail.com>
+Date: Sat Mar 14 18:16:49 2009 -0400
+
+ radeon: fix typo in bios scratch reg setup
+
+commit 96fce5a56269509a935e8ee621a5e17cc9005ddc
+Author: Alex Deucher <alexdeucher(a)gmail.com>
+Date: Fri Mar 13 19:29:58 2009 -0400
+
+ Bump post-release
+
+commit 8da1b82a70de7b3ef38905bd77c58a20fd44ddd6
+Author: Alex Deucher <alexdeucher(a)gmail.com>
+Date: Fri Mar 13 19:23:19 2009 -0400
+
+ bump for release
+
commit 28d9d699dcdff394aa561505f7f54f08db800828
Author: Alex Deucher <alexdeucher(a)gmail.com>
Date: Fri Mar 13 18:18:31 2009 -0400
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/configure new/xf86-video-ati-6.12.1/configure
--- old/xf86-video-ati-6.12.0/configure 2009-03-14 00:20:40.000000000 +0100
+++ new/xf86-video-ati-6.12.1/configure 2009-03-19 01:45:05.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-ati 6.12.0.
+# Generated by GNU Autoconf 2.61 for xf86-video-ati 6.12.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-video-ati'
PACKAGE_TARNAME='xf86-video-ati'
-PACKAGE_VERSION='6.12.0'
-PACKAGE_STRING='xf86-video-ati 6.12.0'
+PACKAGE_VERSION='6.12.1'
+PACKAGE_STRING='xf86-video-ati 6.12.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1443,7 +1443,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 xf86-video-ati 6.12.0 to adapt to many kinds of systems.
+\`configure' configures xf86-video-ati 6.12.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1513,7 +1513,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-ati 6.12.0:";;
+ short | recursive ) echo "Configuration of xf86-video-ati 6.12.1:";;
esac
cat <<\_ACEOF
@@ -1635,7 +1635,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-ati configure 6.12.0
+xf86-video-ati configure 6.12.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1649,7 +1649,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-ati $as_me 6.12.0, which was
+It was created by xf86-video-ati $as_me 6.12.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2344,7 +2344,7 @@
# Define the identity of the package.
PACKAGE='xf86-video-ati'
- VERSION='6.12.0'
+ VERSION='6.12.1'
cat >>confdefs.h <<_ACEOF
@@ -23705,7 +23705,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-ati $as_me 6.12.0, which was
+This file was extended by xf86-video-ati $as_me 6.12.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23758,7 +23758,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-ati config.status 6.12.0
+xf86-video-ati config.status 6.12.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/configure.ac new/xf86-video-ati-6.12.1/configure.ac
--- old/xf86-video-ati-6.12.0/configure.ac 2009-03-14 00:20:28.000000000 +0100
+++ new/xf86-video-ati-6.12.1/configure.ac 2009-03-19 01:44:39.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ati],
- 6.12.0,
+ 6.12.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
xf86-video-ati)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/man/radeon.man new/xf86-video-ati-6.12.1/man/radeon.man
--- old/xf86-video-ati-6.12.0/man/radeon.man 2009-03-13 23:24:21.000000000 +0100
+++ new/xf86-video-ati-6.12.1/man/radeon.man 2009-03-18 17:13:23.000000000 +0100
@@ -568,27 +568,60 @@
The default is
.B off.
+.SH TEXTURED VIDEO ATTRIBUTES
+The driver supports the following X11 Xv attributes for Textured Video.
+You can use the "xvattr" tool to query/set those attributes at runtime.
+
+.TP
+.BI "XV_VSYNC"
+XV_VSYNC is used to control whether textured adapter synchronizes
+the screen update to the monitor vertical refresh to eliminate tearing.
+It has two values: 'off'(0) and 'on'(1). The default is
+.B 'on'(1).
+
+.TP
+.BI "XV_BICUBIC"
+XV_BICUBIC is used to control whether textured adapter should apply
+a bicubic filter to smooth the output. It has three values: 'off'(0), 'on'(1)
+and 'auto'(2). 'off' means never apply the filter, 'on' means always apply
+the filter and 'auto' means apply the filter only if the X and Y
+sizes are scaled to more than double, this to avoid blurred output.
+The default is
+.B 'auto'(2).
+
.SH SEE ALSO
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.IP " 1." 4
-Overview about radeon development code
+Wiki page:
.RS 4
-\%http://cgit.freedesktop.org/xorg/driver/xf86-video-ati/
+http://www.x.org/wiki/radeon
.RE
.IP " 2." 4
-Query the bugtracker for radeon bugs
+Overview about radeon development code:
.RS 4
-.nf
-\%https://bugs.freedesktop.org/query.cgi?\:product=\:xorg&\:component=\:Driver/Radeon
-.fi
+http://cgit.freedesktop.org/xorg/driver/xf86-video-ati/
.RE
.IP " 3." 4
-Submit bugs & patches
+Mailing list:
.RS 4
-.nf
-\%https://bugs.freedesktop.org/enter_bug.cgi?\:product=\:xorg&\:component=\:Driver/Radeon
-.fi
+http://lists.x.org/mailman/listinfo/xorg-driver-ati
.RE
+.IP " 4." 4
+IRC channel:
+.RS 4
+#radeon on irc.freenode.net
+.RE
+.IP " 5." 4
+Query the bugtracker for radeon bugs:
+.RS 4
+https://bugs.freedesktop.org/query.cgi?product=xorg&component=Driver/Radeon
+.RE
+.IP " 6." 4
+Submit bugs & patches:
+.RS 4
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/Radeon
+.RE
+
.SH AUTHORS
.nf
Authors include:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/atombios_output.c new/xf86-video-ati-6.12.1/src/atombios_output.c
--- old/xf86-video-ati-6.12.0/src/atombios_output.c 2009-03-13 23:24:21.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/atombios_output.c 2009-03-19 01:30:45.000000000 +0100
@@ -1625,34 +1625,68 @@
if (radeon_output->devices & ATOM_DEVICE_CRT1_SUPPORT) {
dac_data.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_CRT1_SUPPORT);
- if (info->encoders[ATOM_DEVICE_CRT1_INDEX] &&
- (info->encoders[ATOM_DEVICE_CRT1_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
- dac_data.sDacload.ucDacType = ATOM_DAC_A;
- else
- dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ if (IS_AVIVO_VARIANT) {
+ if (info->encoders[ATOM_DEVICE_CRT1_INDEX] &&
+ (info->encoders[ATOM_DEVICE_CRT1_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ } else {
+ if (info->encoders[ATOM_DEVICE_CRT1_INDEX] &&
+ (info->encoders[ATOM_DEVICE_CRT1_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ }
} else if (radeon_output->devices & ATOM_DEVICE_CRT2_SUPPORT) {
dac_data.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_CRT2_SUPPORT);
- if (info->encoders[ATOM_DEVICE_CRT2_INDEX] &&
- (info->encoders[ATOM_DEVICE_CRT2_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
- dac_data.sDacload.ucDacType = ATOM_DAC_A;
- else
- dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ if (IS_AVIVO_VARIANT) {
+ if (info->encoders[ATOM_DEVICE_CRT2_INDEX] &&
+ (info->encoders[ATOM_DEVICE_CRT2_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ } else {
+ if (info->encoders[ATOM_DEVICE_CRT2_INDEX] &&
+ (info->encoders[ATOM_DEVICE_CRT2_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ }
} else if (radeon_output->devices & ATOM_DEVICE_CV_SUPPORT) {
dac_data.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_CV_SUPPORT);
- if (info->encoders[ATOM_DEVICE_CV_INDEX] &&
- (info->encoders[ATOM_DEVICE_CV_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
- dac_data.sDacload.ucDacType = ATOM_DAC_A;
- else
- dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ if (IS_AVIVO_VARIANT) {
+ if (info->encoders[ATOM_DEVICE_CV_INDEX] &&
+ (info->encoders[ATOM_DEVICE_CV_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ } else {
+ if (info->encoders[ATOM_DEVICE_CV_INDEX] &&
+ (info->encoders[ATOM_DEVICE_CV_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ }
if (minor >= 3)
dac_data.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb;
} else if (radeon_output->devices & ATOM_DEVICE_TV1_SUPPORT) {
dac_data.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_TV1_SUPPORT);
- if (info->encoders[ATOM_DEVICE_TV1_INDEX] &&
- (info->encoders[ATOM_DEVICE_TV1_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
- dac_data.sDacload.ucDacType = ATOM_DAC_A;
- else
- dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ if (IS_AVIVO_VARIANT) {
+ if (info->encoders[ATOM_DEVICE_TV1_INDEX] &&
+ (info->encoders[ATOM_DEVICE_TV1_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ } else {
+ if (info->encoders[ATOM_DEVICE_TV1_INDEX] &&
+ (info->encoders[ATOM_DEVICE_TV1_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ }
+ if (minor >= 3)
+ dac_data.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb;
} else {
ErrorF("invalid output device for dac detection\n");
return ATOM_NOT_IMPLEMENTED;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/r600_exa.c new/xf86-video-ati-6.12.1/src/r600_exa.c
--- old/xf86-video-ati-6.12.0/src/r600_exa.c 2009-03-13 23:24:21.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/r600_exa.c 2009-03-18 18:53:37.000000000 +0100
@@ -2084,8 +2084,11 @@
info->accel_state->exa->PrepareAccess = R600PrepareAccess;
info->accel_state->exa->FinishAccess = R600FinishAccess;
- info->accel_state->exa->UploadToScreen = R600UploadToScreen;
- info->accel_state->exa->DownloadFromScreen = R600DownloadFromScreen;
+ /* AGP seems to have problems with gart transfers */
+ if (info->accelDFS) {
+ info->accel_state->exa->UploadToScreen = R600UploadToScreen;
+ info->accel_state->exa->DownloadFromScreen = R600DownloadFromScreen;
+ }
info->accel_state->exa->flags = EXA_OFFSCREEN_PIXMAPS;
#ifdef EXA_SUPPORTS_PREPARE_AUX
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/radeon_accel.c new/xf86-video-ati-6.12.1/src/radeon_accel.c
--- old/xf86-video-ati-6.12.0/src/radeon_accel.c 2009-03-07 03:20:00.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/radeon_accel.c 2009-03-15 17:07:06.000000000 +0100
@@ -688,8 +688,6 @@
drmBufPtr buffer = info->cp->indirectBuffer;
int start = info->cp->indirectStart;
drm_radeon_indirect_t indirect;
- RING_LOCALS;
- RADEONCP_REFRESH(pScrn, info);
if (!buffer) return;
if (start == buffer->used && !discard) return;
@@ -700,10 +698,14 @@
}
if (info->ChipFamily >= CHIP_FAMILY_R600) {
- while (buffer->used & 0x3c){
- BEGIN_RING(1);
- OUT_RING(CP_PACKET2()); /* fill up to multiple of 16 dwords */
- ADVANCE_RING();
+ if (buffer->used & 0x3c) {
+ RING_LOCALS;
+
+ while (buffer->used & 0x3c) {
+ BEGIN_RING(1);
+ OUT_RING(CP_PACKET2()); /* fill up to multiple of 16 dwords */
+ ADVANCE_RING();
+ }
}
}
@@ -735,12 +737,11 @@
drmBufPtr buffer = info->cp->indirectBuffer;
int start = info->cp->indirectStart;
drm_radeon_indirect_t indirect;
- RING_LOCALS;
- RADEONCP_REFRESH(pScrn, info);
-
if (info->ChipFamily >= CHIP_FAMILY_R600) {
- if (buffer) {
+ if (buffer && (buffer->used & 0x3c)) {
+ RING_LOCALS;
+
while (buffer->used & 0x3c) {
BEGIN_RING(1);
OUT_RING(CP_PACKET2()); /* fill up to multiple of 16 dwords */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/radeon_atombios.c new/xf86-video-ati-6.12.1/src/radeon_atombios.c
--- old/xf86-video-ati-6.12.0/src/radeon_atombios.c 2009-03-01 19:14:02.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/radeon_atombios.c 2009-03-19 01:30:45.000000000 +0100
@@ -1771,14 +1771,19 @@
con_obj_type = (path->usConnObjectId & OBJECT_TYPE_MASK) >> OBJECT_TYPE_SHIFT;
if ((path->usDeviceTag == ATOM_DEVICE_TV1_SUPPORT) ||
- (path->usDeviceTag == ATOM_DEVICE_TV2_SUPPORT) ||
- (path->usDeviceTag == ATOM_DEVICE_CV_SUPPORT)) {
+ (path->usDeviceTag == ATOM_DEVICE_TV2_SUPPORT)) {
if (!enable_tv) {
info->BiosConnector[i].valid = FALSE;
continue;
}
}
+ /* don't support CV yet */
+ if (path->usDeviceTag == ATOM_DEVICE_CV_SUPPORT) {
+ info->BiosConnector[i].valid = FALSE;
+ continue;
+ }
+
if ((info->ChipFamily == CHIP_FAMILY_RS780) &&
(con_obj_id == CONNECTOR_OBJECT_ID_PCIE_CONNECTOR)) {
uint32_t slot_config, ct;
@@ -2203,7 +2208,8 @@
continue;
}
- if (!enable_tv && (i == ATOM_DEVICE_CV_INDEX)) {
+ /* don't support CV yet */
+ if (i == ATOM_DEVICE_CV_INDEX) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Skipping Component Video\n");
info->BiosConnector[i].valid = FALSE;
continue;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/radeon_dri.c new/xf86-video-ati-6.12.1/src/radeon_dri.c
--- old/xf86-video-ati-6.12.0/src/radeon_dri.c 2009-03-12 08:42:08.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/radeon_dri.c 2009-03-16 18:50:31.000000000 +0100
@@ -749,6 +749,8 @@
{ PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x4c59, PCI_VENDOR_IBM,0x052f, 1 },
/* Intel 82855PM host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (lp #195051) */
{ PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x4e50, PCI_VENDOR_IBM,0x0550, 1 },
+ /* Intel 82855PM host bridge / FireGL Mobility T2 RV350 Needs AGPMode 2 (fdo #20647) */
+ { PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x4e54, PCI_VENDOR_IBM,0x054f, 2 },
/* Intel 82855PM host bridge / Mobility M9+ / VaioPCG-V505DX Needs AGPMode 2 (fdo #17928) */
{ PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x5c61, PCI_VENDOR_SONY,0x816b, 2 },
/* Intel 82855PM Processor to I/O Controller / Mobility M9+ Needs AGPMode 8 (phoronix forum) */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/radeon_driver.c new/xf86-video-ati-6.12.1/src/radeon_driver.c
--- old/xf86-video-ati-6.12.0/src/radeon_driver.c 2009-03-13 23:24:21.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/radeon_driver.c 2009-03-18 18:53:31.000000000 +0100
@@ -2375,7 +2375,11 @@
xf86DrvMsg(pScrn->scrnIndex, from, "Page Flipping %sabled%s\n",
info->dri->allowPageFlip ? "en" : "dis", reason);
- info->DMAForXv = TRUE;
+ /* AGP seems to have problems with gart transfers */
+ if ((info->ChipFamily >= CHIP_FAMILY_R600) && (info->cardType == CARD_AGP))
+ info->DMAForXv = FALSE;
+ else
+ info->DMAForXv = TRUE;
from = xf86GetOptValBool(info->Options, OPTION_XV_DMA, &info->DMAForXv)
? X_CONFIG : X_INFO;
xf86DrvMsg(pScrn->scrnIndex, from,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/radeon_output.c new/xf86-video-ati-6.12.1/src/radeon_output.c
--- old/xf86-video-ati-6.12.0/src/radeon_output.c 2009-03-13 23:24:21.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/radeon_output.c 2009-03-14 23:38:13.000000000 +0100
@@ -631,93 +631,60 @@
if (info->IsAtomBios) {
if (radeon_output->active_device & ATOM_DEVICE_TV1_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_TV1_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_TV1_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_TV1_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_TV1_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_CV_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_CV_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_CV_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_CV_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_CV_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_CRT1_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_CRT1_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_CRT1_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_CRT1_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_CRT1_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_CRT2_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_CRT2_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_CRT2_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_CRT2_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_CRT2_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_LCD1_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_LCD1_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_LCD1_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_LCD1_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_LCD1_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP1_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_DFP1_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_DFP1_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_DFP1_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_DFP1_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP2_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_DFP2_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_DFP2_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_DFP2_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_DFP2_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP3_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_DFP3_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_DFP3_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_DFP3_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_DFP3_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP4_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_DFP4_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_DFP4_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_DFP4_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_DFP4_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP5_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_DFP5_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_DFP5_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_DFP5_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_DFP5_ACTIVE;
- }
}
- if (info->ChipFamily >= CHIP_FAMILY_R600) {
+ if (info->ChipFamily >= CHIP_FAMILY_R600)
OUTREG(R600_BIOS_2_SCRATCH, save->bios_2_scratch);
- OUTREG(R600_BIOS_3_SCRATCH, save->bios_3_scratch);
- } else {
+ else
OUTREG(RADEON_BIOS_2_SCRATCH, save->bios_2_scratch);
- OUTREG(RADEON_BIOS_3_SCRATCH, save->bios_3_scratch);
- }
} else {
if (mode == DPMSModeOn) {
save->bios_6_scratch &= ~(RADEON_DPMS_MASK | RADEON_SCREEN_BLANKING);
@@ -727,55 +694,36 @@
save->bios_6_scratch |= (RADEON_DPMS_OFF | RADEON_SCREEN_BLANKING);
}
if (radeon_output->active_device & ATOM_DEVICE_TV1_SUPPORT) {
- if (mode == DPMSModeOn) {
- save->bios_5_scratch |= RADEON_TV1_ON;
+ if (mode == DPMSModeOn)
save->bios_6_scratch |= RADEON_TV_DPMS_ON;
- } else {
- save->bios_5_scratch &= ~RADEON_TV1_ON;
+ else
save->bios_6_scratch &= ~RADEON_TV_DPMS_ON;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_CRT1_SUPPORT) {
- if (mode == DPMSModeOn) {
- save->bios_5_scratch |= RADEON_CRT1_ON;
+ if (mode == DPMSModeOn)
save->bios_6_scratch |= RADEON_CRT_DPMS_ON;
- } else {
- save->bios_5_scratch &= ~RADEON_CRT1_ON;
+ else
save->bios_6_scratch &= ~RADEON_CRT_DPMS_ON;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_CRT2_SUPPORT) {
- if (mode == DPMSModeOn) {
- save->bios_5_scratch |= RADEON_CRT2_ON;
+ if (mode == DPMSModeOn)
save->bios_6_scratch |= RADEON_CRT_DPMS_ON;
- } else {
- save->bios_5_scratch &= ~RADEON_CRT2_ON;
+ else
save->bios_6_scratch &= ~RADEON_CRT_DPMS_ON;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_LCD1_SUPPORT) {
- if (mode == DPMSModeOn) {
- save->bios_5_scratch |= RADEON_LCD1_ON;
+ if (mode == DPMSModeOn)
save->bios_6_scratch |= RADEON_LCD_DPMS_ON;
- } else {
- save->bios_5_scratch &= ~RADEON_LCD1_ON;
+ else
save->bios_6_scratch &= ~RADEON_LCD_DPMS_ON;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP1_SUPPORT) {
- if (mode == DPMSModeOn) {
- save->bios_5_scratch |= RADEON_DFP1_ON;
+ if (mode == DPMSModeOn)
save->bios_6_scratch |= RADEON_DFP_DPMS_ON;
- } else {
- save->bios_5_scratch &= ~RADEON_DFP1_ON;
+ else
save->bios_6_scratch &= ~RADEON_DFP_DPMS_ON;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP2_SUPPORT) {
- if (mode == DPMSModeOn) {
- save->bios_5_scratch |= RADEON_DFP2_ON;
+ if (mode == DPMSModeOn)
save->bios_6_scratch |= RADEON_DFP_DPMS_ON;
- } else {
- save->bios_5_scratch &= ~RADEON_DFP2_ON;
+ else
save->bios_6_scratch &= ~RADEON_DFP_DPMS_ON;
- }
}
- OUTREG(RADEON_BIOS_5_SCRATCH, save->bios_5_scratch);
OUTREG(RADEON_BIOS_6_SCRATCH, save->bios_6_scratch);
}
}
@@ -796,25 +744,25 @@
save->bios_3_scratch &= ~ATOM_S3_TV1_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 18);
} else if (radeon_output->active_device & ATOM_DEVICE_CV_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_CV_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_CV_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 24);
} else if (radeon_output->active_device & ATOM_DEVICE_CRT1_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_CRT1_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_CRT1_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 16);
} else if (radeon_output->active_device & ATOM_DEVICE_CRT2_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_CRT2_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_CRT2_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 20);
} else if (radeon_output->active_device & ATOM_DEVICE_LCD1_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_LCD1_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_LCD1_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 17);
} else if (radeon_output->active_device & ATOM_DEVICE_DFP1_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_DFP1_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_DFP1_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 19);
} else if (radeon_output->active_device & ATOM_DEVICE_DFP2_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_DFP2_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_DFP2_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 23);
} else if (radeon_output->active_device & ATOM_DEVICE_DFP3_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_DFP3_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_DFP3_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 25);
}
if (info->ChipFamily >= CHIP_FAMILY_R600)
@@ -857,66 +805,101 @@
if (info->IsAtomBios) {
switch (radeon_output->active_device) {
case ATOM_DEVICE_TV1_SUPPORT:
- if (!connected)
+ if (connected)
+ save->bios_3_scratch |= ATOM_S3_TV1_ACTIVE;
+ else {
save->bios_0_scratch &= ~ATOM_S0_TV1_MASK;
+ save->bios_3_scratch &= ~ATOM_S3_TV1_ACTIVE;
+ }
break;
case ATOM_DEVICE_CV_SUPPORT:
- if (!connected)
+ if (connected)
+ save->bios_3_scratch |= ATOM_S3_CV_ACTIVE;
+ else {
save->bios_0_scratch &= ~ATOM_S0_CV_MASK;
+ save->bios_3_scratch &= ~ATOM_S3_CV_ACTIVE;
+ }
break;
case ATOM_DEVICE_LCD1_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_LCD1;
- else
+ save->bios_3_scratch |= ATOM_S3_LCD1_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_LCD1;
+ save->bios_3_scratch &= ~ATOM_S3_LCD1_ACTIVE;
+ }
break;
case ATOM_DEVICE_CRT1_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_CRT1_COLOR;
- else
+ save->bios_3_scratch |= ATOM_S3_CRT1_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_CRT1_MASK;
+ save->bios_3_scratch &= ~ATOM_S3_CRT1_ACTIVE;
+ }
break;
case ATOM_DEVICE_CRT2_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_CRT2_COLOR;
- else
+ save->bios_3_scratch |= ATOM_S3_CRT2_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_CRT2_MASK;
+ save->bios_3_scratch &= ~ATOM_S3_CRT2_ACTIVE;
+ }
break;
case ATOM_DEVICE_DFP1_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_DFP1;
- else
+ save->bios_3_scratch |= ATOM_S3_DFP1_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_DFP1;
+ save->bios_3_scratch &= ~ATOM_S3_DFP1_ACTIVE;
+ }
break;
case ATOM_DEVICE_DFP2_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_DFP2;
- else
+ save->bios_3_scratch |= ATOM_S3_DFP2_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_DFP2;
+ save->bios_3_scratch &= ~ATOM_S3_DFP2_ACTIVE;
+ }
break;
case ATOM_DEVICE_DFP3_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_DFP3;
- else
+ save->bios_3_scratch |= ATOM_S3_DFP3_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_DFP3;
+ save->bios_3_scratch &= ~ATOM_S3_DFP3_ACTIVE;
+ }
break;
case ATOM_DEVICE_DFP4_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_DFP4;
- else
+ save->bios_3_scratch |= ATOM_S3_DFP4_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_DFP4;
+ save->bios_3_scratch &= ~ATOM_S3_DFP4_ACTIVE;
+ }
break;
case ATOM_DEVICE_DFP5_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_DFP5;
- else
+ save->bios_3_scratch |= ATOM_S3_DFP5_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_DFP5;
+ save->bios_3_scratch &= ~ATOM_S3_DFP5_ACTIVE;
+ }
break;
}
- if (info->ChipFamily >= CHIP_FAMILY_R600)
+ if (info->ChipFamily >= CHIP_FAMILY_R600) {
OUTREG(R600_BIOS_0_SCRATCH, save->bios_0_scratch);
- else
+ OUTREG(R600_BIOS_3_SCRATCH, save->bios_3_scratch);
+ } else {
OUTREG(RADEON_BIOS_0_SCRATCH, save->bios_0_scratch);
+ OUTREG(RADEON_BIOS_3_SCRATCH, save->bios_3_scratch);
+ }
} else {
switch (radeon_output->active_device) {
case ATOM_DEVICE_TV1_SUPPORT:
@@ -925,41 +908,60 @@
save->bios_4_scratch |= RADEON_TV1_ATTACHED_SVIDEO;
else if (radeon_output->MonType == MT_CTV)
save->bios_4_scratch |= RADEON_TV1_ATTACHED_COMP;
- } else
+ save->bios_5_scratch |= RADEON_TV1_ON;
+ } else {
save->bios_4_scratch &= ~RADEON_TV1_ATTACHED_MASK;
+ save->bios_5_scratch &= ~RADEON_TV1_ON;
+ }
break;
case ATOM_DEVICE_LCD1_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_4_scratch |= RADEON_LCD1_ATTACHED;
- else
+ save->bios_5_scratch |= RADEON_LCD1_ON;
+ } else {
save->bios_4_scratch &= ~RADEON_LCD1_ATTACHED;
+ save->bios_5_scratch &= ~RADEON_LCD1_ON;
+ }
break;
case ATOM_DEVICE_CRT1_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_4_scratch |= RADEON_CRT1_ATTACHED_COLOR;
- else
+ save->bios_5_scratch |= RADEON_CRT1_ON;
+ } else {
save->bios_4_scratch &= ~RADEON_CRT1_ATTACHED_MASK;
+ save->bios_5_scratch &= ~RADEON_CRT1_ON;
+ }
break;
case ATOM_DEVICE_CRT2_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_4_scratch |= RADEON_CRT2_ATTACHED_COLOR;
- else
+ save->bios_5_scratch |= RADEON_CRT2_ON;
+ } else {
save->bios_4_scratch &= ~RADEON_CRT2_ATTACHED_MASK;
+ save->bios_5_scratch &= ~RADEON_CRT2_ON;
+ }
break;
case ATOM_DEVICE_DFP1_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_4_scratch |= RADEON_DFP1_ATTACHED;
- else
+ save->bios_5_scratch |= RADEON_DFP1_ON;
+ } else {
save->bios_4_scratch &= ~RADEON_DFP1_ATTACHED;
+ save->bios_5_scratch &= ~RADEON_DFP1_ON;
+ }
break;
case ATOM_DEVICE_DFP2_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_4_scratch |= RADEON_DFP2_ATTACHED;
- else
+ save->bios_5_scratch |= RADEON_DFP2_ON;
+ } else {
save->bios_4_scratch &= ~RADEON_DFP2_ATTACHED;
+ save->bios_5_scratch &= ~RADEON_DFP2_ON;
+ }
break;
}
OUTREG(RADEON_BIOS_4_SCRATCH, save->bios_4_scratch);
+ OUTREG(RADEON_BIOS_5_SCRATCH, save->bios_5_scratch);
}
}
++++++ xf86-video-i740-1.2.0.tar.bz2 -> xf86-video-i740-1.3.0.tar.bz2 ++++++
++++ 59136 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i740-1.2.0/config.h.in new/xf86-video-i740-1.3.0/config.h.in
--- old/xf86-video-i740-1.2.0/config.h.in 2008-03-19 19:18:47.000000000 +0100
+++ new/xf86-video-i740-1.3.0/config.h.in 2009-03-19 20:25:30.000000000 +0100
@@ -32,6 +32,10 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i740-1.2.0/configure.ac new/xf86-video-i740-1.3.0/configure.ac
--- old/xf86-video-i740-1.2.0/configure.ac 2008-03-19 19:18:31.000000000 +0100
+++ new/xf86-video-i740-1.3.0/configure.ac 2009-03-19 20:25:09.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-i740],
- 1.2.0,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
xf86-video-i740)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i740-1.2.0/man/i740.man new/xf86-video-i740-1.3.0/man/i740.man
--- old/xf86-video-i740-1.2.0/man/i740.man 2008-03-19 15:29:41.000000000 +0100
+++ new/xf86-video-i740-1.3.0/man/i740.man 2009-03-19 20:24:14.000000000 +0100
@@ -25,6 +25,6 @@
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i740-1.2.0/src/i740_driver.c new/xf86-video-i740-1.3.0/src/i740_driver.c
--- old/xf86-video-i740-1.2.0/src/i740_driver.c 2008-03-19 19:18:21.000000000 +0100
+++ new/xf86-video-i740-1.3.0/src/i740_driver.c 2008-08-15 21:45:05.000000000 +0200
@@ -47,10 +47,6 @@
* DGA
*/
-#ifndef USE_DDC2
-#define USE_DDC2 0
-#endif
-
/*
* These are X and server generic header files.
*/
@@ -239,22 +235,6 @@
};
#endif
-#if USE_DDC2
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-#endif
-
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(i740Setup);
@@ -297,9 +277,6 @@
*/
LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
ramdacSymbols, vbeSymbols,
-#if USE_DDC2
- ddcSymbols, i2cSymbols,
-#endif
NULL);
/*
@@ -454,6 +431,7 @@
return foundScreen;
}
+/* Ugh. Can we not do this? */
static void
I740ProbeDDC(ScrnInfoPtr pScrn, int index)
{
@@ -745,6 +723,32 @@
clockRanges->interlaceAllowed = FALSE; /*PL*/
clockRanges->doubleScanAllowed = TRUE; /*PL*/
+ { /*PL*/
+
+ if (xf86LoadSubModule(pScrn, "ddc")) {
+ if (xf86LoadSubModule(pScrn, "i2c") ) {
+ if (I740MapMem(pScrn)) {
+ if (I740_I2CInit(pScrn))
+ {
+ xf86MonPtr MonInfo;
+ if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c))) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n",
+ MonInfo);
+ xf86PrintEDID( MonInfo );
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of DDC Monitor "
+ "info\n\n");
+ xf86SetDDCproperties(pScrn,MonInfo);
+ }
+ }
+ else
+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"I2C initialization failed\n");
+
+ I740UnmapMem(pScrn);
+ }
+ }
+ }
+ }
+
i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
pScrn->display->modes, clockRanges,
0, 320, 1600,
@@ -819,40 +823,6 @@
pI740->usevgacompat=FALSE;
-#if USE_DDC2 /*DDC2*/
- { /*PL*/
-
- if (xf86LoadSubModule(pScrn, "ddc")) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
- if ( xf86LoadSubModule(pScrn, "i2c") ) {
- xf86LoaderReqSymLists(i2cSymbols,NULL);
-
- if (I740MapMem(pScrn))
- {
- if (I740_I2CInit(pScrn))
- {
- xf86MonPtr MonInfo;
-
- if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c))) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n",
- MonInfo);
- xf86PrintEDID( MonInfo );
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of DDC Monitor "
- "info\n\n");
- xf86SetDDCproperties(pScrn,MonInfo);
- }
-
- //xf86SetDDCproperties(pScrn,xf86PrintEDID( xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c)));
- }
- else
- xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"I2C initialization failed\n");
-
- I740UnmapMem(pScrn);
- }
- }
- }
- }
-#endif /*DDC2*/
{ /* Overlay */
pI740->colorKey = (1 << pScrn->offset.red) | (1 << pScrn->offset.green) |
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory
checked in at Fri Mar 20 20:44:29 CET 2009.
--------
--- xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-03-09 04:26:57.000000000 +0100
+++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-03-20 03:50:15.161668001 +0100
@@ -1,0 +2,6 @@
+Fri Mar 20 03:49:29 CET 2009 - sndirsch(a)suse.de
+
+- 11-mouse.fdi
+ * HAL .fdi file for previous SaX2 mouse autoconfiguration
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
11-mouse.fdi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-input.spec ++++++
--- /var/tmp/diff_new_pack.zV3147/_old 2009-03-20 20:43:52.000000000 +0100
+++ /var/tmp/diff_new_pack.zV3147/_new 2009-03-20 20:43:52.000000000 +0100
@@ -24,7 +24,7 @@
BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 24
+Release: 25
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -65,6 +65,7 @@
Source29: xf86-input-synaptics-1.1.0.tar.bz2
Source30: xf86-input-evdev-2.2.0.tar.bz2
Source31: 11-x11-synaptics.fdi
+Source32: 11-mouse.fdi
Patch2: xf86-input-jamstudio.diff
Patch3: p_mouse_misc.diff
Patch5: evdev-overflow.diff
@@ -203,8 +204,11 @@
done
rm $RPM_BUILD_ROOT/usr/include/diamondtouch/ee_defs.h
mkdir -p $RPM_BUILD_ROOT/usr/share/hal/fdi/policy/10osvendor
+mkdir -p $RPM_BUILD_ROOT/usr/share/hal/fdi/policy/20thirdparty
install -m 644 $RPM_SOURCE_DIR/11-x11-synaptics.fdi \
$RPM_BUILD_ROOT/usr/share/hal/fdi/policy/10osvendor
+install -m 644 $RPM_SOURCE_DIR/11-mouse.fdi \
+ $RPM_BUILD_ROOT/usr/share/hal/fdi/policy/20thirdparty
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -215,6 +219,7 @@
%dir /usr/share/hal/fdi
%dir /usr/share/hal/fdi/policy
%dir /usr/share/hal/fdi/policy/10osvendor
+%dir /usr/share/hal/fdi/policy/20thirdparty
/usr/include/xorg/evdev-properties.h
/usr/include/xorg/joystick-properties.h
/usr/include/xorg/synaptics-properties.h
@@ -228,15 +233,18 @@
/usr/bin/syn*
%ifarch %ix86 x86_64
%dir /usr/%{_lib}/hal
-%dir /usr/share/hal/fdi/policy/20thirdparty
/usr/bin/vmmouse_detect
/usr/%{_lib}/hal/hal-probe-vmmouse
/usr/share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
/usr/share/man/man1/vmmouse_detect.1.gz
%endif
/usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
+/usr/share/hal/fdi/policy/20thirdparty/11-mouse.fdi
%changelog
+* Fri Mar 20 2009 sndirsch(a)suse.de
+- 11-mouse.fdi
+ * HAL .fdi file for previous SaX2 mouse autoconfiguration
* Mon Mar 09 2009 sndirsch(a)suse.de
- xf86-input-synaptics 1.1.0
* man: device properties are now supported, should be stated as
++++++ 11-mouse.fdi ++++++
<?xml version="1.0" encoding="ISO-8859-1"?>
<deviceinfo version="0.2">
<device>
<match key="info.capabilities" contains="input.mouse">
<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
string="Linux">
<!-- Logitech tweaks -->
<match key="@input.originating_device:usb.vendor_id" int="0x46d">
<match key="@input.originating_device:usb.product_id" int="0xc50e">
<merge key="input.x11_options.Buttons" type="string">8</merge>
<merge key="input.x11_options.EmulateWheel" type="string">on</merge>
<merge key="input.x11_options.EmulateWheelButton" type="string">8</merge>
<merge key="input.x11_options.YAxisMapping" type="string">4 5</merge>
<merge key="input.x11_options.XAxisMapping" type="string">6 7</merge>
</match>
<match key="@input.originating_device:usb.product_id" int="0xc521">
<merge key="input.x11_options.HWHEELRelativeAxisButtons" type="string">7 6</merge>
</match>
</match>
<!-- Microsoft tweaks -->
<match key="@input.originating_device:usb.vendor_id" int="0x045e">
<match key="@input.originating_device:usb.product_id" int="0x0095">
<merge key="input.x11_options.HWHEELRelativeAxisButtons" type="string">7 6</merge>
</match>
</match>
<!-- ibm trackpoint -->
<match key="@input.originating_device:usb.vendor_id" int="0x0210">
<match key="@input.originating_device:usb.product_id" int="0x0003">
<merge key="input.x11_options.EmulateWheel" type="string">on</merge>
<merge key="input.x11_options.EmulateWheelButton" type="string">2</merge>
</match>
</match>
<match key="@input.originating_device:usb.vendor_id" int="0x0002">
<match key="@input.originating_device:usb.product_id" int="0x000a">
<merge key="input.x11_options.EmulateWheel" type="string">on</merge>
<merge key="input.x11_options.EmulateWheelButton" type="string">2</merge>
</match>
</match>
<match key="@input.originating_device:usb.vendor_id" int="0x04b3">
<match key="@input.originating_device:usb.product_id" int="0x300f">
<merge key="input.x11_options.EmulateWheel" type="string">on</merge>
<merge key="input.x11_options.EmulateWheelButton" type="string">2</merge>
</match>
</match>
<!-- hp-mouse -->
<match key="@input.originating_device:usb.vendor_id" int="0x03f0">
<match key="@input.originating_device:usb.product_id" int="0x1126">
<merge key="input.x11_options.MinX" type="string">0</merge>
<merge key="input.x11_options.MaxX" type="string">3000</merge>
<merge key="input.x11_options.MinY" type="string">0</merge>
<merge key="input.x11_options.MaxX" type="string">3000</merge>
</match>
</match>
</match>
</match>
</device>
</deviceinfo>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package sblim-cmpi-xenvm-builder for openSUSE:Factory
checked in at Fri Mar 20 20:42:49 CET 2009.
--------
--- sblim-cmpi-xenvm-builder/sblim-cmpi-xenvm-builder.changes 2008-11-26 00:29:43.000000000 +0100
+++ sblim-cmpi-xenvm-builder/sblim-cmpi-xenvm-builder.changes 2009-03-20 17:49:09.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Mar 20 17:48:38 CET 2009 - crrodriguez(a)suse.de
+
+- run ldconfig in %postun
+- use --disable-static instead of removing static libraries on %install
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sblim-cmpi-xenvm-builder.spec ++++++
--- /var/tmp/diff_new_pack.R32339/_old 2009-03-20 20:41:43.000000000 +0100
+++ /var/tmp/diff_new_pack.R32339/_new 2009-03-20 20:41:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sblim-cmpi-xenvm-builder (Version 1.0.3)
#
-# 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
@@ -24,7 +24,7 @@
Url: http://www.omc-project.org
# Increment the version every time the source code changes.
Version: 1.0.3
-Release: 1
+Release: 2
Group: System/Management
Summary: Linux CIM providers for CMPI instrumentation of virtual machine creation
PreReq: coreutils
@@ -50,7 +50,7 @@
%prep
# Untar the sources.
-%setup -n %{tarname}-%{version}
+%setup -q -n %{tarname}-%{version}
%build
# If the LD_RUN_PATH environment variable is set at link time,
@@ -61,16 +61,14 @@
autoreconf --force --install
CFLAGS="$RPM_OPT_FLAGS -fstack-protector" \
CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector" \
-%configure
+%configure --disable-static --with-pic
%{__make}
%install
-%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir} -p $RPM_BUILD_ROOT
# Tell 'make install' to install into the BuildRoot
make DESTDIR=$RPM_BUILD_ROOT install
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.{a,la}
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libcmpixen*.{a,la}
+find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -95,6 +93,8 @@
sfcbrepos -f
/etc/init.d/sfcb condrestart
+%postun -p /sbin/ldconfig
+
%preun
# If removing (not upgrading) then de-register, before the files are gone
if [ "x$1" = "x0" ]; then
@@ -112,10 +112,13 @@
%{_datadir}/mof/%{name}/*
%changelog
+* Fri Mar 20 2009 crrodriguez(a)suse.de
+- run ldconfig in %%postun
+- use --disable-static instead of removing static libraries on %%install
* Fri Nov 07 2008 jcarey(a)novell.com
- Fixed Bug where an invalid AutomaticRecoveryAction property was
being return when the property was not specified.
-* Mon Nov 03 2008 jcarey(a)novell.com
+* Tue Nov 04 2008 jcarey(a)novell.com
- Changed to log the vm-install command line to syslog if the
VM_BUILDER_DEBUG environment variable is set.
* Sun Oct 19 2008 jcarey(a)novell.com
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package python-pygame for openSUSE:Factory
checked in at Fri Mar 20 20:41:37 CET 2009.
--------
--- python-pygame/python-pygame.changes 2008-09-12 14:23:08.000000000 +0200
+++ python-pygame/python-pygame.changes 2009-03-20 13:28:36.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Mar 20 13:28:17 CET 2009 - matejcik(a)suse.cz
+
+- (re)added libpng-devel and libjpeg-devel for image format support
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pygame.spec ++++++
--- /var/tmp/diff_new_pack.M31206/_old 2009-03-20 20:41:01.000000000 +0100
+++ /var/tmp/diff_new_pack.M31206/_new 2009-03-20 20:41:01.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-pygame (Version 1.8.1)
#
-# 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
@@ -19,9 +19,9 @@
Name: python-pygame
-BuildRequires: SDL_image-devel SDL_mixer-devel SDL_ttf-devel python-devel python-numeric xorg-x11
+BuildRequires: SDL_image-devel SDL_mixer-devel SDL_ttf-devel libjpeg-devel libpng-devel python-devel python-numeric xorg-x11
Version: 1.8.1
-Release: 1
+Release: 4
Source: pygame-%{version}release.tar.bz2
Source1: README.SuSE
Patch0: %{name}-1.8.0-pep353.diff
@@ -103,6 +103,8 @@
%doc %{_docdir}/python-pygame/examples
%changelog
+* Fri Mar 20 2009 matejcik(a)suse.cz
+- (re)added libpng-devel and libjpeg-devel for image format support
* Fri Sep 12 2008 matejcik(a)suse.cz
- update to 1.8.1
* lots of changes and fixes - see WHATSNEW for details
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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