December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit xorg-x11-server
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package xorg-x11-server checked in at Thu Dec 7 21:38:05 CET 2006. -------- --- xorg-x11-server/xorg-x11-server.changes 2006-11-28 15:46:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2006-12-02 22:39:02.000000000 +0100 @@ -1,0 +2,24 @@ +Sat Dec 2 22:35:59 CET 2006 - sndirsch(a)suse.de + +- X.Org 7.2RC3 release + * Add a -showDefaultModulePath option. + * Add a -showDefaultLibPath option. + * Add DIX_CFLAGS to util builds. + * Fix release date, and tag 1.1.99.903 + * make X server use system libdrm - this requires libdrm >= 2.3.0 + * DRI: call drmSetServerInfo() before drmOpen(). + * add extern to struct definition + * fixup configure.ac problems with DRI_SOURCES and LBX_SOURCES + * bump to 1.1.99.903 + * remove CID support (bug #5553) + * dri: setup libdrm hooks as early as possible. + * Bug #8868: Remove drm from SUBDIRS now that the directory is gone. + * Fix typo before the last commit. + * Fix GL context destruction with AIGLX. + * On DragonFLy, default to /dev/sysmouse (just like on FreeBSD). + * ffs: handle 0 argument (bug #8968) + * Bug #9023: Only check mice for "mouse" or "void" if identifier + is != NULL. Fix potential NULL pointer access in timer code. +- updated Mesa sources to 6.5.2 + +------------------------------------------------------------------- Old: ---- Mesa-6.5.1.tar.bz2 mouse-fix.diff xorg-server-1.1.99.902.tar.bz2 xserver-timers.diff New: ---- Mesa-6.5.2.diff Mesa-6.5.2.tar.bz2 xorg-server-1.1.99.903.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.b6RA96/_old 2006-12-07 21:37:26.000000000 +0100 +++ /var/tmp/diff_new_pack.b6RA96/_new 2006-12-07 21:37:26.000000000 +0100 @@ -11,13 +11,13 @@ # norootforbuild Name: xorg-x11-server -%define dirsuffix 1.1.99.902 +%define dirsuffix 1.1.99.903 %define fglrx_driver_hack 0 BuildRequires: Mesa-devel fontconfig-devel freetype2-devel ghostscript-library glitz-devel libdrm-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.2 -Release: 28 +Release: 30 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -29,7 +29,7 @@ Obsoletes: xorg-x11-Xnest xorg-x11-Xprt xorg-x11-Xvfb xorg-x11-server-glx Summary: X.Org Server Source: xorg-server-%{dirsuffix}.tar.bz2 -Source1: Mesa-6.5.1.tar.bz2 +Source1: Mesa-6.5.2.tar.bz2 Source3: README.updates Source4: xorgcfg.tar.bz2 %if %suse_version > 1010 @@ -64,10 +64,9 @@ Patch28: cfb8-undefined.diff Patch29: xephyr.diff Patch30: p_ppc_domain_workaround.diff -Patch31: mouse-fix.diff Patch32: acpi_events.diff Patch33: p_pci-off-by-one.diff -Patch34: xserver-timers.diff +Patch34: Mesa-6.5.2.diff Patch334: p_pci-domain.diff Patch357: p_pci-ce-x.diff @@ -134,10 +133,9 @@ %patch334 -p0 -b .p_pci-domain.diff %patch357 -p0 -b .p_pci-ce-x.diff %patch30 -%patch31 -p1 %patch32 -p1 %patch33 -p0 -%patch34 -p1 +%patch34 -p0 %build autoreconf -fi @@ -442,6 +440,27 @@ %endif %changelog -n xorg-x11-server +* Sat Dec 02 2006 - sndirsch(a)suse.de +- X.Org 7.2RC3 release + * Add a -showDefaultModulePath option. + * Add a -showDefaultLibPath option. + * Add DIX_CFLAGS to util builds. + * Fix release date, and tag 1.1.99.903 + * make X server use system libdrm - this requires libdrm >= 2.3.0 + * DRI: call drmSetServerInfo() before drmOpen(). + * add extern to struct definition + * fixup configure.ac problems with DRI_SOURCES and LBX_SOURCES + * bump to 1.1.99.903 + * remove CID support (bug #5553) + * dri: setup libdrm hooks as early as possible. + * Bug #8868: Remove drm from SUBDIRS now that the directory is gone. + * Fix typo before the last commit. + * Fix GL context destruction with AIGLX. + * On DragonFLy, default to /dev/sysmouse (just like on FreeBSD). + * ffs: handle 0 argument (bug #8968) + * Bug #9023: Only check mice for "mouse" or "void" if identifier + is != NULL. Fix potential NULL pointer access in timer code. +- updated Mesa sources to 6.5.2 * Tue Nov 28 2006 - sndirsch(a)suse.de - xserver-timers.diff: * fix null pointer reference in timer code (Bug #223718) ++++++ Mesa-6.5.2.diff ++++++ --- GL/mesa/main/Makefile.am.orig 2006-12-03 03:20:15.697973056 +0100 +++ GL/mesa/main/Makefile.am 2006-12-03 03:20:35.293300149 +0100 @@ -60,6 +60,7 @@ light.c \ lines.c \ matrix.c \ + mipmap.c \ mm.c \ occlude.c \ pixel.c \ ++++++ Mesa-6.5.1.tar.bz2 -> Mesa-6.5.2.tar.bz2 ++++++ ++++ 144839 lines of diff (skipped) ++++++ p_default-module-path.diff ++++++ --- /var/tmp/diff_new_pack.b6RA96/_old 2006-12-07 21:37:42.000000000 +0100 +++ /var/tmp/diff_new_pack.b6RA96/_new 2006-12-07 21:37:42.000000000 +0100 @@ -22,3 +22,14 @@ char *uwcrtpath = "/usr/ccs/lib/libcrt.a"; char *path; struct stat st; +--- hw/xfree86/common/xf86Init.c.orig 2006-12-03 17:35:17.412779270 +0100 ++++ hw/xfree86/common/xf86Init.c 2006-12-03 17:37:29.048826467 +0100 +@@ -1876,7 +1876,7 @@ + static void + xf86PrintDefaultModulePath(void) + { +- ErrorF("%s\n", DEFAULT_MODULE_PATH); ++ ErrorF("/usr/LIBDIR/xorg/modules/updates,/usr/LIBDIR/xorg/modules\n"); + } + + static void ++++++ xorg-server-1.1.99.902.tar.bz2 -> xorg-server-1.1.99.903.tar.bz2 ++++++ ++++ 8270 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-proto-devel
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package xorg-x11-proto-devel checked in at Thu Dec 7 21:37:42 CET 2006. -------- --- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2006-11-08 17:20:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2006-12-04 00:01:57.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Dec 3 15:47:43 CET 2006 - sndirsch(a)suse.de + +- udpated xcb-proto to release 1.0 +- added libpthread-stubs (required since xcb 1.0) +- updated util-macros to release 1.1.3 + * xorgversion: automatic PACKAGE_VERSION_* (bug #8590) + +------------------------------------------------------------------- Old: ---- util-macros-1.1.2.tar.bz2 xcb-proto-0.9.93.tar.bz2 New: ---- libpthread-stubs-0.1.tar.bz2 util-macros-1.1.3.tar.bz2 xcb-proto-1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-proto-devel.spec ++++++ --- /var/tmp/diff_new_pack.SYwm8e/_old 2006-12-07 21:37:25.000000000 +0100 +++ /var/tmp/diff_new_pack.SYwm8e/_new 2006-12-07 21:37:25.000000000 +0100 @@ -13,7 +13,7 @@ Name: xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.2 -Release: 5 +Release: 10 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/X11 @@ -36,7 +36,7 @@ Source15: resourceproto-X11R7.0-1.0.2.tar.bz2 Source16: scrnsaverproto-X11R7.1-1.1.0.tar.bz2 Source17: trapproto-X11R7.0-3.4.3.tar.bz2 -Source18: util-macros-1.1.2.tar.bz2 +Source18: util-macros-1.1.3.tar.bz2 Source19: videoproto-X11R7.0-2.2.2.tar.bz2 Source20: windowswmproto-X11R7.0-1.0.3.tar.bz2 Source21: xcmiscproto-X11R7.0-1.1.2.tar.bz2 @@ -51,7 +51,8 @@ Source30: xproto-7.0.9.tar.bz2 Source31: xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2 Source32: evieext-X11R7.0-1.0.2.tar.bz2 -Source33: xcb-proto-0.9.93.tar.bz2 +Source33: xcb-proto-1.0.tar.bz2 +Source34: libpthread-stubs-0.1.tar.bz2 %description This package contains all necessary include files and libraries needed @@ -125,6 +126,11 @@ /usr/share/xcb/ %changelog -n xorg-x11-proto-devel +* Sun Dec 03 2006 - sndirsch(a)suse.de +- udpated xcb-proto to release 1.0 +- added libpthread-stubs (required since xcb 1.0) +- updated util-macros to release 1.1.3 + * xorgversion: automatic PACKAGE_VERSION_* (bug #8590) * Wed Nov 08 2006 - sndirsch(a)suse.de - updated util-macros to release 1.1.2 (X.Org 7.2 RC2) * Make building pdf's configurable, though only disabled when it ++++++ util-macros-1.1.2.tar.bz2 -> util-macros-1.1.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.2/ChangeLog new/util-macros-1.1.3/ChangeLog --- old/util-macros-1.1.2/ChangeLog 2006-11-08 15:38:34.000000000 +0100 +++ new/util-macros-1.1.3/ChangeLog 2006-11-30 21:05:50.000000000 +0100 @@ -1,3 +1,17 @@ +commit e091014e3c7573a49ce51d67f359bd0f3d3e1893 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Thu Nov 30 22:05:27 2006 +0200 + + bump to 1.1.3 + +commit f15961997e9f5986857ed0b143cbaafda1a84cb8 +Author: Andres Salomon <dilinger(a)debian.org> +Date: Thu Nov 30 22:05:13 2006 +0200 + + xorgversion: automatic PACKAGE_VERSION_* (bug #8590) + Automatically define PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} when + XORG_RELEASE_VERSION is called. + commit 0d92c7e31df95c09a9cf1215e9ccb069da97f27a Author: Daniel Stone <daniel(a)fooishbar.org> Date: Wed Nov 8 16:38:16 2006 +0200 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.2/configure new/util-macros-1.1.3/configure --- old/util-macros-1.1.2/configure 2006-11-08 15:38:32.000000000 +0100 +++ new/util-macros-1.1.3/configure 2006-11-30 21:05:47.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for util-macros 1.1.2. +# Generated by GNU Autoconf 2.60 for util-macros 1.1.3. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='util-macros' PACKAGE_TARNAME='util-macros' -PACKAGE_VERSION='1.1.2' -PACKAGE_STRING='util-macros 1.1.2' +PACKAGE_VERSION='1.1.3' +PACKAGE_STRING='util-macros 1.1.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_subst_vars='SHELL @@ -1134,7 +1134,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 util-macros 1.1.2 to adapt to many kinds of systems. +\`configure' configures util-macros 1.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1200,7 +1200,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of util-macros 1.1.2:";; + short | recursive ) echo "Configuration of util-macros 1.1.3:";; esac cat <<\_ACEOF @@ -1278,7 +1278,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -util-macros configure 1.1.2 +util-macros configure 1.1.3 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1292,7 +1292,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by util-macros $as_me 1.1.2, which was +It was created by util-macros $as_me 1.1.3, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -1985,7 +1985,7 @@ # Define the identity of the package. PACKAGE='util-macros' - VERSION='1.1.2' + VERSION='1.1.3' cat >>confdefs.h <<_ACEOF @@ -2566,7 +2566,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by util-macros $as_me 1.1.2, which was +This file was extended by util-macros $as_me 1.1.3, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2609,7 +2609,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -util-macros config.status 1.1.2 +util-macros config.status 1.1.3 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.2/configure.ac new/util-macros-1.1.3/configure.ac --- old/util-macros-1.1.2/configure.ac 2006-11-08 15:38:10.000000000 +0100 +++ new/util-macros-1.1.3/configure.ac 2006-11-30 21:05:21.000000000 +0100 @@ -23,7 +23,7 @@ AC_PREREQ([2.57]) AC_INIT([util-macros], - [1.1.2], + [1.1.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.2/xorg-macros.m4 new/util-macros-1.1.3/xorg-macros.m4 --- old/util-macros-1.1.2/xorg-macros.m4 2006-11-08 15:38:34.000000000 +0100 +++ new/util-macros-1.1.3/xorg-macros.m4 2006-11-30 21:05:50.000000000 +0100 @@ -45,7 +45,7 @@ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.2 + [XORG_MACROS_version=1.1.3 XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.2/xorgversion.m4 new/util-macros-1.1.3/xorgversion.m4 --- old/util-macros-1.1.2/xorgversion.m4 2006-08-27 11:42:39.000000000 +0200 +++ new/util-macros-1.1.3/xorgversion.m4 2006-11-30 21:04:11.000000000 +0100 @@ -27,7 +27,8 @@ # -------------------- # Adds --with/without-release-string and changes the PACKAGE and # PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If -# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. +# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also +# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. AC_DEFUN([XORG_RELEASE_VERSION],[ AC_ARG_WITH(release-version, @@ -40,4 +41,21 @@ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" AC_MSG_NOTICE([Building with package name set to $PACKAGE]) fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], + [`echo $PACKAGE_VERSION | sed -ne 's/^$[[^\.]]\+$.*/\1/p'`], + [Major version of this package]) + PVM=`echo $PACKAGE_VERSION | sed -ne 's/^$[[^\.]]\+$\.$[[^\.]]\+$.*/\2/p'` + if test "x$PVM" = "x"; then + PVM="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], + [$PVM], + [Minor version of this package]) + PVP=`echo $PACKAGE_VERSION | sed -ne 's/^$[[^\.]]\+$\.$[[^\.]]\+$\.$[[^\.]]\+$.*/\3/p'` + if test "x$PVP" = "x"; then + PVP="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], + [$PVP], + [Patch version of this package]) ]) ++++++ xcb-proto-0.9.93.tar.bz2 -> xcb-proto-1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-proto-0.9.93/NEWS new/xcb-proto-1.0/NEWS --- old/xcb-proto-0.9.93/NEWS 2006-11-03 01:48:44.000000000 +0100 +++ new/xcb-proto-1.0/NEWS 2006-11-23 16:13:47.000000000 +0100 @@ -1,3 +1,19 @@ +Release 1.0 (2006-11-23) +======================== + +The "Thanksgiving" release: We feel thankful to have it released. + +* Fix Bug #8990: randr type fixes +* Fixed screen parameter type in several GLX requests to use CARD32 instead + of the SCREEN structure. +* Corrected valueparam arguments to attribute lists in several requests and + a reply. +* Estethic change for attribute parameter name +* Remove support for the <localfield> tag: nothing needs it. +* Fix Bug #8973: In UngrabKey, the 'key' field should have type KEYCODE, not + the more general CARD8. + + Release 1.0 RC3 (2006-11-02) ============================ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-proto-0.9.93/configure new/xcb-proto-1.0/configure --- old/xcb-proto-0.9.93/configure 2006-11-03 01:34:36.000000000 +0100 +++ new/xcb-proto-1.0/configure 2006-11-23 16:46:46.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60a for XCB Proto 0.9.93. +# Generated by GNU Autoconf 2.60a for XCB Proto 1.0. # # Report bugs to <xcb(a)lists.freedesktop.org>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='XCB Proto' PACKAGE_TARNAME='xcb-proto' -PACKAGE_VERSION='0.9.93' -PACKAGE_STRING='XCB Proto 0.9.93' +PACKAGE_VERSION='1.0' +PACKAGE_STRING='XCB Proto 1.0' PACKAGE_BUGREPORT='xcb(a)lists.freedesktop.org' ac_unique_file="xcb-proto.pc.in" @@ -1134,7 +1134,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 XCB Proto 0.9.93 to adapt to many kinds of systems. +\`configure' configures XCB Proto 1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1200,7 +1200,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of XCB Proto 0.9.93:";; + short | recursive ) echo "Configuration of XCB Proto 1.0:";; esac cat <<\_ACEOF @@ -1265,7 +1265,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -XCB Proto configure 0.9.93 +XCB Proto configure 1.0 generated by GNU Autoconf 2.60a Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1279,7 +1279,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by XCB Proto $as_me 0.9.93, which was +It was created by XCB Proto $as_me 1.0, which was generated by GNU Autoconf 2.60a. Invocation command line was $ $0 $@ @@ -1950,7 +1950,7 @@ # Define the identity of the package. PACKAGE='xcb-proto' - VERSION='0.9.93' + VERSION='1.0' cat >>confdefs.h <<_ACEOF @@ -2578,7 +2578,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by XCB Proto $as_me 0.9.93, which was +This file was extended by XCB Proto $as_me 1.0, which was generated by GNU Autoconf 2.60a. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2621,7 +2621,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -XCB Proto config.status 0.9.93 +XCB Proto config.status 1.0 configured by $0, generated by GNU Autoconf 2.60a, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-proto-0.9.93/configure.ac new/xcb-proto-1.0/configure.ac --- old/xcb-proto-0.9.93/configure.ac 2006-11-03 01:34:31.000000000 +0100 +++ new/xcb-proto-1.0/configure.ac 2006-11-23 16:12:57.000000000 +0100 @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([XCB Proto], - 0.9.93, + 1.0, [xcb(a)lists.freedesktop.org] AC_CONFIG_SRCDIR([xcb-proto.pc.in]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-proto-0.9.93/src/glx.xml new/xcb-proto-1.0/src/glx.xml --- old/xcb-proto-0.9.93/src/glx.xml 2006-10-30 05:12:00.000000000 +0100 +++ new/xcb-proto-1.0/src/glx.xml 2006-11-22 06:48:28.000000000 +0100 @@ -342,6 +342,12 @@ <field type="xproto:PIXMAP" name="pixmap" /> <field type="glx:PIXMAP" name="glx_pixmap" /> <field type="CARD32" name="num_attribs" /> + <list type="CARD32" name="attribs"> + <op op="*"> + <fieldref>num_attribs</fieldref> + <value>2</value> + </op> + </list> </request> <request name="DestroyPixmap" opcode="23"> @@ -351,7 +357,7 @@ <request name="CreateNewContext" opcode="24"> <field type="glx:CONTEXT" name="context" /> <field type="CARD32" name="fbconfig" /> - <field type="SCREEN" name="screen" /> + <field type="CARD32" name="screen" /> <field type="CARD32" name="render_type" /> <field type="CARD32" name="share_list" /> <field type="BOOL" name="is_direct" /> @@ -363,11 +369,14 @@ <field type="glx:CONTEXT" name="context" /> <reply> <pad bytes="1" /> - <field type="CARD32" name="num_attributes"/> + <field type="CARD32" name="num_attribs"/> <pad bytes="20" /> - <valueparam value-mask-type="CARD32" - value-mask-name="value_mask" - value-list-name="value_list" /> + <list type="CARD32" name="attribs"> + <op op="*"> + <fieldref>num_attribs</fieldref> + <value>2</value> + </op> + </list> </reply> </request> @@ -384,13 +393,16 @@ </request> <request name="CreatePbuffer" opcode="27"> - <field type="SCREEN" name="screen" /> + <field type="CARD32" name="screen" /> <field type="FBCONFIG" name="fbconfig" /> <field type="PBUFFER" name="pbuffer" /> <field type="CARD32" name="num_attribs" /> - <valueparam value-mask-type="CARD32" - value-mask-name="value_mask" - value-list-name="value_list" /> + <list type="CARD32" name="attribs"> + <op op="*"> + <fieldref>num_attribs</fieldref> + <value>2</value> + </op> + </list> </request> <request name="DestroyPbuffer" opcode="28"> @@ -403,29 +415,38 @@ <pad bytes="1" /> <field type="CARD32" name="num_attribs" /> <pad bytes="20" /> - <valueparam value-mask-type="CARD32" - value-mask-name="value_mask" - value-list-name="value_list" /> + <list type="CARD32" name="attribs"> + <op op="*"> + <fieldref>num_attribs</fieldref> + <value>2</value> + </op> + </list> </reply> </request> <request name="ChangeDrawableAttributes" opcode="30"> <field type="glx:DRAWABLE" name="drawable" /> <field type="CARD32" name="num_attribs" /> - <valueparam value-mask-type="CARD32" - value-mask-name="value_mask" - value-list-name="value_list" /> + <list type="CARD32" name="attribs"> + <op op="*"> + <fieldref>num_attribs</fieldref> + <value>2</value> + </op> + </list> </request> <request name="CreateWindow" opcode="31"> - <field type="SCREEN" name="screen" /> + <field type="CARD32" name="screen" /> <field type="FBCONFIG" name="fbconfig" /> <field type="xproto:WINDOW" name="window" /> <field type="glx:WINDOW" name="glx_window" /> <field type="CARD32" name="num_attribs" /> - <valueparam value-mask-type="CARD32" - value-mask-name="value_mask" - value-list-name="value_list" /> + <list type="CARD32" name="attribs"> + <op op="*"> + <fieldref>num_attribs</fieldref> + <value>2</value> + </op> + </list> </request> <request name="DeleteWindow" opcode="32"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-proto-0.9.93/src/randr.xml new/xcb-proto-1.0/src/randr.xml --- old/xcb-proto-0.9.93/src/randr.xml 2006-10-30 05:12:00.000000000 +0100 +++ new/xcb-proto-1.0/src/randr.xml 2006-11-22 07:00:38.000000000 +0100 @@ -71,17 +71,17 @@ BEWARE: the docs lie! --> <request name="SetScreenConfig" opcode="2"> - <field type="WINDOW" name="drawable" /> - <field type="CARD32" name="timestamp" /> - <field type="CARD32" name="config_timestamp" /> + <field type="DRAWABLE" name="drawable" /> + <field type="TIMESTAMP" name="timestamp" /> + <field type="TIMESTAMP" name="config_timestamp" /> <field type="CARD16" name="sizeID" /> <field type="INT16" name="rotation" /> - <field type="CARD16" name="refresh" /> + <field type="CARD16" name="rate" /> <pad bytes="2" /> <reply> <field type="CARD8" name="status" /> - <field type="CARD32" name="timestamp" /> - <field type="CARD32" name="config_timestamp" /> + <field type="TIMESTAMP" name="new_timestamp" /> + <field type="TIMESTAMP" name="config_timestamp" /> <field type="WINDOW" name="root" /> <field type="CARD16" name="subpixel_order" /> <pad bytes="10" /> @@ -109,8 +109,8 @@ <reply> <field type="CARD8" name="rotations" /> <field type="WINDOW" name="root" /> - <field type="CARD32" name="timestamp" /> - <field type="CARD32" name="config_timestamp" /> + <field type="TIMESTAMP" name="timestamp" /> + <field type="TIMESTAMP" name="config_timestamp" /> <field type="CARD16" name="nSizes" /> <field type="CARD16" name="sizeID" /> <field type="INT16" name="rotation" /> @@ -135,16 +135,16 @@ <event name="ScreenChangeNotify" number="0"> <field type="CARD8" name="rotation" /> - <field type="CARD32" name="timestamp" /> - <field type="CARD32" name="config_timestamp" /> + <field type="TIMESTAMP" name="timestamp" /> + <field type="TIMESTAMP" name="config_timestamp" /> <field type="WINDOW" name="root" /> <field type="WINDOW" name="request_window" /> <field type="CARD16" name="sizeID" /> <field type="CARD16" name="subpixel_order" /> - <field type="CARD16" name="width" /> - <field type="CARD16" name="height" /> - <field type="CARD16" name="mwidth" /> - <field type="CARD16" name="mheight" /> + <field type="INT16" name="width" /> + <field type="INT16" name="height" /> + <field type="INT16" name="mwidth" /> + <field type="INT16" name="mheight" /> </event> </xcb> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-proto-0.9.93/src/xcb.xsd new/xcb-proto-1.0/src/xcb.xsd --- old/xcb-proto-0.9.93/src/xcb.xsd 2006-10-31 01:32:26.000000000 +0100 +++ new/xcb-proto-1.0/src/xcb.xsd 2006-11-20 09:07:16.000000000 +0100 @@ -67,9 +67,6 @@ </xsd:complexType> </xsd:element> -  - <xsd:element name="localfield" type="var" /> -  <xsd:group name="expression"> <xsd:choice> @@ -162,7 +159,6 @@ <xsd:sequence> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:group ref="fields" /> - <xsd:element ref="localfield" /> <xsd:element ref="exprfield" /> <xsd:element ref="valueparam" /> </xsd:choice> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-proto-0.9.93/src/xproto.xml new/xcb-proto-1.0/src/xproto.xml --- old/xcb-proto-0.9.93/src/xproto.xml 2006-11-03 01:31:37.000000000 +0100 +++ new/xcb-proto-1.0/src/xproto.xml 2006-11-20 09:07:16.000000000 +0100 @@ -1086,7 +1086,7 @@ </request> <request name="UngrabKey" opcode="34"> - <field type="CARD8" name="key" /> + <field type="KEYCODE" name="key" /> <field type="WINDOW" name="grab_window" /> <field type="CARD16" name="modifiers" /> </request> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-proto-0.9.93/src/xv.xml new/xcb-proto-1.0/src/xv.xml --- old/xcb-proto-0.9.93/src/xv.xml 2006-10-30 05:12:00.000000000 +0100 +++ new/xcb-proto-1.0/src/xv.xml 2006-11-20 09:07:16.000000000 +0100 @@ -402,10 +402,7 @@ <field type="CARD16" name="drw_h" /> <field type="CARD16" name="width" /> <field type="CARD16" name="height" /> - <localfield type="CARD32" name="data_size" /> - <list type="CARD8" name="data"> - <fieldref>data_size</fieldref> - </list> + <list type="CARD8" name="data" /> </request> <request name="ShmPutImage" opcode="19"> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Thu Dec 7 21:37:19 CET 2006. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-11-24 12:26:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-12-07 12:46:55.000000000 +0100 @@ -1,0 +2,76 @@ +Thu Dec 7 12:42:35 CET 2006 - sndirsch(a)suse.de + +- updated i810 driver to release 1.7.3 + * Make VIDEO_DEBUG into a configure option + * Fix manpage to report 8160 instead of 6144 for LinearAlloc. + * Add some MergedFB checks for accelerator limitations + * Disable some debug message + * update port attributes immediately when overlay is on. + * Be a little more verbose when rejecting modes. + * Don't crash if SetCursorPosition is called with pScrn->currentMode == NULL. + * Add support for the new DRM memory manager. + * Bug 8594: Fix Xv hang with G965 + * obsoletes patches + - xf86-video-i810-965g-xv-hang.diff + - xf86-video-i810-disable-debug.diff + - xf86-video-i810-linearalloc.diff + - xf86-video-i810-mergedfb-checks.diff + - xf86-video-i810-modelines-verbose.diff + - xf86-video-i810-newdrm.diff + - xf86-video-i810-setcursorposition.diff + - xf86-video-i810-update-port-attributes.diff + - xf86-video-i810-video-debug.diff + +------------------------------------------------------------------- +Tue Dec 5 10:42:08 CET 2006 - sndirsch(a)suse.de + +- updated nv driver to release 1.2.1 + * Save and restore DAC0 register 608 when probing for connected + CRTs. Adapted from a patch by Egbert Eich for Novell bug + #220197 (obsoletes xf86-video-nv-bug220197.diff). + * Use XORG_RELEASE_VERSION. + * Handle more than 1 digit in the version numbers. Based on a + change by George Sapountzis <gsap7(a)yahoo.gr>. + * Replace panel message + MODE_BAD with MODE_PANEL. + +------------------------------------------------------------------- +Sun Dec 3 21:57:43 CET 2006 - sndirsch(a)suse.de + +- updated s3 driver to release 0.5.0 + * Evgeny M. Zubok: Make the driver work with modular X (bug 7112) +- updated mga driver to release 1.4.5 + * Minor typofix that was causing configure to exit with a syntax + error + * Enabled the Exa composite hooks on G550. + * Bug #2168: Fix graphics corruptions with Mystique rev 2. + * Removed some duplicated register definitions. + * Removed some unused defines from mga_reg.h. + * Register name tweak. + * Use register names in MGASaveScreenMerged() rather than magic numbers. + * Replaced more magic values with register names. + * Removed a duplicated register definition. + * Made some XAA function static. +- updated sis driver to release 0.9.3 + * include stdlib.h for strtod +- updated vesa driver to release 1.3.0 + * Fix shadow support yet again. +- updated i128 driver to release 1.2.1 + * Revision-number-only change for sequentiality. +- updated tdfx driver to release 1.3.0 +- updated intel modesetting driver (git_2006-12-04) +- xf86-video-i810-newdrm.diff: + * Add support for the new DRM memory manager + +------------------------------------------------------------------- +Sat Dec 2 22:58:44 CET 2006 - sndirsch(a)suse.de + +- newdrm.diff obsolete with libdrm 2.3.0 + +------------------------------------------------------------------- +Fri Dec 1 06:36:22 CET 2006 - sndirsch(a)suse.de + +- bug220197.diff: + Save and restore DAC0 register 608 when probing for connected + CRTs (Bug #220197) + +------------------------------------------------------------------- Old: ---- newdrm.diff p_mga.diff xf86-video-i128-1.1.0.6.tar.bz2 xf86-video-i810-1.7.2.tar.bz2 xf86-video-i810-965g-xv-hang.diff xf86-video-i810-disable-debug.diff xf86-video-i810-linearalloc.diff xf86-video-i810-mergedfb-checks.diff xf86-video-i810-modelines-verbose.diff xf86-video-i810-setcursorposition.diff xf86-video-i810-update-port-attributes.diff xf86-video-i810-video-debug.diff xf86-video-intel.modesetting-20061121.tar.bz2 xf86-video-mga-1.4.4.tar.bz2 xf86-video-nv-1.2.0.tar.bz2 xf86-video-s3-X11R7.1-0.4.1.tar.bz2 xf86-video-sis-0.9.2.tar.bz2 xf86-video-tdfx-1.2.2.tar.bz2 xf86-video-vesa-1.2.2.tar.bz2 New: ---- xf86-video-i128-1.2.1.tar.bz2 xf86-video-i810-1.7.3.tar.bz2 xf86-video-intel.modesetting-20061204.tar.bz2 xf86-video-mga-1.4.5.tar.bz2 xf86-video-nv-1.2.1.tar.bz2 xf86-video-s3-0.5.0.tar.bz2 xf86-video-sis-0.9.3.tar.bz2 xf86-video-tdfx-1.3.0.tar.bz2 xf86-video-vesa-1.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.3PQkAg/_old 2006-12-07 21:33:55.000000000 +0100 +++ /var/tmp/diff_new_pack.3PQkAg/_new 2006-12-07 21:33:55.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 31 +Release: 33 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -31,21 +31,21 @@ Source7: xf86-video-dummy-X11R7.1-0.2.0.tar.bz2 Source8: xf86-video-fbdev-X11R7.1-0.3.0.tar.bz2 Source9: xf86-video-glint-X11R7.1-1.1.1.tar.bz2 -Source10: xf86-video-i128-1.1.0.6.tar.bz2 +Source10: xf86-video-i128-1.2.1.tar.bz2 Source11: xf86-video-i740-X11R7.1-1.1.0.tar.bz2 -Source12: xf86-video-i810-1.7.2.tar.bz2 +Source12: xf86-video-i810-1.7.3.tar.bz2 Source13: xf86-video-imstt-X11R7.1-1.1.0.tar.bz2 -Source14: xf86-video-mga-1.4.4.tar.bz2 +Source14: xf86-video-mga-1.4.5.tar.bz2 Source15: xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2 Source16: xf86-video-newport-0.2.1.tar.bz2 Source17: xf86-video-nsc-2.8.2.tar.bz2 -Source18: xf86-video-nv-1.2.0.tar.bz2 +Source18: xf86-video-nv-1.2.1.tar.bz2 Source19: xf86-video-rendition-4.1.2.tar.bz2 -Source20: xf86-video-s3-X11R7.1-0.4.1.tar.bz2 +Source20: xf86-video-s3-0.5.0.tar.bz2 Source21: xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2 Source22: xf86-video-savage-2.1.2.tar.bz2 Source23: xf86-video-siliconmotion-1.4.2.tar.bz2 -Source24: xf86-video-sis-0.9.2.tar.bz2 +Source24: xf86-video-sis-0.9.3.tar.bz2 Source25: xf86-video-sisusb-X11R7.1-0.8.1.tar.bz2 Source26: xf86-video-sunbw2-X11R7.1-1.1.0.tar.bz2 Source27: xf86-video-suncg14-X11R7.1-1.1.0.tar.bz2 @@ -54,24 +54,23 @@ Source30: xf86-video-sunffb-X11R7.1-1.1.0.tar.bz2 Source31: xf86-video-sunleo-X11R7.1-1.1.0.tar.bz2 Source32: xf86-video-suntcx-X11R7.1-1.1.0.tar.bz2 -Source33: xf86-video-tdfx-1.2.2.tar.bz2 +Source33: xf86-video-tdfx-1.3.0.tar.bz2 Source34: xf86-video-tga-X11R7.1-1.1.0.tar.bz2 Source35: xf86-video-trident-1.2.3.tar.bz2 Source36: xf86-video-tseng-1.1.1.tar.bz2 Source37: xf86-video-v4l-X11R7.1-0.1.1.tar.bz2 -Source38: xf86-video-vesa-1.2.2.tar.bz2 +Source38: xf86-video-vesa-1.3.0.tar.bz2 Source39: xf86-video-vga-X11R7.1-4.1.0.tar.bz2 Source40: xf86-video-via-0.2.2.tar.bz2 Source41: xf86-video-vmware-10.14.0.tar.bz2 Source42: xf86-video-voodoo-1.1.1.tar.bz2 Source43: xf86-video-impact-0.2.0.tar.bz2 Source44: HALlib-4.1.tar.gz -Source45: xf86-video-intel.modesetting-20061121.tar.bz2 +Source45: xf86-video-intel.modesetting-20061204.tar.bz2 Patch1: radeon-xrandr-dotclock.diff Patch2: radeon_dell.diff Patch3: ps_nv.diff Patch5: mga-g200se_pci-fix.diff -Patch6: p_mga.diff Patch9: xf86-video-sunffb.diff Patch10: xf86-video-tdfx.diff Patch11: xf86-video-glint.diff @@ -81,16 +80,7 @@ Patch16: xf86-video-nsc.diff Patch17: p_i810-refresh.diff Patch18: radeon-vbios-ppc.diff -Patch19: xf86-video-i810-video-debug.diff -Patch20: xf86-video-i810-linearalloc.diff -Patch21: xf86-video-i810-setcursorposition.diff -Patch22: xf86-video-i810-mergedfb-checks.diff -Patch23: xf86-video-i810-965g-xv-hang.diff Patch24: xf86-video-intel.modesetting.diff -Patch25: newdrm.diff -Patch26: xf86-video-i810-disable-debug.diff -Patch27: xf86-video-i810-update-port-attributes.diff -Patch28: xf86-video-i810-modelines-verbose.diff Patch29: xf86-video-fbdev-disable-shadowfb.diff %description @@ -113,7 +103,6 @@ pushd xf86-video-mga-*/src tar xzf %{SOURCE44} %patch5 -p1 -%patch6 -p1 popd pushd xf86-video-mga-* %ifarch %ix86 @@ -142,18 +131,9 @@ pushd xf86-video-i810-* ### disabled for now #%patch17 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 popd pushd xf86-video-intel.modesetting %patch24 -p0 -%patch25 -p1 -R mv man/i810.man man/i810beta.man popd @@ -214,6 +194,67 @@ %{_mandir}/man4/* %changelog -n xorg-x11-driver-video +* Thu Dec 07 2006 - sndirsch(a)suse.de +- updated i810 driver to release 1.7.3 + * Make VIDEO_DEBUG into a configure option + * Fix manpage to report 8160 instead of 6144 for LinearAlloc. + * Add some MergedFB checks for accelerator limitations + * Disable some debug message + * update port attributes immediately when overlay is on. + * Be a little more verbose when rejecting modes. + * Don't crash if SetCursorPosition is called with pScrn->currentMode == NULL. + * Add support for the new DRM memory manager. + * Bug 8594: Fix Xv hang with G965 + * obsoletes patches + - xf86-video-i810-965g-xv-hang.diff + - xf86-video-i810-disable-debug.diff + - xf86-video-i810-linearalloc.diff + - xf86-video-i810-mergedfb-checks.diff + - xf86-video-i810-modelines-verbose.diff + - xf86-video-i810-newdrm.diff + - xf86-video-i810-setcursorposition.diff + - xf86-video-i810-update-port-attributes.diff + - xf86-video-i810-video-debug.diff +* Tue Dec 05 2006 - sndirsch(a)suse.de +- updated nv driver to release 1.2.1 + * Save and restore DAC0 register 608 when probing for connected + CRTs. Adapted from a patch by Egbert Eich for Novell bug + [#220197] (obsoletes xf86-video-nv-bug220197.diff). + * Use XORG_RELEASE_VERSION. + * Handle more than 1 digit in the version numbers. Based on a + change by George Sapountzis <gsap7(a)yahoo.gr>. + * Replace panel message + MODE_BAD with MODE_PANEL. +* Sun Dec 03 2006 - sndirsch(a)suse.de +- updated s3 driver to release 0.5.0 + * Evgeny M. Zubok: Make the driver work with modular X (bug 7112) +- updated mga driver to release 1.4.5 + * Minor typofix that was causing configure to exit with a syntax + error + * Enabled the Exa composite hooks on G550. + * Bug #2168: Fix graphics corruptions with Mystique rev 2. + * Removed some duplicated register definitions. + * Removed some unused defines from mga_reg.h. + * Register name tweak. + * Use register names in MGASaveScreenMerged() rather than magic numbers. + * Replaced more magic values with register names. + * Removed a duplicated register definition. + * Made some XAA function static. +- updated sis driver to release 0.9.3 + * include stdlib.h for strtod +- updated vesa driver to release 1.3.0 + * Fix shadow support yet again. +- updated i128 driver to release 1.2.1 + * Revision-number-only change for sequentiality. +- updated tdfx driver to release 1.3.0 +- updated intel modesetting driver (git_2006-12-04) +- xf86-video-i810-newdrm.diff: + * Add support for the new DRM memory manager +* Sat Dec 02 2006 - sndirsch(a)suse.de +- newdrm.diff obsolete with libdrm 2.3.0 +* Fri Dec 01 2006 - sndirsch(a)suse.de +- bug220197.diff: + Save and restore DAC0 register 608 when probing for connected + CRTs (Bug #220197) * Fri Nov 24 2006 - sndirsch(a)suse.de - xf86-video-fbdev-disable-shadowfb.diff: * fbdev: disable use of shadowfb by default (Bug #220171) ++++++ mga-g200se_pci-fix.diff ++++++ --- /var/tmp/diff_new_pack.3PQkAg/_old 2006-12-07 21:33:55.000000000 +0100 +++ /var/tmp/diff_new_pack.3PQkAg/_new 2006-12-07 21:33:55.000000000 +0100 @@ -1,18 +1,3 @@ -diff -u -r mga.orig/mga_dacG.c mga/mga_dacG.c ---- mga.orig/mga_dacG.c 2006-06-01 15:57:34.000000000 +0200 -+++ mga/mga_dacG.c 2006-06-01 15:59:19.000000000 +0200 -@@ -415,10 +415,7 @@ - pReg->DacRegs[ MGA1064_VREF_CTL ] = 0x03; - pReg->DacRegs[ MGA1064_PIX_CLK_CTL ] = 0x01; - pReg->DacRegs[ MGA1064_MISC_CTL ] = 0x19; -- if(pMga->HasSDRAM) -- pReg->Option = 0x40499121; -- else -- pReg->Option = 0x4049cd21; -+ pReg->Option = 0x40049120; - pReg->Option2 = 0x00008000; - break; - case PCI_CHIP_MGAG200: diff -u -r mga.orig/mga_driver.c mga/mga_driver.c --- mga.orig/mga_driver.c 2006-06-01 15:57:34.000000000 +0200 +++ mga/mga_driver.c 2006-06-01 16:07:06.000000000 +0200 @@ -56,3 +41,17 @@ pMga->CurrentLayout.mode = mode; if(pMga->MergedFB && mode->Private && (mode->PrivSize == 0)) { +--- src/mga_dacG.c.orig 2006-12-03 23:06:32.908071711 +0100 ++++ src/mga_dacG.c 2006-12-03 23:07:36.086463534 +0100 +@@ -422,10 +422,7 @@ + MGA1064_MISC_CTL_VGA8 | + MGA1064_MISC_CTL_DAC_RAM_CS; + +- if(pMga->HasSDRAM) +- pReg->Option = 0x40499121; +- else +- pReg->Option = 0x4049cd21; ++ pReg->Option = 0x40049120; + pReg->Option2 = 0x00008000; + break; + case PCI_CHIP_MGAG200: ++++++ xf86-video-i128-1.1.0.6.tar.bz2 -> xf86-video-i128-1.2.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i128-1.1.0.6/configure new/xf86-video-i128-1.2.1/configure --- old/xf86-video-i128-1.1.0.6/configure 2006-10-14 00:31:16.000000000 +0200 +++ new/xf86-video-i128-1.2.1/configure 2006-12-01 23:29:44.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for xf86-video-i128 1.1.0.6. +# Generated by GNU Autoconf 2.59 for xf86-video-i128 1.2.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-i128' PACKAGE_TARNAME='xf86-video-i128' -PACKAGE_VERSION='1.1.0.6' -PACKAGE_STRING='xf86-video-i128 1.1.0.6' +PACKAGE_VERSION='1.2.1' +PACKAGE_STRING='xf86-video-i128 1.2.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -966,7 +966,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-i128 1.1.0.6 to adapt to many kinds of systems. +\`configure' configures xf86-video-i128 1.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1032,7 +1032,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-i128 1.1.0.6:";; + short | recursive ) echo "Configuration of xf86-video-i128 1.2.1:";; esac cat <<\_ACEOF @@ -1181,7 +1181,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xf86-video-i128 configure 1.1.0.6 +xf86-video-i128 configure 1.2.1 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1195,7 +1195,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-i128 $as_me 1.1.0.6, which was +It was created by xf86-video-i128 $as_me 1.2.1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1843,7 +1843,7 @@ # Define the identity of the package. PACKAGE='xf86-video-i128' - VERSION='1.1.0.6' + VERSION='1.2.1' cat >>confdefs.h <<_ACEOF @@ -20824,7 +20824,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by xf86-video-i128 $as_me 1.1.0.6, which was +This file was extended by xf86-video-i128 $as_me 1.2.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20887,7 +20887,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-i128 config.status 1.1.0.6 +xf86-video-i128 config.status 1.2.1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i128-1.1.0.6/configure.ac new/xf86-video-i128-1.2.1/configure.ac --- old/xf86-video-i128-1.1.0.6/configure.ac 2006-10-14 00:31:02.000000000 +0200 +++ new/xf86-video-i128-1.2.1/configure.ac 2006-12-01 23:28:40.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-i128], - 1.1.0.6, + 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-video-i128) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i128-1.1.0.6/src/i128_driver.c new/xf86-video-i128-1.2.1/src/i128_driver.c --- old/xf86-video-i128-1.1.0.6/src/i128_driver.c 2006-10-12 00:25:36.000000000 +0200 +++ new/xf86-video-i128-1.2.1/src/i128_driver.c 2006-12-01 23:28:58.000000000 +0100 @@ -117,8 +117,8 @@ #define I128_NAME "I128" #define I128_DRIVER_NAME "i128" #define I128_MAJOR_VERSION 1 -#define I128_MINOR_VERSION 1 -#define I128_PATCHLEVEL 0 +#define I128_MINOR_VERSION 2 +#define I128_PATCHLEVEL 1 /* * This contains the functions needed by the server after loading the ++++++ xf86-video-i128-1.1.0.6.tar.bz2 -> xf86-video-i810-1.7.3.tar.bz2 ++++++ ++++ 67923 lines of diff (skipped) ++++++ xf86-video-intel.modesetting-20061121.tar.bz2 -> xf86-video-intel.modesetting-20061204.tar.bz2 ++++++ ++++ 12111 lines of diff (skipped) ++++++ xf86-video-mga-1.4.4.tar.bz2 -> xf86-video-mga-1.4.5.tar.bz2 ++++++ ++++ 19566 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-mga-1.4.4/ChangeLog new/xf86-video-mga-1.4.5/ChangeLog --- old/xf86-video-mga-1.4.4/ChangeLog 2006-10-27 21:28:50.000000000 +0200 +++ new/xf86-video-mga-1.4.5/ChangeLog 2006-11-30 19:00:05.000000000 +0100 @@ -1,3 +1,73 @@ +commit 00efdc4959a0b240eb2dc7a3188c0ef64b2ad74a +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Thu Nov 30 19:59:38 2006 +0200 + + bump to 1.4.5 + +commit 5bbafd77678a2b0f82e820aa98337a014d284554 +Author: Tilman Sauerbeck <tilman(a)code-monkey.de> +Date: Sun Nov 26 18:06:12 2006 +0100 + + Made some XAA function static. + +commit 4778901bb13a950285c55ea6f058e94ee7b03652 +Author: Tilman Sauerbeck <tilman(a)code-monkey.de> +Date: Sun Nov 26 16:21:34 2006 +0100 + + Removed a duplicated register definition. + +commit f9d83ad601c8cba197e96f0b907f1dae6134953b +Author: Tilman Sauerbeck <tilman(a)code-monkey.de> +Date: Sun Nov 26 16:17:12 2006 +0100 + + Replaced more magic values with register names. + +commit 6df85941ce077e1eee8b43945c51ab1b0906c758 +Author: Tilman Sauerbeck <tilman(a)code-monkey.de> +Date: Sun Nov 26 15:39:54 2006 +0100 + + Use register names in MGASaveScreenMerged() rather than magic numbers. + +commit b3ee69f6ac058e52d5175f611090baa76eed49f9 +Author: Tilman Sauerbeck <tilman(a)code-monkey.de> +Date: Sun Nov 26 15:24:46 2006 +0100 + + Register name tweak. + + The "DAC power down" register powers down the DAC when it's + set to zero, and enables it when it's set to one. + To avoid confusion, I renamed it. + +commit 0f8c42fe75c6da9e7ea4aeb33b71778551c61528 +Author: Tilman Sauerbeck <tilman(a)code-monkey.de> +Date: Sat Nov 25 17:08:15 2006 +0100 + + Removed some unused defines from mga_reg.h. + +commit 334c7237078652722d7dec1c74812af46bfd7c67 +Author: Tilman Sauerbeck <tilman(a)code-monkey.de> +Date: Sat Nov 25 16:42:49 2006 +0100 + + Removed some duplicated register definitions. + +commit be88d58968c604624617f40820dc9a50a92661be +Author: Tilman Sauerbeck <tilman(a)code-monkey.de> +Date: Sun Nov 19 21:04:01 2006 +0100 + + Bug #2168: Fix graphics corruptions with Mystique rev 2. + +commit daeecb63567fb394654c9e66d64c3c53658f2c7d +Author: Tilman Sauerbeck <tilman(a)code-monkey.de> +Date: Fri Nov 17 23:08:25 2006 +0100 + + Enabled the Exa composite hooks on G550. + +commit d69607fe8b2dfb6c539dbf9f2b2996d04a4a838a +Author: David Nusinow <dnusinow(a)debian.org> +Date: Mon Nov 6 23:58:06 2006 -0500 + + Minor typofix that was causing configure to exit with a syntax error + commit 1dd6e6995d7a37338dce6ee5b1aa4ee9dd848e1d Author: Ian Romanick <idr(a)us.ibm.com> Date: Fri Oct 27 11:53:40 2006 -0700 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-mga-1.4.4/configure.ac new/xf86-video-mga-1.4.5/configure.ac --- old/xf86-video-mga-1.4.4/configure.ac 2006-10-27 20:50:02.000000000 +0200 +++ new/xf86-video-mga-1.4.5/configure.ac 2006-11-30 18:59:28.000000000 +0100 @@ -24,7 +24,7 @@ # When the version number is modified here, also modify it in src/mga.h. AC_INIT([xf86-video-mga], - 1.4.4, + 1.4.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-video-mga) @@ -55,7 +55,7 @@ [DRI=auto]) AC_ARG_ENABLE(exa, AC_HELP_STRING([--disable-exa], - [Disable EXA support [[default enabled]]]), + [Disable EXA support [[default=enabled]]]), [EXA="$enableval"], [EXA=yes]) 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-mga-1.4.4/src/mga_dacG.c new/xf86-video-mga-1.4.5/src/mga_dacG.c --- old/xf86-video-mga-1.4.4/src/mga_dacG.c 2006-10-27 20:27:13.000000000 +0200 +++ new/xf86-video-mga-1.4.5/src/mga_dacG.c 2006-11-30 18:59:07.000000000 +0100 @@ -332,7 +332,8 @@ break; case PCI_CHIP_MGAG100: case PCI_CHIP_MGAG100_PCI: - pReg->DacRegs[ MGAGDAC_XVREFCTRL ] = 0x03; + pReg->DacRegs[MGA1064_VREF_CTL] = 0x03; + if(pMga->HasSDRAM) { if(pMga->OverclockMem) { /* 220 Mhz */ @@ -413,8 +414,14 @@ MGA_HAL(break;); #endif pReg->DacRegs[ MGA1064_VREF_CTL ] = 0x03; - pReg->DacRegs[ MGA1064_PIX_CLK_CTL ] = 0x01; - pReg->DacRegs[ MGA1064_MISC_CTL ] = 0x19; + pReg->DacRegs[MGA1064_PIX_CLK_CTL] = + MGA1064_PIX_CLK_CTL_SEL_PLL; + + pReg->DacRegs[MGA1064_MISC_CTL] = + MGA1064_MISC_CTL_DAC_EN | + MGA1064_MISC_CTL_VGA8 | + MGA1064_MISC_CTL_DAC_RAM_CS; + if(pMga->HasSDRAM) pReg->Option = 0x40499121; else @@ -565,7 +572,11 @@ MGA_NOT_HAL(pReg->DacRegs[MGA1064_CURSOR_BASE_ADR_HI] = pMga->FbCursorOffset >> 18); if (pMga->SyncOnGreen) { - MGA_NOT_HAL(pReg->DacRegs[MGA1064_GEN_CTL] &= ~0x20); + MGA_NOT_HAL( + pReg->DacRegs[MGA1064_GEN_CTL] &= + ~MGA1064_GEN_CTL_SYNC_ON_GREEN_DIS; + ); + pReg->ExtVga[3] |= 0x40; } 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-mga-1.4.4/src/mga_exa.c new/xf86-video-mga-1.4.5/src/mga_exa.c --- old/xf86-video-mga-1.4.4/src/mga_exa.c 2006-10-27 04:48:24.000000000 +0200 +++ new/xf86-video-mga-1.4.5/src/mga_exa.c 2006-11-30 18:59:07.000000000 +0100 @@ -797,7 +797,8 @@ pExa->Copy = mgaCopy; pExa->DoneCopy = mgaNoopDone; - if (pMga->Chipset == PCI_CHIP_MGAG400) { + if (pMga->Chipset == PCI_CHIP_MGAG400 || + pMga->Chipset == PCI_CHIP_MGAG550) { pExa->CheckComposite = mgaCheckComposite; pExa->PrepareComposite = mgaPrepareComposite; pExa->Composite = mgaComposite; 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-mga-1.4.4/src/mga_merge.c new/xf86-video-mga-1.4.5/src/mga_merge.c --- old/xf86-video-mga-1.4.4/src/mga_merge.c 2006-10-27 04:48:24.000000000 +0200 +++ new/xf86-video-mga-1.4.5/src/mga_merge.c 2006-11-30 18:59:07.000000000 +0100 @@ -947,23 +947,28 @@ if (on) { /* SetTimdeSinceLastInputEvent();*/ - + /* power on Dac1 */ - reg = inMGAdac(0x1E); - outMGAdac(0x1E, reg | 1); + reg = inMGAdac(MGA1064_MISC_CTL); + reg |= MGA1064_MISC_CTL_DAC_EN; + outMGAdac(MGA1064_MISC_CTL, reg); + /* power on Dac2 */ - reg = inMGAdac(0xA0); - outMGAdac(0xA0, reg | 1); - + reg = inMGAdac(MGA1064_PWR_CTL); + reg |= 1; + outMGAdac(MGA1064_PWR_CTL, reg); } else { /* power off Dac1 */ - reg = inMGAdac(0x1E); - outMGAdac(0x1E, reg & ~1); - /* power off Dac2 */ - reg = inMGAdac(0xA0); - outMGAdac(0xA0, reg & ~1); + reg = inMGAdac(MGA1064_MISC_CTL); + reg &= ~MGA1064_MISC_CTL_DAC_EN; + outMGAdac(MGA1064_MISC_CTL, reg); + /* power off Dac2 */ + reg = inMGAdac(MGA1064_PWR_CTL); + reg &= ~1; + outMGAdac(MGA1064_PWR_CTL, reg); } + 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-mga-1.4.4/src/mga_reg.h new/xf86-video-mga-1.4.5/src/mga_reg.h --- old/xf86-video-mga-1.4.4/src/mga_reg.h 2006-10-27 04:48:24.000000000 +0200 +++ new/xf86-video-mga-1.4.5/src/mga_reg.h 2006-11-30 18:59:07.000000000 +0100 @@ -355,7 +355,6 @@ #define MGA1064_MUL_CTL_G16V16bits 0x06 #define MGA1064_MUL_CTL_32_24bits 0x07 -#define MGAGDAC_XVREFCTRL 0x18 #define MGA1064_PIX_CLK_CTL 0x1a #define MGA1064_PIX_CLK_CTL_CLK_DIS ( 0x01 << 2 ) #define MGA1064_PIX_CLK_CTL_CLK_POW_DOWN ( 0x01 << 3 ) @@ -365,8 +364,9 @@ #define MGA1064_PIX_CLK_CTL_SEL_MSK ( 0x03 << 0 ) #define MGA1064_GEN_CTL 0x1d +#define MGA1064_GEN_CTL_SYNC_ON_GREEN_DIS (0x01 << 5) #define MGA1064_MISC_CTL 0x1e -#define MGA1064_MISC_CTL_DAC_POW_DN ( 0x01 << 0 ) +#define MGA1064_MISC_CTL_DAC_EN ( 0x01 << 0 ) #define MGA1064_MISC_CTL_VGA ( 0x01 << 1 ) #define MGA1064_MISC_CTL_DIS_CON ( 0x03 << 1 ) #define MGA1064_MISC_CTL_MAFC ( 0x02 << 1 ) @@ -402,10 +402,6 @@ #define MGA1064_PIX_PLL_STAT 0x4f /*Added for G450 dual head*/ -/* Supported PLL*/ -#define __PIXEL_PLL 1 -#define __SYSTEM_PLL 2 -#define __VIDEO_PLL 3 #define MGA1064_VID_PLL_P 0x8D #define MGA1064_VID_PLL_M 0x8E @@ -437,10 +433,6 @@ #define MGAREG_C2OFFSET 0x3c40 #define MGAREG_C2DATACTL 0x3c4c -#define MGA1064_DISP_CTL 0x8a -#define MGA1064_SYNC_CTL 0x8b -#define MGA1064_PWR_CTL 0xa0 - /* video register */ #define MGAREG_BESA1C3ORG 0x3d60 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-mga-1.4.4/src/mga_storm.c new/xf86-video-mga-1.4.5/src/mga_storm.c --- old/xf86-video-mga-1.4.4/src/mga_storm.c 2006-10-27 04:48:24.000000000 +0200 +++ new/xf86-video-mga-1.4.5/src/mga_storm.c 2006-11-30 18:59:07.000000000 +0100 @@ -141,7 +141,7 @@ int x1, int y1, int x2, int y2, int flags, int phase ); #endif -void mgaRestoreAccelState( ScrnInfoPtr pScrn ); +static void mgaRestoreAccelState( ScrnInfoPtr pScrn ); #ifdef XF86DRI void mgaDRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index); @@ -149,21 +149,21 @@ RegionPtr prgnSrc, CARD32 index); #endif -extern void MGASetClippingRectangle(ScrnInfoPtr pScrn, int x1, int y1, +static void MGASetClippingRectangle(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2); -extern void MGADisableClipping(ScrnInfoPtr pScrn); -extern void MGAFillSolidRectsDMA(ScrnInfoPtr pScrn, int fg, int rop, +static void MGADisableClipping(ScrnInfoPtr pScrn); +static void MGAFillSolidRectsDMA(ScrnInfoPtr pScrn, int fg, int rop, unsigned int planemask, int nBox, BoxPtr pBox); -extern void MGAFillSolidSpansDMA(ScrnInfoPtr pScrn, int fg, int rop, +static void MGAFillSolidSpansDMA(ScrnInfoPtr pScrn, int fg, int rop, unsigned int planemask, int n, DDXPointPtr ppt, int *pwidth, int fSorted); -extern void MGAFillMono8x8PatternRectsTwoPass(ScrnInfoPtr pScrn, int fg, int bg, +static void MGAFillMono8x8PatternRectsTwoPass(ScrnInfoPtr pScrn, int fg, int bg, int rop, unsigned int planemask, int nBox, BoxPtr pBox, int pattern0, int pattern1, int xorigin, int yorigin); -extern void MGAValidatePolyArc(GCPtr, unsigned long, DrawablePtr); -extern void MGAValidatePolyPoint(GCPtr, unsigned long, DrawablePtr); -extern void MGAFillCacheBltRects(ScrnInfoPtr, int, unsigned int, int, BoxPtr, +static void MGAValidatePolyArc(GCPtr, unsigned long, DrawablePtr); +static void MGAValidatePolyPoint(GCPtr, unsigned long, DrawablePtr); +static void MGAFillCacheBltRects(ScrnInfoPtr, int, unsigned int, int, BoxPtr, int, int, XAACacheInfoPtr); @@ -220,8 +220,8 @@ #include "mipict.h" #include "dixstruct.h" -CARD32 MGAAlphaTextureFormats[2] = {PICT_a8, 0}; -CARD32 MGATextureFormats[2] = {PICT_a8r8g8b8, 0}; +static CARD32 MGAAlphaTextureFormats[2] = {PICT_a8, 0}; +static CARD32 MGATextureFormats[2] = {PICT_a8r8g8b8, 0}; static void RemoveLinear (FBLinearPtr linear) @@ -1007,7 +1007,7 @@ /* Support for multiscreen */ -void mgaRestoreAccelState(ScrnInfoPtr pScrn) +static void mgaRestoreAccelState(ScrnInfoPtr pScrn) { MGAPtr pMga = MGAPTR(pScrn); MGAFBLayout *pLayout = &pMga->CurrentLayout; @@ -1089,8 +1089,8 @@ CHECK_DMA_QUIESCENT(pMga, pScrn); - /* MGAISBUSY() reportedly causes a freeze for Mystique revision 2 and older */ - if (!(pMga->Chipset == PCI_CHIP_MGA1064 && (pMga->ChipRev >= 0 && pMga->ChipRev <= 2))) + /* MGAISBUSY() reportedly causes a freeze for Mystique revisions 0 and 1 */ + if (!(pMga->Chipset == PCI_CHIP_MGA1064 && (pMga->ChipRev >= 0 && pMga->ChipRev <= 1))) while(MGAISBUSY()); /* flush cache before a read (mga-1064g 5.1.6) */ OUTREG8(MGAREG_CRTC_INDEX, 0); @@ -1191,7 +1191,8 @@ } -void MGASetClippingRectangle( +static void +MGASetClippingRectangle( ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2 ){ @@ -1206,7 +1207,8 @@ pMga->AccelFlags |= CLIPPER_ON; } -void MGADisableClipping(ScrnInfoPtr pScrn) +static void +MGADisableClipping(ScrnInfoPtr pScrn) { MGAPtr pMga = MGAPTR(pScrn); @@ -2212,7 +2214,7 @@ } -void +static void MGAFillSolidRectsDMA( ScrnInfoPtr pScrn, int fg, int rop, @@ -2253,7 +2255,7 @@ OUTREG(MGAREG_OPMODE, MGAOPM_DMA_BLIT); } -void +static void MGAFillSolidSpansDMA( ScrnInfoPtr pScrn, int fg, int rop, @@ -2312,7 +2314,7 @@ } -void +static void MGAFillMono8x8PatternRectsTwoPass( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -2365,7 +2367,7 @@ } -void +static void MGAValidatePolyArc( GCPtr pGC, unsigned long changes, @@ -2452,7 +2454,7 @@ } -void +static void MGAValidatePolyPoint( GCPtr pGC, unsigned long changes, @@ -2476,7 +2478,7 @@ } -void +static void MGAFillCacheBltRects( ScrnInfoPtr pScrn, int rop, ++++++ xf86-video-nv-1.2.0.tar.bz2 -> xf86-video-nv-1.2.1.tar.bz2 ++++++ ++++ 13035 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-nv-1.2.0/ChangeLog new/xf86-video-nv-1.2.1/ChangeLog --- old/xf86-video-nv-1.2.0/ChangeLog 2006-06-30 21:59:13.000000000 +0200 +++ new/xf86-video-nv-1.2.1/ChangeLog 2006-12-01 19:57:41.000000000 +0100 @@ -1,3 +1,37 @@ +commit 2d4b4bb06029e60e5c7b96d94b31c8aadac91843 +Author: Aaron Plattner <aplattner(a)nvidia.com> +Date: Thu Nov 30 17:41:41 2006 -0800 + + Bump to 1.2.1. + +commit 558ef7e26e361529a05360610abc3cbcdb04fd67 +Author: Aaron Plattner <aplattner(a)nvidia.com> +Date: Thu Nov 30 17:36:29 2006 -0800 + + Save and restore DAC0 register 608 when probing for connected CRTs. + + Adapted from a patch by Egbert Eich for Novell bug #220197. + +commit 08bb966abbca11c4581d666af3249e4922156e03 +Author: Aaron Plattner <aplattner(a)nvidia.com> +Date: Thu Nov 30 17:14:38 2006 -0800 + + Use XORG_RELEASE_VERSION. + +commit 162391f8fb640184db3917f3842fbff0bc9ce606 +Author: Aaron Plattner <aplattner(a)nvidia.com> +Date: Thu Oct 26 19:08:29 2006 -0700 + + Handle more than 1 digit in the version numbers. + + Based on a change by George Sapountzis <gsap7(a)yahoo.gr>. + +commit 98372d0f94a9d658a7257d2199ef37a2449b9961 +Author: Adam Jackson <ajax(a)benzedrine.nwnk.net> +Date: Fri Aug 11 16:02:28 2006 -0400 + + Replace panel message + MODE_BAD with MODE_PANEL. + commit 43ec66396f805aba87017d193d97a03372c29909 Author: Aaron Plattner <aplattner(a)nvidia.com> Date: Fri Jun 30 12:54:44 2006 -0700 @@ -560,4 +594,3 @@ Date: Fri Nov 14 15:54:48 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/xf86-video-nv-1.2.0/config.h.in new/xf86-video-nv-1.2.1/config.h.in --- old/xf86-video-nv-1.2.0/config.h.in 2006-06-30 21:50:06.000000000 +0200 +++ new/xf86-video-nv-1.2.1/config.h.in 2006-12-01 19:57:41.000000000 +0100 @@ -35,15 +35,6 @@ /* XV hooks take a DrawablePtr */ #undef HAVE_XV_DRAWABLE -/* Major version */ -#undef NV_MAJOR_VERSION - -/* Minor version */ -#undef NV_MINOR_VERSION - -/* Patch version */ -#undef NV_PATCHLEVEL - /* Name of package */ #undef PACKAGE @@ -62,6 +53,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS 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-nv-1.2.0/configure.ac new/xf86-video-nv-1.2.1/configure.ac --- old/xf86-video-nv-1.2.0/configure.ac 2006-06-30 21:49:05.000000000 +0200 +++ new/xf86-video-nv-1.2.1/configure.ac 2006-12-01 02:41:34.000000000 +0100 @@ -22,19 +22,11 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-nv], - 1.2.0, + 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-video-nv) -AC_DEFINE_UNQUOTED([NV_MAJOR_VERSION], - [$(echo $PACKAGE_VERSION | sed -e 's/^$[[0-9]]$\.[[0-9]]\.[[0-9]]/\1/')], - [Major version]) -AC_DEFINE_UNQUOTED([NV_MINOR_VERSION], - [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.$[[0-9]]$\.[[0-9]]/\1/')], - [Minor version]) -AC_DEFINE_UNQUOTED([NV_PATCHLEVEL], - [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.[[0-9]]\.$[[0-9]]$/\1/')], - [Patch version]) +XORG_RELEASE_VERSION AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.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/xf86-video-nv-1.2.0/src/nv_driver.c new/xf86-video-nv-1.2.1/src/nv_driver.c --- old/xf86-video-nv-1.2.0/src/nv_driver.c 2006-06-30 18:33:22.000000000 +0200 +++ new/xf86-video-nv-1.2.1/src/nv_driver.c 2006-12-01 02:12:36.000000000 +0100 @@ -458,7 +458,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - NV_MAJOR_VERSION, NV_MINOR_VERSION, NV_PATCHLEVEL, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, MOD_CLASS_VIDEODRV, @@ -953,14 +953,9 @@ { NVPtr pNv = NVPTR(xf86Screens[scrnIndex]); - if(pNv->fpWidth && pNv->fpHeight) { - if((pNv->fpWidth < mode->HDisplay) || (pNv->fpHeight < mode->VDisplay)) { - xf86DrvMsg(scrnIndex, X_INFO, "Mode \"%s\" is larger than " - "BIOS programmed panel size of %d x %d. Removing.\n", - mode->name, pNv->fpWidth, pNv->fpHeight); - return (MODE_BAD); - } - } + if(pNv->fpWidth && pNv->fpHeight) + if((pNv->fpWidth < mode->HDisplay) || (pNv->fpHeight < mode->VDisplay)) + return (MODE_PANEL); return (MODE_OK); } 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-nv-1.2.0/src/nv_setup.c new/xf86-video-nv-1.2.1/src/nv_setup.c --- old/xf86-video-nv-1.2.0/src/nv_setup.c 2006-06-17 02:48:53.000000000 +0200 +++ new/xf86-video-nv-1.2.1/src/nv_setup.c 2006-12-01 02:29:39.000000000 +0100 @@ -174,14 +174,17 @@ { NVPtr pNv = NVPTR(pScrn); volatile U032 *PRAMDAC = pNv->PRAMDAC0; - CARD32 reg52C, reg608; + CARD32 reg52C, reg608, dac0_reg608; Bool present; xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Probing for analog device on output %s...\n", output ? "B" : "A"); - if(output) PRAMDAC += 0x800; + if(output) { + dac0_reg608 = PRAMDAC[0x0608/4]; + PRAMDAC += 0x800; + } reg52C = PRAMDAC[0x052C/4]; reg608 = PRAMDAC[0x0608/4]; @@ -204,7 +207,8 @@ else xf86DrvMsg(pScrn->scrnIndex, X_PROBED, " ...can't find one\n"); - pNv->PRAMDAC0[0x0608/4] &= 0x0000EFFF; + if(output) + pNv->PRAMDAC0[0x0608/4] = dac0_reg608; PRAMDAC[0x052C/4] = reg52C; PRAMDAC[0x0608/4] = reg608; 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-nv-1.2.0/src/riva_driver.c new/xf86-video-nv-1.2.1/src/riva_driver.c --- old/xf86-video-nv-1.2.0/src/riva_driver.c 2006-06-17 02:48:53.000000000 +0200 +++ new/xf86-video-nv-1.2.1/src/riva_driver.c 2006-12-01 02:12:52.000000000 +0100 @@ -177,7 +177,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - NV_MAJOR_VERSION, NV_MINOR_VERSION, NV_PATCHLEVEL, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, MOD_CLASS_VIDEODRV, ++++++ xf86-video-s3-X11R7.1-0.4.1.tar.bz2 -> xf86-video-s3-0.5.0.tar.bz2 ++++++ ++++ 15241 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-s3-X11R7.1-0.4.1/compile new/xf86-video-s3-0.5.0/compile --- old/xf86-video-s3-X11R7.1-0.4.1/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-video-s3-0.5.0/compile 2006-11-26 05:33:11.000000000 +0100 @@ -0,0 +1,142 @@ +#! /bin/sh +# Wrapper for compilers which do not understand `-c -o'. + +scriptversion=2005-05-14.22 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Written by Tom Tromey <tromey(a)cygnus.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake(a)gnu.org> or send patches to +# <automake-patches(a)gnu.org>. + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. + +Report bugs to <bug-automake(a)gnu.org>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; +esac + +ofile= +cfile= +eat= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` + +# Create the lock directory. +# Note: use `[/.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: 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-s3-X11R7.1-0.4.1/configure.ac new/xf86-video-s3-0.5.0/configure.ac --- old/xf86-video-s3-X11R7.1-0.4.1/configure.ac 2006-04-08 03:39:49.000000000 +0200 +++ new/xf86-video-s3-0.5.0/configure.ac 2006-11-27 20:14:01.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-s3], - 0.4.1, + 0.5.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-video-s3) 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-s3-X11R7.1-0.4.1/src/Makefile.am new/xf86-video-s3-0.5.0/src/Makefile.am --- old/xf86-video-s3-X11R7.1-0.4.1/src/Makefile.am 2005-07-26 20:46:49.000000000 +0200 +++ new/xf86-video-s3-0.5.0/src/Makefile.am 2006-11-26 05:32:43.000000000 +0100 @@ -30,7 +30,6 @@ s3_drv_la_SOURCES = \ newmmio.h \ - s3_accel.c \ s3_bios.c \ s3_cursor.c \ s3_dga.c \ @@ -41,3 +40,12 @@ s3_Ti.c \ s3_Trio64DAC.c \ s3_video.c + +noinst_LTLIBRARIES = libs3_accel_newmmio.la libs3_accel_pio.la +s3_drv_la_LIBADD = libs3_accel_newmmio.la libs3_accel_pio.la + +libs3_accel_newmmio_la_SOURCES = s3_accel.c +libs3_accel_newmmio_la_CFLAGS = $(AM_CFLAGS) -DS3_NEWMMIO=1 + +libs3_accel_pio_la_SOURCES = s3_accel.c +libs3_accel_pio_la_CFLAGS = $(AM_CFLAGS) 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-s3-X11R7.1-0.4.1/src/s3.h new/xf86-video-s3-0.5.0/src/s3.h --- old/xf86-video-s3-X11R7.1-0.4.1/src/s3.h 2006-04-08 03:39:50.000000000 +0200 +++ new/xf86-video-s3-0.5.0/src/s3.h 2006-11-27 20:19:07.000000000 +0100 @@ -164,10 +164,10 @@ #define DRIVER_NAME "s3" -#define DRIVER_VERSION "0.4.1" +#define DRIVER_VERSION "0.5.0" #define VERSION_MAJOR 0 -#define VERSION_MINOR 4 -#define PATCHLEVEL 1 +#define VERSION_MINOR 5 +#define PATCHLEVEL 0 #define S3_VERSION ((VERSION_MAJOR << 24) | \ (VERSION_MINOR << 16) | PATCHLEVEL) 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-s3-X11R7.1-0.4.1/src/s3_accel.c new/xf86-video-s3-0.5.0/src/s3_accel.c --- old/xf86-video-s3-X11R7.1-0.4.1/src/s3_accel.c 2005-07-11 04:29:58.000000000 +0200 +++ new/xf86-video-s3-0.5.0/src/s3_accel.c 2006-09-02 20:01:40.000000000 +0200 @@ -24,7 +24,7 @@ * * */ -/* $XdotOrg: driver/xf86-video-s3/src/s3_accel.c,v 1.4 2005/07/11 02:29:58 ajax Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2004/04/23 19:43:14 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2001/10/28 03:33:44 tsi Exp $ */ #ifdef HAVE_CONFIG_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/xf86-video-s3-X11R7.1-0.4.1/src/s3_reg.h new/xf86-video-s3-0.5.0/src/s3_reg.h --- old/xf86-video-s3-X11R7.1-0.4.1/src/s3_reg.h 2004-04-23 21:43:14.000000000 +0200 +++ new/xf86-video-s3-0.5.0/src/s3_reg.h 2006-09-02 20:01:40.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XFree86: $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_reg.h,v 1.1 2001/07/02 10:46:04 alanh Exp $ */ #ifndef _S3_REG_H #define _S3_REG_H ++++++ xf86-video-sis-0.9.2.tar.bz2 -> xf86-video-sis-0.9.3.tar.bz2 ++++++ ++++ 17266 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-sis-0.9.2/configure.ac new/xf86-video-sis-0.9.3/configure.ac --- old/xf86-video-sis-0.9.2/configure.ac 2006-10-14 00:43:00.000000000 +0200 +++ new/xf86-video-sis-0.9.3/configure.ac 2006-11-30 18:58:10.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-sis], - 0.9.2, + 0.9.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-video-sis) 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-sis-0.9.2/src/sis_memcpy.c new/xf86-video-sis-0.9.3/src/sis_memcpy.c --- old/xf86-video-sis-0.9.2/src/sis_memcpy.c 2006-10-12 00:27:55.000000000 +0200 +++ new/xf86-video-sis-0.9.3/src/sis_memcpy.c 2006-11-30 15:10:11.000000000 +0100 @@ -31,6 +31,7 @@ #include "config.h" #endif +#include <stdlib.h> #include "sis.h" #if 0 /* Debug */ ++++++ xf86-video-tdfx-1.2.2.tar.bz2 -> xf86-video-tdfx-1.3.0.tar.bz2 ++++++ ++++ 16229 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-tdfx-1.2.2/configure.ac new/xf86-video-tdfx-1.3.0/configure.ac --- old/xf86-video-tdfx-1.2.2/configure.ac 2006-10-14 00:44:41.000000000 +0200 +++ new/xf86-video-tdfx-1.3.0/configure.ac 2006-11-22 18:14:51.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-tdfx], - 1.2.2, + 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-video-tdfx) 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-tdfx-1.2.2/src/tdfx.h new/xf86-video-tdfx-1.3.0/src/tdfx.h --- old/xf86-video-tdfx-1.2.2/src/tdfx.h 2006-10-12 00:28:18.000000000 +0200 +++ new/xf86-video-tdfx-1.3.0/src/tdfx.h 2006-11-22 18:11:02.000000000 +0100 @@ -32,8 +32,8 @@ #define TDFX_NAME "TDFX" #define TDFX_DRIVER_NAME "tdfx" #define TDFX_MAJOR_VERSION 1 -#define TDFX_MINOR_VERSION 2 -#define TDFX_PATCHLEVEL 1 +#define TDFX_MINOR_VERSION 3 +#define TDFX_PATCHLEVEL 0 struct _TDFXRec; typedef struct _TDFXRec *TDFXPtr; @@ -229,6 +229,10 @@ XF86VideoAdaptorPtr textureAdaptor; ScreenBlockHandlerProcPtr BlockHandler; OptionInfoPtr Options; + + ScreenWakeupHandlerProcPtr coreWakeupHandler; + ScreenBlockHandlerProcPtr coreBlockHandler; + } TDFXRec; typedef struct { 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-tdfx-1.2.2/src/tdfx_dri.c new/xf86-video-tdfx-1.3.0/src/tdfx_dri.c --- old/xf86-video-tdfx-1.2.2/src/tdfx_dri.c 2006-10-12 00:28:18.000000000 +0200 +++ new/xf86-video-tdfx-1.3.0/src/tdfx_dri.c 2006-11-22 17:42:50.000000000 +0100 @@ -249,6 +249,12 @@ { ScreenPtr pScreen = screenInfo.screens[screenNum]; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + TDFXPtr pTDFX = TDFXPTR(pScrn); + + pTDFX->pDRIInfo->wrap.WakeupHandler = pTDFX->coreWakeupHandler; + (*pTDFX->pDRIInfo->wrap.WakeupHandler) (screenNum, wakeupData, result, pReadmask); + pTDFX->pDRIInfo->wrap.WakeupHandler = TDFXDoWakeupHandler; + TDFXNeedSync(pScrn); } @@ -259,8 +265,14 @@ { ScreenPtr pScreen = screenInfo.screens[screenNum]; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + TDFXPtr pTDFX = TDFXPTR(pScrn); TDFXCheckSync(pScrn); + + pTDFX->pDRIInfo->wrap.BlockHandler = pTDFX->coreBlockHandler; + (*pTDFX->pDRIInfo->wrap.BlockHandler) (screenNum, blockData, pTimeout, pReadmask); + pTDFX->pDRIInfo->wrap.BlockHandler = TDFXDoBlockHandler; + } Bool TDFXDRIScreenInit(ScreenPtr pScreen) @@ -352,7 +364,9 @@ pDRIInfo->wrap.ValidateTree = 0; pDRIInfo->wrap.PostValidateTree = 0; + pTDFX->coreBlockHandler = pDRIInfo->wrap.BlockHandler; pDRIInfo->wrap.BlockHandler = TDFXDoBlockHandler; + pTDFX->coreWakeupHandler = pDRIInfo->wrap.WakeupHandler; pDRIInfo->wrap.WakeupHandler = TDFXDoWakeupHandler; if (SAREA_MAX_DRAWABLES < TDFX_MAX_DRAWABLES) ++++++ xf86-video-vesa-1.2.2.tar.bz2 -> xf86-video-vesa-1.3.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-vesa-1.2.2/configure new/xf86-video-vesa-1.3.0/configure --- old/xf86-video-vesa-1.2.2/configure 2006-10-14 00:47:49.000000000 +0200 +++ new/xf86-video-vesa-1.3.0/configure 2006-11-30 22:05:45.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for xf86-video-vesa 1.2.2. +# Generated by GNU Autoconf 2.59 for xf86-video-vesa 1.3.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-vesa' PACKAGE_TARNAME='xf86-video-vesa' -PACKAGE_VERSION='1.2.2' -PACKAGE_STRING='xf86-video-vesa 1.2.2' +PACKAGE_VERSION='1.3.0' +PACKAGE_STRING='xf86-video-vesa 1.3.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -966,7 +966,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-vesa 1.2.2 to adapt to many kinds of systems. +\`configure' configures xf86-video-vesa 1.3.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1032,7 +1032,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-vesa 1.2.2:";; + short | recursive ) echo "Configuration of xf86-video-vesa 1.3.0:";; esac cat <<\_ACEOF @@ -1179,7 +1179,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xf86-video-vesa configure 1.2.2 +xf86-video-vesa configure 1.3.0 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1193,7 +1193,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-vesa $as_me 1.2.2, which was +It was created by xf86-video-vesa $as_me 1.3.0, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1841,7 +1841,7 @@ # Define the identity of the package. PACKAGE='xf86-video-vesa' - VERSION='1.2.2' + VERSION='1.3.0' cat >>confdefs.h <<_ACEOF @@ -20587,7 +20587,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by xf86-video-vesa $as_me 1.2.2, which was +This file was extended by xf86-video-vesa $as_me 1.3.0, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20650,7 +20650,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-vesa config.status 1.2.2 +xf86-video-vesa config.status 1.3.0 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-vesa-1.2.2/configure.ac new/xf86-video-vesa-1.3.0/configure.ac --- old/xf86-video-vesa-1.2.2/configure.ac 2006-10-14 00:47:39.000000000 +0200 +++ new/xf86-video-vesa-1.3.0/configure.ac 2006-11-30 22:04:10.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-vesa], - 1.2.2, + 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-video-vesa) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-vesa-1.2.2/src/vesa.c new/xf86-video-vesa-1.3.0/src/vesa.c --- old/xf86-video-vesa-1.2.2/src/vesa.c 2006-10-12 00:28:35.000000000 +0200 +++ new/xf86-video-vesa-1.3.0/src/vesa.c 2006-11-30 22:03:07.000000000 +0100 @@ -747,6 +747,23 @@ } static Bool +vesaCreateScreenResources(ScreenPtr pScreen) +{ + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + VESAPtr pVesa = VESAGetRec(pScrn); + Bool ret; + + pScreen->CreateScreenResources = pVesa->CreateScreenResources; + ret = pScreen->CreateScreenResources(pScreen); + pScreen->CreateScreenResources = vesaCreateScreenResources; + + shadowAdd(pScreen, pScreen->GetScreenPixmap(pScreen), pVesa->update, + pVesa->window, 0, 0); + + return ret; +} + +static Bool VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -788,6 +805,16 @@ if (pVesa->shadowFB && pScrn->bitsPerPixel == 4) pScrn->bitsPerPixel = 8; + if (pVesa->shadowFB) { + pVesa->shadow = xcalloc(1, pScrn->displayWidth * pScrn->virtualY * + ((pScrn->bitsPerPixel + 7) / 8)); + if (!pVesa->shadow) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Failed to allocate shadow buffer\n"); + return FALSE; + } + } + /* save current video state */ VESASaveRestore(pScrn, MODE_SAVE); pVesa->savedPal = VBESetGetPaletteData(pVesa->pVbe, FALSE, 0, 256, @@ -865,7 +892,7 @@ case 24: case 32: if (!fbScreenInit(pScreen, - pVesa->base, + pVesa->shadowFB ? pVesa->shadow : pVesa->base, pScrn->virtualX, pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth, pScrn->bitsPerPixel)) @@ -901,27 +928,26 @@ fbPictureInit(pScreen, 0, 0); if (pVesa->shadowFB) { - ShadowUpdateProc update; - ShadowWindowProc window; - if (mode->MemoryModel == 3) { /* Planar */ if (pScrn->bitsPerPixel == 8) - update = shadowUpdatePlanar4x8Weak(); + pVesa->update = shadowUpdatePlanar4x8Weak(); else - update = shadowUpdatePlanar4Weak(); - window = VESAWindowPlanar; + pVesa->update = shadowUpdatePlanar4Weak(); + pVesa->window = VESAWindowPlanar; } else if (pVesa->mapPhys == 0xa0000) { /* Windowed */ - update = shadowUpdatePackedWeak(); - window = VESAWindowWindowed; + pVesa->update = shadowUpdatePackedWeak(); + pVesa->window = VESAWindowWindowed; } else { /* Linear */ - update = shadowUpdatePackedWeak(); - window = VESAWindowLinear; + pVesa->update = shadowUpdatePackedWeak(); + pVesa->window = VESAWindowLinear; } - if (!shadowInit(pScreen, update, window)) - return (FALSE); + if (!shadowSetup(pScreen)) + return FALSE; + pVesa->CreateScreenResources = pScreen->CreateScreenResources; + pScreen->CreateScreenResources = vesaCreateScreenResources; } else if (pVesa->mapPhys == 0xa0000 && mode->MemoryModel != 0x3) { unsigned int bankShift = 0; @@ -1005,6 +1031,8 @@ pVesa->savedPal, FALSE, TRUE); VESAUnmapVidMem(pScrn); } + if (pVesa->shadowFB && pVesa->shadow) + xfree(pVesa->shadow); if (pVesa->pDGAMode) { xfree(pVesa->pDGAMode); pVesa->pDGAMode = NULL; @@ -1012,6 +1040,7 @@ } pScrn->vtSema = FALSE; + pScreen->CreateScreenResources = pVesa->CreateScreenResources; pScreen->CloseScreen = pVesa->CloseScreen; return pScreen->CloseScreen(scrnIndex, pScreen); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-vesa-1.2.2/src/vesa.h new/xf86-video-vesa-1.3.0/src/vesa.h --- old/xf86-video-vesa-1.2.2/src/vesa.h 2006-10-12 00:28:35.000000000 +0200 +++ new/xf86-video-vesa-1.3.0/src/vesa.h 2006-11-30 22:04:02.000000000 +0100 @@ -83,7 +83,7 @@ #define VESA_NAME "VESA" #define VESA_DRIVER_NAME "vesa" #define VESA_MAJOR_VERSION 1 -#define VESA_MINOR_VERSION 2 +#define VESA_MINOR_VERSION 3 #define VESA_PATCHLEVEL 0 /*XXX*/ @@ -116,9 +116,13 @@ DGAModePtr pDGAMode; int nDGAMode; CloseScreenProcPtr CloseScreen; + CreateScreenResourcesProcPtr CreateScreenResources; OptionInfoPtr Options; IOADDRESS ioBase; Bool ModeSetClearScreen; + void *shadow; + ShadowUpdateProc update; + ShadowWindowProc window; } VESARec, *VESAPtr; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-libs
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package xorg-x11-libs checked in at Thu Dec 7 21:35:56 CET 2006. -------- --- xorg-x11-libs/xorg-x11-libs.changes 2006-11-27 12:41:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-libs/xorg-x11-libs.changes 2006-12-04 00:05:45.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Dec 3 15:54:06 CET 2006 - sndirsch(a)suse.de + +- moved libxcb to seperate package (xorg-x11-libxcb) +- updated libXfont to release 1.2.5 + * remove CID font support (bug #5553) + +------------------------------------------------------------------- Old: ---- libXfont-1.2.3.tar.bz2 libxcb-0.9.93.tar.bz2 New: ---- libXfont-1.2.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libs.spec ++++++ --- /var/tmp/diff_new_pack.bevBhU/_old 2006-12-07 21:35:36.000000000 +0100 +++ /var/tmp/diff_new_pack.bevBhU/_new 2006-12-07 21:35:36.000000000 +0100 @@ -19,7 +19,7 @@ %endif URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 17 +Release: 19 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -34,7 +34,7 @@ Source7: libXcursor-1.1.8.tar.bz2 Source8: libXdamage-1.0.4.tar.bz2 Source9: libXevie-1.0.2.tar.bz2 -Source10: libXfont-1.2.3.tar.bz2 +Source10: libXfont-1.2.5.tar.bz2 Source11: libXfontcache-1.0.3.tar.bz2 Source12: libXft-2.1.11.tar.bz2 Source13: libXi-1.0.2.tar.bz2 @@ -53,7 +53,6 @@ Source26: xbitmaps-X11R7.0-1.0.1.tar.bz2 Source27: libXres-1.0.2.tar.bz2 Source28: libXft1-X11R6.9-1.2.tar.bz2 -Source29: libxcb-0.9.93.tar.bz2 Patch2: libXft-2.1.7-lcd-filter-2.patch Patch3: p_xft_cjk.diff Patch4: p_xft_register.diff @@ -147,6 +146,7 @@ *) #autoreconf -fi ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ + --enable-type1 \ --prefix=/usr \ --libdir=%{_libdir} \ --mandir=%{_mandir} @@ -190,7 +190,6 @@ /usr/include/X11/XprintAppUtil/ /usr/include/X11/extensions/*.h /usr/include/X11/fonts/*.h -/usr/include/xcb/ /usr/%{_lib}/*.a /usr/%{_lib}/*.la /usr/%{_lib}/*.so @@ -200,6 +199,10 @@ %{_mandir}/man3/* %changelog -n xorg-x11-libs +* Sun Dec 03 2006 - sndirsch(a)suse.de +- moved libxcb to seperate package (xorg-x11-libxcb) +- updated libXfont to release 1.2.5 + * remove CID font support (bug #5553) * Mon Nov 27 2006 - dmueller(a)suse.de - reduce p_xft_cjk.diff to only disable antialiasing on fonts with embedded bitmaps (Bug #223682) ++++++ libXfont-1.2.3.tar.bz2 -> libXfont-1.2.5.tar.bz2 ++++++ ++++ 24898 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-libX11
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package xorg-x11-libX11 checked in at Thu Dec 7 21:35:31 CET 2006. -------- --- xorg-x11-libX11/xorg-x11-libX11.changes 2006-11-25 12:18:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-libX11/xorg-x11-libX11.changes 2006-12-03 16:14:15.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Dec 3 16:12:23 CET 2006 - sndirsch(a)suse.de + +- update to release 1.1.1 +- build libX11 against libxcb + +------------------------------------------------------------------- Old: ---- imLcIm.c.diff libX11-1.0.3.tar.bz2 New: ---- libX11-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libX11.spec ++++++ --- /var/tmp/diff_new_pack.dc4vwh/_old 2006-12-07 21:33:58.000000000 +0100 +++ /var/tmp/diff_new_pack.dc4vwh/_new 2006-12-07 21:33:58.000000000 +0100 @@ -11,11 +11,11 @@ # norootforbuild Name: xorg-x11-libX11 -%define dirsuffix 1.0.3 -BuildRequires: pkgconfig xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-proto-devel xorg-x11-xtrans-devel +%define dirsuffix 1.1.1 +BuildRequires: pkgconfig xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libxcb-devel xorg-x11-proto-devel xorg-x11-xtrans-devel Url: http://xorg.freedesktop.org/ Version: 7.2 -Release: 11 +Release: 13 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -36,7 +36,6 @@ Patch7: p_khmer-compose.diff Patch8: p_khmer-locale.diff Patch9: p_xlib_skip_ext_env.diff -Patch10: imLcIm.c.diff %description This package contains the X.Org X11 library. @@ -67,7 +66,7 @@ Summary: Include Files and Libraries mandatory for Development. Group: System/Libraries Provides: xorg-x11-devel:/usr/X11R6/%{_lib}/libX11.so -Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libX11 +Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libxcb-devel xorg-x11-libX11 Autoreqprov: on %description devel @@ -111,7 +110,6 @@ %patch7 %patch8 %patch9 -%patch10 -p1 %build autoreconf -fi @@ -119,6 +117,7 @@ --prefix=/usr \ --libdir=%{_libdir} \ --mandir=%{_mandir} \ + --with-xcb \ --datadir=/usr/share # currently broken since xlcUTF-8 plugin is not built #--enable-loadable-i18n @@ -179,6 +178,9 @@ %{_mandir}/man3/* %changelog -n xorg-x11-libX11 +* Sun Dec 03 2006 - sndirsch(a)suse.de +- update to release 1.1.1 +- build libX11 against libxcb * Sat Nov 25 2006 - sndirsch(a)suse.de - remove nls/{ja.U90,ja.S90}/XLC_LOCALE.pre from sources; no longer mark sources as NoSource in specfile (Bugs #200471, #153744) ++++++ libX11-1.0.3.tar.bz2 -> libX11-1.1.1.tar.bz2 ++++++ ++++ 34080 lines of diff (skipped) ++++++ p_khmer-compose.diff ++++++ --- /var/tmp/diff_new_pack.dc4vwh/_old 2006-12-07 21:34:02.000000000 +0100 +++ /var/tmp/diff_new_pack.dc4vwh/_new 2006-12-07 21:34:02.000000000 +0100 @@ -1,9 +1,9 @@ ---- nls/en_US.UTF-8/Compose.pre.orig 2006-08-07 10:43:07.000000000 +0200 -+++ nls/en_US.UTF-8/Compose.pre 2006-08-07 10:51:07.000000000 +0200 -@@ -5718,3 +5718,9 @@ - <dead_doubleacute> <Cyrillic_u> : "у̏" - <dead_diaeresis> <Cyrillic_U> : "У̏" - <dead_doubleacute> <Cyrillic_U> : "У̏" +--- nls/en_US.UTF-8/Compose.pre.orig 2006-12-03 16:58:03.000000000 +0100 ++++ nls/en_US.UTF-8/Compose.pre 2006-12-03 17:00:09.000000000 +0100 +@@ -5704,3 +5704,9 @@ + <dead_doubleacute> <Cyrillic_u> : "у̏" + <dead_diaeresis> <Cyrillic_U> : "У̏" + <dead_doubleacute> <Cyrillic_U> : "У̏" +# Khmer digraphs +<U17ff> : "ាំ" +<U17fe> : "ោះ" ++++++ p_khmer-locale.diff ++++++ --- /var/tmp/diff_new_pack.dc4vwh/_old 2006-12-07 21:34:02.000000000 +0100 +++ /var/tmp/diff_new_pack.dc4vwh/_new 2006-12-07 21:34:02.000000000 +0100 @@ -1,34 +1,11 @@ -diff -u -r nls.orig/compose.dir nls/compose.dir ---- nls.orig/compose.dir 2006-01-20 17:07:09.000000000 +0100 -+++ nls/compose.dir.pre 2006-01-20 17:08:57.000000000 +0100 -@@ -328,6 +328,7 @@ - en_US.UTF-8/Compose: ja_JP.UTF-8 - en_US.UTF-8/Compose: ka_GE.UTF-8 - en_US.UTF-8/Compose: kl_GL.UTF-8 -+en_US.UTF-8/Compose: km_KH.UTF-8 - en_US.UTF-8/Compose: kn_IN.UTF-8 - en_US.UTF-8/Compose: ko_KR.UTF-8 - en_US.UTF-8/Compose: kw_GB.UTF-8 -diff -u -r nls.orig/locale.alias nls/locale.alias ---- nls.orig/locale.alias 2006-01-20 17:07:09.000000000 +0100 -+++ nls/locale.alias.pre 2006-01-20 17:10:41.000000000 +0100 -@@ -689,6 +689,8 @@ +--- nls/locale.alias.pre.orig 2006-12-03 17:02:26.000000000 +0100 ++++ nls/locale.alias.pre 2006-12-03 17:04:54.000000000 +0100 +@@ -693,6 +693,8 @@ kl_GL.ISO-8859-1: kl_GL.ISO8859-1 kl_GL.iso885915: kl_GL.ISO8859-15 kl_GL.utf8: kl_GL.UTF-8 +km_KH: km_KH.UTF-8 +km_KH.utf8: km_KH.UTF-8 + kn: kn_IN.UTF-8 kn_IN: kn_IN.UTF-8 kn_IN.utf8: kn_IN.UTF-8 - ko: ko_KR.eucKR -diff -u -r nls.orig/locale.dir nls/locale.dir ---- nls.orig/locale.dir 2006-01-20 17:07:09.000000000 +0100 -+++ nls/locale.dir.pre 2006-01-20 17:11:13.000000000 +0100 -@@ -349,6 +349,7 @@ - ja_JP.UTF-8/XLC_LOCALE: ja_JP.UTF-8 - en_US.UTF-8/XLC_LOCALE: ka_GE.UTF-8 - en_US.UTF-8/XLC_LOCALE: kl_GL.UTF-8 -+en_US.UTF-8/XLC_LOCALE: km_KH.UTF-8 - en_US.UTF-8/XLC_LOCALE: kn_IN.UTF-8 - ko_KR.UTF-8/XLC_LOCALE: ko_KR.UTF-8 - en_US.UTF-8/XLC_LOCALE: kw_GB.UTF-8 ++++++ p_new-locales.diff ++++++ --- /var/tmp/diff_new_pack.dc4vwh/_old 2006-12-07 21:34:02.000000000 +0100 +++ /var/tmp/diff_new_pack.dc4vwh/_new 2006-12-07 21:34:02.000000000 +0100 @@ -9,10 +9,9 @@ en_US.UTF-8/Compose: ko_KR.UTF-8 en_US.UTF-8/Compose: kw_GB.UTF-8 en_US.UTF-8/Compose: ky_KG.UTF-8 -diff -u -r nls.orig/locale.alias.pre nls/locale.alias.pre ---- nls.orig/locale.alias.pre 2006-08-05 22:01:45.000000000 +0200 -+++ nls/locale.alias.pre 2006-08-05 22:06:01.000000000 +0200 -@@ -124,8 +124,8 @@ +--- nls/locale.alias.pre.orig 2006-10-04 19:42:02.000000000 +0200 ++++ nls/locale.alias.pre 2006-12-03 16:47:18.000000000 +0100 +@@ -127,8 +127,8 @@ bg_BG.ISO-8859-5: bg_BG.ISO8859-5 bg_BG.koi8r: bg_BG.KOI8-R be_BG.utf8: bg_BG.UTF-8 @@ -22,7 +21,7 @@ br: br_FR.ISO8859-1 br_FR: br_FR.ISO8859-1 br_FR.iso88591: br_FR.ISO8859-1 -@@ -574,8 +574,8 @@ +@@ -577,8 +577,8 @@ gl_ES@euro: gl_ES.ISO8859-15 gl_ES.UTF-8@euro: gl_ES.UTF-8 gl_ES.utf8: gl_ES.UTF-8 @@ -32,33 +31,23 @@ gv: gv_GB.ISO8859-1 gv_GB: gv_GB.ISO8859-1 gv_GB.iso88591: gv_GB.ISO8859-1 -@@ -690,6 +690,8 @@ - kl_GL.ISO-8859-1: kl_GL.ISO8859-1 +@@ -694,8 +694,8 @@ kl_GL.iso885915: kl_GL.ISO8859-15 kl_GL.utf8: kl_GL.UTF-8 + kn: kn_IN.UTF-8 +kn_IN: kn_IN.UTF-8 -+kn_IN.utf8: kn_IN.UTF-8 + kn_IN.utf8: kn_IN.UTF-8 +-kn_IN.UTF-8: kn_IN.UTF-8 ko: ko_KR.eucKR ko_KR: ko_KR.eucKR KO_KR: ko_KR.eucKR -@@ -831,8 +833,8 @@ - oc_FR.iso885915: oc_FR.ISO8859-15 - oc_FR.ISO-8859-15: oc_FR.ISO8859-15 - oc_FR@euro: oc_FR.ISO8859-15 +@@ -843,8 +843,8 @@ + or: or_IN.UTF-8 + or_IN.utf8: or_IN.UTF-8 + or_IN.UTF-8: or_IN.UTF-8 +pa_IN: pa_IN.UTF-8 pa_IN.utf8: pa_IN.UTF-8 -pa_IN.UTF-8: pa_IN.UTF-8 pd: pd_US.ISO8859-1 pd_DE: pd_DE.ISO8859-1 pd_US: pd_US.ISO8859-1 -diff -u -r nls.orig/locale.dir.pre nls/locale.dir.pre ---- nls.orig/locale.dir.pre 2006-08-05 22:01:46.000000000 +0200 -+++ nls/locale.dir.pre 2006-08-05 22:02:09.000000000 +0200 -@@ -350,6 +350,7 @@ - ja_JP.UTF-8/XLC_LOCALE: ja_JP.UTF-8 - en_US.UTF-8/XLC_LOCALE: ka_GE.UTF-8 - en_US.UTF-8/XLC_LOCALE: kl_GL.UTF-8 -+en_US.UTF-8/XLC_LOCALE: kn_IN.UTF-8 - ko_KR.UTF-8/XLC_LOCALE: ko_KR.UTF-8 - en_US.UTF-8/XLC_LOCALE: kw_GB.UTF-8 - en_US.UTF-8/XLC_LOCALE: ky_KG.UTF-8 ++++++ p_sr_CS-compose.diff ++++++ --- /var/tmp/diff_new_pack.dc4vwh/_old 2006-12-07 21:34:02.000000000 +0100 +++ /var/tmp/diff_new_pack.dc4vwh/_new 2006-12-07 21:34:02.000000000 +0100 @@ -1,133 +1,132 @@ -diff -u -r nls.orig/en_US.UTF-8/Compose.pre nls/en_US.UTF-8/Compose.pre ---- nls.orig/en_US.UTF-8/Compose.pre 2006-08-06 15:12:16.000000000 +0200 -+++ nls/en_US.UTF-8/Compose.pre 2006-08-06 15:14:11.000000000 +0200 -@@ -5592,3 +5592,129 @@ - <Multi_key> <U1001D1B9> <U1001D165> <U1001D16F> : "톿" U1D1BF # MUSICAL SYMBOL FUSA WHITE +--- nls/en_US.UTF-8/Compose.pre.orig 2006-11-03 01:32:26.000000000 +0100 ++++ nls/en_US.UTF-8/Compose.pre 2006-12-03 16:56:28.000000000 +0100 +@@ -5578,3 +5578,129 @@ + ##<Multi_key> <U1001D1B9> <U1001D165> <U1001D16F> : "톿" U1D1BF # MUSICAL SYMBOL FUSA WHITE <Multi_key> <U1001D1BC> <U1001D16F> : "퇀" U1D1C0 # MUSICAL SYMBOL FUSA BLACK - <Multi_key> <U1001D1BA> <U1001D165> <U1001D16F> : "퇀" U1D1C0 # MUSICAL SYMBOL FUSA BLACK -+# Serbian accented Cyrillic -+# а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A -+# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E -+# о О - U+043E, U+041E Cyrillic_o, Cyrillic_O -+# у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U -+# и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I -+# -+# ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave> -+# ́ - U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute> -+# ̂ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum> -+# ̏ - U+030F <dead_diaeresis>, <dead_doubleacute> -+# ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave> -+<dead_grave> <Cyrillic_a> : "а̀" -+<combining_grave> <Cyrillic_a> : "а̀" -+<Multi_key> <grave> <Cyrillic_a> : "а̀" -+<dead_grave> <Cyrillic_A> : "А̀" -+<combining_grave> <Cyrillic_A> : "А̀" -+<Multi_key> <grave> <Cyrillic_A> : "А̀" -+<dead_grave> <Cyrillic_e> : "ѐ" -+<combining_grave> <Cyrillic_e> : "ѐ" -+<Multi_key> <grave> <Cyrillic_e> : "ѐ" -+<dead_grave> <Cyrillic_E> : "Ѐ" -+<combining_grave> <Cyrillic_E> : "Ѐ" -+<Multi_key> <grave> <Cyrillic_E> : "Ѐ" -+<dead_grave> <Cyrillic_i> : "ѝ" -+<combining_grave> <Cyrillic_i> : "ѝ" -+<Multi_key> <grave> <Cyrillic_i> : "ѝ" -+<dead_grave> <Cyrillic_I> : "Ѝ" -+<combining_grave> <Cyrillic_I> : "Ѝ" -+<Multi_key> <grave> <Cyrillic_I> : "Ѝ" -+<dead_grave> <Cyrillic_o> : "о̀" -+<combining_grave> <Cyrillic_o> : "о̀" -+<Multi_key> <grave> <Cyrillic_o> : "о̀" -+<dead_grave> <Cyrillic_O> : "О̀" -+<combining_grave> <Cyrillic_O> : "О̀" -+<Multi_key> <grave> <Cyrillic_O> : "О̀" -+<dead_grave> <Cyrillic_u> : "у̀" -+<combining_grave> <Cyrillic_u> : "у̀" -+<Multi_key> <grave> <Cyrillic_u> : "у̀" -+<dead_grave> <Cyrillic_U> : "У̀" -+<combining_grave> <Cyrillic_U> : "У̀" -+<Multi_key> <grave> <Cyrillic_U> : "У̀" -+# ́ - dugouzlazni, U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute> -+<dead_acute> <Cyrillic_a> : "а́" -+<combining_acute> <Cyrillic_a> : "а́" -+<Multi_key> <acute> <Cyrillic_a> : "а́" -+<Multi_key> <apostrophe> <Cyrillic_a> : "а́" -+<dead_acute> <Cyrillic_A> : "А́" -+<combining_acute> <Cyrillic_A> : "А́" -+<Multi_key> <acute> <Cyrillic_A> : "А́" -+<Multi_key> <apostrophe> <Cyrillic_A> : "А́" -+<dead_acute> <Cyrillic_e> : "е́" -+<combining_acute> <Cyrillic_e> : "е́" -+<Multi_key> <acute> <Cyrillic_e> : "е́" -+<Multi_key> <apostrophe> <Cyrillic_e> : "е́" -+<dead_acute> <Cyrillic_E> : "Е́" -+<combining_acute> <Cyrillic_E> : "Е́" -+<Multi_key> <acute> <Cyrillic_E> : "Е́" -+<Multi_key> <apostrophe> <Cyrillic_E> : "Е́" -+<dead_acute> <Cyrillic_i> : "и́" -+<combining_acute> <Cyrillic_i> : "и́" -+<Multi_key> <acute> <Cyrillic_i> : "и́" -+<Multi_key> <apostrophe> <Cyrillic_i> : "и́" -+<dead_acute> <Cyrillic_I> : "И́" -+<combining_acute> <Cyrillic_I> : "И́" -+<Multi_key> <acute> <Cyrillic_I> : "И́" -+<Multi_key> <apostrophe> <Cyrillic_I> : "И́" -+<dead_acute> <Cyrillic_o> : "о́" -+<combining_acute> <Cyrillic_o> : "о́" -+<Multi_key> <acute> <Cyrillic_o> : "о́" -+<Multi_key> <apostrophe> <Cyrillic_o> : "о́" -+<dead_acute> <Cyrillic_O> : "О́" -+<combining_acute> <Cyrillic_O> : "О́" -+<Multi_key> <acute> <Cyrillic_O> : "О́" -+<Multi_key> <apostrophe> <Cyrillic_O> : "О́" -+<dead_acute> <Cyrillic_u> : "у́" -+<combining_acute> <Cyrillic_u> : "у́" -+<Multi_key> <acute> <Cyrillic_u> : "у́" -+<Multi_key> <apostrophe> <Cyrillic_u> : "у́" -+<dead_acute> <Cyrillic_U> : "У́" -+<combining_acute> <Cyrillic_U> : "У́" -+<Multi_key> <acute> <Cyrillic_U> : "У́" -+<Multi_key> <apostrophe> <Cyrillic_U> : "У́" -+# ̂ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum> -+<dead_circumflex> <Cyrillic_a> : "а̂" -+<Multi_key> <asciicircum> <Cyrillic_a> : "а̂" -+<dead_circumflex> <Cyrillic_A> : "А̂" -+<Multi_key> <asciicircum> <Cyrillic_A> : "А̂" -+<dead_circumflex> <Cyrillic_e> : "е̂" -+<Multi_key> <asciicircum> <Cyrillic_e> : "е̂" -+<dead_circumflex> <Cyrillic_E> : "Е̂" -+<Multi_key> <asciicircum> <Cyrillic_E> : "Е̂" -+<dead_circumflex> <Cyrillic_i> : "и̂" -+<Multi_key> <asciicircum> <Cyrillic_i> : "и̂" -+<dead_circumflex> <Cyrillic_I> : "И̂" -+<Multi_key> <asciicircum> <Cyrillic_I> : "И̂" -+<dead_circumflex> <Cyrillic_o> : "о̂" -+<Multi_key> <asciicircum> <Cyrillic_o> : "о̂" -+<dead_circumflex> <Cyrillic_O> : "О̂" -+<Multi_key> <asciicircum> <Cyrillic_O> : "О̂" -+<dead_circumflex> <Cyrillic_u> : "у̂" -+<Multi_key> <asciicircum> <Cyrillic_u> : "у̂" -+<dead_circumflex> <Cyrillic_U> : "У̂" -+<Multi_key> <asciicircum> <Cyrillic_U> : "У̂" -+# ̏ - kratkosilazni, U+030F <dead_diaeresis>, <dead_doubleacute> -+# there's no appropriate dead_doublegrave, so we use these two dead keys -+<dead_diaeresis> <Cyrillic_a> : "а̏" -+<dead_doubleacute> <Cyrillic_a> : "а̏" -+<dead_diaeresis> <Cyrillic_A> : "А̏" -+<dead_doubleacute> <Cyrillic_A> : "А̏" -+<dead_diaeresis> <Cyrillic_e> : "е̏" -+<dead_doubleacute> <Cyrillic_e> : "е̏" -+<dead_diaeresis> <Cyrillic_E> : "Е̏" -+<dead_doubleacute> <Cyrillic_E> : "Е̏" -+<dead_diaeresis> <Cyrillic_i> : "и̏" -+<dead_doubleacute> <Cyrillic_i> : "и̏" -+<dead_diaeresis> <Cyrillic_I> : "И̏" -+<dead_doubleacute> <Cyrillic_I> : "И̏" -+<dead_diaeresis> <Cyrillic_o> : "о̏" -+<dead_doubleacute> <Cyrillic_o> : "о̏" -+<dead_diaeresis> <Cyrillic_O> : "О̏" -+<dead_doubleacute> <Cyrillic_O> : "О̏" -+<dead_diaeresis> <Cyrillic_u> : "у̏" -+<dead_doubleacute> <Cyrillic_u> : "у̏" -+<dead_diaeresis> <Cyrillic_U> : "У̏" -+<dead_doubleacute> <Cyrillic_U> : "У̏" + ##<Multi_key> <U1001D1BA> <U1001D165> <U1001D16F> : "퇀" U1D1C0 # MUSICAL SYMBOL FUSA BLACK ++# Serbian accented Cyrillic ++# а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A ++# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E ++# о О - U+043E, U+041E Cyrillic_o, Cyrillic_O ++# у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U ++# и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I ++# ++# ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave> ++# ́ - U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute> ++# ̂ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum> ++# ̏ - U+030F <dead_diaeresis>, <dead_doubleacute> ++# ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave> ++<dead_grave> <Cyrillic_a> : "а̀" ++<combining_grave> <Cyrillic_a> : "а̀" ++<Multi_key> <grave> <Cyrillic_a> : "а̀" ++<dead_grave> <Cyrillic_A> : "А̀" ++<combining_grave> <Cyrillic_A> : "А̀" ++<Multi_key> <grave> <Cyrillic_A> : "А̀" ++<dead_grave> <Cyrillic_e> : "ѐ" ++<combining_grave> <Cyrillic_e> : "ѐ" ++<Multi_key> <grave> <Cyrillic_e> : "ѐ" ++<dead_grave> <Cyrillic_E> : "Ѐ" ++<combining_grave> <Cyrillic_E> : "Ѐ" ++<Multi_key> <grave> <Cyrillic_E> : "Ѐ" ++<dead_grave> <Cyrillic_i> : "ѝ" ++<combining_grave> <Cyrillic_i> : "ѝ" ++<Multi_key> <grave> <Cyrillic_i> : "ѝ" ++<dead_grave> <Cyrillic_I> : "Ѝ" ++<combining_grave> <Cyrillic_I> : "Ѝ" ++<Multi_key> <grave> <Cyrillic_I> : "Ѝ" ++<dead_grave> <Cyrillic_o> : "о̀" ++<combining_grave> <Cyrillic_o> : "о̀" ++<Multi_key> <grave> <Cyrillic_o> : "о̀" ++<dead_grave> <Cyrillic_O> : "О̀" ++<combining_grave> <Cyrillic_O> : "О̀" ++<Multi_key> <grave> <Cyrillic_O> : "О̀" ++<dead_grave> <Cyrillic_u> : "у̀" ++<combining_grave> <Cyrillic_u> : "у̀" ++<Multi_key> <grave> <Cyrillic_u> : "у̀" ++<dead_grave> <Cyrillic_U> : "У̀" ++<combining_grave> <Cyrillic_U> : "У̀" ++<Multi_key> <grave> <Cyrillic_U> : "У̀" ++# ́ - dugouzlazni, U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute> ++<dead_acute> <Cyrillic_a> : "а́" ++<combining_acute> <Cyrillic_a> : "а́" ++<Multi_key> <acute> <Cyrillic_a> : "а́" ++<Multi_key> <apostrophe> <Cyrillic_a> : "а́" ++<dead_acute> <Cyrillic_A> : "А́" ++<combining_acute> <Cyrillic_A> : "А́" ++<Multi_key> <acute> <Cyrillic_A> : "А́" ++<Multi_key> <apostrophe> <Cyrillic_A> : "А́" ++<dead_acute> <Cyrillic_e> : "е́" ++<combining_acute> <Cyrillic_e> : "е́" ++<Multi_key> <acute> <Cyrillic_e> : "е́" ++<Multi_key> <apostrophe> <Cyrillic_e> : "е́" ++<dead_acute> <Cyrillic_E> : "Е́" ++<combining_acute> <Cyrillic_E> : "Е́" ++<Multi_key> <acute> <Cyrillic_E> : "Е́" ++<Multi_key> <apostrophe> <Cyrillic_E> : "Е́" ++<dead_acute> <Cyrillic_i> : "и́" ++<combining_acute> <Cyrillic_i> : "и́" ++<Multi_key> <acute> <Cyrillic_i> : "и́" ++<Multi_key> <apostrophe> <Cyrillic_i> : "и́" ++<dead_acute> <Cyrillic_I> : "И́" ++<combining_acute> <Cyrillic_I> : "И́" ++<Multi_key> <acute> <Cyrillic_I> : "И́" ++<Multi_key> <apostrophe> <Cyrillic_I> : "И́" ++<dead_acute> <Cyrillic_o> : "о́" ++<combining_acute> <Cyrillic_o> : "о́" ++<Multi_key> <acute> <Cyrillic_o> : "о́" ++<Multi_key> <apostrophe> <Cyrillic_o> : "о́" ++<dead_acute> <Cyrillic_O> : "О́" ++<combining_acute> <Cyrillic_O> : "О́" ++<Multi_key> <acute> <Cyrillic_O> : "О́" ++<Multi_key> <apostrophe> <Cyrillic_O> : "О́" ++<dead_acute> <Cyrillic_u> : "у́" ++<combining_acute> <Cyrillic_u> : "у́" ++<Multi_key> <acute> <Cyrillic_u> : "у́" ++<Multi_key> <apostrophe> <Cyrillic_u> : "у́" ++<dead_acute> <Cyrillic_U> : "У́" ++<combining_acute> <Cyrillic_U> : "У́" ++<Multi_key> <acute> <Cyrillic_U> : "У́" ++<Multi_key> <apostrophe> <Cyrillic_U> : "У́" ++# ̂ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum> ++<dead_circumflex> <Cyrillic_a> : "а̂" ++<Multi_key> <asciicircum> <Cyrillic_a> : "а̂" ++<dead_circumflex> <Cyrillic_A> : "А̂" ++<Multi_key> <asciicircum> <Cyrillic_A> : "А̂" ++<dead_circumflex> <Cyrillic_e> : "е̂" ++<Multi_key> <asciicircum> <Cyrillic_e> : "е̂" ++<dead_circumflex> <Cyrillic_E> : "Е̂" ++<Multi_key> <asciicircum> <Cyrillic_E> : "Е̂" ++<dead_circumflex> <Cyrillic_i> : "и̂" ++<Multi_key> <asciicircum> <Cyrillic_i> : "и̂" ++<dead_circumflex> <Cyrillic_I> : "И̂" ++<Multi_key> <asciicircum> <Cyrillic_I> : "И̂" ++<dead_circumflex> <Cyrillic_o> : "о̂" ++<Multi_key> <asciicircum> <Cyrillic_o> : "о̂" ++<dead_circumflex> <Cyrillic_O> : "О̂" ++<Multi_key> <asciicircum> <Cyrillic_O> : "О̂" ++<dead_circumflex> <Cyrillic_u> : "у̂" ++<Multi_key> <asciicircum> <Cyrillic_u> : "у̂" ++<dead_circumflex> <Cyrillic_U> : "У̂" ++<Multi_key> <asciicircum> <Cyrillic_U> : "У̂" ++# ̏ - kratkosilazni, U+030F <dead_diaeresis>, <dead_doubleacute> ++# there's no appropriate dead_doublegrave, so we use these two dead keys ++<dead_diaeresis> <Cyrillic_a> : "а̏" ++<dead_doubleacute> <Cyrillic_a> : "а̏" ++<dead_diaeresis> <Cyrillic_A> : "А̏" ++<dead_doubleacute> <Cyrillic_A> : "А̏" ++<dead_diaeresis> <Cyrillic_e> : "е̏" ++<dead_doubleacute> <Cyrillic_e> : "е̏" ++<dead_diaeresis> <Cyrillic_E> : "Е̏" ++<dead_doubleacute> <Cyrillic_E> : "Е̏" ++<dead_diaeresis> <Cyrillic_i> : "и̏" ++<dead_doubleacute> <Cyrillic_i> : "и̏" ++<dead_diaeresis> <Cyrillic_I> : "И̏" ++<dead_doubleacute> <Cyrillic_I> : "И̏" ++<dead_diaeresis> <Cyrillic_o> : "о̏" ++<dead_doubleacute> <Cyrillic_o> : "о̏" ++<dead_diaeresis> <Cyrillic_O> : "О̏" ++<dead_doubleacute> <Cyrillic_O> : "О̏" ++<dead_diaeresis> <Cyrillic_u> : "у̏" ++<dead_doubleacute> <Cyrillic_u> : "у̏" ++<dead_diaeresis> <Cyrillic_U> : "У̏" ++<dead_doubleacute> <Cyrillic_U> : "У̏" ++++++ p_xlib-threadsafe.diff ++++++ --- /var/tmp/diff_new_pack.dc4vwh/_old 2006-12-07 21:34:02.000000000 +0100 +++ /var/tmp/diff_new_pack.dc4vwh/_new 2006-12-07 21:34:02.000000000 +0100 @@ -1,21 +1,3 @@ -Index: FilterEv.c -=================================================================== -RCS file: /home/eich/cvs/xc/lib/X11/FilterEv.c,v -retrieving revision 1.1.1.4 -diff -u -r1.1.1.4 FilterEv.c ---- FilterEv.c 20 Dec 2001 12:37:37 -0000 1.1.1.4 -+++ src/FilterEv.c 7 Jul 2005 13:11:33 -0000 -@@ -88,9 +88,9 @@ - if (win == p->window) { - if ((mask & p->event_mask) || - (ev->type >= p->start_type && ev->type <= p->end_type)) { -+ UnlockDisplay(ev->xany.display); - ret = (*(p->filter))(ev->xany.display, p->window, ev, - p->client_data); -- UnlockDisplay(ev->xany.display); - return(ret); - } - } Index: imDefLkup.c =================================================================== RCS file: /home/eich/cvs/xc/lib/X11/imDefLkup.c,v ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-input
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package xorg-x11-driver-input checked in at Thu Dec 7 21:33:52 CET 2006. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2006-11-20 16:06:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2006-12-05 11:32:33.000000000 +0100 @@ -1,0 +2,25 @@ +Tue Dec 5 11:28:10 CET 2006 - sndirsch(a)suse.de + +- updated evdev driver to release 1.1.4 + * key: use os bell-ringing function. Use the OS bell-ringing + function to ding the bell. + * support new DIX motion history API. Use the DIX motion history + if we have ABI version 1 or higher. + * brain: call xf86DeleteInput when removing device. Call + xf86DeleteInput from evdevRemoveDevice, so it also gets removed + from xf86InputDevs in the DDX. + * key: remove usage of OS keyboard layer for bell. Right now, + bell is a no-op. + * fix InitValuatorClassDeviceStruct call. "I don't know how the + last parameter got there. Sorry." + * pass maxval correctly to xf86InitValuatorAxisDeviceStruct. + Pass a maxval of -1 (i.e., fill this in appropriately), rather + than 0 (0). + * pass number of axes to InitValuatorClassDeviceStruct. This is + now required with the input-hotplug server. + * prune device list on DEVICE_CLOSE. Remove a device from the + device list when we get DEVICE_CLOSE. + * remove XFree86LOADER usage. Build evdevModuleData, et al, + unconditionally. + +------------------------------------------------------------------- Old: ---- xf86-input-evdev-1.1.3.tar.bz2 New: ---- xf86-input-evdev-1.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.OqSstF/_old 2006-12-07 21:33:35.000000000 +0100 +++ /var/tmp/diff_new_pack.OqSstF/_new 2006-12-07 21:33:35.000000000 +0100 @@ -15,7 +15,7 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.2 -Release: 17 +Release: 19 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -30,7 +30,7 @@ Source6: xf86-input-dynapro-X11R7.1-1.1.0.tar.bz2 Source7: xf86-input-elo2300-X11R7.1-1.1.0.tar.bz2 Source8: xf86-input-elographics-1.1.0.tar.bz2 -Source9: xf86-input-evdev-1.1.3.tar.bz2 +Source9: xf86-input-evdev-1.1.4.tar.bz2 Source10: xf86-input-fpit-X11R7.1-1.1.0.tar.bz2 Source11: xf86-input-hyperpen-X11R7.1-1.1.0.tar.bz2 Source12: xf86-input-jamstudio-X11R7.1-1.1.0.tar.bz2 @@ -118,6 +118,28 @@ %{_mandir}/man4/* %changelog -n xorg-x11-driver-input +* Tue Dec 05 2006 - sndirsch(a)suse.de +- updated evdev driver to release 1.1.4 + * key: use os bell-ringing function. Use the OS bell-ringing + function to ding the bell. + * support new DIX motion history API. Use the DIX motion history + if we have ABI version 1 or higher. + * brain: call xf86DeleteInput when removing device. Call + xf86DeleteInput from evdevRemoveDevice, so it also gets removed + from xf86InputDevs in the DDX. + * key: remove usage of OS keyboard layer for bell. Right now, + bell is a no-op. + * fix InitValuatorClassDeviceStruct call. "I don't know how the + last parameter got there. Sorry." + * pass maxval correctly to xf86InitValuatorAxisDeviceStruct. + Pass a maxval of -1 (i.e., fill this in appropriately), rather + than 0 (0). + * pass number of axes to InitValuatorClassDeviceStruct. This is + now required with the input-hotplug server. + * prune device list on DEVICE_CLOSE. Remove a device from the + device list when we get DEVICE_CLOSE. + * remove XFree86LOADER usage. Build evdevModuleData, et al, + unconditionally. * Mon Nov 20 2006 - sndirsch(a)suse.de - moved mousedrv back to man4 directory (Bug #222582) * Fri Nov 17 2006 - sndirsch(a)suse.de ++++++ xf86-input-evdev-1.1.3.tar.bz2 -> xf86-input-evdev-1.1.4.tar.bz2 ++++++ ++++ 16034 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-input-evdev-1.1.3/ChangeLog new/xf86-input-evdev-1.1.4/ChangeLog --- old/xf86-input-evdev-1.1.3/ChangeLog 2006-10-14 00:25:00.000000000 +0200 +++ new/xf86-input-evdev-1.1.4/ChangeLog 2006-11-02 02:44:06.000000000 +0100 @@ -1,3 +1,72 @@ +commit 5a5457e69c719980334cb662e5abcb77cd09bc7a +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Thu Nov 2 03:42:57 2006 +0200 + + bump to 1.1.4 + +commit 3fc70342aaba5f95d01b6e51164ae207532fa8f4 +Merge: 1a8cea3... ef01c2e... +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Thu Nov 2 03:42:14 2006 +0200 + + Merge branch 'input-hotplug' + +commit 1a8cea3dc4d8336b61a071a52479e71d7dd619d4 +Merge: 51d21a3... 4c72fb7... +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Thu Nov 2 03:42:13 2006 +0200 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-evdev + +commit ef01c2ef65fa64cb213dc3adfa30c75635d1fe03 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Thu Nov 2 03:41:48 2006 +0200 + + key: use os bell-ringing function + Use the OS bell-ringing function to ding the bell. + +commit 036b457c1b3f7d2d174da890cb8598d907181f8e +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Wed Oct 25 02:22:46 2006 +0300 + + support new DIX motion history API + Use the DIX motion history if we have ABI version 1 or higher. + +commit 79eb7dcac8cdbecc07be08737388a8a6574e3d76 +Merge: d7f686b... 63f7edf... +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Tue Oct 17 11:32:39 2006 +0300 + + Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-evdev into input-hotplug + +commit d7f686bfa3e773cfc7740c707da9fc64196e143c +Merge: ec09e0d... 4c72fb7... +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Tue Oct 17 11:31:58 2006 +0300 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-evdev into input-hotplug + +commit ec09e0d55dd14164cc46a68a71d439cc550df063 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Sun Oct 15 19:37:46 2006 +0300 + + brain: call xf86DeleteInput when removing device + Call xf86DeleteInput from evdevRemoveDevice, so it also gets removed from + xf86InputDevs in the DDX. + +commit 4c72fb7b769b78cfa2b4cc39eb03fdacd2b5039c +Author: Adam Jackson <ajax(a)benzedrine.nwnk.net> +Date: Fri Oct 13 18:25:10 2006 -0400 + + Bump to 1.1.3 + +commit 77cbbc20b60fd564f8add39bfb840c85d5cad51d +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Sun Oct 8 16:14:12 2006 +0300 + + key: remove usage of OS keyboard layer for bell + Right now, bell is a no-op. + commit 5c5ef3fbd6eb0b668139df3ff5eda67766e86dcd Author: Drew Parsons <dparsons(a)debian.org> Date: Fri Oct 6 10:56:24 2006 +1000 @@ -25,6 +94,13 @@ Fix compilation. +commit 63f7edf7862032221e25de3c59fee1158d616597 +Merge: 7b91f92... 771eee9... +Author: Zephaniah E. Hull <warp(a)agamemnon.b5> +Date: Tue Jul 25 16:00:44 2006 -0400 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-evdev into input-hotplug + commit 771eee968282e308d997adfa78bd39e7429d2c1c Author: Zephaniah E. Hull <warp(a)agamemnon.b5> Date: Sun Jul 23 22:40:51 2006 -0400 @@ -32,6 +108,13 @@ Replace the old two buffer approach to handling rel emulation of abs axes, should help with some of the reported jitter problems. +commit e4681504487151553894ae0d513b9e833d2597d1 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Fri Jul 21 14:38:12 2006 -0400 + + fix InitValuatorClassDeviceStruct call + I don't know how the last parameter got there. Sorry. + commit fa03de438ea0ae0f07424235f4972e73ff88ef17 Author: Zephaniah E. Hull <warp(a)agamemnon.b5> Date: Wed Jul 19 23:06:23 2006 -0400 @@ -40,6 +123,27 @@ This might solve some problems, but should at least prevent some odd behavior. +commit 7b91f9277afb4bd9e557f9600bd92c68dd2435c9 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Wed Jul 19 19:45:27 2006 -0400 + + pass maxval correctly to xf86InitValuatorAxisDeviceStruct + Pass a maxval of -1 (i.e., fill this in appropriately), rather than 0 (0). + +commit 7defeb0aefb216d203b495a53a6d1d505f7dece4 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Wed Jul 19 19:43:08 2006 -0400 + + pass number of axes to InitValuatorClassDeviceStruct + This is now required with the input-hotplug server. + +commit 1cb568c0a6c18ec62ebb89ca21a22a77c78cad24 +Author: Daniel Stone <daniel.stone(a)nokia.com> +Date: Wed Jul 19 19:41:54 2006 -0400 + + prune device list on DEVICE_CLOSE + Remove a device from the device list when we get DEVICE_CLOSE. + commit dc88668839f4613d60526aa78aed3e74eebe64ad Author: Zephaniah E. Hull <warp(a)agamemnon.b5> Date: Thu Jul 13 11:59:25 2006 -0400 @@ -96,6 +200,13 @@ Set pInfo->fd to -1 when we close it in EvdevProc. +commit 51d21a369416bb0a45a2894e83a1cb092cc307d8 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Sun Jul 9 18:08:50 2006 +0100 + + remove XFree86LOADER usage + Build evdevModuleData, et al, unconditionally. + commit 4645247d45b1653c56d8c99d5685960159e464be Author: Adam Jackson <ajax(a)nwnk.net> Date: Thu Jun 22 21:16:44 2006 +0000 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-input-evdev-1.1.3/configure.ac new/xf86-input-evdev-1.1.4/configure.ac --- old/xf86-input-evdev-1.1.3/configure.ac 2006-10-14 00:04:50.000000000 +0200 +++ new/xf86-input-evdev-1.1.4/configure.ac 2006-11-02 02:42:33.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-evdev], - 1.1.3, + 1.1.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-input-evdev) 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-input-evdev-1.1.3/src/evdev.c new/xf86-input-evdev-1.1.4/src/evdev.c --- old/xf86-input-evdev-1.1.3/src/evdev.c 2006-10-12 00:23:37.000000000 +0200 +++ new/xf86-input-evdev-1.1.4/src/evdev.c 2006-11-02 02:42:14.000000000 +0100 @@ -214,6 +214,9 @@ EvdevKeyOff (device); } + if (what == DEVICE_CLOSE) + evdevRemoveDevice(pEvdev); + device->public.on = FALSE; break; } @@ -238,10 +241,12 @@ else return !Success; break; +#if 0 case SendCoreEvents: case DontSendCoreEvents: xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents)); break; +#endif default: return !Success; } @@ -268,7 +273,9 @@ pInfo->device_control = EvdevProc; pInfo->read_input = EvdevReadInput; pInfo->switch_mode = EvdevSwitchMode; +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 pInfo->motion_history_proc = xf86GetMotionEvents; +#endif pInfo->conf_idev = driver->dev; pInfo->private = device; @@ -459,8 +466,6 @@ 0 }; -#ifdef XFree86LOADER - static void EvdevUnplug(pointer p) { @@ -496,4 +501,3 @@ EvdevPlug, EvdevUnplug }; -#endif /* XFree86LOADER */ 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-input-evdev-1.1.3/src/evdev.h new/xf86-input-evdev-1.1.4/src/evdev.h --- old/xf86-input-evdev-1.1.3/src/evdev.h 2006-10-12 00:23:37.000000000 +0200 +++ new/xf86-input-evdev-1.1.4/src/evdev.h 2006-11-02 02:42:14.000000000 +0100 @@ -252,6 +252,7 @@ Bool evdevStart (InputDriverPtr drv); Bool evdevNewDriver (evdevDriverPtr driver); Bool evdevGetBits (int fd, evdevBitsPtr bits); +void evdevRemoveDevice (evdevDevicePtr device); int EvdevBtnInit (DeviceIntPtr device); int EvdevBtnOn (DeviceIntPtr device); 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-input-evdev-1.1.3/src/evdev_axes.c new/xf86-input-evdev-1.1.4/src/evdev_axes.c --- old/xf86-input-evdev-1.1.3/src/evdev_axes.c 2006-10-12 00:23:37.000000000 +0200 +++ new/xf86-input-evdev-1.1.4/src/evdev_axes.c 2006-11-02 02:42:14.000000000 +0100 @@ -672,8 +672,14 @@ return Success; if (!InitValuatorClassDeviceStruct(device, axes, +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 1 + GetMotionHistory, + GetMotionHistorySize(), +#else miPointerGetMotionEvents, - miPointerGetMotionBufferSize(), 0)) + miPointerGetMotionBufferSize(), +#endif + 0)) return !Success; for (i = 0; i < axes; i++) { @@ -684,7 +690,9 @@ if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) return !Success; +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 xf86MotionHistoryAllocate (pInfo); +#endif return Success; } 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-input-evdev-1.1.3/src/evdev_brain.c new/xf86-input-evdev-1.1.4/src/evdev_brain.c --- old/xf86-input-evdev-1.1.3/src/evdev_brain.c 2006-10-12 00:23:37.000000000 +0200 +++ new/xf86-input-evdev-1.1.4/src/evdev_brain.c 2006-11-02 02:42:14.000000000 +0100 @@ -462,6 +462,24 @@ return TRUE; } +void +evdevRemoveDevice (evdevDevicePtr pEvdev) +{ + evdevDriverPtr driver; + evdevDevicePtr *device; + + for (driver = evdev_drivers; driver; driver = driver->next) { + for (device = &driver->devices; *device; device = &(*device)->next) { + if (*device == pEvdev) { + *device = pEvdev->next; + xf86DeleteInput(pEvdev->pInfo, 0); + pEvdev->next = NULL; + return; + } + } + } +} + Bool evdevGetBits (int fd, evdevBitsPtr bits) { 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-input-evdev-1.1.3/src/evdev_key.c new/xf86-input-evdev-1.1.4/src/evdev_key.c --- old/xf86-input-evdev-1.1.3/src/evdev_key.c 2006-10-12 00:23:37.000000000 +0200 +++ new/xf86-input-evdev-1.1.4/src/evdev_key.c 2006-11-02 02:42:14.000000000 +0100 @@ -238,10 +238,11 @@ * So use the system bell for now. */ static void -EvdevKbdBell (int percent, DeviceIntPtr device, pointer ctrl, int unused) +EvdevKbdBell (int percent, DeviceIntPtr device, pointer arg, int unused) { - xf86SoundKbdBell(percent, ((KeybdCtrl*) ctrl)->bell_pitch, - ((KeybdCtrl*) ctrl)->bell_duration); + KeybdCtrl *ctrl = arg; + + xf86OSRingBell(percent, ctrl->bell_pitch, ctrl->bell_duration); } static void ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package xorg-x11 checked in at Thu Dec 7 21:33:48 CET 2006. -------- --- xorg-x11/xorg-x11.changes 2006-11-24 15:46:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2006-12-06 00:20:02.000000000 +0100 @@ -1,0 +2,34 @@ +Wed Dec 6 00:19:10 CET 2006 - sndirsch(a)suse.de + +- removed /usr/%{_lib}/X11/xdm/libXdmGreet.a, + /usr/%{_lib}/X11/xdm/libXdmGreet.la (Bug #223734) + +------------------------------------------------------------------- +Tue Dec 5 10:47:08 CET 2006 - sndirsch(a)suse.de + +- updated setxkbmap to release 1.0.3 + * new "-device" option to specify device + +------------------------------------------------------------------- +Sun Dec 3 22:02:42 CET 2006 - sndirsch(a)suse.de + +- updated rendercheck to release 1.2 + * New version that adds one small new test, more command flags + to control what tests are run, and testing against more formats. + Now, bugs in Render code revealed by rendercheck may be slightly + less mysterious. +- updated sessreg to release 1.0.2 + * Fix grep pattern in Makefile.am + * include <time.h> before <utmp.h>. Required on some systems. + * obsoletes sessreg.diff +- updated twm to release 1.0.3 + * Fix system.twmrc handling +- updated xdm to release 1.1.2 + * Bug 7317: xfs doesn't build on some GLIBC based systems: + _XOPEN_SOURCE undefined +- updated xfs to release 1.0.4 + * Bug 7317: xfs doesn't build on some GLIBC based systems: + _XOPEN_SOURCE undefined +- removed deprecated mkcfm (X.Org Bug #5553) + +------------------------------------------------------------------- Old: ---- mkcfm-X11R7.0-1.0.1.tar.bz2 rendercheck-1.1.tar.bz2 sessreg-1.0.1.tar.bz2 sessreg.diff setxkbmap-X11R7.1-1.0.2.tar.bz2 twm-1.0.2.tar.bz2 xdm-1.1.1.tar.bz2 xfs-1.0.3.tar.bz2 New: ---- rendercheck-1.2.tar.bz2 sessreg-1.0.2.tar.bz2 setxkbmap-1.0.3.tar.bz2 twm-1.0.3.tar.bz2 xdm-1.1.2.tar.bz2 xfs-1.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.RvOewe/_old 2006-12-07 21:33:25.000000000 +0100 +++ /var/tmp/diff_new_pack.RvOewe/_new 2006-12-07 21:33:25.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 24 +Release: 26 License: X11/MIT, Other License(s), see package BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -35,7 +35,6 @@ Source10: lbxproxy-X11R7.0-1.0.1.tar.bz2 Source11: listres-X11R7.0-1.0.1.tar.bz2 Source12: luit-1.0.2.tar.bz2 -Source13: mkcfm-X11R7.0-1.0.1.tar.bz2 Source14: mkfontdir-X11R7.1-1.0.2.tar.bz2 Source15: mkfontscale-1.0.3.tar.bz2 Source16: oclock-X11R7.0-1.0.1.tar.bz2 @@ -43,11 +42,11 @@ Source18: rgb-X11R7.1-1.0.1.tar.bz2 Source19: rstart-X11R7.1-1.0.2.tar.bz2 Source20: scripts-X11R7.0-1.0.1.tar.bz2 -Source21: sessreg-1.0.1.tar.bz2 -Source22: setxkbmap-X11R7.1-1.0.2.tar.bz2 +Source21: sessreg-1.0.2.tar.bz2 +Source22: setxkbmap-1.0.3.tar.bz2 Source23: showfont-X11R7.0-1.0.1.tar.bz2 Source24: smproxy-X11R7.1-1.0.2.tar.bz2 -Source25: twm-1.0.2.tar.bz2 +Source25: twm-1.0.3.tar.bz2 Source26: viewres-X11R7.0-1.0.1.tar.bz2 Source27: x11perf-X11R7.1-1.4.1.tar.bz2 Source28: xauth-X11R7.0-1.0.1.tar.bz2 @@ -61,7 +60,7 @@ Source36: xcursorgen-X11R7.1-1.0.1.tar.bz2 Source37: xdbedizzy-1.0.2.tar.bz2 Source38: xditview-X11R7.0-1.0.1.tar.bz2 -Source39: xdm-1.1.1.tar.bz2 +Source39: xdm-1.1.2.tar.bz2 Source40: xdpyinfo-X11R7.0-1.0.1.tar.bz2 Source41: xdriinfo-X11R7.1-1.0.1.tar.bz2 Source42: xedit-X11R7.1-1.0.2.tar.bz2 @@ -71,7 +70,7 @@ Source46: xfd-X11R7.0-1.0.1.tar.bz2 Source47: xfindproxy-X11R7.0-1.0.1.tar.bz2 Source48: xfontsel-X11R7.0-1.0.1.tar.bz2 -Source49: xfs-1.0.3.tar.bz2 +Source49: xfs-1.0.4.tar.bz2 Source50: xfsinfo-X11R7.0-1.0.1.tar.bz2 Source51: xfwp-X11R7.0-1.0.1.tar.bz2 Source52: xgamma-X11R7.0-1.0.1.tar.bz2 @@ -116,7 +115,7 @@ Source91: xwininfo-X11R7.1-1.0.2.tar.bz2 Source92: xwud-X11R7.0-1.0.1.tar.bz2 Source93: mkcomposecache-1.1.tar.bz2 -Source94: rendercheck-1.1.tar.bz2 +Source94: rendercheck-1.2.tar.bz2 Source200: misc.tar.bz2 Source201: twm.tar.bz2 Source202: xdm.tar.bz2 @@ -140,7 +139,6 @@ Patch17: x11r6.9.0-setuid.diff Patch19: scripts.diff Patch20: xdm.diff -Patch22: sessreg.diff %description This package contains the X.Org core and sample applications. @@ -222,7 +220,6 @@ popd %patch17 patch -d scripts-* -p0 -s < %PATCH19 -patch -d sessreg-* -p0 -s < %PATCH22 %build @@ -235,7 +232,6 @@ pushd $dir #autoreconf -fi case $dir in - mkcfm-*) option="--with-ciddir=/usr/share/fonts/CID" ;; xdm-*) option="--with-pam --with-xdmconfigdir=/etc/X11/xdm --with-xdmscriptdir=/etc/X11/xdm" ;; xfs-*|lbxproxy-*|proxymngr-*|rstart-*|x11perf-*|xedit-*|xinit-*|xsm-*|scripts-*|sessreg-*) option=""; autoreconf -fi ;; @@ -321,6 +317,9 @@ $RPM_BUILD_ROOT/usr/sbin/rcxdm \ $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.displaymanager %endif + # Bug 223734 + rm $RPM_BUILD_ROOT/usr/%{_lib}/X11/xdm/libXdmGreet.a \ + $RPM_BUILD_ROOT/usr/%{_lib}/X11/xdm/libXdmGreet.la ;; xfs-*) pushd $RPM_BUILD_ROOT @@ -441,6 +440,31 @@ /var/lib/xdm/authdir/ %changelog -n xorg-x11 +* Wed Dec 06 2006 - sndirsch(a)suse.de +- removed /usr/%%{_lib}/X11/xdm/libXdmGreet.a, + /usr/%%{_lib}/X11/xdm/libXdmGreet.la (Bug #223734) +* Tue Dec 05 2006 - sndirsch(a)suse.de +- updated setxkbmap to release 1.0.3 + * new "-device" option to specify device +* Sun Dec 03 2006 - sndirsch(a)suse.de +- updated rendercheck to release 1.2 + * New version that adds one small new test, more command flags + to control what tests are run, and testing against more formats. + Now, bugs in Render code revealed by rendercheck may be slightly + less mysterious. +- updated sessreg to release 1.0.2 + * Fix grep pattern in Makefile.am + * include <time.h> before <utmp.h>. Required on some systems. + * obsoletes sessreg.diff +- updated twm to release 1.0.3 + * Fix system.twmrc handling +- updated xdm to release 1.1.2 + * Bug 7317: xfs doesn't build on some GLIBC based systems: + _XOPEN_SOURCE undefined +- updated xfs to release 1.0.4 + * Bug 7317: xfs doesn't build on some GLIBC based systems: + _XOPEN_SOURCE undefined +- removed deprecated mkcfm (X.Org Bug #5553) * Fri Nov 24 2006 - sndirsch(a)suse.de - added /usr/bin/X11 compatibility symlink (Bug #223524) * Mon Nov 20 2006 - sndirsch(a)suse.de ++++++ p_xauth.diff ++++++ --- /var/tmp/diff_new_pack.RvOewe/_old 2006-12-07 21:33:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RvOewe/_new 2006-12-07 21:33:26.000000000 +0100 @@ -174,7 +174,7 @@ extern int auth_finalize ( void ); extern int process_command ( char *inputfilename, int lineno, int argc, char **argv ); --- programs/xdm/auth.c.orig 2005-11-09 10:41:27.000000000 +0100 -+++ xdm-1.1.1/auth.c 2005-11-11 11:33:00.000000000 +0100 ++++ xdm-1.1.2/auth.c 2005-11-11 11:33:00.000000000 +0100 @@ -680,7 +680,7 @@ } ++++++ ps_suse.diff ++++++ --- /var/tmp/diff_new_pack.RvOewe/_old 2006-12-07 21:33:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RvOewe/_new 2006-12-07 21:33:26.000000000 +0100 @@ -1,5 +1,5 @@ --- twm-X11R7.0-1.0.1.orig/src/system.twmrc 2006-08-19 11:02:18.000000000 +0200 -+++ twm-1.0.2/src/system.twmrc 2006-08-19 11:02:35.000000000 +0200 ++++ twm-1.0.3/src/system.twmrc 2006-08-19 11:02:35.000000000 +0200 @@ -15,11 +15,11 @@ NoGrabServer RestartPreviousState ++++++ rendercheck-1.1.tar.bz2 -> rendercheck-1.2.tar.bz2 ++++++ ++++ 1617 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/rendercheck-1.1/Makefile.am new/rendercheck-1.2/Makefile.am --- old/rendercheck-1.1/Makefile.am 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/Makefile.am 2006-07-17 17:08:01.000000000 +0200 @@ -7,6 +7,7 @@ rendercheck.h \ tests.c \ t_blend.c \ + t_bug7366.c \ t_composite.c \ t_dstcoords.c \ t_fill.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/rendercheck-1.1/NEWS new/rendercheck-1.2/NEWS --- old/rendercheck-1.1/NEWS 2006-05-23 08:41:52.000000000 +0200 +++ new/rendercheck-1.2/NEWS 2006-11-27 18:45:18.000000000 +0100 @@ -1,3 +1,9 @@ +2006-11-27: + Version 1.2 released + Adds test for bug #7366 + Tests against more picture formats. + Allows testing against a subset of the operators and formats. + 2006-05-22: Version 1.1 released. Adds tests for triangles, gradients, and repeating sources. 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/rendercheck-1.1/README new/rendercheck-1.2/README --- old/rendercheck-1.1/README 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/README 2006-11-27 18:42:15.000000000 +0100 @@ -9,3 +9,4 @@ repeating Pictures and 10x10 Pictures. - Linear gradients - Repeating sources/masks at POT and non-POT sizes +- Some regression tests for bugs from freedesktop.org bugzilla. 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/rendercheck-1.1/configure.ac new/rendercheck-1.2/configure.ac --- old/rendercheck-1.1/configure.ac 2006-05-23 08:42:35.000000000 +0200 +++ new/rendercheck-1.2/configure.ac 2006-11-29 00:02:54.000000000 +0100 @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([rendercheck], - 1.1, + 1.2, [anholt(a)FreeBSD.org] rendercheck) 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/rendercheck-1.1/main.c new/rendercheck-1.2/main.c --- old/rendercheck-1.1/main.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/main.c 2006-10-27 01:22:19.000000000 +0200 @@ -29,9 +29,12 @@ extern int num_ops; extern int num_colors; -int is_verbose = FALSE; +Bool is_verbose = FALSE, minimalrendering = FALSE; int enabled_tests = ~0; /* Enable all tests by default */ +int format_whitelist_len = 0; +char **format_whitelist; + /* Number of times to repeat operations so that pixmaps will tend to get moved * into offscreen memory and allow hardware acceleration. */ @@ -40,7 +43,7 @@ int win_width = 40; int win_height = 40; -static int +int bit_count(int i) { int count; @@ -104,9 +107,11 @@ usage (char *program) { fprintf(stderr, "usage: %s [-d|--display display] [-v|--verbose]\n" - "\t[-t test1,test2,...] [--sync]\n" - "\tAvailable tests: dcoors,scoords,mcoords,tscoords,\n" - "\t\ttmcoords,blend,composite,cacomposite,gradients,repeat,triangles\n", + "\t[-t test1,test2,...] [-o op1,op2,...] [-f format1,format2,...]\n" + "\t[--sync] [--minimalrendering]\n" + "\tAvailable tests: fill,dcoords,scoords,mcoords,tscoords,\n" + "\t\ttmcoords,blend,composite,cacomposite,gradients,repeat,triangles,\n" + "\t\tbug7366\n", program); exit(1); } @@ -121,18 +126,22 @@ XSetWindowAttributes as; picture_info window; char *display = NULL; - char *test, *nextname; + char *test, *format, *opname, *nextname; static struct option longopts[] = { { "display", required_argument, NULL, 'd' }, { "iterations", required_argument, NULL, 'i' }, + { "formats", required_argument, NULL, 'f' }, { "tests", required_argument, NULL, 't' }, + { "ops", required_argument, NULL, 'o' }, { "verbose", no_argument, NULL, 'v' }, { "sync", no_argument, &is_sync, 1}, + { "minimalrendering", no_argument, &minimalrendering, + TRUE}, { NULL, 0, NULL, 0 } }; - while ((o = getopt_long(argc, argv, "d:i:t:v", longopts, NULL)) != -1) { + while ((o = getopt_long(argc, argv, "d:i:f:t:o:v", longopts, NULL)) != -1) { switch (o) { case 'd': display = optarg; @@ -140,6 +149,46 @@ case 'i': pixmap_move_iter = atoi(optarg); break; + case 'o': + for (i = 0; i < num_ops; i++) + ops[i].disabled = TRUE; + + nextname = optarg; + while ((opname = strsep(&nextname, ",")) != NULL) { + for (i = 0; i < num_ops; i++) { + if (strcasecmp(ops[i].name, opname) != + 0) + continue; + ops[i].disabled = FALSE; + break; + } + if (i == num_ops) + usage(argv[0]); + } + break; + case 'f': + nextname = optarg; + for (format_whitelist_len = 0;;format_whitelist_len++) + { + if ((format = strsep(&nextname, ",")) == NULL) + break; + } + + format_whitelist = malloc(sizeof(char *) * + format_whitelist_len); + if (format_whitelist == NULL) + errx(1, "malloc"); + + /* Now the list is separated by \0s, so use strlen to + * step between entries. + */ + format = optarg; + for (i = 0; i < format_whitelist_len; i++) { + format_whitelist[i] = strdup(format); + format += strlen(format) + 1; + } + + break; case 't': nextname = optarg; @@ -171,6 +220,8 @@ enabled_tests |= TEST_REPEAT; } else if (strcmp(test, "triangles") == 0) { enabled_tests |= TEST_TRIANGLES; + } else if (strcmp(test, "bug7366") == 0) { + enabled_tests |= TEST_BUG7366; } else { usage(argv[0]); } 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/rendercheck-1.1/rendercheck.1 new/rendercheck-1.2/rendercheck.1 --- old/rendercheck-1.1/rendercheck.1 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/rendercheck.1 2006-10-26 21:57:01.000000000 +0200 @@ -5,7 +5,8 @@ .SH SYNOPSIS .nf .B rendercheck [\-d|\-\-display display] [\-i|\-\-iter] [\-\-sync] \ -[\-t|\-\-tests test1,test2,test3,...] [\-v|\-\-verbose] +[\-t|\-\-tests test1,test2,test3,...] [\-o|\-\-ops op1,op2,op3,...] +[\-v|\-\-verbose] [\-\-minimalrendering] .fi .SH DESCRIPTION .B rendercheck @@ -28,12 +29,25 @@ .BI \-t|\-\-tests\ test1,test2,test3... Enables only a specific subset of the possible tests. Test names include fill, dcoords, scoords, mcoords, tscoords, tmcoords, blend, composite, -cacomposite, gradients, repeat, and triangles. Names must be separated by +cacomposite, gradients, repeat, triangles, and bug7366. +Names must be separated by commas and have no spaces. .TP +.BI \-f|\-\-formats\ format1,format2,format3... +Enables only a specific subset of the possible formats. Only formats listed +in the server-supported format list are available. Names must be separated by +commas and have no spaces. +.TP +.BI \-o|\-\-ops +Enables only a specific subset of the Render operators. +.TP .BI \-v|\-\-verbose Enables verbose printing of information on tests run, and successes and failures. +.TP +.BI \-\-minimalrendering +Disables copying of offscreen destinations to the window, which is on by default +to provide the user with visual feedback. .SH BUGS Several limitations are documented in the TODO file accompanying the source. Please report any further bugs you find to http://bugs.freedesktop.org/. 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/rendercheck-1.1/rendercheck.h new/rendercheck-1.2/rendercheck.h --- old/rendercheck-1.1/rendercheck.h 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/rendercheck.h 2006-10-27 01:22:43.000000000 +0200 @@ -64,6 +64,7 @@ struct op_info { int op; char *name; + Bool disabled; }; #define TEST_FILL 0x0001 @@ -78,19 +79,25 @@ #define TEST_GRADIENTS 0x0200 #define TEST_REPEAT 0x0400 #define TEST_TRIANGLES 0x0800 +#define TEST_BUG7366 0x1000 extern int pixmap_move_iter; extern int win_width, win_height; extern struct op_info ops[]; -extern Bool is_verbose; +extern Bool is_verbose, minimalrendering; extern color4d colors[]; extern int enabled_tests; +extern int format_whitelist_len; +extern char **format_whitelist; extern picture_info *argb32white, *argb32red, *argb32green, *argb32blue; /* main.c */ void describe_format(char *desc, int len, XRenderPictFormat *format); +int +bit_count(int i); + /* tests.c */ void color_correct(picture_info *pi, color4d *color); @@ -109,6 +116,10 @@ Bool do_tests(Display *dpy, picture_info *win); +void +copy_pict_to_win(Display *dpy, picture_info *pict, picture_info *win, + int width, int height); + /* ops.c */ void do_composite(int op, color4d *src, color4d *mask, color4d *dst, color4d *result, @@ -162,3 +173,6 @@ Bool trifan_test(Display *dpy, picture_info *win, picture_info *dst, int op, picture_info *src_color, picture_info *dst_color); + +Bool +bug7366_test(Display *dpy); 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/rendercheck-1.1/t_blend.c new/rendercheck-1.2/t_blend.c --- old/rendercheck-1.1/t_blend.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_blend.c 2006-10-27 01:23:03.000000000 +0200 @@ -24,6 +24,9 @@ #include "rendercheck.h" +#define TEST_WIDTH 10 +#define TEST_HEIGHT 10 + /* Test a composite of a given operation, source, and destination picture. * Fills the window, and samples from the 0,0 pixel corner. */ @@ -36,16 +39,13 @@ int i; for (i = 0; i < pixmap_move_iter; i++) { - XRenderComposite(dpy, PictOpSrc, dst_color->pict, 0, dst->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); - XRenderComposite(dpy, ops[op].op, src_color->pict, 0, dst->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + XRenderComposite(dpy, PictOpSrc, dst_color->pict, 0, + dst->pict, 0, 0, 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); + XRenderComposite(dpy, ops[op].op, src_color->pict, 0, + dst->pict, 0, 0, 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); } get_pixel(dpy, dst, 0, 0, &tested); - /* Copy the output to the window, so the user sees something visual. */ - if (win != dst) - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + copy_pict_to_win(dpy, dst, win, TEST_WIDTH, TEST_HEIGHT); tdst = dst_color->color; color_correct(dst, &tdst); @@ -55,10 +55,14 @@ snprintf(testname, 20, "%s blend", ops[op].name); if (!eval_diff(testname, &expected, &tested, 0, 0, is_verbose)) { - printf("src color: %.2f %.2f %.2f %.2f\n" + char srcformat[20]; + + describe_format(srcformat, 20, src_color->format); + printf("src color: %.2f %.2f %.2f %.2f (%s)\n" "dst color: %.2f %.2f %.2f %.2f\n", src_color->color.r, src_color->color.g, src_color->color.b, src_color->color.a, + srcformat, dst_color->color.r, dst_color->color.g, dst_color->color.b, dst_color->color.a); printf("src: %s, dst: %s\n", src_color->name, dst->name); 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/rendercheck-1.1/t_bug7366.c new/rendercheck-1.2/t_bug7366.c --- old/rendercheck-1.1/t_bug7366.c 1970-01-01 01:00:00.000000000 +0100 +++ new/rendercheck-1.2/t_bug7366.c 2006-10-27 01:22:19.000000000 +0200 @@ -0,0 +1,151 @@ +/* + * Copyright © 2006 Eric Anholt + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Eric Anholt not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Eric Anholt makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "rendercheck.h" + +int +expecting_error(Display *dpy, XErrorEvent *event) +{ + return TRUE; +} + +/** + * Check SetPictureTransform on a source picture causing a crash. + */ +static Bool +bug7366_test_set_picture_transform(Display *dpy) +{ + Picture source_pict; + XRenderColor color; + XTransform transform; + + memset(&color, 0, sizeof(color)); + source_pict = XRenderCreateSolidFill(dpy, &color); + + memset(&transform, 0, sizeof(transform)); + XRenderSetPictureTransform(dpy, source_pict, &transform); + + XSync(dpy, FALSE); + + XRenderFreePicture(dpy, source_pict); + + return TRUE; +} + +/** + * Check setting of AlphaMap to a source picture causing a crash. + */ +static Bool +bug7366_test_set_alpha_map(Display *dpy) +{ + Picture source_pict, pict; + XRenderColor color; + Drawable pixmap; + XRenderPictureAttributes pa; + + memset(&color, 0, sizeof(color)); + source_pict = XRenderCreateSolidFill(dpy, &color); + + pixmap = XCreatePixmap(dpy, RootWindow(dpy, 0), 1, 1, 32); + pict = XRenderCreatePicture(dpy, pixmap, + XRenderFindStandardFormat(dpy, PictStandardARGB32), 0, NULL); + + XSetErrorHandler(expecting_error); + pa.alpha_map = source_pict; + XRenderChangePicture(dpy, pict, CPAlphaMap, &pa); + XSync(dpy, FALSE); + XSetErrorHandler(NULL); + + XFreePixmap(dpy, pixmap); + XRenderFreePicture(dpy, pict); + XRenderFreePicture(dpy, source_pict); + + return TRUE; +} + +/** + * Check SetPictureClipRectangles on a source potentially causing a crash. + */ +static Bool +bug7366_test_set_picture_clip_rectangles(Display *dpy) +{ + Picture source_pict; + XRenderColor color; + XRectangle rectangle; + + memset(&color, 0, sizeof(color)); + source_pict = XRenderCreateSolidFill(dpy, &color); + + memset(&rectangle, 0, sizeof(rectangle)); + XSetErrorHandler(expecting_error); + XRenderSetPictureClipRectangles(dpy, source_pict, 0, 0, &rectangle, 1); + XSync(dpy, FALSE); + XSetErrorHandler(NULL); + + XRenderFreePicture(dpy, source_pict); + + return TRUE; +} + +/** + * Check SetPictureFilter on a source potentially causing a crash. + */ +static Bool +bug7366_test_set_picture_filter(Display *dpy) +{ + Picture source_pict; + XRenderColor color; + + memset(&color, 0, sizeof(color)); + source_pict = XRenderCreateSolidFill(dpy, &color); + + XRenderSetPictureFilter(dpy, source_pict, "bilinear", NULL, 0); + XSync(dpy, FALSE); + XSetErrorHandler(NULL); + + XRenderFreePicture(dpy, source_pict); + + return TRUE; +} + +Bool +bug7366_test(Display *dpy) +{ + int maj, min; + + /* Make sure we actually have gradients available */ + XRenderQueryVersion(dpy, &maj, &min); + if (maj != 0 || min < 10) + return TRUE; + + bug7366_test_set_picture_transform(dpy); + bug7366_test_set_alpha_map(dpy); + bug7366_test_set_picture_clip_rectangles(dpy); + bug7366_test_set_picture_filter(dpy); + + /* If the server isn't gone, then we've succeeded. */ + 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/rendercheck-1.1/t_composite.c new/rendercheck-1.2/t_composite.c --- old/rendercheck-1.1/t_composite.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_composite.c 2006-10-27 01:23:35.000000000 +0200 @@ -24,6 +24,9 @@ #include "rendercheck.h" +#define TEST_WIDTH 10 +#define TEST_HEIGHT 10 + /* Test a composite of a given operation, source, mask, and destination picture. * Fills the window, and samples from the 0,0 pixel corner. */ @@ -45,16 +48,14 @@ } for (i = 0; i < pixmap_move_iter; i++) { XRenderComposite(dpy, PictOpSrc, dst_color->pict, 0, dst->pict, - 0, 0, 0, 0, 0, 0, win_width, win_height); + 0, 0, 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); XRenderComposite(dpy, ops[op].op, src_color->pict, mask_color->pict, dst->pict, 0, 0, 0, 0, 0, 0, - win_width, win_height); + TEST_WIDTH, TEST_HEIGHT); } get_pixel(dpy, dst, 0, 0, &tested); - /* Copy the output to the window, so the user sees something visual. */ - if (win != dst) - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + copy_pict_to_win(dpy, dst, win, TEST_WIDTH, TEST_HEIGHT); + if (componentAlpha) { pa.component_alpha = FALSE; XRenderChangePicture(dpy, mask_color->pict, CPComponentAlpha, 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/rendercheck-1.1/t_dstcoords.c new/rendercheck-1.2/t_dstcoords.c --- old/rendercheck-1.1/t_dstcoords.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_dstcoords.c 2006-10-27 01:24:58.000000000 +0200 @@ -24,6 +24,9 @@ #include "rendercheck.h" +#define TEST_WIDTH 10 +#define TEST_HEIGHT 10 + /* Test destination coordinates by drawing a 3x3 picture offset one pixel. * XXX: This should be done with another operation, to catch issues with Render * acceleration in the non-CopyArea-equivalent case. @@ -38,13 +41,12 @@ for (i = 0; i < pixmap_move_iter; i++) { XRenderComposite(dpy, PictOpSrc, bg->pict, 0, dst->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); XRenderComposite(dpy, PictOpSrc, fg->pict, 0, dst->pict, 0, 0, 0, 0, 1, 1, 1, 1); } - /* Copy the output to the window, so the user sees something visual. */ - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, 0, 0, - 0, 0, win_width, win_height); + + copy_pict_to_win(dpy, dst, win, TEST_WIDTH, TEST_HEIGHT); for (x = 0; x < 3; x++) { for (y = 0; y < 3; y++) { 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/rendercheck-1.1/t_fill.c new/rendercheck-1.2/t_fill.c --- old/rendercheck-1.1/t_fill.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_fill.c 2006-10-27 01:25:13.000000000 +0200 @@ -35,9 +35,8 @@ char name[20]; get_pixel(dpy, src, 0, 0, &tested); - /* Copy the output to the window, so the user sees something visual. */ - XRenderComposite(dpy, PictOpSrc, src->pict, 0, win->pict, 0, 0, 0, 0, - 0, 0, win_width, win_height); + + copy_pict_to_win(dpy, src, win, win_width, win_height); strcpy(name, "fill "); describe_format(name, 20 - strlen(name), src->format); 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/rendercheck-1.1/t_gradient.c new/rendercheck-1.2/t_gradient.c --- old/rendercheck-1.1/t_gradient.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_gradient.c 2006-10-27 01:25:43.000000000 +0200 @@ -216,10 +216,7 @@ XRenderComposite(dpy, ops[op].op, gradient, 0, dst->pict, 0, 0, 0, 0, 0, 0, win_width, win_height); - /* Copy the output to the window, so the user sees something visual. */ - if (win != dst) - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + copy_pict_to_win(dpy, dst, win, win_width, win_height); pix = test_pixels; while (pix->x >= 0) { 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/rendercheck-1.1/t_repeat.c new/rendercheck-1.2/t_repeat.c --- old/rendercheck-1.1/t_repeat.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_repeat.c 2006-10-27 01:26:11.000000000 +0200 @@ -96,15 +96,8 @@ 0, 0, 0, 0, 0, 0, win_width, win_height); } } - /* Copy the output to the window, so the user sees something - * visual. - */ - if (win != dst) { - XRenderComposite(dpy, PictOpSrc, - dst->pict, None, win->pict, - 0, 0, 0, 0, 0, 0, - win_width, win_height); - } + + copy_pict_to_win(dpy, dst, win, win_width, win_height); tdst = dst_color->color; color_correct(dst, &tdst); 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/rendercheck-1.1/t_triangles.c new/rendercheck-1.2/t_triangles.c --- old/rendercheck-1.1/t_triangles.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_triangles.c 2006-10-27 01:27:29.000000000 +0200 @@ -29,6 +29,9 @@ #include "rendercheck.h" +#define TEST_WIDTH 10 +#define TEST_HEIGHT 10 + /* Test basic functionality of the triangle operations. We don't care that much * probably (nobody has used them yet), but we can trivially test by filling * doing two triangles that will exactly cover the rectangle from 2,2 to 4,4. @@ -58,14 +61,12 @@ /* Fill the dst to dst_color */ XRenderComposite(dpy, PictOpSrc, dst_color->pict, None, dst->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); /* Paint the triangles with src_color */ XRenderCompositeTriangles(dpy, ops[op].op, src_color->pict, dst->pict, XRenderFindStandardFormat(dpy, PictStandardA8), 0, 0, triangles, 2); - /* Copy the output to the window, so the user sees something visual. */ - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, 0, 0, - 0, 0, win_width, win_height); + copy_pict_to_win(dpy, dst, win, TEST_WIDTH, TEST_HEIGHT); /* Color expected outside of the triangles */ tdst = dst_color->color; @@ -126,14 +127,12 @@ /* Fill the dst to dst_color */ XRenderComposite(dpy, PictOpSrc, dst_color->pict, None, dst->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); /* Paint the triangles with src_color */ XRenderCompositeTriFan(dpy, ops[op].op, src_color->pict, dst->pict, XRenderFindStandardFormat(dpy, PictStandardA8), 0, 0, points, 4); - /* Copy the output to the window, so the user sees something visual. */ - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, 0, 0, - 0, 0, win_width, win_height); + copy_pict_to_win(dpy, dst, win, TEST_WIDTH, TEST_HEIGHT); /* Color expected outside of the triangles */ tdst = dst_color->color; @@ -194,14 +193,12 @@ /* Fill the dst to dst_color */ XRenderComposite(dpy, PictOpSrc, dst_color->pict, None, dst->pict, 0, 0, - 0, 0, 0, 0, win_width, win_height); + 0, 0, 0, 0, TEST_WIDTH, TEST_HEIGHT); /* Paint the triangles with src_color */ XRenderCompositeTriStrip(dpy, ops[op].op, src_color->pict, dst->pict, XRenderFindStandardFormat(dpy, PictStandardA8), 0, 0, points, 4); - /* Copy the output to the window, so the user sees something visual. */ - XRenderComposite(dpy, PictOpSrc, dst->pict, 0, win->pict, 0, 0, 0, 0, - 0, 0, win_width, win_height); + copy_pict_to_win(dpy, dst, win, TEST_WIDTH, TEST_HEIGHT); /* Color expected outside of the triangles */ tdst = dst_color->color; 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/rendercheck-1.1/t_tsrccoords.c new/rendercheck-1.2/t_tsrccoords.c --- old/rendercheck-1.1/t_tsrccoords.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/t_tsrccoords.c 2006-10-27 01:22:20.000000000 +0200 @@ -63,6 +63,15 @@ free(p); } +static void init_transform (XTransform *t) +{ + int i, j; + + for (i = 0; i < 3; i++) + for (j = 0; j < 3; j++) + t->matrix[i][j] = XDoubleToFixed((i == j) ? 1 : 0); +} + /* Test drawing a 5x5 source image scaled 8x, as either a source or mask. */ Bool @@ -82,9 +91,9 @@ return FALSE; } - t.matrix[0][0] = 1.0; t.matrix[0][1] = 0.0; t.matrix[0][2] = 0.0; - t.matrix[1][0] = 0.0; t.matrix[1][1] = 1.0; t.matrix[1][2] = 0.0; - t.matrix[2][0] = 0.0; t.matrix[2][1] = 0.0; t.matrix[2][2] = 8.0; + init_transform(&t); + t.matrix[2][2] = XDoubleToFixed(8); + XRenderSetPictureTransform(dpy, src->pict, &t); if (!test_mask) @@ -137,9 +146,9 @@ printf("\n"); } } - t.matrix[0][0] = 1.0; t.matrix[0][1] = 0.0; t.matrix[0][2] = 0.0; - t.matrix[1][0] = 0.0; t.matrix[1][1] = 1.0; t.matrix[1][2] = 0.0; - t.matrix[2][0] = 0.0; t.matrix[2][1] = 0.0; t.matrix[2][2] = 1.0; + + init_transform(&t); + XRenderSetPictureTransform(dpy, src->pict, &t); destroy_dot_picture(dpy, src); 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/rendercheck-1.1/tests.c new/rendercheck-1.2/tests.c --- old/rendercheck-1.1/tests.c 2006-05-23 08:25:00.000000000 +0200 +++ new/rendercheck-1.2/tests.c 2006-10-27 01:22:20.000000000 +0200 @@ -27,18 +27,20 @@ #include "rendercheck.h" +XRenderPictFormat **format_list; +int nformats; +int argb32index; + /* Note: changing the order of these colors may disrupt tests that depend on - * specific colors. Just add to the end if you need. + * specific colors. Just add to the end if you need. These are + * not premultiplied, but will be in main(). */ color4d colors[] = { {1.0, 1.0, 1.0, 1.0}, {1.0, 0, 0, 1.0}, {0, 1.0, 0, 1.0}, {0, 0, 1.0, 1.0}, - {0.5, 0, 0, 0.25}, {0.5, 0, 0, .5}, - {0.0, .5, 1.0, .5}, - {0.0, .5, 1.0, 0} }; /* Convenience pointers to 1x1 repeating colors */ @@ -154,7 +156,7 @@ rscale = 1.0 * (1 << 5); gscale = 1.0 * (1 << 6); bscale = 1.0 * (1 << 5); - ascale = 1.0; + ascale = 1.0 * 32; rdiff = fabs(test->r - expected->r) * rscale; bdiff = fabs(test->g - expected->g) * gscale; gdiff = fabs(test->b - expected->b) * bscale; @@ -166,6 +168,7 @@ diff = max(max(max(rdiff, gdiff), bdiff), adiff); if (diff > 3.0) { printf("%s test error of %.4f at (%d, %d) --\n" + " R G B A\n" "got: %.2f %.2f %.2f %.2f\n" "expected: %.2f %.2f %.2f %.2f\n", name, diff, x, y, test->r, test->g, test->b, test->a, @@ -193,28 +196,108 @@ XRenderFillRectangle(dpy, PictOpSrc, p->pict, &rendercolor, x, y, w, h); } +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + +/* Create a set of direct format XRenderPictFormats for later use. This lets + * us get more formats than just the standard required set, and lets us attach + * names to them. + */ +void +create_formats_list(Display *dpy) +{ + int i; + int nformats_allocated = 5; + XRenderPictFormat templ; + + memset(&templ, 0, sizeof(templ)); + templ.type = PictTypeDirect; + + format_list = malloc(sizeof(XRenderPictFormat *) * nformats_allocated); + if (format_list == NULL) + errx(1, "malloc error"); + nformats = 0; + + argb32index = -1; + for (i = 0; ; i++) { + char name[20]; + int alphabits, redbits; + + if (nformats + 1 == nformats_allocated) { + nformats_allocated *= 2; + format_list = realloc(format_list, sizeof(XRenderPictFormat *) * + nformats_allocated); + if (format_list == NULL) + errx(1, "realloc error"); + } + + format_list[nformats] = XRenderFindFormat(dpy, PictFormatType, &templ, + i); + if (format_list[nformats] == NULL) + break; + + alphabits = bit_count(format_list[nformats]->direct.alphaMask); + redbits = bit_count(format_list[nformats]->direct.redMask); + + /* Our testing code isn't all that hot, so don't bother trying at + * the low depths yet. + */ + if ((redbits >= 1 && redbits <= 4) || + (alphabits >= 1 && alphabits <= 4)) + { + continue; + } + + describe_format(name, 20, format_list[nformats]); + + if (format_whitelist_len != 0) { + Bool ok = FALSE; + int j; + + for (j = 0; j < format_whitelist_len; j++) { + if (strcmp(format_whitelist[j], name) == 0) { + ok = TRUE; + break; + } + } + if (!ok) { + printf("Ignoring server-supported format: %s\n", name); + continue; + } + } + + if (format_list[nformats] == XRenderFindStandardFormat(dpy, + PictStandardARGB32)) + { + argb32index = nformats; + } + + printf("Found server-supported format: %s\n", name); + + nformats++; + } + if (argb32index == -1) { + errx(1, "required ARGB32 format not found"); + } +} + Bool do_tests(Display *dpy, picture_info *win) { int i, j, src, dst = 0, mask; - int num_dests, num_formats; + int num_dests; picture_info *dests, *pictures_1x1, *pictures_10x10, picture_3x3, *pictures_solid; int success_mask = 0, tests_passed = 0, tests_total = 0; + int num_tests; + + create_formats_list(dpy); - num_dests = 3; + num_dests = nformats; dests = (picture_info *)malloc(num_dests * sizeof(dests[0])); if (dests == NULL) errx(1, "malloc error"); - dests[0].format = XRenderFindStandardFormat(dpy, PictStandardARGB32); - dests[1].format = XRenderFindStandardFormat(dpy, PictStandardRGB24); - dests[2].format = XRenderFindStandardFormat(dpy, PictStandardA8); - /* - dests[3].format = XRenderFindStandardFormat(dpy, PictStandardA4); - dests[4].format = XRenderFindStandardFormat(dpy, PictStandardA1); - */ - for (i = 0; i < num_dests; i++) { + dests[i].format = format_list[i]; dests[i].d = XCreatePixmap(dpy, RootWindow(dpy, 0), win_width, win_height, dests[i].format->depth); dests[i].pict = XRenderCreatePicture(dpy, dests[i].d, @@ -226,20 +309,17 @@ describe_format(dests[i].name, 20, dests[i].format); } - num_formats = 3; - - pictures_1x1 = (picture_info *)malloc(num_colors * num_formats * + pictures_1x1 = (picture_info *)malloc(num_colors * nformats * sizeof(picture_info)); if (pictures_1x1 == NULL) errx(1, "malloc error"); - for (i = 0; i < num_colors * num_formats; i++) { + for (i = 0; i < num_colors * nformats; i++) { XRenderPictureAttributes pa; - color4d *c = &colors[i / num_formats]; + color4d *c = &colors[i / nformats]; /* The standard PictFormat numbers go from 0 to 4 */ - pictures_1x1[i].format = XRenderFindStandardFormat(dpy, - i % num_formats); + pictures_1x1[i].format = format_list[i % nformats]; pictures_1x1[i].d = XCreatePixmap(dpy, RootWindow(dpy, 0), 1, 1, pictures_1x1[i].format->depth); pa.repeat = TRUE; @@ -260,23 +340,22 @@ pictures_1x1[i].color = *c; color_correct(&pictures_1x1[i], &pictures_1x1[i].color); } - argb32white = &pictures_1x1[0 * num_formats]; - argb32red = &pictures_1x1[1 * num_formats]; - argb32green = &pictures_1x1[2 * num_formats]; - argb32blue = &pictures_1x1[3 * num_formats]; + argb32white = &pictures_1x1[0 * nformats + argb32index]; + argb32red = &pictures_1x1[1 * nformats + argb32index]; + argb32green = &pictures_1x1[2 * nformats + argb32index]; + argb32blue = &pictures_1x1[3 * nformats + argb32index]; - pictures_10x10 = (picture_info *)malloc(num_colors * num_formats * + pictures_10x10 = (picture_info *)malloc(num_colors * nformats * sizeof(picture_info)); if (pictures_10x10 == NULL) errx(1, "malloc error"); - for (i = 0; i < num_colors * num_formats; i++) { + for (i = 0; i < num_colors * nformats; i++) { XRenderPictureAttributes pa; - color4d *c = &colors[i / num_formats]; + color4d *c = &colors[i / nformats]; /* The standard PictFormat numbers go from 0 to 4 */ - pictures_10x10[i].format = XRenderFindStandardFormat(dpy, - i % num_formats); + pictures_10x10[i].format = format_list[i % nformats]; pictures_10x10[i].d = XCreatePixmap(dpy, RootWindow(dpy, 0), 10, 10, pictures_10x10[i].format->depth); pa.repeat = TRUE; @@ -320,6 +399,7 @@ c.green = (int)(colors[i].g*65535); c.blue = (int)(colors[i].b*65535); pictures_solid[i].pict = XRenderCreateSolidFill(dpy, &c); + pictures_solid[i].format = format_list[argb32index]; pictures_solid[i].name = "Solid"; } @@ -331,17 +411,19 @@ tests_total++; \ } while (0) + num_tests = num_colors * nformats; + if (enabled_tests & TEST_FILL) { Bool ok, group_ok = TRUE; printf("Beginning testing of filling of 1x1R pictures\n"); - for (i = 0; i < num_colors * num_formats; i++) { + for (i = 0; i < num_tests; i++) { ok = fill_test(dpy, win, &pictures_1x1[i]); RECORD_RESULTS(); } printf("Beginning testing of filling of 10x10 pictures\n"); - for (i = 0; i < num_colors * num_formats; i++) { + for (i = 0; i < num_tests; i++) { ok = fill_test(dpy, win, &pictures_10x10[i]); RECORD_RESULTS(); } @@ -353,9 +435,8 @@ Bool ok, group_ok = TRUE; printf("Beginning dest coords test\n"); - /* 0 and num_formats should result in ARGB8888 red on ARGB8888 white. */ - ok = dstcoords_test(dpy, win, &dests[0], &pictures_1x1[0], - &pictures_1x1[num_formats]); + ok = dstcoords_test(dpy, win, &dests[0], argb32white, + argb32red); RECORD_RESULTS(); if (group_ok) success_mask |= TEST_DSTCOORDS; @@ -365,7 +446,7 @@ Bool ok, group_ok = TRUE; printf("Beginning src coords test\n"); - ok = srccoords_test(dpy, win, &pictures_1x1[0], FALSE); + ok = srccoords_test(dpy, win, argb32white, FALSE); RECORD_RESULTS(); if (group_ok) success_mask |= TEST_SRCCOORDS; @@ -375,7 +456,7 @@ Bool ok, group_ok = TRUE; printf("Beginning mask coords test\n"); - ok = srccoords_test(dpy, win, &pictures_1x1[0], TRUE); + ok = srccoords_test(dpy, win, argb32white, TRUE); RECORD_RESULTS(); if (group_ok) success_mask |= TEST_MASKCOORDS; @@ -385,7 +466,7 @@ Bool ok, group_ok = TRUE; printf("Beginning transformed src coords test\n"); - ok = trans_coords_test(dpy, win, &pictures_1x1[0], FALSE); + ok = trans_coords_test(dpy, win, argb32white, FALSE); RECORD_RESULTS(); if (group_ok) success_mask |= TEST_TSRCCOORDS; @@ -395,7 +476,7 @@ Bool ok, group_ok = TRUE; printf("Beginning transformed mask coords test\n"); - ok = trans_coords_test(dpy, win, &pictures_1x1[0], TRUE); + ok = trans_coords_test(dpy, win, argb32white, TRUE); RECORD_RESULTS(); if (group_ok) success_mask |= TEST_TMASKCOORDS; @@ -405,6 +486,9 @@ Bool ok, group_ok = TRUE; for (i = 0; i < num_ops; i++) { + if (ops[i].disabled) + continue; + for (j = 0; j <= num_dests; j++) { picture_info *pi; @@ -415,8 +499,8 @@ printf("Beginning %s blend test on %s\n", ops[i].name, pi->name); - for (src = 0; src < num_colors * num_formats; src++) { - for (dst = 0; dst < num_colors; dst++) { + for (src = 0; src < num_tests; src++) { + for (dst = 0; dst < num_tests; dst++) { ok = blend_test(dpy, win, pi, i, &pictures_1x1[src], &pictures_1x1[dst]); @@ -443,6 +527,9 @@ Bool ok, group_ok = TRUE; for (i = 0; i < num_ops; i++) { + if (ops[i].disabled) + continue; + for (j = 0; j <= num_dests; j++) { picture_info *pi; @@ -453,9 +540,9 @@ printf("Beginning %s composite mask test on %s\n", ops[i].name, pi->name); - for (src = 0; src < num_colors; src++) { - for (mask = 0; mask < num_colors; mask++) { - for (dst = 0; dst < num_colors; dst++) { + for (src = 0; src < num_tests; src++) { + for (mask = 0; mask < num_tests; mask++) { + for (dst = 0; dst < num_tests; dst++) { ok = composite_test(dpy, win, pi, i, &pictures_10x10[src], &pictures_10x10[mask], @@ -489,6 +576,9 @@ Bool ok, group_ok = TRUE; for (i = 0; i < num_ops; i++) { + if (ops[i].disabled) + continue; + for (j = 0; j <= num_dests; j++) { picture_info *pi; @@ -499,9 +589,9 @@ printf("Beginning %s composite CA mask test on %s\n", ops[i].name, pi->name); - for (src = 0; src < num_colors; src++) { - for (mask = 0; mask < num_colors; mask++) { - for (dst = 0; dst < num_colors; dst++) { + for (src = 0; src < num_tests; src++) { + for (mask = 0; mask < num_tests; mask++) { + for (dst = 0; dst < num_tests; dst++) { ok = composite_test(dpy, win, pi, i, &pictures_10x10[src], &pictures_10x10[mask], @@ -535,6 +625,9 @@ Bool ok, group_ok = TRUE; for (i = 0; i < num_ops; i++) { + if (ops[i].disabled) + continue; + for (j = 0; j <= num_dests; j++) { picture_info *pi; @@ -545,8 +638,8 @@ printf("Beginning %s linear gradient test on %s\n", ops[i].name, pi->name); - for (src = 0; src < num_colors; src++) { - for (mask = 0; mask < num_colors; mask++) { + for (src = 0; src < num_tests; src++) { + for (mask = 0; mask < num_tests; mask++) { ok = linear_gradient_test(dpy, win, pi, i, &pictures_1x1[dst]); RECORD_RESULTS(); @@ -562,6 +655,9 @@ Bool ok, group_ok = TRUE; for (i = 0; i < num_ops; i++) { + if (ops[i].disabled) + continue; + for (j = 0; j <= num_dests; j++) { picture_info *pi; @@ -596,6 +692,9 @@ Bool ok, group_ok = TRUE; for (i = 0; i < num_ops; i++) { + if (ops[i].disabled) + continue; + for (j = 0; j <= num_dests; j++) { picture_info *pi; @@ -607,19 +706,19 @@ printf("Beginning %s Triangles test on %s\n", ops[i].name, pi->name); ok = triangles_test(dpy, win, pi, i, - &pictures_1x1[num_formats], &pictures_1x1[0]); + argb32red, argb32white); RECORD_RESULTS(); printf("Beginning %s TriStrip test on %s\n", ops[i].name, pi->name); ok = tristrip_test(dpy, win, pi, i, - &pictures_1x1[num_formats], &pictures_1x1[0]); + argb32red, argb32white); RECORD_RESULTS(); printf("Beginning %s TriFan test on %s\n", ops[i].name, pi->name); ok = trifan_test(dpy, win, pi, i, - &pictures_1x1[num_formats], &pictures_1x1[0]); + argb32red, argb32white); RECORD_RESULTS(); } } @@ -627,7 +726,35 @@ success_mask |= TEST_TRIANGLES; } + if (enabled_tests & TEST_BUG7366) { + Bool ok, group_ok = TRUE; + + ok = bug7366_test(dpy); + RECORD_RESULTS(); + + if (group_ok) + success_mask |= TEST_BUG7366; + } + printf("%d tests passed of %d total\n", tests_passed, tests_total); return tests_passed == tests_total; } + +/** + * \brief copies the contents of a picture to the window. + * + * This is used in tests so that the user sees flashing colors indicating that + * rendercheck is really doing things. The minimalrendering commandline option + * indicates that this behavior should be disabled. + */ +void +copy_pict_to_win(Display *dpy, picture_info *pict, picture_info *win, + int width, int height) +{ + if (pict == win || minimalrendering) + return; + + XRenderComposite(dpy, PictOpSrc, pict->pict, 0, win->pict, 0, 0, + 0, 0, 0, 0, width, height); +} ++++++ sessreg-1.0.1.tar.bz2 -> sessreg-1.0.2.tar.bz2 ++++++ ++++ 10861 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/sessreg-1.0.1/ChangeLog new/sessreg-1.0.2/ChangeLog --- old/sessreg-1.0.1/ChangeLog 2006-11-09 00:35:46.000000000 +0100 +++ new/sessreg-1.0.2/ChangeLog 2006-11-08 15:33:56.000000000 +0100 @@ -1,14 +1,8 @@ -commit 82fbb553114e8d00b6b3886aee4554dfd178cb01 -Author: Alan Coopersmith <alan.coopersmith(a)sun.com> -Date: Wed Nov 8 13:51:50 2006 -0800 - - Improve formatting of file names in sessreg.man - -commit 02379845b074cb252c0cb42d18c6cb8effcdc9f5 -Author: Alan Coopersmith <alan.coopersmith(a)sun.com> -Date: Wed Nov 8 13:48:05 2006 -0800 +commit 2989b28529b964f12a1bb3dcdf77b87ae8effaf0 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Wed Nov 8 16:32:56 2006 +0200 - Fix builds when $(srcdir) != $(objdir) + bump to 1.0.1 commit c472f5f9257e6dcb9e82042a99ef028e3390e93e Author: Alan Coopersmith <alan.coopersmith(a)sun.com> 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/sessreg-1.0.1/Makefile.am new/sessreg-1.0.2/Makefile.am --- old/sessreg-1.0.1/Makefile.am 2006-11-08 22:46:44.000000000 +0100 +++ new/sessreg-1.0.2/Makefile.am 2006-11-30 18:40:16.000000000 +0100 @@ -63,7 +63,7 @@ filenames.sed: filenames.sed.c $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(srcdir)/filenames.sed.c | grep 's\|__' > $@ + $(CPPFLAGS) $(srcdir)/filenames.sed.c | grep 's|__' > $@ if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 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/sessreg-1.0.1/configure.ac new/sessreg-1.0.2/configure.ac --- old/sessreg-1.0.1/configure.ac 2006-11-09 00:33:45.000000000 +0100 +++ new/sessreg-1.0.2/configure.ac 2006-11-30 18:40:29.000000000 +0100 @@ -21,7 +21,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(sessreg, [1.0.1], +AC_INIT(sessreg, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] sessreg) AM_INIT_AUTOMAKE([dist-bzip2]) 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/sessreg-1.0.1/sessreg.h new/sessreg-1.0.2/sessreg.h --- old/sessreg-1.0.1/sessreg.h 2006-11-08 02:28:49.000000000 +0100 +++ new/sessreg-1.0.2/sessreg.h 2006-11-30 18:40:16.000000000 +0100 @@ -55,6 +55,7 @@ #include "config.h" +#include <time.h> #include <utmp.h> #ifdef HAVE_UTMPX_H ++++++ setxkbmap-X11R7.1-1.0.2.tar.bz2 -> setxkbmap-1.0.3.tar.bz2 ++++++ ++++ 6156 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/setxkbmap-X11R7.1-1.0.2/configure.ac new/setxkbmap-1.0.3/configure.ac --- old/setxkbmap-X11R7.1-1.0.2/configure.ac 2006-03-10 10:09:12.000000000 +0100 +++ new/setxkbmap-1.0.3/configure.ac 2006-11-02 02:38:59.000000000 +0100 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(setxkbmap,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],setxkbmap) +AC_INIT(setxkbmap,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],setxkbmap) AM_INIT_AUTOMAKE([dist-bzip2]) AM_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/setxkbmap-X11R7.1-1.0.2/setxkbmap.c new/setxkbmap-1.0.3/setxkbmap.c --- old/setxkbmap-X11R7.1-1.0.2/setxkbmap.c 2006-03-10 10:09:12.000000000 +0100 +++ new/setxkbmap-1.0.3/setxkbmap.c 2006-10-15 20:10:40.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XdotOrg: app/setxkbmap/setxkbmap.c,v 1.3 2006/03/10 09:09:12 daniels Exp $ */ +/* $XdotOrg: app/setxkbmap/setxkbmap.c,v 1.2 2004/04/23 19:54:37 eich Exp $ */ /************************************************************ Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. @@ -47,7 +47,7 @@ #endif #ifndef DFLT_XKB_CONFIG_ROOT -#define DFLT_XKB_CONFIG_ROOT "/usr/X11R6/lib/X11/xkb" +#define DFLT_XKB_CONFIG_ROOT "/usr/share/X11/xkb" #endif #ifndef DFLT_XKB_RULES_FILE #define DFLT_XKB_RULES_FILE __XKBDEFRULES__ @@ -56,7 +56,7 @@ #define DFLT_XKB_LAYOUT "us" #endif #ifndef DFLT_XKB_MODEL -#define DFLT_XKB_MODEL "pc101" +#define DFLT_XKB_MODEL "pc105" #endif #define UNDEFINED 0 @@ -118,6 +118,8 @@ XkbDescPtr xkb= NULL; +int deviceSpec = XkbUseCoreKbd; + /***====================================================================***/ #define streq(s1,s2) (strcmp(s1,s2)==0) @@ -204,6 +206,7 @@ MSG("-?,-help Print this message\n"); MSG("-compat <name> Specifies compatibility map component name\n"); MSG("-config <file> Specifies configuration file to use\n"); + MSG("-device <deviceid> Specifies the device ID to use\n"); MSG("-display <dpy> Specifies display to use\n"); MSG("-geometry <name> Specifies geometry component name\n"); MSG("-I[<dir>] Add <dir> to list of directories to be used\n"); @@ -334,6 +337,8 @@ ok= setOptString(&i,argc,argv,COMPAT_NDX,FROM_CMD_LINE); else if (streq(argv[i],"-config")) ok= setOptString(&i,argc,argv,CONFIG_NDX,FROM_CMD_LINE); + else if (streq(argv[i],"-device")) + deviceSpec= atoi(argv[++i]); else if (streq(argv[i],"-display")) ok= setOptString(&i,argc,argv,DISPLAY_NDX,FROM_CMD_LINE); else if (streq(argv[i],"-geometry")) @@ -811,7 +816,7 @@ cmdNames.keycodes= svValue[KEYCODES_NDX]; cmdNames.geometry= svValue[GEOMETRY_NDX]; cmdNames.keymap= svValue[KEYMAP_NDX]; - xkb= XkbGetKeyboardByName(dpy,XkbUseCoreKbd,&cmdNames, + xkb= XkbGetKeyboardByName(dpy,deviceSpec,&cmdNames, XkbGBN_AllComponentsMask, XkbGBN_AllComponentsMask&(~XkbGBN_GeometryMask), True); ++++++ twm-1.0.2.tar.bz2 -> twm-1.0.3.tar.bz2 ++++++ ++++ 11319 lines of diff (skipped) ++++++ xdm-1.1.1.tar.bz2 -> xdm-1.1.2.tar.bz2 ++++++ ++++ 33452 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/xdm-1.1.1/ChangeLog new/xdm-1.1.2/ChangeLog --- old/xdm-1.1.1/ChangeLog 2006-11-13 23:52:15.000000000 +0100 +++ new/xdm-1.1.2/ChangeLog 2006-11-30 18:53:19.000000000 +0100 @@ -1,3 +1,17 @@ +commit 75a8fce621adecd50db129c839a578df630137db +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Thu Nov 30 19:49:31 2006 +0200 + + bump to 1.1.2 + +commit c8612093ba0a67c1a161111d58aac9956b9c5320 +Author: J.P. Larocque <piranha-fdo-bz(a)thoughtcrime.us> +Date: Mon Nov 20 11:06:18 2006 -0800 + + Bug 7317: xfs doesn't build on some GLIBC based systems: _XOPEN_SOURCE undefined + + Bug 7317: <https://bugs.freedesktop.org/show_bug.cgi?id=7317> + commit 15e5c60cced750559853ca7e9bddcd6b7f1dd3f9 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Mon Nov 13 14:51:16 2006 -0800 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/xdm-1.1.1/config.h.in new/xdm-1.1.2/config.h.in --- old/xdm-1.1.1/config.h.in 2006-11-13 23:50:59.000000000 +0100 +++ new/xdm-1.1.2/config.h.in 2006-11-30 18:50:18.000000000 +0100 @@ -117,9 +117,6 @@ /* Support IPv6 for TCP connections */ #undef IPv6 -/* Support os-specific local connections */ -#undef LOCALCONN - /* Name of package */ #undef PACKAGE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.1/configure.ac new/xdm-1.1.2/configure.ac --- old/xdm-1.1.1/configure.ac 2006-11-13 23:50:10.000000000 +0100 +++ new/xdm-1.1.2/configure.ac 2006-11-30 18:49:23.000000000 +0100 @@ -24,7 +24,7 @@ dnl $XdotOrg: app/xdm/configure.ac,v 1.42 2006/06/03 01:01:21 alanc Exp $ AC_PREREQ([2.57]) -AC_INIT(xdm,[1.1.1],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm) +AC_INIT(xdm,[1.1.2],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -122,7 +122,7 @@ case $host_os in - linux*|gnu*) + linux*|gnu*|*-gnu) OS_CFLAGS="-D_XOPEN_SOURCE" SU="su" ;; ++++++ xfs-1.0.3.tar.bz2 -> xfs-1.0.4.tar.bz2 ++++++ ++++ 8128 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/xfs-1.0.3/configure.ac new/xfs-1.0.4/configure.ac --- old/xfs-1.0.3/configure.ac 2006-10-13 23:29:24.000000000 +0200 +++ new/xfs-1.0.4/configure.ac 2006-11-30 18:50:48.000000000 +0100 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xfs,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs) +AC_INIT(xfs,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -33,7 +33,7 @@ AC_CANONICAL_HOST case $host_os in - linux*) + linux*|gnu*|*-gnu) OS_CFLAGS="-D_XOPEN_SOURCE" ;; *) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 x11-input-wacom
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package x11-input-wacom checked in at Thu Dec 7 21:33:28 CET 2006. -------- --- x11-input-wacom/x11-input-wacom.changes 2006-11-02 14:20:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2006-12-04 12:48:22.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Dec 4 12:44:51 CET 2006 - sndirsch(a)suse.de + +- updated to release 0.7.6-4 + * updated xsetwacom + * Fixed cursor relative out-prox issue + * Changed CursorProx option from 2 inputs into 1 + * updated xsetwacom and wacom_drv + * Removed serial number and device ID in 4th - 5th + high bytes due to bug 1592814 + * Updated acinclude.m4 and configure.in (Mats Johannesson) + * Updated X driver for Xinerama setup + * Removed option gimp + +------------------------------------------------------------------- Old: ---- linuxwacom-0.7.6-2.tar.bz2 New: ---- linuxwacom-0.7.6-4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.HdCx3r/_old 2006-12-07 21:33:10.000000000 +0100 +++ /var/tmp/diff_new_pack.HdCx3r/_new 2006-12-07 21:33:10.000000000 +0100 @@ -15,14 +15,14 @@ %ifnarch s390 s390x BuildRequires: xorg-x11-server-sdk %endif -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) URL: http://linuxwacom.sourceforge.net/ Group: System/X11/Utilities Version: 0.7.6 -Release: 9 +Release: 18 Summary: X11 input module for wacom tablet Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o -Source: linuxwacom-%{version}-2.tar.bz2 +Source: linuxwacom-%{version}-4.tar.bz2 Patch1: xsetwacom.diff Patch3: xorg7.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -73,7 +73,7 @@ Ping Cheng <pingc(a)wacom.com> %prep -%setup -n linuxwacom-%{version}-2 +%setup -n linuxwacom-%{version}-4 %ifnarch s390 s390x %patch1 cp /usr/include/xorg/{xf86Parser.h,xf86Optrec.h} . @@ -153,6 +153,17 @@ /usr/%_lib/libwacomcfg.so %changelog -n x11-input-wacom +* Mon Dec 04 2006 - sndirsch(a)suse.de +- updated to release 0.7.6-4 + * updated xsetwacom + * Fixed cursor relative out-prox issue + * Changed CursorProx option from 2 inputs into 1 + * updated xsetwacom and wacom_drv + * Removed serial number and device ID in 4th - 5th + high bytes due to bug 1592814 + * Updated acinclude.m4 and configure.in (Mats Johannesson) + * Updated X driver for Xinerama setup + * Removed option gimp * Thu Nov 02 2006 - sndirsch(a)suse.de - updated to release 0.7.6-2 * Updated README and NEWS ++++++ linuxwacom-0.7.6-2.tar.bz2 -> linuxwacom-0.7.6-4.tar.bz2 ++++++ ++++ 3034 lines of diff (skipped) ++++++ xorg7.diff ++++++ --- /var/tmp/diff_new_pack.HdCx3r/_old 2006-12-07 21:33:12.000000000 +0100 +++ /var/tmp/diff_new_pack.HdCx3r/_new 2006-12-07 21:33:12.000000000 +0100 @@ -6,6 +6,6 @@ #define NEED_XF86_TYPES #if !defined(DGUX) +#include <unistd.h> - #include <xf86_ansic.h> #include <xisb.h> + #include <xf86_ansic.h> #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 x11-input-synaptics
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package x11-input-synaptics checked in at Thu Dec 7 21:33:04 CET 2006. -------- --- x11-input-synaptics/x11-input-synaptics.changes 2006-09-03 22:40:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/x11-input-synaptics/x11-input-synaptics.changes 2006-12-04 16:06:00.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 4 16:05:54 CET 2006 - sndirsch(a)suse.de + +- fixed gunze driver docs + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-synaptics.spec ++++++ --- /var/tmp/diff_new_pack.G5wXio/_old 2006-12-07 21:33:00.000000000 +0100 +++ /var/tmp/diff_new_pack.G5wXio/_new 2006-12-07 21:33:00.000000000 +0100 @@ -16,12 +16,12 @@ BuildRequires: xorg-x11-server-sdk %endif URL: http://web.telia.com/~u89404340/touchpad/ -License: GPL +License: GNU General Public License (GPL) Group: System/X11/Servers/XF86_4 Autoreqprov: on %define driver_release 0.14.6 Version: 0.14.6 -Release: 1 +Release: 24 Summary: X11 input module for synaptics touchpad Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/synaptics_drv.o Source: synaptics-%{version}.tar.bz2 @@ -64,7 +64,7 @@ Group: System/X11/Servers/XF86_4 Autoreqprov: on Version: 031126 -Release: 37 +Release: 60 %description -n x11-input-gunze X11 input module for gunze touchscreen @@ -82,7 +82,7 @@ Requires: x11-input-gunze = %{version}-%{release} Autoreqprov: on Version: 031126 -Release: 37 +Release: 60 %description -n x11-input-gunze-tools Tools to configure and calibrate gunze X11 input driver. @@ -129,6 +129,8 @@ make install DESTDIR=$RPM_BUILD_ROOT pushd ../programs/Xserver/hw/xfree86/input/gunze make install DESTDIR=$RPM_BUILD_ROOT + mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/x11-input-gunze + install -m 644 README $RPM_BUILD_ROOT/%{_defaultdocdir}/x11-input-gunze popd %endif pushd ../gunze-tools @@ -171,7 +173,7 @@ %files -n x11-input-gunze %defattr(-,root,root) -%doc README +%doc %{_defaultdocdir}/x11-input-gunze %ifnarch s390 s390x %dir /usr/%{_lib}/xorg %dir /usr/%{_lib}/xorg/modules @@ -187,6 +189,8 @@ /usr/bin/gunzets_calib %changelog -n x11-input-synaptics +* Mon Dec 04 2006 - sndirsch(a)suse.de +- fixed gunze driver docs * Sun Sep 03 2006 - sndirsch(a)suse.de - updated synaptics driver to release 0.14.6 * Some small fixes for xorg 7.0 builds. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 wireshark
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package wireshark checked in at Thu Dec 7 21:32:55 CET 2006. -------- --- wireshark/wireshark.changes 2006-11-13 16:31:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/wireshark/wireshark.changes 2006-12-07 10:30:57.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 7 10:30:28 CET 2006 - prusnak(a)suse.cz + +- fixed libdir path in spec file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireshark.spec ++++++ --- /var/tmp/diff_new_pack.zUVVkA/_old 2006-12-07 21:32:44.000000000 +0100 +++ /var/tmp/diff_new_pack.zUVVkA/_new 2006-12-07 21:32:44.000000000 +0100 @@ -12,12 +12,12 @@ Name: wireshark BuildRequires: cairo-devel gtk2-devel krb5-devel libadns-devel libpcap net-snmp-devel pcre-devel python tcpd-devel update-desktop-files -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Productivity/Networking/Diagnostic Autoreqprov: on Summary: A Network Traffic Analyser Version: 0.99.4 -Release: 1 +Release: 5 URL: http://www.wireshark.org/ Source: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop @@ -34,7 +34,7 @@ Wireshark is a free network protocol analyzer for Unix and Windows. It allows you to examine data from a live network or from a capture file on disk. You can interactively browse the capture data, viewing summary -and detail information for each packet. Ethereal has several powerful +and detail information for each packet. Wireshark has several powerful features, including a rich display filter language and the ability to view the reconstructed stream of a TCP session. @@ -78,7 +78,7 @@ Wireshark is a free network protocol analyzer for Unix and Windows. It allows you to examine data from a live network or from a capture file on disk. You can interactively browse the capture data, viewing summary -and detail information for each packet. Ethereal has several powerful +and detail information for each packet. Wireshark has several powerful features, including a rich display filter language and the ability to view the reconstructed stream of a TCP session. @@ -129,7 +129,7 @@ --enable-ipv6 \ --with-ssl=/usr \ --with-krb5=yes \ - --libdir=/%{_libdir} + --libdir=%{_libdir} make %{?jobs:-j%jobs} %install @@ -179,6 +179,8 @@ %{_mandir}/man1/idl2wrs* %changelog -n wireshark +* Thu Dec 07 2006 - prusnak(a)suse.cz +- fixed libdir path in spec file * Mon Nov 13 2006 - mjancar(a)suse.cz - update to 0.99.4 * final 0.99.4 release ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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