March 2009 - openSUSE Commits - openSUSE Mailing Lists

commit glibc for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at Tue Mar 3 18:33:59 CET 2009. -------- --- glibc/glibc.changes 2009-02-19 09:21:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/glibc/glibc.changes 2009-02-27 16:21:49.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 27 16:21:17 CET 2009 - rguenther(a)suse.de + +- Make sure to mark fortified inline routines with + __attribute__((__artificial__)). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- glibc-2.9-fortify.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.Zw9628/_old 2009-03-03 18:32:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Zw9628/_new 2009-03-03 18:32:47.000000000 +0100 @@ -69,7 +69,7 @@ Provides: rtld(GNU_HASH) AutoReqProv: on Version: 2.9 -Release: 12 +Release: 14 %define snapshot_date 2008111711 Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem @@ -149,6 +149,7 @@ Patch55: glibc-cpusetsize.diff Patch56: glibc-ldscript.diff Patch57: glibc-mtfsf.diff +Patch58: glibc-2.9-fortify.diff %description The GNU C Library provides the most important standard libraries used @@ -358,6 +359,7 @@ %patch55 %patch56 %patch57 +%patch58 %patch5 # # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! @@ -1056,6 +1058,9 @@ %{_libdir}/libdl_p.a %changelog +* Fri Feb 27 2009 rguenther(a)suse.de +- Make sure to mark fortified inline routines with + __attribute__((__artificial__)). * Wed Feb 18 2009 adrian(a)suse.de - Build i686 glibc src rpm as nosrc to get both versions on the media [bnc#474338] ++++++ glibc-2.9-fortify.diff ++++++ --- misc/sys/cdefs.h.orig 2009-02-27 16:05:10.000000000 +0100 +++ misc/sys/cdefs.h 2009-02-27 16:06:32.000000000 +0100 @@ -303,7 +303,12 @@ # endif # else # define __extern_inline extern __inline -# define __extern_always_inline extern __always_inline +# if __GNUC_PREREQ (4,3) +# define __extern_always_inline \ + extern __always_inline __attribute__ ((__artificial__)) +# else +# define __extern_always_inline extern __always_inline +# endif # endif #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 freeglut for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package freeglut for openSUSE:Factory checked in at Tue Mar 3 18:19:56 CET 2009. -------- --- freeglut/freeglut.changes 2009-01-20 18:37:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/freeglut/freeglut.changes 2009-03-03 12:44:10.816192873 +0100 @@ -1,0 +2,6 @@ +Tue Mar 3 12:37:15 CET 2009 - sndirsch(a)suse.de + +- switched to current freeglut sources in SVN (2009-03-01) +- obsoletes freeglut-080721.diff, freeglut-sig11-bug466806.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- freeglut-080721.diff freeglut-080721.tar.bz2 freeglut-sig11-bug466806.diff New: ---- freeglut-090301.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeglut.spec ++++++ --- /var/tmp/diff_new_pack.p18317/_old 2009-03-03 18:19:49.000000000 +0100 +++ /var/tmp/diff_new_pack.p18317/_new 2009-03-03 18:19:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package freeglut (Version 080721) +# spec file for package freeglut (Version 090301) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,8 +21,8 @@ Name: freeglut BuildRequires: Mesa-devel gcc-c++ libdrm-devel pkgconfig xorg-x11-devel Summary: Freely licensed alternative to the GLUT library -Version: 080721 -Release: 23 +Version: 090301 +Release: 1 Url: http://freeglut.sourceforge.net/ %define USE_EXTERNAL_MESA 1 Source0: freeglut-%{version}.tar.bz2 @@ -30,9 +30,7 @@ Source2: glxdemos.tar.bz2 Source3: xdriinfo-1.0.2.tar.bz2 Source4: compat70.tar.bz2 -Patch: freeglut-%{version}.diff Patch1: glxdemos.diff -Patch2: freeglut-sig11-bug466806.diff Patch10: freeglut-glxgears-notify.diff Patch11: freeglut-glxinfo-notify.diff License: X11/MIT @@ -99,8 +97,6 @@ %prep %setup -q -b1 -b2 -b3 -b4 -n freeglut -%patch -%patch2 %if %USE_EXTERNAL_MESA pushd .. %patch1 @@ -200,6 +196,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 03 2009 sndirsch(a)suse.de +- switched to current freeglut sources in SVN (2009-03-01) +- obsoletes freeglut-080721.diff, freeglut-sig11-bug466806.diff * Tue Jan 20 2009 mhopf(a)suse.de - freeglut-glxgears-notify.diff, freeglut-glxinfo-notify.diff * Notify user if direct rendering or hardware acceleration ++++++ freeglut-080721.tar.bz2 -> freeglut-090301.tar.bz2 ++++++ ++++ 1972 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 MesaGLw for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package MesaGLw for openSUSE:Factory checked in at Tue Mar 3 18:19:15 CET 2009. -------- --- MesaGLw/MesaGLw.changes 2008-09-20 18:39:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/MesaGLw/MesaGLw.changes 2009-03-03 11:27:56.820489628 +0100 @@ -1,0 +2,5 @@ +Tue Mar 3 11:27:47 CET 2009 - sndirsch(a)suse.de + +- update to Mesa 7.3 sources + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- MesaLib-7.2.tar.bz2 New: ---- MesaLib-7.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MesaGLw.spec ++++++ --- /var/tmp/diff_new_pack.F15736/_old 2009-03-03 18:18:52.000000000 +0100 +++ /var/tmp/diff_new_pack.F15736/_new 2009-03-03 18:18:52.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package MesaGLw (Version 7.2) +# spec file for package MesaGLw (Version 7.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 @@ -25,7 +25,7 @@ Group: System/Libraries Provides: Mesa:%{_libdir}/libGLw.so.1 AutoReqProv: on -Version: 7.2 +Version: 7.3 Release: 1 Summary: Mesa Widget library Source: MesaLib-%{version}.tar.bz2 @@ -97,6 +97,8 @@ %{_libdir}/libGLw.so %changelog +* Tue Mar 03 2009 sndirsch(a)suse.de +- update to Mesa 7.3 sources * Sat Sep 20 2008 sndirsch(a)suse.de - update to Mesa 7.2 sources * Wed Aug 27 2008 sndirsch(a)suse.de @@ -131,11 +133,11 @@ * Fix several bugs relating to uniforms and attributes in GLSL API (Bruce Merry, bug 13753) * glTexImage3D(GL_PROXY_TEXTURE_3D) mis-set teximage depth field -* Wed Jan 02 2008 crrodriguez(a)suse.de +* Tue Jan 01 2008 crrodriguez(a)suse.de - fix library-without-ldconfig-* error * Sat Nov 10 2007 sndirsch(a)suse.de - updated to Mesa 7.0.2 (final) -* Thu Nov 01 2007 sndirsch(a)suse.de +* Wed Oct 31 2007 sndirsch(a)suse.de - updated to Mesa 7.0.2 RC1 * Sat Aug 04 2007 sndirsch(a)suse.de - updated to bugfix release 7.0 @@ -146,7 +148,7 @@ * Mesa 7.0 is a stable, follow-on release to Mesa 6.5.3. The only difference is bug fixes. The major version number bump is due to OpenGL 2.1 API support. -* Tue May 01 2007 sndirsch(a)suse.de +* Mon Apr 30 2007 sndirsch(a)suse.de - updated to Mesa 6.5.3 * Fri Apr 27 2007 sndirsch(a)suse.de - back to Mesa 6.5.2 (Bug #269155/269042) @@ -161,7 +163,7 @@ * a number of bug fixes since the first RC * Sat Apr 21 2007 sndirsch(a)suse.de - updated to Mesa 6.5.3rc1 -* Sun Dec 03 2006 sndirsch(a)suse.de +* Sat Dec 02 2006 sndirsch(a)suse.de - updated to Mesa 6.5.2 * Mon Sep 18 2006 sndirsch(a)suse.de - updated to Mesa 6.5.1 ++++++ MesaLib-7.2.tar.bz2 -> MesaLib-7.3.tar.bz2 ++++++ ++++ 122222 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

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

03 Mar '09

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Tue Mar 3 18:18:09 CET 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-02-27 18:12:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2009-03-03 05:06:15.824038475 +0100 @@ -1,0 +2,5 @@ +Tue Mar 3 05:06:02 CET 2009 - sndirsch(a)suse.de + +- regenerated xorg-server-xf4vnc.patch (still disabled) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.y13831/_old 2009-03-03 18:18:01.000000000 +0100 +++ /var/tmp/diff_new_pack.y13831/_new 2009-03-03 18:18:01.000000000 +0100 @@ -30,7 +30,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 28 +Release: 29 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -545,6 +545,8 @@ %endif %changelog +* Tue Mar 03 2009 sndirsch(a)suse.de +- regenerated xorg-server-xf4vnc.patch (still disabled) * Fri Feb 27 2009 sndirsch(a)suse.de - xorg-server 1.6.0 - temporarily disabled build of Xvnc/libvnc.so ++++++ xorg-server-xf4vnc.patch ++++++ ++++ 1443 lines (skipped) ++++ between xorg-x11-server/xorg-server-xf4vnc.patch ++++ and /mounts/work_src_done/STABLE/xorg-x11-server/xorg-server-xf4vnc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-proto-devel for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package xorg-x11-proto-devel for openSUSE:Factory checked in at Tue Mar 3 18:17:50 CET 2009. -------- --- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2009-03-01 20:51:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2009-03-02 21:57:54.921933757 +0100 @@ -1,0 +2,5 @@ +Mon Mar 2 21:57:44 CET 2009 - sndirsch(a)suse.de + +- xproto 7.0.15 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xproto-7.0.14.tar.bz2 New: ---- xproto-7.0.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-proto-devel.spec ++++++ --- /var/tmp/diff_new_pack.G12426/_old 2009-03-03 18:17:44.000000000 +0100 +++ /var/tmp/diff_new_pack.G12426/_new 2009-03-03 18:17:44.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: python-base Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 6 +Release: 7 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/X11 @@ -57,7 +57,7 @@ Source27: xf86rushproto-X11R7.0-1.1.2.tar.bz2 Source28: xf86vidmodeproto-X11R7.0-2.2.2.tar.bz2 Source29: xineramaproto-X11R7.0-1.1.2.tar.bz2 -Source30: xproto-7.0.14.tar.bz2 +Source30: xproto-7.0.15.tar.bz2 Source31: xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2 Source32: evieext-X11R7.0-1.0.2.tar.bz2 Source33: xcb-proto-1.4.tar.bz2 @@ -142,6 +142,8 @@ /usr/share/xcb/ %changelog +* Mon Mar 02 2009 sndirsch(a)suse.de +- xproto 7.0.15 * Sun Mar 01 2009 sndirsch(a)suse.de - xextproto 7.0.5 * Sun Mar 01 2009 sndirsch(a)suse.de ++++++ xproto-7.0.14.tar.bz2 -> xproto-7.0.15.tar.bz2 ++++++ ++++ 7342 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/xproto-7.0.14/autogen.sh new/xproto-7.0.15/autogen.sh --- old/xproto-7.0.14/autogen.sh 2008-04-16 05:45:58.000000000 +0200 +++ new/xproto-7.0.15/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" 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/xproto-7.0.14/ChangeLog new/xproto-7.0.15/ChangeLog --- old/xproto-7.0.14/ChangeLog 2008-10-23 14:14:20.000000000 +0200 +++ new/xproto-7.0.15/ChangeLog 2009-03-02 19:51:27.000000000 +0100 @@ -1,12 +1,113 @@ +commit 034319189648eaaa483f9546c62451edb7be0c28 +Author: James Cloos <cloos(a)jhcloos.com> +Date: Mon Mar 2 12:54:17 2009 -0500 + + Bump to 7.0.15. + +commit 391f302a7d71b9169ce4c18794251ea3ccc95904 +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Tue Jan 27 20:06:04 2009 -0200 + + Janitor: Correct make distcheck and dont distribute autogen.sh + +commit 1e33337d4dd151da4f0898a86608a1ee67588163 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Oct 27 16:36:11 2008 +1030 + + Add XF86XK_Suspend and XF86XK_Hibernate keysym defs. + + At the moment, we have the following keysyms defined to put a computer into a + sleep state: + + XF86XK_Standby 0x1008FF10 /* System into standby mode */ + XF86XK_PowerDown 0x1008FF21 /* Deep sleep the system */ + XF86XK_Sleep 0x1008FF2F /* Put system to sleep */ + + Proposed change by Richard Hughes: + "The nomenclature I've been trying to make stick + (most projects now use this) for a few years now is: + + standby: high sleep state, nobody uses this any more + hibernate: sleep to disk - slow, but can remove power + suspend: sleep to ram - fast, but can't remove power + hybrid sleep: sleep to both, slow, and can remove power, but quick to + resume if you don't - most users don't use this" + + This patch adds XF86XK_Suspend and XF86XK_Hibernate. The behaviour of + XF86XK_Sleep can then be configured on a per-session basis. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)redhat.com> + +commit 2563153ed69d3d6f052ba275ff79df3cbe54b76d +Author: James Cloos <cloos(a)jhcloos.com> +Date: Tue Nov 11 16:26:05 2008 -0500 + + [keysymdef.h] Add dead_currency symbol. + + As requested for the Bépo keyboard layout (http://clavier-dvorak.org/wiki/). + + Cf. bugs: + + http://bugs.freedesktop.org/show_bug.cgi?id=17821 + http://bugs.freedesktop.org/show_bug.cgi?id=17822 + +commit 735d745e17a6180f569f24f9792513b44e100aef +Author: James Cloos <cloos(a)jhcloos.com> +Date: Mon Oct 13 03:11:10 2008 -0400 + + Add a dead_belowcomma keysym + + Requested by the Bépo group. + + The belowcomma is only used for: + + U+0218 [Ș] LATIN CAPITAL LETTER S WITH COMMA BELOW + U+0219 [ș] LATIN SMALL LETTER S WITH COMMA BELOW + U+021A [Ț] LATIN CAPITAL LETTER T WITH COMMA BELOW + U+021B [ț] LATIN SMALL LETTER T WITH COMMA BELOW + + (aka 0xAA, 0xBA, 0xDE and 0xFE from iso-8859-16). + + Cf: http://bugs.freedesktop.org/show_bug.cgi?id=17822 + http://bugs.freedesktop.org/show_bug.cgi?id=17821 + http://clavier-dvorak.org/wiki/ + +commit 935dd37be409bd616ef46a4d3b62c44327b3f710 +Author: Sayamindu Dasgupta <sayamindu(a)gmail.com> +Date: Mon Oct 13 03:00:30 2008 -0400 + + Add dead vowels in keysymdef.h + + At OLPC, we are using an XKB based Amharic keyboard layout, which requires the + use of dead vowels to generate the various consonant + vowel combinations (see + http://en.wikipedia.org/wiki/Ge%27ez_alphabet#Syllable_signs for a detailed + explanation). + + [Patch modified to use available keysym codes. -JimC] + + Cf: http://bugs.freedesktop.org/show_bug.cgi?id=17437 + + Signed-off-by: James Cloos <cloos(a)jhcloos.com> + +commit c43f804f44ba3d751f343c2e27d9b491a1ebb458 +Author: James Cloos <cloos(a)jhcloos.com> +Date: Wed Sep 17 04:09:16 2008 -0400 + + Add dead keysyms for DOUBLE GRAVE and INVERTED BREVE accents + + Several COMBINING characters are used in libX11's Compose tables + where dead keys should be used; these are the two most-used which + so far have not had equivalent dead keys. + commit 33a7de5cdacb59503b26c6523ffb33dba118faed Author: Peter Hutterer <peter.hutterer(a)redhat.com> -Date: Thu Oct 23 22:41:01 2008 +1030 +Date: Thu Oct 23 22:40:38 2008 +1030 Bump to 7.0.14. commit 1cf41088ff751e60071a519466b5a51b65c7626a Author: Bastien Nocera <bnocera(a)redhat.com> -Date: Wed Oct 15 14:20:45 2008 +1030 +Date: Wed Oct 15 14:20:22 2008 +1030 Keysyms needed for some HID remote controls to work under X. #16519 @@ -18,7 +119,7 @@ commit 0b541b3fa282531c97c6ecee574c8b92b1489bfc Author: Peter Hutterer <peter.hutterer(a)redhat.com> -Date: Tue Oct 14 21:56:14 2008 +1030 +Date: Tue Oct 14 21:55:51 2008 +1030 Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round). @@ -28,7 +129,7 @@ commit c94477f16356790741ebc139d2d0b15d79c83e28 Author: Peter Hutterer <peter.hutterer(a)redhat.com> -Date: Tue Oct 14 21:54:16 2008 +1030 +Date: Tue Oct 14 21:53:53 2008 +1030 Revert "Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round)." @@ -39,7 +140,7 @@ commit 2945d2f97c264783e4050a8f6c3016290014b9e2 Author: Peter Hutterer <peter.hutterer(a)redhat.com> -Date: Tue Oct 14 21:04:08 2008 +1030 +Date: Tue Oct 14 21:03:45 2008 +1030 Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round). @@ -49,13 +150,13 @@ commit 610eb9698316b7cdfe378ce7776c4520f8b061ff Author: Peter Hutterer <peter.hutterer(a)redhat.com> -Date: Mon Oct 13 12:01:16 2008 +1030 +Date: Mon Oct 13 12:00:53 2008 +1030 Add keysyms for XF86XK_Battery, XF86XK_Bluetooth, XF86XK_WLAN, XF86XK_UWB. commit 0846d7adfe790897e879c5ed53d4f81db459a20d Author: James Cloos <cloos(a)jhcloos.com> -Date: Sun Jul 13 17:57:09 2008 -0400 +Date: Sun Jul 13 17:56:46 2008 -0400 Add dead_perispomeni to keysymdef.h @@ -67,50 +168,50 @@ commit 38edd9839fa8495602378af36c67b2477b24eca2 Author: James Cloos <cloos(a)jhcloos.com> -Date: Sun Jul 13 17:54:47 2008 -0400 +Date: Sun Jul 13 17:54:24 2008 -0400 fix typo in commit 40ed4eef commit 53859ee4e431c21000e282971894dbe9384ed205 Author: Peter Hutterer <peter(a)cs.unisa.edu.au> -Date: Wed May 28 17:17:38 2008 +0930 +Date: Wed May 28 17:17:15 2008 +0930 Bump to 7.0.13. commit 44e458285bb2e7771963a9ab9b5f03d2fb48e611 Author: Peter Hutterer <peter(a)cs.unisa.edu.au> -Date: Tue May 15 16:41:08 2007 +0930 +Date: Tue May 15 16:40:45 2007 +0930 Add GenericEvent and xGenericEvent definitions. (cherry picked from commit 8a96cdca08db2563e8c4c7c9a110a3ab6d973fcc) commit 22878c30d21580146200c00070478f88d969bcaa Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> -Date: Thu May 8 15:02:41 2008 -0700 +Date: Thu May 8 15:02:18 2008 -0700 Apple: Added a comment to explain _DARWIN_C_SOURCE commit e3035a7e6e56e01eb79478ea5342e032ec67a190 Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> -Date: Thu May 8 12:16:15 2008 -0700 +Date: Thu May 8 12:15:52 2008 -0700 Apple: Define _DARWIN_C_SOURCE otherwise _XOPEN_SOURCE, _POSIX_SOURCE, or _POSIX_C_SOURCE will cause fd_mask to not be defined due to the strict namespace commit 05b119d78e1c6a4db563b2a976cee0173489f9b6 Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> -Date: Thu May 8 11:36:03 2008 -0700 +Date: Thu May 8 11:35:40 2008 -0700 Apple: Cleaned up some Apple definitions commit c879dab58f82f4789f27933c22706c84015f8684 Author: Alan Hourihane <alanh(a)tungstengraphics.com> -Date: Tue Apr 29 00:37:28 2008 +0100 +Date: Tue Apr 29 00:37:05 2008 +0100 avoid checking for fds_bits on mingw commit 8642ec676db0dd875f4d3a97d8a3cdbf6843a985 Author: Colin Harrison <colin.harrison-at-virgin.net> -Date: Sat Apr 26 18:21:41 2008 +0100 +Date: Sat Apr 26 18:21:18 2008 +0100 Use Sleep() instead of sleep() on windows @@ -118,19 +219,19 @@ commit a893a6ac5d9fdfe9a420d1812402a01904e6482b Author: Colin Harrison <colin.harrison-at-virgin.net> -Date: Sat Apr 26 08:52:29 2008 +0100 +Date: Sat Apr 26 08:52:06 2008 +0100 Use winsock2.h commit c705bab0f6efcb6937b7ccc2fb415e701878fddb Author: Markus Kuhn <Markus.Kuhn(a)cl.cam.ac.uk> -Date: Mon Apr 21 21:27:26 2008 +0100 +Date: Mon Apr 21 21:27:03 2008 +0100 Added comment to slightly discourage the definition of ever more Unicode keysyms commit 44e24a27bca023cf7b799f191fe6d52e12efbe5f Author: James Cloos <cloos(a)jhcloos.com> -Date: Sat Apr 12 15:48:46 2008 -0400 +Date: Sat Apr 12 15:48:23 2008 -0400 Add more dead key syms Add dead keys to support input of the precomposed latin characters in @@ -141,7 +242,7 @@ commit 07e83988ec0b1c9577646daca3943badd5dcc0d1 Author: James Cloos <cloos(a)jhcloos.com> -Date: Thu Mar 6 11:34:17 2008 -0500 +Date: Thu Mar 6 11:33:54 2008 -0500 Fix typo in XF86Keysym.h @@ -150,13 +251,13 @@ commit d34310efef11264ddff79320b8c6f03705b1208a Author: Adam Jackson <ajax(a)redhat.com> -Date: Wed Mar 5 22:09:16 2008 -0500 +Date: Wed Mar 5 22:08:53 2008 -0500 x11proto 7.0.12 commit e4ad7a8080e4ac0b868fa7cf39bc5ad9a6e0bee1 Author: Jeremy Huddleston <jeremy(a)tifa.local> -Date: Sun Feb 10 19:07:49 2008 -0800 +Date: Sun Feb 10 19:07:26 2008 -0800 Fixed #ifdef checks that were using i386 to use __i386__ @@ -173,25 +274,25 @@ commit e49280c1c33622dbf288b0ac4f8324b01ff9b4aa Author: Jeremy Huddleston <jeremy(a)yuffie.local> -Date: Mon Dec 10 21:33:01 2007 -0800 +Date: Mon Dec 10 21:32:38 2007 -0800 Changed __DARWIN__ to __APPLE__ commit 5ae4d304ecb5fb4af0435c9f2efde3d2da5905d1 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> -Date: Tue Oct 30 18:44:49 2007 -0700 +Date: Tue Oct 30 18:44:26 2007 -0700 Make Xalloca.h work with Sun C++ compiler commit 5ccc71161283fdb2c42da1eeb4049650f6a2f429 Author: Ben Byer <bbyer(a)bbyer.apple.com> -Date: Tue Oct 30 18:40:47 2007 -0700 +Date: Tue Oct 30 18:40:24 2007 -0700 fd_mask needs to be defined on OS X, too commit 8be48ca399c3efd0e5d59f53da1b37d02647f33b Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Mon Sep 24 12:28:25 2007 +0300 +Date: Mon Sep 24 12:28:02 2007 +0300 Check headers before testing for fds_bits access method (bug #8442) @@ -200,19 +301,19 @@ commit 68e841fb4bf489531635e6bee70f041d2c3cb87c Author: James Cloos <cloos(a)jhcloos.com> -Date: Sat Sep 8 08:30:17 2007 -0400 +Date: Sat Sep 8 08:29:54 2007 -0400 bump to 7.0.11 commit 11fd082a384499c38065e06065bf80f244e9909a Author: Eric Anholt <eric(a)anholt.net> -Date: Tue Aug 28 14:54:44 2007 -0700 +Date: Tue Aug 28 14:54:21 2007 -0700 Describe what XF86XK_Display does (or now is meant to do). commit 40ed4eef92e31fcf7ea0a436e1a00cdf49484c1b Author: James Cloos <cloos(a)jhcloos.com> -Date: Wed Aug 22 21:10:47 2007 -0400 +Date: Wed Aug 22 21:10:24 2007 -0400 Add dead_abovecomma and dead_abovereversedcomma @@ -224,7 +325,7 @@ commit ab74d270c76b17926504815ba43ee35b8b18d3be Author: James Cloos <cloos(a)jhcloos.com> -Date: Wed Aug 22 21:01:48 2007 -0400 +Date: Wed Aug 22 21:01:25 2007 -0400 Comment on the new locations of the files referenced in keysymdef.h keysymdef.h has a comment from the monolithic days suggesting that @@ -235,107 +336,107 @@ commit 1edcfdb7f5c51e5c8014c56c4d5937337b7d4302 Author: James Cloos <cloos(a)jhcloos.com> -Date: Tue Aug 21 00:10:08 2007 -0400 +Date: Tue Aug 21 00:09:45 2007 -0400 Add *~ to .gitignore to skip patch/emacs droppings commit d8a49874bbd05a927c42102c0c5c147cf72cb1dd Author: Colin Harrison <colin.harrison-at-virgin.net> -Date: Wed May 9 16:46:25 2007 +0100 +Date: Wed May 9 16:46:02 2007 +0100 bcopy needs definition in Xfuncs.h for Xming commit 7505880329d6b81f0c77d6aaa3995390659d5c63 Author: Tilman Sauerbeck <tilman(a)code-monkey.de> -Date: Tue May 1 14:54:27 2007 +0200 +Date: Tue May 1 14:54:04 2007 +0200 Added some more files to .gitignore. commit 0c55a57dca2e888ba089e280f62e1c5bb55db7d7 Author: Tilman Sauerbeck <tilman(a)code-monkey.de> -Date: Tue May 1 14:52:57 2007 +0200 +Date: Tue May 1 14:52:34 2007 +0200 Enable GCC's visibility attributes on GCC 4 or greater only. commit 30f5eedf800f6683161fca9fc3e2d6ddc9ce0ac3 Author: Zephaniah E. Hull <warp(a)agamemnon.b5> -Date: Fri Feb 2 15:11:26 2007 -0500 +Date: Fri Feb 2 15:11:03 2007 -0500 Add keysym definitions from Jim Gettys. commit 5951f0355c6b1c591241bccb2023e6c4d493e701 Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Sat Dec 16 01:09:50 2006 +0200 +Date: Sat Dec 16 01:09:27 2006 +0200 bump to 7.0.10 commit 0422755ef9373fbb6f69fbb599d791331837f747 Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Sat Dec 16 01:09:44 2006 +0200 +Date: Sat Dec 16 01:09:21 2006 +0200 don't distribute Xfuncproto.h and Xpoll.h Don't distribute these two files, as they're generated during the build. commit cf44526713681ccfb6ef929a9c25ea650c5d1a32 Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Wed Dec 6 19:02:19 2006 +0200 +Date: Wed Dec 6 19:01:56 2006 +0200 Makefile.am: make ChangeLog hook safer Make ChangeLog hook as safe as possible. commit 528e313fd1f1ae6f2303d3963afe41545f55ef88 Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Thu Oct 26 00:45:44 2006 +0300 +Date: Thu Oct 26 00:45:21 2006 +0300 bump to 7.0.9 commit ab484c934301a61edc66dc1e4f554ec97b53aaf8 Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Thu Oct 26 00:45:36 2006 +0300 +Date: Thu Oct 26 00:45:13 2006 +0300 Xfuncproto: add _X_LIKELY and _X_UNLIKELY Add gcc branch hinting annotations. commit 178cae180bc8b2e8feaaeda6d7c0317cf2715e14 Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Thu Sep 21 18:43:06 2006 +0300 +Date: Thu Sep 21 18:42:43 2006 +0300 Xfuncproto: define _X_INLINE for older compilers commit 241e9dfd400aa21919d06fb7c78b5730eee12aab Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Thu Sep 21 14:51:00 2006 +0300 +Date: Thu Sep 21 14:50:37 2006 +0300 bump to 7.0.8 commit e51b21e316a5a1b9442a5d972b4ffa03455aca6e Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Thu Sep 21 14:50:45 2006 +0300 +Date: Thu Sep 21 14:50:22 2006 +0300 XF86keysym: add keyboard/monitor brightness controls (Bug #8120) Add XF86{Kbd,Mon}Brightness{Up,Down}, and XF86KbdLightOnOff. commit c3f56593f776e7f9e3e0d220c6bcf8be38a16839 Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Wed Sep 20 21:11:30 2006 +0300 +Date: Wed Sep 20 21:11:07 2006 +0300 Xfuncproto: add _X_INLINE commit 4fb2e257ae6de38971be8005283402226aea1ee5 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> -Date: Fri Jul 14 17:59:19 2006 -0700 +Date: Fri Jul 14 17:58:56 2006 -0700 Replace manual ChangeLog with dist-hook to generate from git log commit 2153ef4b7c2a93cba39ae08352ea2c46e5f0eefb Author: Alan Coopersmith <alan.coopersmith(a)sun.com> -Date: Fri Jul 14 17:54:38 2006 -0700 +Date: Fri Jul 14 17:54:15 2006 -0700 renamed: .cvsignore -> .gitignore commit 0b76eb310307cd16e55d0c0792b54a2c6774fb88 Author: Dan McNichol <mcnichol(a)austin.ibm.com> -Date: Fri Jul 14 17:53:34 2006 -0700 +Date: Fri Jul 14 17:53:11 2006 -0700 Bug #7458: AIX changes to Xmd.h @@ -344,43 +445,43 @@ commit bb7584b5c88236c59c4e3040bc7c28c150abf048 Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Sat Jun 10 15:33:50 2006 +0000 +Date: Sat Jun 10 15:33:27 2006 +0000 Add ISO_Level5_{Shift,Latch,Lock}. commit e9aebeae3661d4c464c7aa53722d0a6bf915101a Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Thu Jun 1 23:31:20 2006 +0000 +Date: Thu Jun 1 23:30:57 2006 +0000 Bug #6887: Add dead_stroke, bump to 7.0.7. (Troy Korjuslommi) commit f3886640d29026359ffc4add39b66b8ff48472d3 Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Thu Jun 1 23:00:34 2006 +0000 +Date: Thu Jun 1 23:00:11 2006 +0000 Bump to 7.0.6. commit d10d0302be37adb22804270926332e9d701935bb Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Thu Jun 1 23:00:03 2006 +0000 +Date: Thu Jun 1 22:59:40 2006 +0000 Bug #6296: Add support for Braille. (Samuel Thibault) commit 0471bfcce2787d2f1ff0fc2d019840e2bae8bc49 Author: Adam Jackson <ajax(a)nwnk.net> -Date: Wed Apr 26 23:26:49 2006 +0000 +Date: Wed Apr 26 23:26:26 2006 +0000 Bump to 7.0.5 commit 2a2b6db1f78f94c8f3690f675f0c032401fb2541 Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> -Date: Wed Apr 26 00:00:02 2006 +0000 +Date: Tue Apr 25 23:59:39 2006 +0000 Fix more comment typos. commit 33cea539618d58d64efb6a5c0465d14a471256cd Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> -Date: Thu Apr 20 01:24:25 2006 +0000 +Date: Thu Apr 20 01:24:02 2006 +0000 On Solaris, #include <sys/isa_defs.h> to be sure _LP64 is defined in 64-bit builds. @@ -388,31 +489,31 @@ commit 5e7d5cbf21c33f883ab508a51422775f59c4da00 Author: Kevin E Martin <kem(a)kem.org> -Date: Thu Dec 15 00:24:39 2005 +0000 +Date: Thu Dec 15 00:24:17 2005 +0000 Update package version number for final X11R7 release candidate. commit 1827a78f3a23c77dbcddfc8227d85c5add59d819 Author: Kevin E Martin <kem(a)kem.org> -Date: Sat Dec 3 05:49:47 2005 +0000 +Date: Sat Dec 3 05:49:25 2005 +0000 Update package version number for X11R7 RC3 release. commit 45811c86eb34e9f09e7d807ba4633107513f0d52 Author: Kevin E Martin <kem(a)kem.org> -Date: Sat Dec 3 01:13:36 2005 +0000 +Date: Sat Dec 3 01:13:14 2005 +0000 Automatically generate FUNCPROTO and NARROWPROTO defines in Xfuncproto.h. commit c03cc7739b37ca504a2b56a73945755c41c68b2a Author: Eric Anholt <anholt(a)freebsd.org> -Date: Mon Nov 21 10:51:15 2005 +0000 +Date: Mon Nov 21 10:50:53 2005 +0000 Ignore Xpoll.h, which is generated now. commit 54c8ddf303053fb398e00fc8a35df712a7f3d47d Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> -Date: Mon Nov 21 02:47:21 2005 +0000 +Date: Mon Nov 21 02:46:59 2005 +0000 Change values of XK_MATHEMATICAL symbols to use 0x1000000 + Unicode value, as Xorg Architecture Task Force agreed last year should be done for all @@ -420,57 +521,57 @@ commit f13eca1bc0feba2476f87e019a4ef40693a61ed8 Author: Kevin E Martin <kem(a)kem.org> -Date: Wed Nov 9 21:20:33 2005 +0000 +Date: Wed Nov 9 21:20:11 2005 +0000 Update package version number for X11R7 RC2 release. commit 448763bde4a31cb012ad17cd6c5159411102432b Author: Kean Johnson <kean(a)armory.com> -Date: Tue Nov 8 06:33:25 2005 +0000 +Date: Tue Nov 8 06:33:03 2005 +0000 See ChangeLog entry 2005-11-07 for details. commit 59a5a5ebb6781d417d7a4d5905999da5fc76a083 Author: Kevin E Martin <kem(a)kem.org> -Date: Wed Oct 19 02:48:15 2005 +0000 +Date: Wed Oct 19 02:47:53 2005 +0000 Update package version number for RC1 release. commit 3f74cc5e8309b2a4ac7671ca3c52c304ec5aa57f Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> -Date: Sat Oct 15 00:48:27 2005 +0000 +Date: Sat Oct 15 00:48:05 2005 +0000 Remove duplicate keysyms accidentally added to XK_MATHEMATICAL section. commit eaffdc0d593b94d9036033911535371e73698573 Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Sun Oct 9 15:37:29 2005 +0000 +Date: Sun Oct 9 15:37:07 2005 +0000 Bug #4688: Add various mathematical keysyms (all Unicode). commit 40b6e64fb1084f7b0270c279ac7132e52886c912 Author: Matthieu Herrb <matthieu.herrb(a)laas.fr> -Date: Sun Aug 21 15:27:27 2005 +0000 +Date: Sun Aug 21 15:27:05 2005 +0000 define CSRG_BASED here on systems that used to define it in Imake configuration. For use in the modular tree. commit 04f9f7fd17cab16e5b0b135409011c0d284b002c Author: Eric Anholt <anholt(a)freebsd.org> -Date: Tue Aug 2 19:19:40 2005 +0000 +Date: Tue Aug 2 19:19:18 2005 +0000 Add basic .cvsignore files for proto modules. commit cd0400eeda5d7818232844d93343877ef0ff8168 Author: Adam Jackson <ajax(a)nwnk.net> -Date: Tue Aug 2 18:36:30 2005 +0000 +Date: Tue Aug 2 18:36:08 2005 +0000 Fix the fds_bits test on OSX and maybe others. OSX defines fd_set in <sys/types.h> just to be perverse. commit a475adb523a4d24cd53d436ba8c98ac7c8d37934 Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> -Date: Sat Jul 30 21:07:25 2005 +0000 +Date: Sat Jul 30 21:07:03 2005 +0000 Add prototypes of Xalloc/free functions. Export ImUtil.h to match modular tree install. @@ -479,7 +580,7 @@ commit f6bd2288d3630ff7cb864e54cc7ebab1b3069067 Author: Kevin E Martin <kem(a)kem.org> -Date: Fri Jul 29 21:22:57 2005 +0000 +Date: Fri Jul 29 21:22:35 2005 +0000 Various changes preparing packages for RC0: - Verify and update package version numbers as needed @@ -493,14 +594,14 @@ commit 74a3f7f77830e4417a4bc4145114030dfaef6f4e Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Sat Jul 23 02:53:32 2005 +0000 +Date: Sat Jul 23 02:53:10 2005 +0000 Remove all _XOPEN_SOURCE definitions from Xos.h, as Xpoll.h.in now deals with this by using which of fds_bits or __fds_bits we have. commit f97e34e65e403140dde00d260be0fd7f853ac8f0 Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Fri Jul 22 08:01:39 2005 +0000 +Date: Fri Jul 22 08:01:17 2005 +0000 Add includex11dir as a path to the includes, sans X11/. Turn Xpoll.h into a generated file. In the modular tree, substitute in @@ -511,20 +612,20 @@ commit 7a9ce57163172557d6ba41119a5a3b2837dbbc8e Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> -Date: Sat Jul 16 20:54:13 2005 +0000 +Date: Sat Jul 16 20:53:51 2005 +0000 Guard INCLUDE_ALLOCA_H define to end redefinition warnings. commit 825b6ae347b3896b8ea38e6021170d45ae3bfd65 Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> -Date: Thu Jul 14 22:08:38 2005 +0000 +Date: Thu Jul 14 22:08:16 2005 +0000 Don't define _XOPEN_SOURCE on SVR4, because it will REMOVE required definitions. commit acc0551fb1af1152c1b630ff5e82f023f11751e2 Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> -Date: Wed Jul 13 23:43:08 2005 +0000 +Date: Wed Jul 13 23:42:46 2005 +0000 #define INCLUDE_ALLOCA_H when building with Sun compilers. (Imake *.cf files define this for a number of platforms in the monolith, but these @@ -533,14 +634,14 @@ commit b8301067b6e962a3dc786dd909726b7e6cb81085 Author: Alexander Gottwald <alexander.gottwald(a)s1999.tu-chemnitz.de> -Date: Wed Jul 13 20:12:13 2005 +0000 +Date: Wed Jul 13 20:11:51 2005 +0000 include <X11/Xwindows.h> instead of <windows.h>. Several namespace conflicts are worked around in Xwindows.h commit ec7a156bcdbe8e4bddf232d4a03f47d426096736 Author: Keith Packard <keithp(a)keithp.com> -Date: Wed Jul 13 07:23:56 2005 +0000 +Date: Wed Jul 13 07:23:34 2005 +0000 Make some minor source adjustments so that we don not need to use -D_XOPEN_SOURCE -D_BSD_SOURCE everywhere as this will leak out of the @@ -549,13 +650,13 @@ commit 2a0445903d06c332acf70cfd18ba57ddbbeada32 Author: Daniel Stone <daniel(a)fooishbar.org> -Date: Sun Jul 3 07:55:00 2005 +0000 +Date: Sun Jul 3 07:54:38 2005 +0000 Move misc.h and os.h from proto/X11 to xserver/xorg/include. commit ef6f542053b30af29b8045ffa6ce26386aab7bba Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk> -Date: Tue Jun 28 13:15:27 2005 +0000 +Date: Tue Jun 28 13:15:05 2005 +0000 - Remove xfixes.pc.in from lib/lbxutil - Add missing backslash in proto/X11/Makefile.am @@ -563,7 +664,7 @@ commit 4cf89be7baf8a79d2d399abd17c4e23279cca364 Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk> -Date: Mon Jun 27 17:41:09 2005 +0000 +Date: Mon Jun 27 17:40:47 2005 +0000 - Add os.h and misc.h to proto/X11 - In symlink.sh move os.h and misc.h from xserver/include to proto/X11 @@ -571,7 +672,7 @@ commit e575c5104a8627428dd18c4040d4ad787655164a Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk> -Date: Wed May 25 22:12:21 2005 +0000 +Date: Wed May 25 22:11:59 2005 +0000 - Use XTRANS_CONNECTION_FLAGS macro in lib/FS/configure.ac - Don't symlink transport.c, which is a generated file @@ -579,7 +680,7 @@ commit 207e3f82011d5f83db0eca318a1de50f0c1da0dc Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk> -Date: Wed May 25 21:47:56 2005 +0000 +Date: Wed May 25 21:47:34 2005 +0000 - Add FSlib to symlink.sh - Change Xtrans includedir back to be X11/Xtrans, so that users of it can @@ -591,7 +692,7 @@ commit a5a4bfe9b432e7d8238f9a02d80be4ce6bb64978 Author: Josh Triplett <josh(a)speakeasy.net> -Date: Mon May 23 01:22:10 2005 +0000 +Date: Mon May 23 01:21:48 2005 +0000 The macros in Xpoll.h poke at the guts of struct fd_set in ways that only work if _XOPEN_SOURCE is defined, so define it in Cflags in the @@ -599,37 +700,37 @@ commit 2f4c3aa871a047359f8121e6401be1ba4cf0b8e0 Author: Adam Jackson <ajax(a)nwnk.net> -Date: Thu May 19 00:22:40 2005 +0000 +Date: Thu May 19 00:22:18 2005 +0000 revert last change, didn't do right thing at all, sorry for the noise commit 4809dd9150599a9e88f64cd1b82737872b7b1b94 Author: Adam Jackson <ajax(a)nwnk.net> -Date: Thu May 19 00:10:19 2005 +0000 +Date: Thu May 19 00:09:57 2005 +0000 Require automake 1.7 in AM_INIT_AUTOMAKE commit 6ff17c33f0773e152122d66cbaffaa54e53e086c Author: Josh Triplett <josh(a)speakeasy.net> -Date: Sat May 14 07:56:49 2005 +0000 +Date: Sat May 14 07:56:27 2005 +0000 Add AUTHORS file for X11 from xlibs tree. commit 3f8b0ba6071dcdd62ea424cab0bddb39db2ebe6a Author: Josh Triplett <josh(a)speakeasy.net> -Date: Sat May 14 07:55:10 2005 +0000 +Date: Sat May 14 07:54:48 2005 +0000 Add some COPYING files. commit 803c8ecaba2f8c703bbb46c0d740bfa349ce0245 Author: Kevin E Martin <kem(a)kem.org> -Date: Fri May 6 01:46:31 2005 +0000 +Date: Fri May 6 01:46:09 2005 +0000 Initial build system files for proto module. commit a870c60741273ebd6cb1e69b4e535ce3a6bc76bf Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> -Date: Thu Apr 28 22:04:12 2005 +0000 +Date: Thu Apr 28 22:03:50 2005 +0000 Don't define X_NOT_STDC_ENV on Solaris x86. Bugzilla #3158: https://bugs.freedesktop.org/show_bug.cgi?id=3158 Patch #2588: @@ -638,13 +739,13 @@ commit 372f37171ba3875ea4bf7f60150d92869e06010f Author: Alexander Gottwald <alexander.gottwald(a)s1999.tu-chemnitz.de> -Date: Wed Apr 20 13:58:17 2005 +0000 +Date: Wed Apr 20 13:57:55 2005 +0000 check for define PATH_MAX before referencing it commit e489ec65b4b2ab0a050d8dbf7ec0658e6decb8b3 Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> -Date: Wed Mar 2 19:29:31 2005 +0000 +Date: Wed Mar 2 19:29:09 2005 +0000 Patch #2007 <https://bugs.freedesktop.org/attachment.cgi?id=2007> 1) Fix Solaris #ifdefs to choose between UI/SVR4 (early POSIX draft) and @@ -655,7 +756,7 @@ commit d761e87224d3e60c5355ac3e3468835fc3b4be92 Author: Roland Mainz <roland.mainz(a)nrubsig.org> -Date: Wed Mar 2 11:20:29 2005 +0000 +Date: Wed Mar 2 11:20:07 2005 +0000 xc/config/cf/DragonFly.cf xc/config/cf/Imake.cf @@ -675,99 +776,99 @@ commit 1cae0cb4b1442b34d76ee5623fb2a17ed2353c50 Author: Alexander Gottwald <alexander.gottwald(a)s1999.tu-chemnitz.de> -Date: Sun Jan 9 15:06:04 2005 +0000 +Date: Sun Jan 9 15:05:42 2005 +0000 Make sure PATH_MAX is at least 1024 commit 9df4ffce552a0f6eca47764a3f79b466629e8bab Author: Egbert Eich <eich(a)suse.de> -Date: Mon Jan 3 18:03:49 2005 +0000 +Date: Mon Jan 3 18:03:27 2005 +0000 gcc 4 doesn't like predeffines line 'linux' any more. To muffle the compiler replace them with __linux__ (Bugzilla #2207). commit dd82af84ed67f439444e75ea1d032c082e15db51 Author: Alexander Gottwald <alexander.gottwald(a)s1999.tu-chemnitz.de> -Date: Mon Nov 15 15:06:53 2004 +0000 +Date: Mon Nov 15 15:06:31 2004 +0000 Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added mingw (Win32) port commit 618956f1f783a8c330aab8eac425937f0b8e50e1 Author: Markus Kuhn <Markus.Kuhn(a)cl.cam.ac.uk> -Date: Sun Sep 26 20:46:18 2004 +0000 +Date: Sun Sep 26 20:45:56 2004 +0000 The big keysym cleanup, to bring implementation in line with the recent revision of Appendix A of the protocol spec. (Markus Kuhn) commit 7cb1490d8932d745b3a5e2b3370a000da064306f Author: Kevin E Martin <kem(a)kem.org> -Date: Wed Aug 11 21:14:16 2004 +0000 +Date: Wed Aug 11 21:13:54 2004 +0000 Apply PPC64 build patch (Bug #303, Mike A. Harris, Alan Coopersmith). commit 5b67de2bce0e33a4a85439ebcf7b726a6da24545 Author: Egbert Eich <eich(a)suse.de> -Date: Fri Apr 23 18:43:05 2004 +0000 +Date: Fri Apr 23 18:42:43 2004 +0000 Merging XORG-CURRENT into trunk commit e88a09c1df46637979c4d131a8e41af923ff4d45 Author: Egbert Eich <eich(a)suse.de> -Date: Sun Mar 14 08:31:34 2004 +0000 +Date: Sun Mar 14 08:31:12 2004 +0000 Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 commit 9259b43390c50d330f557390cc4576f5315c3f53 Author: Egbert Eich <eich(a)suse.de> -Date: Wed Mar 3 12:10:53 2004 +0000 +Date: Wed Mar 3 12:10:31 2004 +0000 Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 commit 99bbbc3fcaf67b02a50e4ff4007225b1b64beb36 Author: Egbert Eich <eich(a)suse.de> -Date: Thu Feb 26 13:35:11 2004 +0000 +Date: Thu Feb 26 13:34:49 2004 +0000 readding XFree86's cvs IDs commit 82d7bb39bc84eb16134e931263f53bc88d1788ac Author: Egbert Eich <eich(a)suse.de> -Date: Thu Feb 26 09:22:24 2004 +0000 +Date: Thu Feb 26 09:22:02 2004 +0000 Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 commit 0700ff31a84abc06fdf4b05c2328ff2329dc909c Author: Egbert Eich <eich(a)suse.de> -Date: Thu Jan 29 08:07:54 2004 +0000 +Date: Thu Jan 29 08:07:32 2004 +0000 Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 commit ad76b5cc436937d9fb945bd43d9356651fe182ca Author: Kaleb Keithley <kaleb(a)freedesktop.org> -Date: Fri Dec 19 20:54:20 2003 +0000 +Date: Fri Dec 19 20:53:58 2003 +0000 XFree86 4.3.99.902 (RC 2) commit 376f9efdab6ef2dce267caa0a0228892e768e390 Author: Kaleb Keithley <kaleb(a)freedesktop.org> -Date: Tue Nov 25 19:28:01 2003 +0000 +Date: Tue Nov 25 19:27:39 2003 +0000 XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks commit 5ec315b967cb1ae519f514896f0b48fb5407f863 Author: Kaleb Keithley <kaleb(a)freedesktop.org> -Date: Fri Nov 14 16:48:42 2003 +0000 +Date: Fri Nov 14 16:48:20 2003 +0000 XFree86 4.3.0.1 commit f2001f5bd5316842106a98b23f09400688575fa3 Author: Kaleb Keithley <kaleb(a)freedesktop.org> -Date: Fri Nov 14 16:48:42 2003 +0000 +Date: Fri Nov 14 16:48:20 2003 +0000 Initial revision commit ee0a1a43dc707f960e637fdf2118723e4de0a55d Author: Kaleb Keithley <kaleb(a)freedesktop.org> -Date: Fri Nov 14 15:54:35 2003 +0000 +Date: Fri Nov 14 15:54:13 2003 +0000 R6.6 is the Xorg base-line 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/xproto-7.0.14/configure.ac new/xproto-7.0.15/configure.ac --- old/xproto-7.0.14/configure.ac 2008-10-23 13:47:33.000000000 +0200 +++ new/xproto-7.0.15/configure.ac 2009-03-02 18:54:21.000000000 +0100 @@ -1,10 +1,14 @@ AC_PREREQ([2.57]) -AC_INIT([Xproto], [7.0.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([Xproto], [7.0.15], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_CONFIG_HEADER([do-not-use-config.h]) AC_CONFIG_HEADER([Xfuncproto.h]) +# Require xorg-macros: XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + AC_CANONICAL_HOST m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) @@ -197,6 +201,7 @@ fi XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile Xpoll.h 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/xproto-7.0.14/keysymdef.h new/xproto-7.0.15/keysymdef.h --- old/xproto-7.0.14/keysymdef.h 2008-10-15 05:54:49.000000000 +0200 +++ new/xproto-7.0.15/keysymdef.h 2008-11-11 22:26:20.000000000 +0100 @@ -406,12 +406,30 @@ #define XK_dead_psili 0xfe64 /* alias for dead_abovecomma */ #define XK_dead_abovereversedcomma 0xfe65 #define XK_dead_dasia 0xfe65 /* alias for dead_abovereversedcomma */ +#define XK_dead_doublegrave 0xfe66 #define XK_dead_belowring 0xfe67 #define XK_dead_belowmacron 0xfe68 #define XK_dead_belowcircumflex 0xfe69 #define XK_dead_belowtilde 0xfe6a #define XK_dead_belowbreve 0xfe6b #define XK_dead_belowdiaeresis 0xfe6c +#define XK_dead_invertedbreve 0xfe6d +#define XK_dead_belowcomma 0xfe6e +#define XK_dead_currency 0xfe6f + +/* dead vowels for universal syllable entry */ +#define XK_dead_a 0xfe80 +#define XK_dead_A 0xfe81 +#define XK_dead_e 0xfe82 +#define XK_dead_E 0xfe83 +#define XK_dead_i 0xfe84 +#define XK_dead_I 0xfe85 +#define XK_dead_o 0xfe86 +#define XK_dead_O 0xfe87 +#define XK_dead_u 0xfe88 +#define XK_dead_U 0xfe89 +#define XK_dead_small_schwa 0xfe8a +#define XK_dead_capital_schwa 0xfe8b #define XK_First_Virtual_Screen 0xfed0 #define XK_Prev_Virtual_Screen 0xfed1 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/xproto-7.0.14/Makefile.am new/xproto-7.0.15/Makefile.am --- old/xproto-7.0.14/Makefile.am 2008-04-16 05:45:58.000000000 +0200 +++ new/xproto-7.0.15/Makefile.am 2009-01-29 20:37:39.000000000 +0100 @@ -32,14 +32,14 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xproto.pc -EXTRA_DIST = autogen.sh xproto.pc.in ChangeLog +EXTRA_DIST = xproto.pc.in ChangeLog CLEANFILES=ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog 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/xproto-7.0.14/XF86keysym.h new/xproto-7.0.15/XF86keysym.h --- old/xproto-7.0.14/XF86keysym.h 2008-10-15 05:54:49.000000000 +0200 +++ new/xproto-7.0.15/XF86keysym.h 2008-11-14 18:27:29.000000000 +0100 @@ -206,6 +206,9 @@ #define XF86XK_Yellow 0x1008FFA5 /* Yellow button */ #define XF86XK_Blue 0x1008FFA6 /* Blue button */ +#define XF86XK_Suspend 0x1008FFA7 /* Sleep to RAM */ +#define XF86XK_Hibernate 0x1008FFA8 /* Sleep to disk */ + /* Keys for special action keys (hot keys) */ /* Virtual terminals on some operating systems */ #define XF86XK_Switch_VT_1 0x1008FE01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-libxcb for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package xorg-x11-libxcb for openSUSE:Factory checked in at Tue Mar 3 18:17:36 CET 2009. -------- --- xorg-x11-libxcb/xorg-x11-libxcb.changes 2009-03-02 17:59:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-libxcb/xorg-x11-libxcb.changes 2009-03-02 21:24:38.912836677 +0100 @@ -1,0 +2,6 @@ +Mon Mar 2 21:13:44 CET 2009 - sndirsch(a)suse.de + +- create fake libxcb-xlib.so.0 instead of faking the Provides for + it + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libxcb.spec ++++++ --- /var/tmp/diff_new_pack.H10581/_old 2009-03-03 18:17:14.000000000 +0100 +++ /var/tmp/diff_new_pack.H10581/_new 2009-03-03 18:17:14.000000000 +0100 @@ -21,14 +21,14 @@ Name: xorg-x11-libxcb %define dirsuffix 1.2 BuildRequires: libxslt pkgconfig python-base python-xml xorg-x11-libXau-devel xorg-x11-proto-devel -%ifarch ppc64 s390x x86_64 -Provides: libxcb-xlib.so.0()(64bit) -%else -Provides: libxcb-xlib.so.0 -%endif +#%ifarch ppc64 s390x x86_64 +#Provides: libxcb-xlib.so.0()(64bit) +#%else +#Provides: libxcb-xlib.so.0 +#%endif Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 5 +Release: 6 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -79,6 +79,11 @@ %install make install DESTDIR=$RPM_BUILD_ROOT +# create fake libxcb-xlib.so.0 +> xcb-xlib.c +gcc -Wall -ansi -pedantic -c xcb-xlib.c -fPIC +ld -shared -soname libxcb-xlib.so.0 \ + -o $RPM_BUILD_ROOT/usr/%{_lib}/libxcb-xlib.so.0 xcb-xlib.o %clean rm -rf "$RPM_BUILD_ROOT" @@ -101,6 +106,9 @@ /usr/%{_lib}/pkgconfig/*.pc %changelog +* Mon Mar 02 2009 sndirsch(a)suse.de +- create fake libxcb-xlib.so.0 instead of faking the Provides for + it * Mon Mar 02 2009 ro(a)suse.de - extend last fix to baselibs.conf * Mon Mar 02 2009 sndirsch(a)suse.de ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.H10581/_old 2009-03-03 18:17:14.000000000 +0100 +++ /var/tmp/diff_new_pack.H10581/_new 2009-03-03 18:17:14.000000000 +0100 @@ -1,4 +1,4 @@ xorg-x11-libxcb - targettype 32bit provides "libxcb-xlib.so.0" - targettype 64bit provides "libxcb-xlib.so.0()(64bit)" + #targettype 32bit provides "libxcb-xlib.so.0" + #targettype 64bit provides "libxcb-xlib.so.0()(64bit)" xorg-x11-libxcb-devel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-libX11 for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package xorg-x11-libX11 for openSUSE:Factory checked in at Tue Mar 3 18:17:06 CET 2009. -------- --- xorg-x11-libX11/xorg-x11-libX11.changes 2009-03-01 20:42:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-libX11/xorg-x11-libX11.changes 2009-03-03 12:20:05.819882559 +0100 @@ -1,0 +2,7 @@ +Tue Mar 3 12:08:56 CET 2009 - sndirsch(a)suse.de + +- redone scim_swallow.diff (replaces scim_swallow1.diff/ + scim_swallow2.diff); disabled for now since it breaks scim + completely + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- scim_swallow1.diff scim_swallow2.diff New: ---- scim_swallow.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libX11.spec ++++++ --- /var/tmp/diff_new_pack.sx9659/_old 2009-03-03 18:16:57.000000000 +0100 +++ /var/tmp/diff_new_pack.sx9659/_new 2009-03-03 18:16:57.000000000 +0100 @@ -28,7 +28,7 @@ PreReq: coreutils Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 7 +Release: 8 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -51,8 +51,7 @@ Patch15: en-locales.diff Patch17: Xcms.diff Patch18: compose-zh_CN.UTF-8.diff -Patch19: scim_swallow1.diff -Patch20: scim_swallow2.diff +Patch19: scim_swallow.diff %description This package contains the X.Org X11 library. @@ -131,8 +130,7 @@ %patch15 -p0 %patch17 -p0 %patch18 -p0 -%patch19 -p1 -%patch20 -p1 +#%patch19 -p1 %build autoreconf -fi @@ -204,6 +202,10 @@ %{_mandir}/man3/* %changelog +* Tue Mar 03 2009 sndirsch(a)suse.de +- redone scim_swallow.diff (replaces scim_swallow1.diff/ + scim_swallow2.diff); disabled for now since it breaks scim + completely * Sun Mar 01 2009 sndirsch(a)suse.de - libX11 1.2 - obsoletes bug356556-bad_array_index.diff, ++++++ scim_swallow1.diff -> scim_swallow.diff ++++++ --- xorg-x11-libX11/scim_swallow1.diff 2009-03-01 20:29:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-libX11/scim_swallow.diff 2009-03-03 12:06:01.730292351 +0100 @@ -1,6 +1,44 @@ ---- a/modules/im/ximcp/imDefIc.c.orig 2009-03-01 20:20:31.000000000 +0100 -+++ a/modules/im/ximcp/imDefIc.c 2009-03-01 20:22:09.000000000 +0100 -@@ -974,8 +974,6 @@ _XimProtoSetFocus( +diff --git a/modules/im/ximcp/imDefFlt.c b/modules/im/ximcp/imDefFlt.c +index 685d515..fb12869 100644 +--- a/modules/im/ximcp/imDefFlt.c ++++ b/modules/im/ximcp/imDefFlt.c +@@ -143,13 +143,11 @@ _XimProtoKeypressFilter( + Xic ic, + XKeyEvent *ev) + { +-#ifdef XIM_CONNECTABLE + Xim im = (Xim)ic->core.im; +-#endif + +- if (IS_FABLICATED(ic)) { ++ if (IS_FABRICATED(im)) { + _XimPendingFilter(ic); +- UNMARK_FABLICATED(ic); ++ UNMARK_FABRICATED(im); + return NOTFILTERD; + } + +@@ -206,13 +204,11 @@ _XimProtoKeyreleaseFilter( + Xic ic, + XKeyEvent *ev) + { +-#ifdef XIM_CONNECTABLE + Xim im = (Xim)ic->core.im; +-#endif + +- if (IS_FABLICATED(ic)) { ++ if (IS_FABRICATED(im)) { + _XimPendingFilter(ic); +- UNMARK_FABLICATED(ic); ++ UNMARK_FABRICATED(im); + return NOTFILTERD; + } + +diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c +index 36ab101..dc1277f 100644 +--- a/modules/im/ximcp/imDefIc.c ++++ b/modules/im/ximcp/imDefIc.c +@@ -949,8 +949,6 @@ _XimProtoSetFocus( (void)_XimWrite(im, len, (XPointer)buf); _XimFlush(im); @@ -9,7 +47,7 @@ _XimRegisterFilter(ic); return; } -@@ -1023,8 +1021,6 @@ _XimProtoUnsetFocus( +@@ -996,8 +994,6 @@ _XimProtoUnsetFocus( (void)_XimWrite(im, len, (XPointer)buf); _XimFlush(im); @@ -18,45 +56,13 @@ _XimUnregisterFilter(ic); return; } ---- a/modules/im/ximcp/imDefLkup.c.orig 2009-03-01 20:20:31.000000000 +0100 -+++ a/modules/im/ximcp/imDefLkup.c 2009-03-01 20:24:45.000000000 +0100 -@@ -216,13 +216,8 @@ _XimRespSyncReply( - Xic ic, - BITMASK16 mode) - { -- if (mode & XimSYNCHRONUS) /* SYNC Request */ { -- if (IS_FOCUSED(ic)) -- MARK_NEED_SYNC_REPLY(ic); -- else -- _XimProcSyncReply((Xim)ic->core.im, ic); -- } -- -+ if (mode & XimSYNCHRONUS) /* SYNC Request */ -+ MARK_NEED_SYNC_REPLY(ic->core.im); - return True; - } - -@@ -359,7 +354,7 @@ _XimProcEvent( - ev->xany.serial |= serial << 16; - ev->xany.send_event = False; - ev->xany.display = d; -- MARK_FABLICATED(ic); -+ MARK_FABRICATED(ic->core.im); - return; - } - -@@ -712,7 +707,7 @@ _XimCommitRecv( - - if (ic->private.proto.registed_filter_event - & (KEYPRESS_MASK | KEYRELEASE_MASK)) -- MARK_FABLICATED(ic); -+ MARK_FABRICATED(im); - - ev.type = KeyPress; - ev.send_event = False; ---- libX11-1.1.4/modules/im/ximcp/imExten.c 2008-03-06 21:45:06.000000000 +0100 -+++ libX11-1.1.4.xim-fix/modules/im/ximcp/imExten.c 2008-10-30 16:41:19.000000000 +0100 -@@ -162,7 +162,7 @@ +diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c +index 7909e93..05be238 100644 +diff --git a/modules/im/ximcp/imExten.c b/modules/im/ximcp/imExten.c +index ea598e3..7eff6eb 100644 +--- a/modules/im/ximcp/imExten.c ++++ b/modules/im/ximcp/imExten.c +@@ -162,7 +162,7 @@ _XimProcExtForwardKeyEvent( XPutBackEvent(im->core.display, &ev); _XimRespSyncReply(ic, buf_s[0]); @@ -65,9 +71,11 @@ return True; } ---- libX11-1.1.4/src/xlibi18n/XimintP.h 2008-03-06 21:45:06.000000000 +0100 -+++ libX11-1.1.4.xim-fix/src/xlibi18n/XimintP.h 2008-10-30 16:41:19.000000000 +0100 -@@ -144,6 +144,8 @@ +diff --git a/src/xlibi18n/XimintP.h b/src/xlibi18n/XimintP.h +index bb99313..d51b85b 100644 +--- a/src/xlibi18n/XimintP.h ++++ b/src/xlibi18n/XimintP.h +@@ -144,6 +144,8 @@ typedef struct _XimProtoPrivateRec { #define DELAYBINDABLE (1L << 3) #define RECONNECTABLE (1L << 4) #endif /* XIM_CONNECTABLE */ @@ -76,7 +84,7 @@ /* * macro for the flag of XIMPrivateRec -@@ -182,6 +184,20 @@ +@@ -182,6 +184,20 @@ typedef struct _XimProtoPrivateRec { (((Xim)im)->private.proto.flag &= ~(DELAYBINDABLE|RECONNECTABLE)) #endif /* XIM_CONNECTABLE */ @@ -97,7 +105,7 @@ /* * bit mask for the register_filter_event of XIMPrivateRec/XICPrivateRec */ -@@ -242,9 +258,6 @@ +@@ -242,9 +258,6 @@ typedef struct _XicProtoPrivateRec { * bit mask for the flag of XICPrivateRec */ #define IC_CONNECTED (1L) @@ -107,7 +115,7 @@ /* * macro for the flag of XICPrivateRec -@@ -256,27 +269,6 @@ +@@ -256,27 +269,6 @@ typedef struct _XicProtoPrivateRec { #define UNMARK_IC_CONNECTED(ic) \ (((Xic)ic)->private.proto.flag &= ~IC_CONNECTED) @@ -135,3 +143,38 @@ /* * macro for the filter_event_mask of XICPrivateRec */ +--- libX11-1.2/modules/im/ximcp/imDefLkup.c.orig 2009-03-03 11:59:48.000000000 +0100 ++++ libX11-1.2/modules/im/ximcp/imDefLkup.c 2009-03-03 12:04:07.000000000 +0100 +@@ -216,12 +216,8 @@ _XimRespSyncReply( + Xic ic, + BITMASK16 mode) + { +- if (mode & XimSYNCHRONUS) /* SYNC Request */ { +- if (IS_FOCUSED(ic)) +- MARK_NEED_SYNC_REPLY(ic); +- else +- _XimProcSyncReply((Xim)ic->core.im, ic); +- } ++ if (mode & XimSYNCHRONUS) /* SYNC Request */ ++ MARK_NEED_SYNC_REPLY(ic->core.im); + + return True; + } +@@ -359,7 +355,7 @@ _XimProcEvent( + ev->xany.serial |= serial << 16; + ev->xany.send_event = False; + ev->xany.display = d; +- MARK_FABLICATED(ic); ++ MARK_FABRICATED(ic->core.im); + return; + } + +@@ -712,7 +708,7 @@ _XimCommitRecv( + + if (ic->private.proto.registed_filter_event + & (KEYPRESS_MASK | KEYRELEASE_MASK)) +- MARK_FABLICATED(ic); ++ MARK_FABRICATED(im); + + ev.type = KeyPress; + ev.send_event = False; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-libICE for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package xorg-x11-libICE for openSUSE:Factory checked in at Tue Mar 3 18:16:49 CET 2009. -------- --- xorg-x11-libICE/xorg-x11-libICE.changes 2008-09-11 14:20:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-libICE/xorg-x11-libICE.changes 2009-03-03 15:45:09.479225265 +0100 @@ -1,0 +2,5 @@ +Tue Mar 3 15:44:39 CET 2009 - sndirsch(a)suse.de + +- libICE 1.0.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libICE-1.0.4.tar.bz2 New: ---- libICE-1.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libICE.spec ++++++ --- /var/tmp/diff_new_pack.Cr8275/_old 2009-03-03 18:15:43.000000000 +0100 +++ /var/tmp/diff_new_pack.Cr8275/_new 2009-03-03 18:15:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-libICE (Version 7.4) # -# 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,11 +19,11 @@ Name: xorg-x11-libICE -%define dirsuffix 1.0.4 +%define dirsuffix 1.0.5 BuildRequires: pkgconfig xorg-x11-proto-devel xorg-x11-xtrans-devel Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 1 +Release: 4 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -102,12 +102,14 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Mar 03 2009 sndirsch(a)suse.de +- libICE 1.0.5 * Thu Sep 11 2008 sndirsch(a)suse.de - bumped release number to 7.4 * Thu Apr 10 2008 ro(a)suse.de - added baselibs.conf file to build xxbit packages for multilib support -* Wed Jan 02 2008 crrodriguez(a)suse.de +* Tue Jan 01 2008 crrodriguez(a)suse.de - fix library-without-ldconfig-* error - add missing PreReq coreutils * Sat Sep 29 2007 sndirsch(a)suse.de ++++++ libICE-1.0.4.tar.bz2 -> libICE-1.0.5.tar.bz2 ++++++ ++++ 33112 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Tue Mar 3 18:15:05 CET 2009. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-02-28 11:59:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-03-03 15:19:20.766312785 +0100 @@ -1,0 +2,6 @@ +Tue Mar 3 15:16:26 CET 2009 - sndirsch(a)suse.de + +- xf86-video-ast 0.88.8 +- xf86-video-intel 2.6.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-video-ast-0.87.0.tar.bz2 xf86-video-intel-2.6.2.tar.bz2 New: ---- xf86-video-ast-0.88.8.tar.bz2 xf86-video-intel-2.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.vK4189/_old 2009-03-03 18:14:48.000000000 +0100 +++ /var/tmp/diff_new_pack.vK4189/_new 2009-03-03 18:14:48.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: 42 +Release: 43 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -35,7 +35,7 @@ ExcludeArch: s390 s390x Source0: xf86-video-apm-1.2.1.tar.bz2 Source1: xf86-video-ark-0.7.1.tar.bz2 -Source2: xf86-video-ast-0.87.0.tar.bz2 +Source2: xf86-video-ast-0.88.8.tar.bz2 Source4: xf86-video-chips-1.2.1.tar.bz2 Source5: xf86-video-cirrus-1.2.1.tar.bz2 Source7: xf86-video-dummy-0.3.1.tar.bz2 @@ -66,7 +66,7 @@ Source42: xf86-video-voodoo-1.2.1.tar.bz2 Source43: xf86-video-impact-0.2.0.tar.bz2 Source44: HALlib-4.1.tar.gz -Source45: xf86-video-intel-2.6.2.tar.bz2 +Source45: xf86-video-intel-2.6.3.tar.bz2 Source46: xf86-video-ati-6.11.0.tar.bz2 Source48: xf86-video-mga-1.9.100.tar.bz2 Source50: xf86-video-xgi-1.5.0.tar.bz2 @@ -277,6 +277,9 @@ /var/lib/hardware/ids/20.%{name} %changelog +* Tue Mar 03 2009 sndirsch(a)suse.de +- xf86-video-ast 0.88.8 +- xf86-video-intel 2.6.3 * Fri Feb 27 2009 sndirsch(a)suse.de - xf86-video-sisusb 0.9.1 - disabled build of mga-1.9.100, vga, xgi ++++++ xf86-video-ast-0.87.0.tar.bz2 -> xf86-video-ast-0.88.8.tar.bz2 ++++++ ++++ 15624 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-ast-0.87.0/ChangeLog new/xf86-video-ast-0.88.8/ChangeLog --- old/xf86-video-ast-0.87.0/ChangeLog 2008-12-22 05:18:28.000000000 +0100 +++ new/xf86-video-ast-0.88.8/ChangeLog 2009-01-16 07:52:37.000000000 +0100 @@ -1,3 +1,21 @@ +2009-01-16 Y.C. Chen <yc_chen(a)aspedtech.com> + * src/ast_driver.c + - Fixed Support Modes Incorrect Issues on Solaris 10 x86 + +2009-01-08 Y.C. Chen >yc_chen(a)aspedtech.com> + * src/ast.h + * src/ast_driver.c + * src/ast_2dtool.c, ast_2dtool.h + * src/ast_accel.c + * src/ast_cursor.c + * src/ast_mode.c + * src/ast_vgatool.c + - Support AST2200/2150 + - Support ASPEED Graphics as Secondary + - Fixed AST1100 1280x1024x32bpp thershold issue + - Fixed Screen saver - celtic, DecayScreen abnormal issues + - Fixed Game - Potato Guys abnormal issue + 2008-08-22 Y.C. Chen <yc_chen(a)aspeedtech.com> * src/ast.h * src/ast_driver.c 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-ast-0.87.0/configure.ac new/xf86-video-ast-0.88.8/configure.ac --- old/xf86-video-ast-0.87.0/configure.ac 2008-12-22 05:18:28.000000000 +0100 +++ new/xf86-video-ast-0.88.8/configure.ac 2009-01-16 07:53:45.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-ast], - 0.87.0, + 0.88.8, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-ast) 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-ast-0.87.0/src/ast_2dtool.c new/xf86-video-ast-0.88.8/src/ast_2dtool.c --- old/xf86-video-ast-0.87.0/src/ast_2dtool.c 2008-12-22 05:18:28.000000000 +0100 +++ new/xf86-video-ast-0.88.8/src/ast_2dtool.c 2009-01-16 07:50:21.000000000 +0100 @@ -189,6 +189,22 @@ Bool bEnable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST) { + ULONG ulData; + + switch (pAST->jChipType) + { + case AST2100: + case AST1100: + case AST2200: + case AST2150: + *(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = 0x1e6e0000; + *(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x1; + + ulData = *(ULONG *) (pAST->MMIOVirtualAddr + 0x1200c); + *(ULONG *) (pAST->MMIOVirtualAddr + 0x1200c) = (ulData & 0xFFFFFFFD); + break; + } + SetIndexRegMask(CRTC_PORT, 0xA4, 0xFE, 0x01); /* enable 2D */ if (!bInitCMDQInfo(pScrn, pAST)) 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-ast-0.87.0/src/ast_accel.c new/xf86-video-ast-0.88.8/src/ast_accel.c --- old/xf86-video-ast-0.87.0/src/ast_accel.c 2008-03-10 00:45:27.000000000 +0100 +++ new/xf86-video-ast-0.88.8/src/ast_accel.c 2009-01-16 07:50:21.000000000 +0100 @@ -316,6 +316,10 @@ ASTSetupSRCPitch(pSingleCMD, pAST->VideoModeInfo.ScreenPitch); pSingleCMD++; ASTSetupDSTPitchHeight(pSingleCMD, pAST->VideoModeInfo.ScreenPitch, -1); + + /* Update Write Pointer */ + mUpdateWritePointer; + } else { @@ -337,83 +341,91 @@ /* xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentScreenToScreenCopy\n"); */ - - /* Modify Reg. Value */ - cmdreg = pAST->ulCMDReg; - if (pAST->EnableClip) - cmdreg |= CMD_ENABLE_CLIP; - else - cmdreg &= ~CMD_ENABLE_CLIP; - srcbase = dstbase = 0; - if (y1 >= MAX_SRC_Y) - { - srcbase=pAST->VideoModeInfo.ScreenPitch*y1; - y1=0; - } + if ((width != 0) && (height != 0)) + { + /* Modify Reg. Value */ + cmdreg = pAST->ulCMDReg; + if (pAST->EnableClip) + cmdreg |= CMD_ENABLE_CLIP; + else + cmdreg &= ~CMD_ENABLE_CLIP; + srcbase = dstbase = 0; - if (y2 >= pScrn->virtualY) - { - dstbase=pAST->VideoModeInfo.ScreenPitch*y2; - y2=0; - } + if (y1 >= MAX_SRC_Y) + { + srcbase=pAST->VideoModeInfo.ScreenPitch*y1; + } + + if (y2 >= pScrn->virtualY) + { + dstbase=pAST->VideoModeInfo.ScreenPitch*y2; + } + + if (x1 < x2) + { + src_x = x1 + width - 1; + dst_x = x2 + width - 1; + cmdreg |= CMD_X_DEC; + } + else + { + src_x = x1; + dst_x = x2; + } + + if (y1 < y2) + { + if (srcbase) y1 = 0; + if (dstbase) y2 = 0; + + src_y = y1 + height - 1; + dst_y = y2 + height - 1; + cmdreg |= CMD_Y_DEC; + } + else + { + if (srcbase) y1 = 0; + if (dstbase) y2 = 0; + + src_y = y1; + dst_y = y2; + } + + if (!pAST->MMIO2D) + { + /* Write to CMDQ */ + pSingleCMD = (PKT_SC *) pjRequestCMDQ(pAST, PKT_SINGLE_LENGTH*6); - if (x1 < x2) - { - src_x = x1 + width - 1; - dst_x = x2 + width - 1; - cmdreg |= CMD_X_DEC; - } - else - { - src_x = x1; - dst_x = x2; - } - - if (y1 < y2) - { - src_y = y1 + height - 1; - dst_y = y2 + height - 1; - cmdreg |= CMD_Y_DEC; - } - else - { - src_y = y1; - dst_y = y2; - } + ASTSetupSRCBase(pSingleCMD, srcbase); + pSingleCMD++; + ASTSetupDSTBase(pSingleCMD, dstbase); + pSingleCMD++; + ASTSetupDSTXY(pSingleCMD, dst_x, dst_y); + pSingleCMD++; + ASTSetupSRCXY(pSingleCMD, src_x, src_y); + pSingleCMD++; + ASTSetupRECTXY(pSingleCMD, width, height); + pSingleCMD++; + ASTSetupCMDReg(pSingleCMD, cmdreg); + + /* Update Write Pointer */ + mUpdateWritePointer; - if (!pAST->MMIO2D) - { - /* Write to CMDQ */ - pSingleCMD = (PKT_SC *) pjRequestCMDQ(pAST, PKT_SINGLE_LENGTH*6); - - ASTSetupSRCBase(pSingleCMD, srcbase); - pSingleCMD++; - ASTSetupDSTBase(pSingleCMD, dstbase); - pSingleCMD++; - ASTSetupDSTXY(pSingleCMD, dst_x, dst_y); - pSingleCMD++; - ASTSetupSRCXY(pSingleCMD, src_x, src_y); - pSingleCMD++; - ASTSetupRECTXY(pSingleCMD, width, height); - pSingleCMD++; - ASTSetupCMDReg(pSingleCMD, cmdreg); - - /* Update Write Pointer */ - mUpdateWritePointer; - - } - else - { - ASTSetupSRCBase_MMIO(srcbase); - ASTSetupDSTBase_MMIO(dstbase); - ASTSetupDSTXY_MMIO(dst_x, dst_y); - ASTSetupSRCXY_MMIO(src_x, src_y); - ASTSetupRECTXY_MMIO(width, height); - ASTSetupCMDReg_MMIO(cmdreg); - - vWaitEngIdle(pScrn, pAST); - } + } + else + { + ASTSetupSRCBase_MMIO(srcbase); + ASTSetupDSTBase_MMIO(dstbase); + ASTSetupDSTXY_MMIO(dst_x, dst_y); + ASTSetupSRCXY_MMIO(src_x, src_y); + ASTSetupRECTXY_MMIO(width, height); + ASTSetupCMDReg_MMIO(cmdreg); + + vWaitEngIdle(pScrn, pAST); + } + + } /* width & height check */ } /* end of ASTSubsequentScreenToScreenCopy */ @@ -455,7 +467,11 @@ ASTSetupDSTPitchHeight(pSingleCMD, pAST->VideoModeInfo.ScreenPitch, -1); pSingleCMD++; - ASTSetupFG(pSingleCMD, color); + ASTSetupFG(pSingleCMD, color); + + /* Update Write Pointer */ + mUpdateWritePointer; + } else { @@ -477,47 +493,51 @@ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentSolidFillRect\n"); */ - /* Modify Reg. Value */ - cmdreg = pAST->ulCMDReg; - if (pAST->EnableClip) - cmdreg |= CMD_ENABLE_CLIP; - else - cmdreg &= ~CMD_ENABLE_CLIP; - dstbase = 0; - - if (dst_y >= pScrn->virtualY) - { - dstbase=pAST->VideoModeInfo.ScreenPitch*dst_y; - dst_y=0; - } - - if (!pAST->MMIO2D) - { - /* Write to CMDQ */ - pSingleCMD = (PKT_SC *) pjRequestCMDQ(pAST, PKT_SINGLE_LENGTH*4); - - ASTSetupDSTBase(pSingleCMD, dstbase); - pSingleCMD++; - ASTSetupDSTXY(pSingleCMD, dst_x, dst_y); - pSingleCMD++; - ASTSetupRECTXY(pSingleCMD, width, height); - pSingleCMD++; - ASTSetupCMDReg(pSingleCMD, cmdreg); - - /* Update Write Pointer */ - mUpdateWritePointer; - - } - else - { - ASTSetupDSTBase_MMIO(dstbase); - ASTSetupDSTXY_MMIO(dst_x, dst_y); - ASTSetupRECTXY_MMIO(width, height); - ASTSetupCMDReg_MMIO(cmdreg); - - vWaitEngIdle(pScrn, pAST); - - } + if ((width != 0) && (height != 0)) + { + /* Modify Reg. Value */ + cmdreg = pAST->ulCMDReg; + if (pAST->EnableClip) + cmdreg |= CMD_ENABLE_CLIP; + else + cmdreg &= ~CMD_ENABLE_CLIP; + dstbase = 0; + + if (dst_y >= pScrn->virtualY) + { + dstbase=pAST->VideoModeInfo.ScreenPitch*dst_y; + dst_y=0; + } + + if (!pAST->MMIO2D) + { + /* Write to CMDQ */ + pSingleCMD = (PKT_SC *) pjRequestCMDQ(pAST, PKT_SINGLE_LENGTH*4); + + ASTSetupDSTBase(pSingleCMD, dstbase); + pSingleCMD++; + ASTSetupDSTXY(pSingleCMD, dst_x, dst_y); + pSingleCMD++; + ASTSetupRECTXY(pSingleCMD, width, height); + pSingleCMD++; + ASTSetupCMDReg(pSingleCMD, cmdreg); + + /* Update Write Pointer */ + mUpdateWritePointer; + + } + else + { + ASTSetupDSTBase_MMIO(dstbase); + ASTSetupDSTXY_MMIO(dst_x, dst_y); + ASTSetupRECTXY_MMIO(width, height); + ASTSetupCMDReg_MMIO(cmdreg); + + vWaitEngIdle(pScrn, pAST); + + } + + } /* width & height check */ } /* end of ASTSubsequentSolidFillRect */ @@ -563,6 +583,9 @@ pSingleCMD++; ASTSetupBG(pSingleCMD, 0); + /* Update Write Pointer */ + mUpdateWritePointer; + } else { @@ -586,58 +609,61 @@ /* xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentSolidHorVertLine\n"); */ - - /* Modify Reg. Value */ - cmdreg = (pAST->ulCMDReg & (~CMD_MASK)) | CMD_BITBLT; - if (pAST->EnableClip) - cmdreg |= CMD_ENABLE_CLIP; - else - cmdreg &= ~CMD_ENABLE_CLIP; - dstbase = 0; - - if(dir == DEGREES_0) { /* horizontal */ - width = len; - height = 1; - } else { /* vertical */ - width = 1; - height = len; - } - - if ((y + height) >= pScrn->virtualY) - { - dstbase=pAST->VideoModeInfo.ScreenPitch*y; - y=0; - } - - - if (!pAST->MMIO2D) - { - /* Write to CMDQ */ - pSingleCMD = (PKT_SC *) pjRequestCMDQ(pAST, PKT_SINGLE_LENGTH*4); - - ASTSetupDSTBase(pSingleCMD, dstbase); - pSingleCMD++; - ASTSetupDSTXY(pSingleCMD, x, y); - pSingleCMD++; - ASTSetupRECTXY(pSingleCMD, width, height); - pSingleCMD++; - ASTSetupCMDReg(pSingleCMD, cmdreg); - - /* Update Write Pointer */ - mUpdateWritePointer; - - } - else - { - ASTSetupDSTBase_MMIO(dstbase); - ASTSetupDSTXY_MMIO(x, y); - ASTSetupRECTXY_MMIO(width, height); - ASTSetupCMDReg_MMIO(cmdreg); - - vWaitEngIdle(pScrn, pAST); - - } + if (len != 0) + { + /* Modify Reg. Value */ + cmdreg = (pAST->ulCMDReg & (~CMD_MASK)) | CMD_BITBLT; + if (pAST->EnableClip) + cmdreg |= CMD_ENABLE_CLIP; + else + cmdreg &= ~CMD_ENABLE_CLIP; + dstbase = 0; + + if(dir == DEGREES_0) { /* horizontal */ + width = len; + height = 1; + } else { /* vertical */ + width = 1; + height = len; + } + + if ((y + height) >= pScrn->virtualY) + { + dstbase=pAST->VideoModeInfo.ScreenPitch*y; + y=0; + } + + + if (!pAST->MMIO2D) + { + /* Write to CMDQ */ + pSingleCMD = (PKT_SC *) pjRequestCMDQ(pAST, PKT_SINGLE_LENGTH*4); + + ASTSetupDSTBase(pSingleCMD, dstbase); + pSingleCMD++; + ASTSetupDSTXY(pSingleCMD, x, y); + pSingleCMD++; + ASTSetupRECTXY(pSingleCMD, width, height); + pSingleCMD++; + ASTSetupCMDReg(pSingleCMD, cmdreg); + + /* Update Write Pointer */ + mUpdateWritePointer; + + } + else + { + ASTSetupDSTBase_MMIO(dstbase); + ASTSetupDSTXY_MMIO(x, y); + ASTSetupRECTXY_MMIO(width, height); + ASTSetupCMDReg_MMIO(cmdreg); + + vWaitEngIdle(pScrn, pAST); + + } + + } /* len check */ } /* end of ASTSubsequentSolidHorVertLine */ @@ -674,7 +700,7 @@ y1 -= miny; y2 -= miny; } - + LineInfo.X1 = x1; LineInfo.Y1 = y1; LineInfo.X2 = x2; @@ -783,7 +809,10 @@ pSingleCMD++; ASTSetupLineStyle1(pSingleCMD, *pattern); pSingleCMD++; - ASTSetupLineStyle2(pSingleCMD, *(pattern+4)); + ASTSetupLineStyle2(pSingleCMD, *(pattern+4)); + + /* Update Write Pointer */ + mUpdateWritePointer; } else @@ -825,7 +854,7 @@ if (pAST->EnableClip) ulCommand |= CMD_ENABLE_CLIP; else - ulCommand &= ~CMD_ENABLE_CLIP; + ulCommand &= ~CMD_ENABLE_CLIP; dstbase = 0; miny = (y1 > y2) ? y2 : y1; maxy = (y1 > y2) ? y1 : y2; @@ -834,7 +863,7 @@ y1 -= miny; y2 -= miny; } - + LineInfo.X1 = x1; LineInfo.Y1 = y1; LineInfo.X2 = x2; @@ -873,7 +902,7 @@ /* Patch KDE pass abnormal point, ycchen@052507 */ vWaitEngIdle(pScrn, pAST); - + } else { @@ -937,7 +966,11 @@ pSingleCMD++; ASTSetupMONO1(pSingleCMD, patx); pSingleCMD++; - ASTSetupMONO2(pSingleCMD, paty); + ASTSetupMONO2(pSingleCMD, paty); + + /* Update Write Pointer */ + mUpdateWritePointer; + } else { @@ -968,7 +1001,7 @@ if (pAST->EnableClip) cmdreg |= CMD_ENABLE_CLIP; else - cmdreg &= ~CMD_ENABLE_CLIP; + cmdreg &= ~CMD_ENABLE_CLIP; dstbase = 0; if (dst_y >= pScrn->virtualY) @@ -1056,7 +1089,11 @@ ASTSetupPatReg(pSingleCMD, (i*j + j) , (*(CARD32 *) (pataddr++))); pSingleCMD++; } - } + } + + /* Update Write Pointer */ + mUpdateWritePointer; + } else { @@ -1089,7 +1126,7 @@ if (pAST->EnableClip) cmdreg |= CMD_ENABLE_CLIP; else - cmdreg &= ~CMD_ENABLE_CLIP; + cmdreg &= ~CMD_ENABLE_CLIP; dstbase = 0; if (dst_y >= pScrn->virtualY) @@ -1174,6 +1211,9 @@ ASTSetupFG(pSingleCMD, fg); pSingleCMD++; ASTSetupBG(pSingleCMD, bg); + + /* Update Write Pointer */ + mUpdateWritePointer; } else @@ -1205,7 +1245,7 @@ if (pAST->EnableClip) cmdreg |= CMD_ENABLE_CLIP; else - cmdreg &= ~CMD_ENABLE_CLIP; + cmdreg &= ~CMD_ENABLE_CLIP; dstbase = 0; if (dst_y >= pScrn->virtualY) @@ -1298,6 +1338,9 @@ ASTSetupFG(pSingleCMD, fg); pSingleCMD++; ASTSetupBG(pSingleCMD, bg); + + /* Update Write Pointer */ + mUpdateWritePointer; } else @@ -1398,7 +1441,11 @@ ASTSetupCLIP1(pSingleCMD, left, top); pSingleCMD++; - ASTSetupCLIP2(pSingleCMD, right, bottom); + ASTSetupCLIP2(pSingleCMD, right, bottom); + + /* Update Write Pointer */ + mUpdateWritePointer; + } else { @@ -1418,5 +1465,4 @@ pAST->EnableClip = FALSE; } - #endif /* end of Accel_2D */ 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-ast-0.87.0/src/ast_cursor.c new/xf86-video-ast-0.88.8/src/ast_cursor.c --- old/xf86-video-ast-0.87.0/src/ast_cursor.c 2008-03-10 00:45:27.000000000 +0100 +++ new/xf86-video-ast-0.88.8/src/ast_cursor.c 2009-01-16 07:50:21.000000000 +0100 @@ -242,6 +242,12 @@ ulTempDstAnd32[1] = ((jTempSrcAnd32 >> (k-1)) & 0x01) ? 0x80000000L:0x00L; ulTempDstXor32[1] = ((jTempSrcXor32 >> (k-1)) & 0x01) ? 0x40000000L:0x00L; ulTempDstData32[1] = ((jTempSrcXor32 >> (k-1)) & 0x01) ? (pAST->HWCInfo.fg << 16):(pAST->HWCInfo.bg << 16); + ulTempDstData32[1] = ((jTempSrcXor32 >> (k-1)) & 0x01) ? (pAST->HWCInfo.fg << 16):(pAST->HWCInfo.bg << 16); + /* No inverse for X Window cursor, ycchen@111808 */ + if (ulTempDstAnd32[0]) + ulTempDstXor32[0] = 0; + if (ulTempDstAnd32[1]) + ulTempDstXor32[1] = 0; *((ULONG *) pjDstData) = ulTempDstAnd32[0] | ulTempDstXor32[0] | ulTempDstData32[0] | ulTempDstAnd32[1] | ulTempDstXor32[1] | ulTempDstData32[1]; ulCheckSum += *((ULONG *) pjDstData); pjDstData += 4; @@ -276,6 +282,9 @@ static Bool ASTUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) { + if ( (pCurs->bits->width > MAX_HWC_WIDTH) || (pCurs->bits->height > MAX_HWC_HEIGHT) ) + return FALSE; + return TRUE; } @@ -377,6 +386,9 @@ static Bool ASTUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs) { + if ( (pCurs->bits->width > MAX_HWC_WIDTH) || (pCurs->bits->height > MAX_HWC_HEIGHT) ) + return FALSE; + return TRUE; } 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-ast-0.87.0/src/ast_driver.c new/xf86-video-ast-0.88.8/src/ast_driver.c --- old/xf86-video-ast-0.87.0/src/ast_driver.c 2008-12-22 05:18:28.000000000 +0100 +++ new/xf86-video-ast-0.88.8/src/ast_driver.c 2009-01-16 07:51:00.000000000 +0100 @@ -72,6 +72,7 @@ extern void vSetStartAddressCRT1(ASTRecPtr pAST, ULONG base); extern Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); extern Bool GetVGA2EDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer); +extern void vInitDRAMReg(ScrnInfoPtr pScrn); extern Bool bInitCMDQInfo(ScrnInfoPtr pScrn, ASTRecPtr pAST); extern Bool bEnableCMDQ(ScrnInfoPtr pScrn, ASTRecPtr pAST); @@ -123,8 +124,8 @@ /* Chipsets */ static SymTabRec ASTChipsets[] = { - {PCI_CHIP_AST2000, "AST2000 Family"}, - {PCI_CHIP_AST2100, "AST1100_2050_2100"}, + {PCI_CHIP_AST2000, "ASPEED Graphics Family"}, + {PCI_CHIP_AST2100, "ASPEED Graphics Family"}, {-1, NULL} }; @@ -223,6 +224,7 @@ "xf86InitInt10", "xf86Int10AllocPages", "xf86int10Addr", + "xf86FreeInt10", NULL }; @@ -600,7 +602,7 @@ from = X_CONFIG; } else { if (PCI_REGION_BASE(pAST->PciInfo, 1, REGION_MEM)) { - pAST->MMIOPhysAddr = PCI_REGION_BASE(pAST->PciInfo, 1, REGION_IO) & 0xFFFF0000; + pAST->MMIOPhysAddr = PCI_REGION_BASE(pAST->PciInfo, 1, REGION_MEM) & 0xFFFF0000; from = X_PROBED; } else { xf86DrvMsg(pScrn->scrnIndex, X_INFO, @@ -612,38 +614,58 @@ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "IO registers at addr 0x%lX\n", (unsigned long) pAST->MMIOPhysAddr); + /* Map MMIO */ + pAST->MMIOMapSize = DEFAULT_MMIO_SIZE; + if (!ASTMapMMIO(pScrn)) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Map Memory Map IO Failed \n"); + return FALSE; + } + + /* Init VGA Adapter */ + if (!xf86IsPrimaryPci(pAST->PciInfo)) + { + if (xf86LoadSubModule(pScrn, "int10")) { + xf86Int10InfoPtr pInt10; + xf86LoaderReqSymLists(int10Symbols, NULL); + xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n"); + pInt10 = xf86InitInt10(pAST->pEnt->index); + xf86FreeInt10(pInt10); + } + } + + vASTOpenKey(pScrn); + bASTRegInit(pScrn); + + /* Get Chip Type */ + if (PCI_DEV_REVISION(pAST->PciInfo) >= 0x10) + GetChipType(pScrn); + else + pAST->jChipType = AST2000; + + if (!xf86IsPrimaryPci(pAST->PciInfo)) + { + vInitDRAMReg (pScrn); + } + + /* Map Framebuffer */ pScrn->videoRam = GetVRAMInfo(pScrn) / 1024; from = X_DEFAULT; - if (pAST->pEnt->device->videoRam) { pScrn->videoRam = pAST->pEnt->device->videoRam; from = X_CONFIG; } - + pAST->FbMapSize = pScrn->videoRam * 1024; - pAST->MMIOMapSize = DEFAULT_MMIO_SIZE; - - /* Map resource */ + if (!ASTMapMem(pScrn)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Map FB Memory Failed \n"); return FALSE; } - - if (!ASTMapMMIO(pScrn)) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Map Memory Map IO Failed \n"); - return FALSE; - } pScrn->memPhysBase = (ULONG)pAST->FBPhysAddr; pScrn->fbOffset = 0; - /* Get Revision */ - if (PCI_DEV_REVISION(pAST->PciInfo) >= 0x10) - GetChipType(pScrn); - else - pAST->jChipType = AST2000; - /* Do DDC * should be done after xf86CollectOptions */ @@ -659,7 +681,7 @@ clockRanges->doubleScanAllowed = FALSE; /* Add for AST2100, ycchen@061807 */ - if (pAST->jChipType == AST2100) + if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST2200)) i = xf86ValidateModes(pScrn, pScrn->monitor->Modes, pScrn->display->modes, clockRanges, 0, 320, 1920, 8 * pScrn->bitsPerPixel, @@ -1020,7 +1042,7 @@ } /* Add for AST2100, ycchen@061807 */ - if (pAST->jChipType == AST2100) + if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST2200)) { if ( (mode->CrtcHDisplay == 1920) && (mode->CrtcVDisplay == 1200) ) return MODE_OK; @@ -1084,7 +1106,6 @@ static Bool ASTSaveScreen(ScreenPtr pScreen, Bool unblack) { - /* more ref. SiS */ return vgaHWSaveScreen(pScreen, unblack); } @@ -1148,7 +1169,12 @@ astReg = &pAST->SavedReg; /* do save */ - vgaHWSave(pScrn, vgaReg, VGA_SR_ALL); + if (xf86IsPrimaryPci(pAST->PciInfo)) { + vgaHWSave(pScrn, vgaReg, VGA_SR_ALL); + } + else { + vgaHWSave(pScrn, vgaReg, VGA_SR_MODE); + } /* Ext. Save */ vASTOpenKey(pScrn); @@ -1175,8 +1201,11 @@ astReg = &pAST->SavedReg; /* do restore */ - vgaHWProtect(pScrn, TRUE); - vgaHWRestore(pScrn, vgaReg, VGA_SR_ALL); + vgaHWProtect(pScrn, TRUE); + if (xf86IsPrimaryPci(pAST->PciInfo)) + vgaHWRestore(pScrn, vgaReg, VGA_SR_ALL); + else + vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE); vgaHWProtect(pScrn, FALSE); /* Ext. restore */ @@ -1230,7 +1259,7 @@ MonInfo = MonInfo1; /* For VGA2 CLONE Support, ycchen@012508 */ - if (xf86ReturnOptValBool(pAST->Options, OPTION_VGA2_CLONE, FALSE)) { + if ((xf86ReturnOptValBool(pAST->Options, OPTION_VGA2_CLONE, FALSE)) || pAST->VGA2Clone) { if (GetVGA2EDID(pScrn, DDC_data) == TRUE) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Get VGA2 EDID Correctly!! \n"); MonInfo2 = xf86InterpretEDID(pScrn->scrnIndex, DDC_data); 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-ast-0.87.0/src/ast.h new/xf86-video-ast-0.88.8/src/ast.h --- old/xf86-video-ast-0.87.0/src/ast.h 2008-12-22 05:18:28.000000000 +0100 +++ new/xf86-video-ast-0.88.8/src/ast.h 2009-01-16 07:50:21.000000000 +0100 @@ -48,7 +48,9 @@ VGALegacy, AST2000, AST2100, - AST1100 + AST1100, + AST2200, + AST2150 } CHIP_ID; /* AST REC Info */ @@ -161,6 +163,7 @@ Bool MMIO2D; int ENGCaps; int DBGSelect; + Bool VGA2Clone; ULONG FBPhysAddr; /* Frame buffer physical address */ ULONG MMIOPhysAddr; /* MMIO region physical address */ 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-ast-0.87.0/src/ast_mode.c new/xf86-video-ast-0.88.8/src/ast_mode.c --- old/xf86-video-ast-0.87.0/src/ast_mode.c 2008-12-22 05:18:28.000000000 +0100 +++ new/xf86-video-ast-0.88.8/src/ast_mode.c 2009-01-16 07:50:21.000000000 +0100 @@ -684,8 +684,16 @@ SetIndexRegMask(CRTC_PORT,0xA8, 0xFD, (UCHAR) jRegA8); /* Set Threshold */ - SetIndexReg(CRTC_PORT,0xA7, 0x2F); - SetIndexReg(CRTC_PORT,0xA6, 0x1F); + if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST1100) || (pAST->jChipType == AST2200) || (pAST->jChipType == AST2150) ) + { + SetIndexReg(CRTC_PORT,0xA7, 0x3F); + SetIndexReg(CRTC_PORT,0xA6, 0x2F); + } + else + { + SetIndexReg(CRTC_PORT,0xA7, 0x2F); + SetIndexReg(CRTC_PORT,0xA6, 0x1F); + } } 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-ast-0.87.0/src/ast_vgatool.c new/xf86-video-ast-0.88.8/src/ast_vgatool.c --- old/xf86-video-ast-0.87.0/src/ast_vgatool.c 2008-12-22 05:18:28.000000000 +0100 +++ new/xf86-video-ast-0.88.8/src/ast_vgatool.c 2009-01-16 07:57:54.000000000 +0100 @@ -68,6 +68,7 @@ void vASTLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, VisualPtr pVisual); void ASTDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags); Bool GetVGA2EDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer); +void vInitDRAMReg(ScrnInfoPtr pScrn); void vASTOpenKey(ScrnInfoPtr pScrn) @@ -176,23 +177,30 @@ /* Get Bandwidth */ /* Modify DARM utilization to 60% for AST1100/2100 16bits DRAM, ycchen@032508 */ - if ( ((pAST->jChipType == AST2100) || (pAST->jChipType == AST1100)) && (ulDRAMBusWidth == 16) ) + if ( ((pAST->jChipType == AST2100) || (pAST->jChipType == AST1100) || (pAST->jChipType == AST2200) || (pAST->jChipType == AST2150)) && (ulDRAMBusWidth == 16) ) DRAMEfficiency = 600; ulDRAMBandwidth = ulMCLK * ulDRAMBusWidth * 2 / 8; ActualDRAMBandwidth = ulDRAMBandwidth * DRAMEfficiency / 1000; - /* Get Max DCLK */ + /* Get Max DCLK */ + /* Fixed Fixed KVM + CRT threshold issue on AST2100 8bpp modes, ycchen@100708 */ GetIndexRegMask(CRTC_PORT, 0xD0, 0xFF, jReg); - if (jReg & 0x08) + if ((jReg & 0x08) && (pAST->jChipType == AST2000)) ulDCLK = ActualDRAMBandwidth / ((pScrn->bitsPerPixel+1+16) / 8); + else if ((jReg & 0x08) && (pScrn->bitsPerPixel == 8)) + ulDCLK = ActualDRAMBandwidth / ((pScrn->bitsPerPixel+1+24) / 8); else ulDCLK = ActualDRAMBandwidth / ((pScrn->bitsPerPixel+1) / 8); /* Add for AST2100, ycchen@061807 */ - if (pAST->jChipType == AST2100) + if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST2200)) + { if (ulDCLK > 200) ulDCLK = 200; + } else + { if (ulDCLK > 165) ulDCLK = 165; + } return(ulDCLK); @@ -203,6 +211,7 @@ { ASTRecPtr pAST = ASTPTR(pScrn); ULONG ulData; + UCHAR jReg; pAST->jChipType = AST2100; @@ -211,8 +220,34 @@ ulData = *(ULONG *) (pAST->MMIOVirtualAddr + 0x1207c); +#if 0 if ((ulData & 0x0300) == 0x0200) pAST->jChipType = AST1100; +#endif + switch (ulData & 0x0300) + { + case 0x0200: + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "AST1100 Detected.\n"); + pAST->jChipType = AST1100; + break; + case 0x0100: + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "AST2200 Detected.\n"); + pAST->jChipType = AST2200; + break; + case 0x0000: + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "AST2150 Detected.\n"); + pAST->jChipType = AST2150; + break; + default: + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "AST2100 Detected.\n"); + pAST->jChipType = AST2100; + } + + /* VGA2 Clone Support */ + GetIndexRegMask(CRTC_PORT, 0x90, 0xFF, jReg); + if (jReg & 0x10) + pAST->VGA2Clone = TRUE; + } void @@ -438,3 +473,238 @@ return (TRUE); } /* GetVGA2EDID */ + +typedef struct _AST_DRAMStruct { + + USHORT Index; + ULONG Data; + +} AST_DRAMStruct, *PAST_DRAMStruct; + +AST_DRAMStruct AST2000DRAMTableData[] = { + { 0x0108, 0x00000000 }, + { 0x0120, 0x00004a21 }, + { 0xFF00, 0x00000043 }, + { 0x0000, 0xFFFFFFFF }, + { 0x0004, 0x00000089 }, + { 0x0008, 0x22331353 }, + { 0x000C, 0x0d07000b }, + { 0x0010, 0x11113333 }, + { 0x0020, 0x00110350 }, + { 0x0028, 0x1e0828f0 }, + { 0x0024, 0x00000001 }, + { 0x001C, 0x00000000 }, + { 0x0014, 0x00000003 }, + { 0xFF00, 0x00000043 }, + { 0x0018, 0x00000131 }, + { 0x0014, 0x00000001 }, + { 0xFF00, 0x00000043 }, + { 0x0018, 0x00000031 }, + { 0x0014, 0x00000001 }, + { 0xFF00, 0x00000043 }, + { 0x0028, 0x1e0828f1 }, + { 0x0024, 0x00000003 }, + { 0x002C, 0x1f0f28fb }, + { 0x0030, 0xFFFFFE01 }, + { 0xFFFF, 0xFFFFFFFF } +}; + +AST_DRAMStruct AST1100DRAMTableData[] = { + { 0x2000, 0x1688a8a8 }, + { 0x2020, 0x000041f0 }, + { 0xFF00, 0x00000043 }, + { 0x0000, 0xfc600309 }, + { 0x006C, 0x00909090 }, + { 0x0064, 0x00050000 }, + { 0x0004, 0x00000585 }, + { 0x0008, 0x0011030f }, + { 0x0010, 0x22201724 }, + { 0x0018, 0x1e29011a }, + { 0x0020, 0x00c82222 }, + { 0x0014, 0x01001523 }, + { 0x001C, 0x1024010d }, + { 0x0024, 0x00cb2522 }, + { 0x0038, 0xffffff82 }, + { 0x003C, 0x00000000 }, + { 0x0040, 0x00000000 }, + { 0x0044, 0x00000000 }, + { 0x0048, 0x00000000 }, + { 0x004C, 0x00000000 }, + { 0x0050, 0x00000000 }, + { 0x0054, 0x00000000 }, + { 0x0058, 0x00000000 }, + { 0x005C, 0x00000000 }, + { 0x0060, 0x032aa02a }, + { 0x0064, 0x002d3000 }, + { 0x0068, 0x00000000 }, + { 0x0070, 0x00000000 }, + { 0x0074, 0x00000000 }, + { 0x0078, 0x00000000 }, + { 0x007C, 0x00000000 }, + { 0x0034, 0x00000001 }, + { 0xFF00, 0x00000043 }, + { 0x002C, 0x00000732 }, + { 0x0030, 0x00000040 }, + { 0x0028, 0x00000005 }, + { 0x0028, 0x00000007 }, + { 0x0028, 0x00000003 }, + { 0x0028, 0x00000001 }, + { 0x000C, 0x00005a08 }, + { 0x002C, 0x00000632 }, + { 0x0028, 0x00000001 }, + { 0x0030, 0x000003c0 }, + { 0x0028, 0x00000003 }, + { 0x0030, 0x00000040 }, + { 0x0028, 0x00000003 }, + { 0x000C, 0x00005a21 }, + { 0x0034, 0x00007c03 }, + { 0x0120, 0x00004c41 }, + { 0xffff, 0xffffffff }, +}; + +AST_DRAMStruct AST2100DRAMTableData[] = { + { 0x2000, 0x1688a8a8 }, + { 0x2020, 0x00004120 }, + { 0xFF00, 0x00000043 }, + { 0x0000, 0xfc600309 }, + { 0x006C, 0x00909090 }, + { 0x0064, 0x00070000 }, + { 0x0004, 0x00000489 }, + { 0x0008, 0x0011030f }, + { 0x0010, 0x32302926 }, + { 0x0018, 0x274c0122 }, + { 0x0020, 0x00ce2222 }, + { 0x0014, 0x01001523 }, + { 0x001C, 0x1024010d }, + { 0x0024, 0x00cb2522 }, + { 0x0038, 0xffffff82 }, + { 0x003C, 0x00000000 }, + { 0x0040, 0x00000000 }, + { 0x0044, 0x00000000 }, + { 0x0048, 0x00000000 }, + { 0x004C, 0x00000000 }, + { 0x0050, 0x00000000 }, + { 0x0054, 0x00000000 }, + { 0x0058, 0x00000000 }, + { 0x005C, 0x00000000 }, + { 0x0060, 0x0f2aa02a }, + { 0x0064, 0x003f3005 }, + { 0x0068, 0x02020202 }, + { 0x0070, 0x00000000 }, + { 0x0074, 0x00000000 }, + { 0x0078, 0x00000000 }, + { 0x007C, 0x00000000 }, + { 0x0034, 0x00000001 }, + { 0xFF00, 0x00000043 }, + { 0x002C, 0x00000942 }, + { 0x0030, 0x00000040 }, + { 0x0028, 0x00000005 }, + { 0x0028, 0x00000007 }, + { 0x0028, 0x00000003 }, + { 0x0028, 0x00000001 }, + { 0x000C, 0x00005a08 }, + { 0x002C, 0x00000842 }, + { 0x0028, 0x00000001 }, + { 0x0030, 0x000003c0 }, + { 0x0028, 0x00000003 }, + { 0x0030, 0x00000040 }, + { 0x0028, 0x00000003 }, + { 0x000C, 0x00005a21 }, + { 0x0034, 0x00007c03 }, + { 0x0120, 0x00005061 }, + { 0xffff, 0xffffffff }, +}; + +void vInitDRAMReg(ScrnInfoPtr pScrn) +{ + AST_DRAMStruct *pjDRAMRegInfo; + ASTRecPtr pAST = ASTPTR(pScrn); + ULONG i, ulTemp; + UCHAR jReg; + + GetIndexRegMask(CRTC_PORT, 0xD0, 0xFF, jReg); + + if ((jReg & 0x80) == 0) /* VGA only */ + { + if (pAST->jChipType == AST2000) + { + pjDRAMRegInfo = AST2000DRAMTableData; + + *(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = 0x1e6e0000; + *(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x1; + *(ULONG *) (pAST->MMIOVirtualAddr + 0x10100) = 0xa8; + + do { + ; + } while (*(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x10100) != 0xa8); + + } + else /* AST2100/1100 */ + { + GetChipType(pScrn); + + if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST2200)) + pjDRAMRegInfo = AST2100DRAMTableData; + else + pjDRAMRegInfo = AST1100DRAMTableData; + + *(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = 0x1e6e0000; + *(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x1; + + *(ULONG *) (pAST->MMIOVirtualAddr + 0x12000) = 0x1688A8A8; + do { + ; + } while (*(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x12000) != 0x01); + + *(ULONG *) (pAST->MMIOVirtualAddr + 0x10000) = 0xFC600309; + do { + ; + } while (*(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x10000) != 0x01); + + } + + while (pjDRAMRegInfo->Index != 0xFFFF) + { + if (pjDRAMRegInfo->Index == 0xFF00) /* Delay function */ + { + for (i=0; i<15; i++) + xf86UDelay(pjDRAMRegInfo->Data); + } + else if ( (pjDRAMRegInfo->Index == 0x0004) && (pAST->jChipType != AST2000) ) + { + ulTemp = *(ULONG *) (pAST->MMIOVirtualAddr + 0x12070); + ulTemp &= 0x0000000C; + *(ULONG *) (pAST->MMIOVirtualAddr + 0x10000 + pjDRAMRegInfo->Index) = (pjDRAMRegInfo->Data | ulTemp); + } + else + { + *(ULONG *) (pAST->MMIOVirtualAddr + 0x10000 + pjDRAMRegInfo->Index) = pjDRAMRegInfo->Data; + } + pjDRAMRegInfo++; + } + + switch (pAST->jChipType) + { + case AST2000: + *(ULONG *) (pAST->MMIOVirtualAddr + 0x10140) |= 0x40; + break; + + case AST1100: + case AST2100: + case AST2200: + case AST2150: + ulTemp = *(ULONG *) (pAST->MMIOVirtualAddr + 0x1200c); + *(ULONG *) (pAST->MMIOVirtualAddr + 0x1200c) = (ulTemp & 0xFFFFFFFD); + + *(ULONG *) (pAST->MMIOVirtualAddr + 0x12040) |= 0x40; + break; + } + + } /* Init DRAM */ + + /* wait ready */ + do { + GetIndexRegMask(CRTC_PORT, 0xD0, 0xFF, jReg); + } while ((jReg & 0x40) == 0); + +} /* vInitDRAMReg */ ++++++ xf86-video-intel-2.6.2.tar.bz2 -> xf86-video-intel-2.6.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.6.2/configure new/xf86-video-intel-2.6.3/configure --- old/xf86-video-intel-2.6.2/configure 2009-02-24 23:09:47.000000000 +0100 +++ new/xf86-video-intel-2.6.3/configure 2009-03-02 20:21:16.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-intel 2.6.2. +# Generated by GNU Autoconf 2.61 for xf86-video-intel 2.6.3. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-intel' PACKAGE_TARNAME='xf86-video-intel' -PACKAGE_VERSION='2.6.2' -PACKAGE_STRING='xf86-video-intel 2.6.2' +PACKAGE_VERSION='2.6.3' +PACKAGE_STRING='xf86-video-intel 2.6.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1476,7 +1476,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-intel 2.6.2 to adapt to many kinds of systems. +\`configure' configures xf86-video-intel 2.6.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1546,7 +1546,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-intel 2.6.2:";; + short | recursive ) echo "Configuration of xf86-video-intel 2.6.3:";; esac cat <<\_ACEOF @@ -1683,7 +1683,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-video-intel configure 2.6.2 +xf86-video-intel configure 2.6.3 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1697,7 +1697,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-intel $as_me 2.6.2, which was +It was created by xf86-video-intel $as_me 2.6.3, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2392,7 +2392,7 @@ # Define the identity of the package. PACKAGE='xf86-video-intel' - VERSION='2.6.2' + VERSION='2.6.3' cat >>confdefs.h <<_ACEOF @@ -24046,7 +24046,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-intel $as_me 2.6.2, which was +This file was extended by xf86-video-intel $as_me 2.6.3, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24099,7 +24099,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-intel config.status 2.6.2 +xf86-video-intel config.status 2.6.3 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-intel-2.6.2/configure.ac new/xf86-video-intel-2.6.3/configure.ac --- old/xf86-video-intel-2.6.2/configure.ac 2009-02-24 23:09:26.000000000 +0100 +++ new/xf86-video-intel-2.6.3/configure.ac 2009-03-02 20:21:07.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-intel], - 2.6.2, + 2.6.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-intel) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.6.2/src/i830_dri.c new/xf86-video-intel-2.6.3/src/i830_dri.c --- old/xf86-video-intel-2.6.2/src/i830_dri.c 2009-02-24 23:08:49.000000000 +0100 +++ new/xf86-video-intel-2.6.3/src/i830_dri.c 2009-03-02 20:21:02.000000000 +0100 @@ -1862,36 +1862,33 @@ pPixmap = pDepthPixmap; pPixmap->refcnt++; } else { - uint32_t tiling = I915_TILING_NONE; + unsigned int hint = 0; - pPixmap = (*pScreen->CreatePixmap)(pScreen, - pDraw->width, - pDraw->height, - pDraw->depth, 0); switch (attachments[i]) { case DRI2BufferDepth: if (SUPPORTS_YTILING(pI830)) - tiling = I915_TILING_Y; + hint = INTEL_CREATE_PIXMAP_TILING_Y; else - tiling = I915_TILING_X; + hint = INTEL_CREATE_PIXMAP_TILING_X; break; case DRI2BufferFakeFrontLeft: case DRI2BufferFakeFrontRight: case DRI2BufferBackLeft: case DRI2BufferBackRight: - tiling = I915_TILING_X; + hint = INTEL_CREATE_PIXMAP_TILING_X; break; } if (!pI830->tiling || (!IS_I965G(pI830) && !pI830->kernel_exec_fencing)) - tiling = I915_TILING_NONE; + hint = 0; + + pPixmap = (*pScreen->CreatePixmap)(pScreen, + pDraw->width, + pDraw->height, + pDraw->depth, + hint); - if (tiling != I915_TILING_NONE) { - bo = i830_get_pixmap_bo(pPixmap); - drm_intel_bo_set_tiling(bo, &tiling, - intel_get_pixmap_pitch(pPixmap)); - } } if (attachments[i] == DRI2BufferDepth) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.6.2/src/i830_driver.c new/xf86-video-intel-2.6.3/src/i830_driver.c --- old/xf86-video-intel-2.6.2/src/i830_driver.c 2009-02-24 23:08:16.000000000 +0100 +++ new/xf86-video-intel-2.6.3/src/i830_driver.c 2009-03-02 20:21:02.000000000 +0100 @@ -1694,6 +1694,10 @@ pI830->can_resize = FALSE; if (pI830->accel == ACCEL_UXA && pI830->directRenderingType != DRI_XF86DRI) pI830->can_resize = TRUE; +#if !defined(DRI2) && defined(XF86DRI) + /* Disable resizing so that DRI1 can initialize and give us GEM support. */ + pI830->can_resize = FALSE; +#endif xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Resizable framebuffer: %s (%d %d)\n", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.6.2/src/i830_exa.c new/xf86-video-intel-2.6.3/src/i830_exa.c --- old/xf86-video-intel-2.6.2/src/i830_exa.c 2009-02-24 23:08:16.000000000 +0100 +++ new/xf86-video-intel-2.6.3/src/i830_exa.c 2009-03-02 20:21:02.000000000 +0100 @@ -883,29 +883,38 @@ if (w && h) { unsigned int size; + uint32_t tiling = I915_TILING_NONE; stride = ROUND_TO((w * pixmap->drawable.bitsPerPixel + 7) / 8, i830->accel_pixmap_pitch_alignment); - /* Use the I915_FENCE_TILING_X even if it may end up being TILING_Y, - * as it just results in larger alignment. Really, we need to use the - * usage hint to tell what the pixmap's going to be. - */ - stride = i830_get_fence_pitch(i830, stride, I915_TILING_X); - /* Round the object up to the size of the fence it will live in - * if necessary. We could potentially make the kernel allocate - * a larger aperture space and just bind the subset of pages in, - * but this is easier and also keeps us out of trouble (as much) - * with drm_intel_bufmgr_check_aperture(). - */ - size = i830_get_fence_size(i830, stride * h); + if (usage == INTEL_CREATE_PIXMAP_TILING_X) + tiling = I915_TILING_X; + else if (usage == INTEL_CREATE_PIXMAP_TILING_Y) + tiling = I915_TILING_Y; + + if (tiling == I915_TILING_NONE) { + size = stride * h; + } else { + stride = i830_get_fence_pitch(i830, stride, tiling); + /* Round the object up to the size of the fence it will live in + * if necessary. We could potentially make the kernel allocate + * a larger aperture space and just bind the subset of pages in, + * but this is easier and also keeps us out of trouble (as much) + * with drm_intel_bufmgr_check_aperture(). + */ + size = i830_get_fence_size(i830, stride * h); + } bo = drm_intel_bo_alloc_for_render(i830->bufmgr, "pixmap", size, 0); if (!bo) { fbDestroyPixmap (pixmap); return NullPixmap; } - + + if (tiling != I915_TILING_NONE) + drm_intel_bo_set_tiling(bo, &tiling, stride); + screen->ModifyPixmapHeader (pixmap, w, h, 0, 0, stride, NULL); i830_uxa_set_pixmap_bo (pixmap, bo); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.6.2/src/i830.h new/xf86-video-intel-2.6.3/src/i830.h --- old/xf86-video-intel-2.6.2/src/i830.h 2009-02-24 23:08:16.000000000 +0100 +++ new/xf86-video-intel-2.6.3/src/i830.h 2009-03-02 20:21:02.000000000 +0100 @@ -1095,4 +1095,15 @@ #define QUIRK_IGNORE_CRT 0x00000080 extern void i830_fixup_devices(ScrnInfoPtr); +/** + * Hints to CreatePixmap to tell the driver how the pixmap is going to be + * used. + * + * Compare to CREATE_PIXMAP_USAGE_* in the server. + */ +enum { + INTEL_CREATE_PIXMAP_TILING_X = 0x10000000, + INTEL_CREATE_PIXMAP_TILING_Y, +}; + #endif /* _I830_H_ */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.6.2/src/Makefile.in new/xf86-video-intel-2.6.3/src/Makefile.in --- old/xf86-video-intel-2.6.2/src/Makefile.in 2009-02-24 23:09:49.000000000 +0100 +++ new/xf86-video-intel-2.6.3/src/Makefile.in 2009-03-02 20:21:43.000000000 +0100 @@ -67,7 +67,7 @@ @XVMC_TRUE@ $(INTEL_XVMC_SRCS) subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.6.2/src/TODO new/xf86-video-intel-2.6.3/src/TODO --- old/xf86-video-intel-2.6.2/src/TODO 2008-12-04 19:01:21.000000000 +0100 +++ new/xf86-video-intel-2.6.3/src/TODO 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -nuke wm scratch -replace scrn virtualxy with pixmap \ No newline at end of file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xkeyboard-config for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package xkeyboard-config for openSUSE:Factory checked in at Tue Mar 3 18:14:39 CET 2009. -------- --- xkeyboard-config/xkeyboard-config.changes 2009-02-09 10:28:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/xkeyboard-config/xkeyboard-config.changes 2009-03-03 14:43:44.599359980 +0100 @@ -1,0 +2,13 @@ +Tue Mar 3 12:52:55 CET 2009 - sndirsch(a)suse.de + +- xkeyboard-config 1.5 + * More than 40 bugs from freedesktop.org bugzilla were fixed. + symbols/inet restructured. +- obsoletes xkeyboard-config.powerbook-usb-iso-keyboard.patch, + unknown-keysym.diff +- adjusted MDSW-change-keycode.diff, xkeyboard-config.inet.patch + disable-2xalt_2xctrl-toggle.diff, ucw_suse.diff +- cs.po.diff + * removed dup to fix build + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- unknown-keysym.diff xkeyboard-config-1.3.tar.bz2 xkeyboard-config.powerbook-usb-iso-keyboard.patch New: ---- cs.po.diff xkeyboard-config-1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.Hq2732/_old 2009-03-03 18:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Hq2732/_new 2009-03-03 18:14:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xkeyboard-config (Version 1.3) +# spec file for package xkeyboard-config (Version 1.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,8 +27,8 @@ Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm AutoReqProv: on -Version: 1.3 -Release: 33 +Version: 1.5 +Release: 1 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 Patch4: xkeyboard-config.mainline-cvs.mac-es.patch @@ -36,16 +36,15 @@ Patch40: xkeyboard-config.macintosh.patch Patch100: p_suse.diff Patch101: ibm_space_saver.diff -Patch103: xkeyboard-config.powerbook-usb-iso-keyboard.patch Patch104: xkeyboard-config.inet.patch Patch106: microsoftnek4k.diff Patch107: microsoftnek4k-symbols.diff Patch108: microsoftnek4k-keycodes.diff Patch109: disable-2xalt_2xctrl-toggle.diff Patch110: MDSW-change-keycode.diff -Patch111: unknown-keysym.diff Patch112: ucw_suse.diff Patch113: xkeyboard-config.sr(a)latin.diff +Patch114: cs.po.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -72,16 +71,15 @@ %patch40 %patch100 %patch101 -%patch103 %patch104 %patch106 %patch107 %patch108 %patch109 -p1 %patch110 -%patch111 %patch112 -p1 %patch113 -p0 +%patch114 -p0 mv po/sr(a){Latn,latin}.po %build @@ -112,6 +110,16 @@ /usr/share/X11/xkb/ %changelog +* Tue Mar 03 2009 sndirsch(a)suse.de +- xkeyboard-config 1.5 + * More than 40 bugs from freedesktop.org bugzilla were fixed. + symbols/inet restructured. +- obsoletes xkeyboard-config.powerbook-usb-iso-keyboard.patch, + unknown-keysym.diff +- adjusted MDSW-change-keycode.diff, xkeyboard-config.inet.patch + disable-2xalt_2xctrl-toggle.diff, ucw_suse.diff +- cs.po.diff + * removed dup to fix build * Mon Feb 09 2009 sndirsch(a)suse.de - sr@Latn no longer exists; moved it to sr@latin * Thu Feb 05 2009 sndirsch(a)suse.de ++++++ cs.po.diff ++++++ --- po/cs.po.orig 2009-03-03 13:31:59.000000000 +0000 +++ po/cs.po 2009-03-03 13:34:47.000000000 +0000 @@ -2622,10 +2622,6 @@ msgstr "qwerty/číslice" msgid "qwertz" msgstr "qwertz" -#: ../rules/base.xml.in.h:647 -msgid "UCW layout (accented letters only)" -msgstr "rozložení UCW (pouze akcentovaná písmena)" - #: ../rules/base.xml.in.h:648 msgid "CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action." msgstr "klávesa CapsLock přepne při stisknutí rozložení, Alt+CapsLock má původní význam capslock." ++++++ disable-2xalt_2xctrl-toggle.diff ++++++ --- /var/tmp/diff_new_pack.Hq2732/_old 2009-03-03 18:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Hq2732/_new 2009-03-03 18:14:12.000000000 +0100 @@ -1,15 +1,3 @@ -diff -aurp xkeyboard-config-1.2/rules/base.lst xkeyboard-config-1.2-patched/rules/base.lst ---- xkeyboard-config-1.2/rules/base.lst 2008-01-29 22:54:02.000000000 +0100 -+++ xkeyboard-config-1.2-patched/rules/base.lst 2008-05-13 13:13:01.545881000 +0200 -@@ -545,8 +545,6 @@ - grp:shift_caps_toggle Shift+CapsLock changes layout. - grp:alt_caps_toggle Alt+CapsLock changes layout. - grp:shifts_toggle Both Shift keys together change layout. -- grp:alts_toggle Both Alt keys together change layout. -- grp:ctrls_toggle Both Ctrl keys together change layout. - grp:ctrl_shift_toggle Ctrl+Shift change layout. - grp:lctrl_lshift_toggle LCtrl+LShift change layout. - grp:ctrl_alt_toggle Alt+Ctrl change layout. diff -aurp xkeyboard-config-1.2/rules/base.xml.in xkeyboard-config-1.2-patched/rules/base.xml.in --- xkeyboard-config-1.2/rules/base.xml.in 2008-01-08 00:08:25.000000000 +0100 +++ xkeyboard-config-1.2-patched/rules/base.xml.in 2008-05-13 13:13:23.870533000 +0200 ++++++ MDSW-change-keycode.diff ++++++ --- /var/tmp/diff_new_pack.Hq2732/_old 2009-03-03 18:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Hq2732/_new 2009-03-03 18:14:12.000000000 +0100 @@ -1,23 +1,3 @@ ---- symbols/inet.orig 2008-05-14 06:09:21.000000000 +0200 -+++ symbols/inet 2008-05-14 06:16:57.000000000 +0200 -@@ -2093,7 +2093,7 @@ partial xkb_symbols "apple" { - key <K5E> { [ F14 ] }; - key <K5F> { [ F15 ] }; - key <K6C> { [ XF86Eject ] }; -- key <MDSW> { [ F16 ] }; -+ key <II5D> { [ F16 ] }; - }; - - partial alphanumeric_keys -@@ -2233,7 +2233,7 @@ xkb_symbols "logitech_g15" { - key <K74> { [ XF86WWW ] }; - key <K75> { [ XF86LaunchE ] }; - -- key <MDSW> { [ XF86Launch1 ] }; -+ key <II5D> { [ XF86Launch1 ] }; - key <NFER> { [ XF86Launch2 ] }; - - key <XFER> { [ XF86Launch8 ] }; --- keycodes/xfree86.orig 2008-05-14 06:17:28.000000000 +0200 +++ keycodes/xfree86 2008-05-14 06:21:33.000000000 +0200 @@ -301,6 +301,9 @@ xkb_keycodes "basic" { @@ -39,3 +19,23 @@ <LVL3> = 124; // <U7C> <ALT> = 125; // <U7D> <META> = 156; // <I1C> +--- symbols/inet.orig 2009-03-03 13:03:22.000000000 +0100 ++++ symbols/inet 2009-03-03 13:28:20.000000000 +0100 +@@ -1195,7 +1195,7 @@ xkb_symbols "logitech_g15" { + key <K72> { [ XF86LaunchC ] }; + key <K74> { [ XF86WWW ] }; + key <K75> { [ XF86LaunchE ] }; +- key <MDSW> { [ XF86Launch1 ] }; ++ key <II5D> { [ XF86Launch1 ] }; + key <NFER> { [ XF86Launch2 ] }; + key <XFER> { [ XF86Launch8 ] }; + }; +@@ -1732,7 +1732,7 @@ xkb_symbols "apple" { + key <K5E> { [ F14 ] }; + key <K5F> { [ F15 ] }; + key <K6C> { [ XF86Eject ] }; +- key <MDSW> { [ F16 ] }; ++ key <II5D> { [ F16 ] }; + key <KPEQ> { [ KP_Equal ] }; + }; + ++++++ ucw_suse.diff ++++++ --- /var/tmp/diff_new_pack.Hq2732/_old 2009-03-03 18:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Hq2732/_new 2009-03-03 18:14:12.000000000 +0100 @@ -13,52 +13,6 @@ +#: ../rules/base.xml.in.h:648 +msgid "CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action." +msgstr "klávesa CapsLock přepne při stisknutí rozložení, Alt+CapsLock má původní význam capslock." -diff -ur xkeyboard-config-1.3.orig/rules/base.lst xkeyboard-config-1.3.suse/rules/base.lst ---- xkeyboard-config-1.3.orig/rules/base.lst 2008-09-12 16:23:05.000000000 +0200 -+++ xkeyboard-config-1.3.suse/rules/base.lst 2008-09-15 11:22:06.000000000 +0200 -@@ -331,6 +331,7 @@ - bksl cz: With <\|> key - qwerty cz: qwerty - qwerty_bksl cz: qwerty, extended Backslash -+ ucw cz: UCW layout (accented letters only) - nodeadkeys dk: Eliminate dead keys - mac dk: Macintosh - mac_nodeadkeys dk: Macintosh, eliminate dead keys -@@ -561,6 +562,7 @@ - grp:lwin_switch Left Win-key switches layout while pressed. - grp:rwin_switch Right Win-key switches layout while pressed. - grp:win_switch Both Win-keys switch layout while pressed. -+ grp:caps_switch CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action. - grp:rctrl_switch Right Ctrl key switches layout while pressed. - grp:toggle Right Alt key changes layout. - grp:lalt_toggle Left Alt key changes layout. -@@ -624,6 +626,7 @@ - caps:capslock CapsLock toggles normal capitalization of alphabetic characters. - caps:swapescape Swap ESC and CapsLock. - caps:shiftlock CapsLock toggles Shift so all keys are affected. -+ caps:groupshift CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action. - altwin Alt/Win key behavior - altwin:menu Add the standard behavior to Menu key. - altwin:meta_alt Alt and Meta are on the Alt keys. -diff -ur xkeyboard-config-1.3.orig/rules/base.o_s.part xkeyboard-config-1.3.suse/rules/base.o_s.part ---- xkeyboard-config-1.3.orig/rules/base.o_s.part 2008-04-30 23:12:57.000000000 +0200 -+++ xkeyboard-config-1.3.suse/rules/base.o_s.part 2008-09-15 10:44:39.000000000 +0200 -@@ -12,6 +12,7 @@ - grp:win_switch = +group(win_switch) - grp:lwin_switch = +group(lwin_switch) - grp:rwin_switch = +group(rwin_switch) -+ grp:caps_switch = +group(caps_switch) - grp:toggle = +group(toggle) - grp:shifts_toggle = +group(shifts_toggle) - grp:ctrls_toggle = +group(ctrls_toggle) -@@ -46,6 +47,7 @@ - caps:shiftlock = +capslock(shiftlock) - caps:grouplock = +capslock(grouplock) - caps:swapescape = +capslock(swapescape) -+ caps:groupshift = +capslock(groupshift) - ctrl:nocaps = +ctrl(nocaps) - ctrl:swapcaps = +ctrl(swapcaps) - ctrl:ctrl_ac = +ctrl(ctrl_ac) diff -ur xkeyboard-config-1.3.orig/rules/base.xml.in xkeyboard-config-1.3.suse/rules/base.xml.in --- xkeyboard-config-1.3.orig/rules/base.xml.in 2008-09-12 16:23:05.000000000 +0200 +++ xkeyboard-config-1.3.suse/rules/base.xml.in 2008-09-15 15:24:15.000000000 +0200 @@ -194,3 +148,21 @@ // using the group(shift_caps_toggle) map, pressing: // Shift+Caps Lock toggles group partial modifier_keys +--- xkeyboard-config-1.5/rules/base.o_s.part.orig 2009-01-12 23:24:13.000000000 +0100 ++++ xkeyboard-config-1.5/rules/base.o_s.part 2009-03-03 13:43:43.000000000 +0100 +@@ -13,6 +13,7 @@ + grp:win_switch = +group(win_switch) + grp:lwin_switch = +group(lwin_switch) + grp:rwin_switch = +group(rwin_switch) ++ grp:caps_switch = +group(caps_switch) + grp:toggle = +group(toggle) + grp:shifts_toggle = +group(shifts_toggle) + grp:ctrls_toggle = +group(ctrls_toggle) +@@ -52,6 +53,7 @@ + caps:swapescape = +capslock(swapescape) + caps:escape = +capslock(escape) + caps:backspace = +capslock(backspace) ++ caps:groupshift = +capslock(groupshift) + ctrl:nocaps = +ctrl(nocaps) + ctrl:swapcaps = +ctrl(swapcaps) + ctrl:ctrl_ac = +ctrl(ctrl_ac) ++++++ xkeyboard-config-1.3.tar.bz2 -> xkeyboard-config-1.5.tar.bz2 ++++++ ++++ 79767 lines of diff (skipped) ++++++ xkeyboard-config.inet.patch ++++++ --- /var/tmp/diff_new_pack.Hq2732/_old 2009-03-03 18:14:14.000000000 +0100 +++ /var/tmp/diff_new_pack.Hq2732/_new 2009-03-03 18:14:14.000000000 +0100 @@ -1,16 +1,10 @@ ---- symbols/inet -+++ symbols/inet -@@ -2191,12 +2191,12 @@ - key <I57> { [ XF86Launch0 ] }; +--- symbols/inet.orig 2009-01-12 23:24:13.000000000 +0100 ++++ symbols/inet 2009-03-03 13:00:45.000000000 +0100 +@@ -1689,6 +1689,7 @@ xkb_symbols "apple" { key <I58> { [ XF86Launch1 ] }; key <I59> { [ XF86Launch2 ] }; -+ key <K59> { [ KP_Equal ] }; + key <I5E> { [ XF86PowerOff ] }; ++ key <K59> { [ KP_Equal ] }; key <K5D> { [ F13 ] }; key <K5E> { [ F14 ] }; key <K5F> { [ F15 ] }; - key <K6C> { [ XF86Eject ] }; - key <MDSW> { [ F16 ] }; -- key <KPEQ> { [ KP_Equal ] }; - }; - - partial alphanumeric_keys ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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