January 2010 - openSUSE Commits - openSUSE Mailing Lists

commit yast2 for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Thu Jan 7 13:05:30 CET 2010. -------- --- yast2/yast2.changes 2009-11-26 18:57:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2010-01-05 16:30:39.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Jan 5 15:07:54 UTC 2010 - lslezak(a)suse.cz + +- added missing UI::SetProductName() call - display the proper + product name in help texts (using &product; macro) (bnc#535483) +- 2.19.1 + +------------------------------------------------------------------- +Mon Dec 7 13:03:25 CET 2009 - jsrain(a)suse.cz + +- translate module names properly in NCurses CC (bnc#553644) + +------------------------------------------------------------------- +Thu Nov 26 19:40:24 CET 2009 - locilka(a)suse.cz + +- Fixed access rights for /etc/install.inf (bnc #500124) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.19.0.tar.bz2 New: ---- yast2-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.m9MQFz/_old 2010-01-07 13:05:24.000000000 +0100 +++ /var/tmp/diff_new_pack.m9MQFz/_new 2010-01-07 13:05:24.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2 (Version 2.19.0) +# spec file for package yast2 (Version 2.19.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,10 +19,10 @@ Name: yast2 -Version: 2.19.0 +Version: 2.19.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.19.0.tar.bz2 +Source0: yast2-2.19.1.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ @@ -111,7 +111,7 @@ installation with YaST2. %prep -%setup -n yast2-2.19.0 +%setup -n yast2-2.19.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.19.0.tar.bz2 -> yast2-2.19.1.tar.bz2 ++++++ ++++ 26349 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/yast2-2.19.0/VERSION new/yast2-2.19.1/VERSION --- old/yast2-2.19.0/VERSION 2009-11-26 18:54:08.000000000 +0100 +++ new/yast2-2.19.1/VERSION 2010-01-05 16:24:18.000000000 +0100 @@ -1 +1 @@ -2.19.0 +2.19.1 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/yast2-2.19.0/configure.in new/yast2-2.19.1/configure.in --- old/yast2-2.19.0/configure.in 2009-09-04 19:16:56.000000000 +0200 +++ new/yast2-2.19.1/configure.in 2010-01-05 16:29:19.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.18.23, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.19.1, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.23" +VERSION="2.19.1" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" 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/yast2-2.19.0/library/control/src/ProductFeatures.ycp new/yast2-2.19.1/library/control/src/ProductFeatures.ycp --- old/yast2-2.19.0/library/control/src/ProductFeatures.ycp 2009-09-02 13:08:53.000000000 +0200 +++ new/yast2-2.19.1/library/control/src/ProductFeatures.ycp 2010-01-05 13:45:40.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Anas Nashif <nashif(a)suse.de> * Jiri Srain <jsrain(a)suse.cz> * - * $Id: ProductFeatures.ycp 57925 2009-07-08 10:00:41Z aschnell $ + * $Id: ProductFeatures.ycp 60109 2009-12-15 10:50:54Z aschnell $ */ { @@ -49,9 +49,9 @@ "base_product_license_directory" : "/etc/YaST2/licenses/base/", ], "partitioning" : $[ - "evms_config" : "no", "use_flexible_partitioning" : false, "flexible_partitioning" : $[], + "vm_keep_unpartitioned_region" : false, ], "software" : $[ "software_proposal" : "selection", 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/yast2-2.19.0/library/desktop/src/Desktop.ycp new/yast2-2.19.1/library/desktop/src/Desktop.ycp --- old/yast2-2.19.0/library/desktop/src/Desktop.ycp 2009-06-24 12:52:46.000000000 +0200 +++ new/yast2-2.19.1/library/desktop/src/Desktop.ycp 2010-01-05 13:45:40.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Handling of .desktop entries * Author: Michal Svec <msvec(a)suse.cz> * - * $Id: Desktop.ycp 55298 2009-02-06 11:28:30Z ug $ + * $Id: Desktop.ycp 59977 2009-12-07 12:05:13Z jsrain $ */ { @@ -74,7 +74,7 @@ //no translations in .desktop, check desktop_translations.mo then string msgid = sformat("%1(%2): %3", key, fname, fallback ); - ret = dgettext( "desktop_translations", msgid ); + ret = dpgettext( "desktop_translations", "/usr/share/locale", msgid ); //probably untranslated - return english name if(ret == msgid) 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/yast2-2.19.0/library/modules/Linuxrc.ycp new/yast2-2.19.1/library/modules/Linuxrc.ycp --- old/yast2-2.19.0/library/modules/Linuxrc.ycp 2009-06-24 12:52:46.000000000 +0200 +++ new/yast2-2.19.1/library/modules/Linuxrc.ycp 2009-11-30 14:56:06.000000000 +0100 @@ -4,7 +4,7 @@ * Purpose: Interaction with linuxrc * * Author: Anas Nashif <nashif(a)suse.de? - * $Id: Linuxrc.ycp 50232 2008-08-20 11:50:01Z ug $ + * $Id: Linuxrc.ycp 59852 2009-11-30 09:27:15Z locilka $ */ { module "Linuxrc"; @@ -148,9 +148,11 @@ if (root != nil && root != "" && root != "/") { if (WFM::Read (.local.size, inst_if_file) != -1) { y2milestone ("Copying %1 to %2", inst_if_file, root); - WFM::Execute (.local.bash, sformat ( - "grep -v '^Sourcemounted' '%1' > %2/%1; chmod 0600 %1", inst_if_file, root - )); + if ((integer) WFM::Execute (.local.bash, sformat ( + "grep -vi '^Sourcemounted' '%1' > %2/%1; chmod 0600 %2/%1", inst_if_file, root + )) != 0) { + y2error ("Cannot SaveInstallInf %1 to %2", inst_if_file, root); + } } else { y2error ("Can't SaveInstallInf, file %1 doesn't exist", inst_if_file); } 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/yast2-2.19.0/library/modules/Version.ycp new/yast2-2.19.1/library/modules/Version.ycp --- old/yast2-2.19.0/library/modules/Version.ycp 2009-11-26 18:56:37.000000000 +0100 +++ new/yast2-2.19.1/library/modules/Version.ycp 2010-01-05 16:29:32.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.19.0"; +global string yast2 = "2.19.1"; /* EOF */ } 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/yast2-2.19.0/library/wizard/src/Wizard.ycp new/yast2-2.19.1/library/wizard/src/Wizard.ycp --- old/yast2-2.19.0/library/wizard/src/Wizard.ycp 2009-09-02 13:08:53.000000000 +0200 +++ new/yast2-2.19.1/library/wizard/src/Wizard.ycp 2010-01-05 16:03:43.000000000 +0100 @@ -1840,6 +1840,7 @@ { y2milestone ("Setting product name to '%1'", name); product_name = name; + UI::SetProductName(product_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/yast2-2.19.0/missing new/yast2-2.19.1/missing --- old/yast2-2.19.0/missing 2009-09-04 19:17:01.000000000 +0200 +++ new/yast2-2.19.1/missing 2010-01-05 16:29:24.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xpdf-poppler for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package xpdf-poppler for openSUSE:Factory checked in at Thu Jan 7 13:05:16 CET 2010. -------- --- xpdf-poppler/xpdf-poppler.changes 2009-11-24 11:37:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/xpdf-poppler/xpdf-poppler.changes 2009-12-30 11:37:13.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 30 11:33:46 CET 2009 - bernhard(a)bwalle.de + +- Add xpdf-poppler-set-icon.patch to set the application icon for + window managers in xpdf. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xpdf-poppler-set-icon.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xpdf-poppler.spec ++++++ --- /var/tmp/diff_new_pack.q6stAh/_old 2010-01-07 13:05:08.000000000 +0100 +++ /var/tmp/diff_new_pack.q6stAh/_new 2010-01-07 13:05:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xpdf-poppler (Version 3.02) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ License: GPLv2 Group: Productivity/Publishing/PDF Version: 3.02 -Release: 4 +Release: 5 AutoReqProv: on Requires: ghostscript-fonts-std Summary: A PDF File Viewer for the X Window System @@ -55,6 +55,7 @@ Patch10: %{name}-private-textpage-destructor.patch # PATCH-FIX-UPSTREAM xpdf-poppler-getCMap-arguments.patch pgajdos(a)suse.cz Patch11: %{name}-getCMap-arguments.patch +Patch12: %{name}-set-icon.patch Url: http://www.foolabs.com/xpdf/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: xpdf @@ -84,6 +85,7 @@ %patch9 %patch10 %patch11 +%patch12 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS -DSYSTEM_XPDFRC=\\\"/etc/xpdfrc\\\"" ++++++ xpdf-poppler-set-icon.patch ++++++ Set HAVE_X11_XPM_H and link against -lXpm to set the application icon in xpdf --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -LIBS=$(shell pkg-config --libs poppler) -lXm +LIBS=$(shell pkg-config --libs poppler) -lXm -lXpm POPPLERBASE=$(strip $(shell pkg-config --cflags poppler)) INCLUDES=$(POPPLERBASE) $(POPPLERBASE)/goo $(POPPLERBASE)/splash -CPPFLAGS+= $(INCLUDES) -DHAVE_DIRENT_H +CPPFLAGS+= $(INCLUDES) -DHAVE_DIRENT_H -DHAVE_X11_XPM_H xpdf: CoreOutputDev.o GlobalParamsGUI.o ImageOutputDev.o PDFCore.o XPDFApp.o XPDFCore.o XPDFTree.o XPDFViewer.o parseargs.o xpdf.o $(CXX) $(CXXFLAGS) $(LDFLAGS) -o xpdf *.o $(LIBS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Thu Jan 7 13:05:09 CET 2010. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-12-15 16:58:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-01-05 00:15:35.000000000 +0100 @@ -0,0 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 5 00:01:40 CET 2010 - sndirsch(a)suse.de + +- xf86-video-intel 2.10.0 + * minor change to the configure script, and some small updates + to the documentation since 2.9.99.902 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-video-intel-2.9.99.902.tar.bz2 New: ---- xf86-video-intel-2.10.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.vE2BNk/_old 2010-01-07 13:05:01.000000000 +0100 +++ /var/tmp/diff_new_pack.vE2BNk/_new 2010-01-07 13:05:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-driver-video (Version 7.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 92 +Release: 93 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -68,7 +68,7 @@ Source42: xf86-video-voodoo-1.2.3.tar.bz2 Source43: xf86-video-impact-0.2.0.tar.bz2 Source44: HALlib-4.1.tar.gz -Source45: xf86-video-intel-2.9.99.902.tar.bz2 +Source45: xf86-video-intel-2.10.0.tar.bz2 Source46: xf86-video-ati-6.12.4.tar.bz2 Source48: xf86-video-mga-1.9.100.tar.bz2 Source50: xf86-video-xgi-1.5.1.tar.bz2 ++++++ xf86-video-intel-2.9.99.902.tar.bz2 -> xf86-video-intel-2.10.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-intel-2.9.99.902/ChangeLog new/xf86-video-intel-2.10.0/ChangeLog --- old/xf86-video-intel-2.9.99.902/ChangeLog 2009-12-11 00:27:00.000000000 +0100 +++ new/xf86-video-intel-2.10.0/ChangeLog 2010-01-04 23:21:11.000000000 +0100 @@ -1,3 +1,70 @@ +commit 091035146463bf1aa6674bff6947d04fc620c18f +Author: Carl Worth <cworth(a)cworth.org> +Date: Mon Jan 4 14:20:11 2010 -0800 + + configure.ac: Bump version to 2.10.0. + + In preparation for the 2.10.0 release. + +commit 01f7d0307b3f5f085e383ff85026757de9cda359 +Author: Carl Worth <cworth(a)cworth.org> +Date: Mon Jan 4 14:19:17 2010 -0800 + + NEWS: Add final release notes for the 2.10.0 release. + + Mentioning that it's functionally identical to our most recent release + candidate. + +commit e966bca3a9143cff37beb54359bea13c9f693b44 +Author: Zhenyu Wang <zhenyuw(a)linux.intel.com> +Date: Tue Dec 29 21:49:49 2009 -0800 + + Take note for Pineview support in README and manpage + + Signed-off-by: Zhenyu Wang <zhenyuw(a)linux.intel.com> + +commit 6137791e9f1a4778afabbbc06de3da68648ae258 +Author: Carl Worth <cworth(a)cworth.org> +Date: Mon Jan 4 14:08:24 2010 -0800 + + man page: Remove section describing BACKLIGHT_CONTROL property. + + This apparently no longer exists in a KMS world, so remove it from the + documentation. + +commit 7f36a439249cc2101d8985de5e95af652e5b984b +Author: Carl Worth <cworth(a)cworth.org> +Date: Mon Jan 4 14:07:24 2010 -0800 + + man page: Rename PANEL_FITTING to "scaling mode". + + The old UMS name was PANEL_FITTING while the new KMS name is "scaling mode". + + Fixes bug #25606. + +commit a6fb71e6e26fb31f4cd10fad2d3a87d9114a649a +Author: Carl Worth <cworth(a)cworth.org> +Date: Mon Jan 4 14:05:27 2010 -0800 + + man page: Add additional indentation for some output configuration options. + + The BACKLIGHT_CONTROL and PANEL_FITTING options appear in a list, and + then each contain a sub-list of sub-options. Use indentation to make + this structure more apparent to the reader. + +commit 25a6c8dfae240143309b14cc32ebac6008c3a378 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Dec 15 21:46:48 2009 -0500 + + configure.ac: use backticks rather than $() for cmd subs + + Use "$PKG_CONFIG" rather than hard coded "pkg-config" + + Acked-by: Dan Nicholson <dbn.lists(a)gmail.com> + Acked-by: Daniel Stone <daniel(a)fooishbar.org> + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + commit 2c142e421e859406b5aff16ba18624150269fc06 Author: Carl Worth <cworth(a)cworth.org> Date: Thu Dec 10 15:25:44 2009 -0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-intel-2.9.99.902/NEWS new/xf86-video-intel-2.10.0/NEWS --- old/xf86-video-intel-2.9.99.902/NEWS 2009-12-11 00:17:42.000000000 +0100 +++ new/xf86-video-intel-2.10.0/NEWS 2010-01-04 23:19:07.000000000 +0100 @@ -1,5 +1,5 @@ -Work-in-progress release notes for the next release (which will be 2.10.0) -========================================================================== +Release 1.10.0 (2010-01-04) +=========================== New requirements of 2.10 compared to 2.9 ---------------------------------------- * Linux kernel with kernel-modesetting (KMS) @@ -30,10 +30,6 @@ * Fix to support larger extended desktops, (such as a 2560x1600 plus a 1920x1200 monitor). - * i915: Fix texture sample coordinates, (was causing gray border around - images). - - https://bugs.freedesktop.org/show_bug.cgi?id=21523 * Fix glyph corruption due to insufficient cache flushing: @@ -41,9 +37,10 @@ Several other correctness and performance fixes are also included. -[Developers, please provide me summaries for any additional features -of this release that you think should appear in NEWS and in the 2.10.0 -release notes. +Note: The driver code of the 2.10.0 release is identical to that of +the 2.9.99.901 release candidate. The only changes in 2.10.0 compared +to 2.9.99.902 are a minor change to the configure script, and some +small updates to the documentation. Snapshot 2.9.99.902 (2009-12-10) ================================ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-intel-2.9.99.902/README new/xf86-video-intel-2.10.0/README --- old/xf86-video-intel-2.9.99.902/README 2009-09-21 23:32:42.000000000 +0200 +++ new/xf86-video-intel-2.10.0/README 2010-01-04 23:15:21.000000000 +0100 @@ -13,6 +13,8 @@ 915G/GM,945G/GM/GME,946GZ G/GM/GME/Q965, G/Q33,G/Q35,G41,G/Q43,G/GM/Q45 + PineView-M (Atom N400 series) + PineView-D (Atom D400/D500 series) Where to get more information about the driver ---------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-intel-2.9.99.902/configure new/xf86-video-intel-2.10.0/configure --- old/xf86-video-intel-2.9.99.902/configure 2009-12-11 00:26:55.000000000 +0100 +++ new/xf86-video-intel-2.10.0/configure 2010-01-04 23:21:07.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for xf86-video-intel 2.9.99.902. +# Generated by GNU Autoconf 2.65 for xf86-video-intel 2.10.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-intel' PACKAGE_TARNAME='xf86-video-intel' -PACKAGE_VERSION='2.9.99.902' -PACKAGE_STRING='xf86-video-intel 2.9.99.902' +PACKAGE_VERSION='2.10.0' +PACKAGE_STRING='xf86-video-intel 2.10.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1497,7 +1497,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-video-intel 2.9.99.902 to adapt to many kinds of systems. +\`configure' configures xf86-video-intel 2.10.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1568,7 +1568,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-intel 2.9.99.902:";; + short | recursive ) echo "Configuration of xf86-video-intel 2.10.0:";; esac cat <<\_ACEOF @@ -1704,7 +1704,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-video-intel configure 2.9.99.902 +xf86-video-intel configure 2.10.0 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2114,7 +2114,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-video-intel $as_me 2.9.99.902, which was +It was created by xf86-video-intel $as_me 2.10.0, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2927,7 +2927,7 @@ # Define the identity of the package. PACKAGE='xf86-video-intel' - VERSION='2.9.99.902' + VERSION='2.10.0' cat >>confdefs.h <<_ACEOF @@ -12684,7 +12684,7 @@ fi -sdkdir=$(pkg-config --variable=sdkdir xorg-server) +sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` save_CFLAGS="$CFLAGS" CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" @@ -13742,7 +13742,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-video-intel $as_me 2.9.99.902, which was +This file was extended by xf86-video-intel $as_me 2.10.0, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13808,7 +13808,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xf86-video-intel config.status 2.9.99.902 +xf86-video-intel config.status 2.10.0 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-intel-2.9.99.902/configure.ac new/xf86-video-intel-2.10.0/configure.ac --- old/xf86-video-intel-2.9.99.902/configure.ac 2009-12-11 00:25:35.000000000 +0100 +++ new/xf86-video-intel-2.10.0/configure.ac 2010-01-04 23:20:07.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-intel], - 2.9.99.902, + 2.10.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-intel) @@ -97,7 +97,7 @@ HAVE_XEXTPROTO_71="no") AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) -sdkdir=$(pkg-config --variable=sdkdir xorg-server) +sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` save_CFLAGS="$CFLAGS" CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-intel-2.9.99.902/man/intel.man new/xf86-video-intel-2.10.0/man/intel.man --- old/xf86-video-intel-2.9.99.902/man/intel.man 2009-12-10 23:51:38.000000000 +0100 +++ new/xf86-video-intel-2.10.0/man/intel.man 2010-01-04 23:15:21.000000000 +0100 @@ -25,7 +25,8 @@ .B intel supports the i810, i810-DC100, i810e, i815, i830M, 845G, 852GM, 855GM, 865G, 915G, 915GM, 945G, 945GM, 965G, 965Q, 946GZ, 965GM, 945GME, -G33, Q33, Q35, G35, GM45, G45, Q45, G43 and G41 chipsets. +G33, Q33, Q35, G35, GM45, G45, Q45, G43, G41 chipsets, and Pineview-M in +Atom N400 series, Pineview-D in Atom D400/D500 series. .SH CONFIGURATION DETAILS Please refer to __xconfigfile__(__filemansuffix__) for general configuration @@ -199,32 +200,11 @@ By adjusting the BACKLIGHT property, the brightness on the LVDS output can be adjusted. In some cases, this property may be unavailable (for example if your platform uses an external microcontroller to control the backlight). .PP -.B BACKLIGHT_CONTROL -- method used to control backlight -.TP 2 -The driver will attempt to automatically detect the backlight control method for your platform. If this fails however, you can select another method which may allow you to control your backlight. Available methods include: -.PP -.B native -.TP 4 -Intel chipsets include backlight control registers, which on some platforms may be wired to control the backlight directly. This method uses those registers. -.PP -.B legacy -.TP 4 -The legacy backlight control registers exist in PCI configuration space, and have fewer available backlight levels than the native registers. However, some platforms are wired this way and so need to use this method. -.PP -.B combo -.TP 4 -This method attempts to use the native registers where possible, resorting to the legacy, configuration space registers only to enable the backlight if needed. On platforms that have both wired this can be a good choice as it allows the fine grained backlight control of the native interface. -.PP -.B kernel -.TP 4 -On some system, the kernel may provide a backlight control driver. In that case, using the kernel interfaces is preferable, as the same driver may respond to hotkey events or external APIs. - -.PP -.B PANEL_FITTING -- control LCD panel fitting +.B scaling mode +- control LCD panel scaling mode .TP 2 By default, the driver will attempt to upscale resolutions smaller than the LCD's native size while preserving the aspect ratio. Other modes are available however: +.RS .PP .B center .TP 4 @@ -237,6 +217,7 @@ .B full .TP 4 Upscale the image to the native screen size without regard to aspect ratio. In this mode, the full screen image may appear distorted in some resolutions. +.RE .SS "TV" Integrated TV output. Available properties include: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package x11-input-wacom for openSUSE:Factory checked in at Thu Jan 7 13:04:52 CET 2010. -------- --- x11-input-wacom/x11-input-wacom.changes 2009-12-26 11:10:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2010-01-04 01:39:35.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Jan 4 01:33:53 CET 2010 - sndirsch(a)suse.de + +- update to development release 0.8.5-9 + * Incorporated Ayuthia's Bamboo P&T patch -34 + - submitted by Favux <favux.is(a)gmail.com> + * Fixed a protocol4 mouse button click issue + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- linuxwacom-0.8.5-8.tar.bz2 New: ---- linuxwacom-0.8.5-9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.OSu4Vd/_old 2010-01-07 13:04:23.000000000 +0100 +++ /var/tmp/diff_new_pack.OSu4Vd/_new 2010-01-07 13:04:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package x11-input-wacom (Version 0.8.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ # norootforbuild -%define revision 8 +%define revision 9 %define udev_rules_custom 0 Name: x11-input-wacom @@ -32,7 +32,7 @@ Url: http://linuxwacom.sourceforge.net/ Group: System/X11/Utilities Version: 0.8.5 -Release: 2 +Release: 3 Summary: X11 input module for wacom tablet Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o Supplements: xorg-x11-server ++++++ linuxwacom-0.8.5-8.tar.bz2 -> linuxwacom-0.8.5-9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/ChangeLog new/linuxwacom-0.8.5-9/ChangeLog --- old/linuxwacom-0.8.5-8/ChangeLog 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/ChangeLog 2009-12-31 01:05:15.000000000 +0100 @@ -1,3 +1,10 @@ +2009-12-30 Ping Cheng <pingc(a)wacom.com> + * Incorporated Ayuthia's Bamboo P&T patch -34 + - submitted by Favux <favux.is(a)gmail.com> + * Fixed some kernel misplacement + * Fixed a protocol4 mouse button click issue + * Label 0.8.5-9 + 2009-12-22 Ping Cheng <pingc(a)wacom.com> * Added max and resolution for local tool * Use linuxwacom.fdi gathered from Ubuntu forum Files old/linuxwacom-0.8.5-8/prebuilt/32/.libs/libwacomcfg.a and new/linuxwacom-0.8.5-9/prebuilt/32/.libs/libwacomcfg.a differ Files old/linuxwacom-0.8.5-8/prebuilt/32/.libs/libwacomxi.a and new/linuxwacom-0.8.5-9/prebuilt/32/.libs/libwacomxi.a differ Files old/linuxwacom-0.8.5-8/prebuilt/32/wacom_drv.o and new/linuxwacom-0.8.5-9/prebuilt/32/wacom_drv.o differ Files old/linuxwacom-0.8.5-8/prebuilt/32/wacom_drv.so and new/linuxwacom-0.8.5-9/prebuilt/32/wacom_drv.so differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/prebuilt/32/wacomcpl-exec new/linuxwacom-0.8.5-9/prebuilt/32/wacomcpl-exec --- old/linuxwacom-0.8.5-8/prebuilt/32/wacomcpl-exec 2009-12-23 00:27:06.000000000 +0100 +++ new/linuxwacom-0.8.5-9/prebuilt/32/wacomcpl-exec 2009-12-31 01:06:11.000000000 +0100 @@ -1920,6 +1920,13 @@ set numPadButtons($i) 4 set numPadRings($i) 1 } + + # Bamboo Pen and Touch + for { set i 208 } { $i <= 212 } { incr i 1 } { + set hasPad($i) 1 + set numPadButtons($i) 4 + } + # I3 set numPadButtons(176) 4 set numPadStrips(176) 1 Files old/linuxwacom-0.8.5-8/prebuilt/64/.libs/libwacomcfg.a and new/linuxwacom-0.8.5-9/prebuilt/64/.libs/libwacomcfg.a differ Files old/linuxwacom-0.8.5-8/prebuilt/64/.libs/libwacomxi.a and new/linuxwacom-0.8.5-9/prebuilt/64/.libs/libwacomxi.a differ Files old/linuxwacom-0.8.5-8/prebuilt/64/wacom_drv.o and new/linuxwacom-0.8.5-9/prebuilt/64/wacom_drv.o differ Files old/linuxwacom-0.8.5-8/prebuilt/64/wacom_drv.so and new/linuxwacom-0.8.5-9/prebuilt/64/wacom_drv.so differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/prebuilt/64/wacomcpl-exec new/linuxwacom-0.8.5-9/prebuilt/64/wacomcpl-exec --- old/linuxwacom-0.8.5-8/prebuilt/64/wacomcpl-exec 2009-12-23 02:01:32.000000000 +0100 +++ new/linuxwacom-0.8.5-9/prebuilt/64/wacomcpl-exec 2009-12-31 02:38:56.000000000 +0100 @@ -1920,6 +1920,13 @@ set numPadButtons($i) 4 set numPadRings($i) 1 } + + # Bamboo Pen and Touch + for { set i 208 } { $i <= 212 } { incr i 1 } { + set hasPad($i) 1 + set numPadButtons($i) 4 + } + # I3 set numPadButtons(176) 4 set numPadStrips(176) 1 Files old/linuxwacom-0.8.5-8/prebuilt/wacom.4x.gz and new/linuxwacom-0.8.5-9/prebuilt/wacom.4x.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/src/2.6.24/wacom.h new/linuxwacom-0.8.5-9/src/2.6.24/wacom.h --- old/linuxwacom-0.8.5-8/src/2.6.24/wacom.h 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/src/2.6.24/wacom.h 2009-12-31 01:05:15.000000000 +0100 @@ -84,7 +84,7 @@ /* * Version Information */ -#define DRIVER_VERSION "v1.46-pc0.8" +#define DRIVER_VERSION "v1.46-pc0.9" #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech(a)ucw.cz>" #define DRIVER_DESC "USB Wacom tablet driver" #define DRIVER_LICENSE "GPL" @@ -133,6 +133,7 @@ extern void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac); +extern void input_dev_bpt(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_tpc(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_tpc2fg(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern __u16 wacom_le16_to_cpu(unsigned char *data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/src/2.6.24/wacom_sys.c new/linuxwacom-0.8.5-9/src/2.6.24/wacom_sys.c --- old/linuxwacom-0.8.5-8/src/2.6.24/wacom_sys.c 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/src/2.6.24/wacom_sys.c 2009-12-31 01:05:15.000000000 +0100 @@ -76,9 +76,15 @@ static void wacom_sys_irq(struct urb *urb) { struct wacom *wacom = urb->context; - struct wacom_combo wcombo; + struct wacom_combo *wcombo; int retval; + wcombo = kzalloc(sizeof(struct wacom_combo), GFP_ATOMIC); + if (!wcombo) { + dbg("could not allocate memory in wacom_sys_irq"); + return; + } + switch (urb->status) { case 0: /* success */ @@ -88,23 +94,31 @@ case -ESHUTDOWN: /* this urb is terminated, clean up */ dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); + kfree(wcombo); return; + + case -EOVERFLOW: + dbg("%s - urb overflow detected with size: %d", __func__, urb->actual_length); + goto exit; + default: dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); goto exit; } - wcombo.wacom = wacom; - wcombo.urb = urb; + wcombo->wacom = wacom; + wcombo->urb = urb; - if (wacom_wac_irq(wacom->wacom_wac, (void *)&wcombo)) - input_sync(get_input_dev(&wcombo)); + if (wacom_wac_irq(wacom->wacom_wac, (void *)wcombo)) + input_sync(get_input_dev(wcombo)); exit: retval = usb_submit_urb (urb, GFP_ATOMIC); if (retval) err ("%s - usb_submit_urb failed with result %d", __FUNCTION__, retval); + + kfree(wcombo); } void wacom_report_key(void *wcombo, unsigned int key_type, int key_data) @@ -169,6 +183,20 @@ usb_kill_urb(wacom->irq); } +void input_dev_bpt(struct input_dev *input_dev, struct wacom_wac *wacom_wac) +{ + if (wacom_wac->features->device_type == BTN_TOOL_DOUBLETAP) { + input_set_abs_params(input_dev, ABS_RX, 0, wacom_wac->features->x_phy, 0, 0); + input_set_abs_params(input_dev, ABS_RY, 0, wacom_wac->features->y_phy, 0, 0); + input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_DOUBLETAP); + input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_TRIPLETAP); + input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_2) | + BIT_MASK(BTN_3) | + BIT_MASK(BTN_BACK) | + BIT_MASK(BTN_FORWARD); + } +} + void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac) { input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_1) | @@ -335,17 +363,28 @@ features->pktlen = WACOM_PKGLEN_TPC2FG; features->device_type = BTN_TOOL_TRIPLETAP; } - features->x_max = - wacom_le16_to_cpu(&report[i + 3]); - features->x_phy = - wacom_le16_to_cpu(&report[i + 6]); - features->unit = report[i + 9]; - features->unitExpo = report[i + 11]; - i += 12; + if (features->type == BAMBOO_PT) { + /* need to reset back */ + features->pktlen = WACOM_PKGLEN_BBTOUCH; + features->x_max = + wacom_le16_to_cpu(&report[i + 5]); + features->x_phy = + wacom_le16_to_cpu(&report[i + 8]); + i += 15; + } else { + features->x_max = + wacom_le16_to_cpu(&report[i + 3]); + features->x_phy = + wacom_le16_to_cpu(&report[i + 6]); + features->unit = report[i + 9]; + features->unitExpo = report[i + 11]; + i += 12; + } } else if (pen) { /* penabled only accepts exact bytes of data */ - if (features->type == TABLETPC2FG) - features->pktlen = WACOM_PKGLEN_PENABLED; + if ((features->type == TABLETPC2FG)|| + (features->type == BAMBOO_PT)) + features->pktlen = WACOM_PKGLEN_GRAPHIRE; features->device_type = BTN_TOOL_PEN; features->x_max = (wacom_le16_to_cpu(&report[i+3])); @@ -373,6 +412,12 @@ features->y_phy = wacom_le16_to_cpu(&report[i + 6]); i += 7; + } else if (features->type == BAMBOO_PT) { + features->y_max = + wacom_le16_to_cpu(&report[i + 3]); + features->y_phy = + wacom_le16_to_cpu(&report[i + 6]); + i += 12; } else { features->y_max = features->x_max; @@ -383,7 +428,7 @@ } else if (pen) { /* penabled only accepts exact bytes of data */ if (features->type == TABLETPC2FG) - features->pktlen = WACOM_PKGLEN_PENABLED; + features->pktlen = WACOM_PKGLEN_GRAPHIRE; features->device_type = BTN_TOOL_PEN; features->y_max = (wacom_le16_to_cpu(&report[i+3])); i += 4; @@ -425,12 +470,14 @@ { char rep_data[4], limit = 0, report_id = 2; int error = -ENOMEM; + /* - * Ask to report tablet data if it is 2FGT or not a Tablet PC. + * Ask to report tablet data if it is a 2FGT Tablet PC + * OR not a Tablet PC. * Repeat 3 times since on some systems the first 2 may fail. */ - - if (features->device_type == BTN_TOOL_TRIPLETAP) { + if ((features->device_type == BTN_TOOL_TRIPLETAP) && + (features->type == TABLETPC2FG)) { do { rep_data[0] = 3; rep_data[1] = 4; @@ -465,10 +512,11 @@ struct hid_descriptor *hid_desc; /* default device to penabled */ - features->device_type = BTN_TOOL_PEN; + features->device_type = BTN_TOOL_PEN; - /* only Tablet PCs need to retrieve the info */ - if ((features->type != TABLETPC) && (features->type != TABLETPC2FG)) + /* only Tablet PCs and devices with touch need to retrieve the info */ + if ((features->type != TABLETPC) && (features->type != TABLETPC2FG) + && (features->type != BAMBOO_PT)) goto out; if (usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/src/2.6.26/wacom.h new/linuxwacom-0.8.5-9/src/2.6.26/wacom.h --- old/linuxwacom-0.8.5-8/src/2.6.26/wacom.h 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/src/2.6.26/wacom.h 2009-12-31 01:05:15.000000000 +0100 @@ -87,7 +87,7 @@ /* * Version Information */ -#define DRIVER_VERSION "v1.49-pc-4" +#define DRIVER_VERSION "v1.49-pc-5" #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech(a)ucw.cz>" #define DRIVER_DESC "USB Wacom tablet driver" #define DRIVER_LICENSE "GPL" @@ -136,6 +136,7 @@ extern void input_dev_i4(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac); +extern void input_dev_bpt(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_tpc(struct input_dev *input_dev, struct wacom_wac *wacom_wac); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/src/2.6.26/wacom_sys.c new/linuxwacom-0.8.5-9/src/2.6.26/wacom_sys.c --- old/linuxwacom-0.8.5-8/src/2.6.26/wacom_sys.c 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/src/2.6.26/wacom_sys.c 2009-12-31 01:05:15.000000000 +0100 @@ -73,9 +73,15 @@ static void wacom_sys_irq(struct urb *urb) { struct wacom *wacom = urb->context; - struct wacom_combo wcombo; + struct wacom_combo *wcombo; int retval; + wcombo = kzalloc(sizeof(struct wacom_combo), GFP_ATOMIC); + if (!wcombo) { + dbg("could not allocate memory in wacom_sys_irq"); + return; + } + switch (urb->status) { case 0: /* success */ @@ -85,17 +91,23 @@ case -ESHUTDOWN: /* this urb is terminated, clean up */ dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); + kfree(wcombo); return; + + case -EOVERFLOW: + dbg("%s - urb overflow detected with size: %d", __func__, urb->actual_length); + goto exit; + default: dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); goto exit; } - wcombo.wacom = wacom; - wcombo.urb = urb; + wcombo->wacom = wacom; + wcombo->urb = urb; - if (wacom_wac_irq(wacom->wacom_wac, (void *)&wcombo)) - input_sync(get_input_dev(&wcombo)); + if (wacom_wac_irq(wacom->wacom_wac, (void *)wcombo)) + input_sync(get_input_dev(wcombo)); exit: usb_mark_last_busy(wacom->usbdev); @@ -103,6 +115,8 @@ if (retval) err ("%s - usb_submit_urb failed with result %d", __FUNCTION__, retval); + + kfree(wcombo); } void wacom_report_key(void *wcombo, unsigned int key_type, int key_data) @@ -186,6 +200,20 @@ mutex_unlock(&wacom->lock); } +void input_dev_bpt(struct input_dev *input_dev, struct wacom_wac *wacom_wac) +{ + if (wacom_wac->features->device_type == BTN_TOOL_DOUBLETAP) { + input_set_abs_params(input_dev, ABS_RX, 0, wacom_wac->features->x_phy, 0, 0); + input_set_abs_params(input_dev, ABS_RY, 0, wacom_wac->features->y_phy, 0, 0); + input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_DOUBLETAP); + input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_TRIPLETAP); + input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_2) | + BIT_MASK(BTN_3) | + BIT_MASK(BTN_BACK) | + BIT_MASK(BTN_FORWARD); + } +} + void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac) { input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_1) | @@ -352,17 +380,28 @@ features->pktlen = WACOM_PKGLEN_TPC2FG; features->device_type = BTN_TOOL_TRIPLETAP; } - features->x_max = - wacom_le16_to_cpu(&report[i + 3]); - features->x_phy = - wacom_le16_to_cpu(&report[i + 6]); - features->unit = report[i + 9]; - features->unitExpo = report[i + 11]; - i += 12; + if (features->type == BAMBOO_PT) { + /* need to reset back */ + features->pktlen = WACOM_PKGLEN_BBTOUCH; + features->x_max = + wacom_le16_to_cpu(&report[i + 5]); + features->x_phy = + wacom_le16_to_cpu(&report[i + 8]); + i += 15; + } else { + features->x_max = + wacom_le16_to_cpu(&report[i + 3]); + features->x_phy = + wacom_le16_to_cpu(&report[i + 6]); + features->unit = report[i + 9]; + features->unitExpo = report[i + 11]; + i += 12; + } } else if (pen) { /* penabled only accepts exact bytes of data */ - if (features->type == TABLETPC2FG) - features->pktlen = WACOM_PKGLEN_PENABLED; + if ((features->type == TABLETPC2FG) || + (features->type == BAMBOO_PT)) + features->pktlen = WACOM_PKGLEN_GRAPHIRE; features->device_type = BTN_TOOL_PEN; features->x_max = (wacom_le16_to_cpu(&report[i+3])); i += 4; @@ -440,12 +479,14 @@ { char rep_data[4], limit = 0, report_id = 2; int error = -ENOMEM; + /* - * Ask to report tablet data if it is 2FGT or not a Tablet PC. + * Ask to report tablet data if it is 2FGT Tablet PC + * OR not a Tablet PC. * Repeat 3 times since on some systems the first 2 may fail. */ - - if (features->device_type == BTN_TOOL_TRIPLETAP) { + if ((features->device_type == BTN_TOOL_TRIPLETAP) && + (features->type == TABLETPC2FG)) { do { rep_data[0] = 3; rep_data[1] = 4; @@ -482,8 +523,9 @@ /* default device to penabled */ features->device_type = BTN_TOOL_PEN; - /* only Tablet PCs need to retrieve the info */ - if ((features->type != TABLETPC) && (features->type != TABLETPC2FG)) + /* only Tablet PCs and devices with touch need to retrieve the info */ + if ((features->type != TABLETPC) && (features->type != TABLETPC2FG) + && (features->type != BAMBOO_PT)) goto out; if (usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/src/2.6.27/wacom.h new/linuxwacom-0.8.5-9/src/2.6.27/wacom.h --- old/linuxwacom-0.8.5-8/src/2.6.27/wacom.h 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/src/2.6.27/wacom.h 2009-12-31 01:05:15.000000000 +0100 @@ -92,7 +92,7 @@ /* * Version Information */ -#define DRIVER_VERSION "v1.52-pc-0.1" +#define DRIVER_VERSION "v1.52-pc-0.2" #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech(a)ucw.cz>" #define DRIVER_DESC "USB Wacom tablet driver" #define DRIVER_LICENSE "GPL" @@ -141,6 +141,7 @@ extern void input_dev_i4(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac); +extern void input_dev_bpt(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_tpc(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_tpc2fg(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/src/2.6.27/wacom_sys.c new/linuxwacom-0.8.5-9/src/2.6.27/wacom_sys.c --- old/linuxwacom-0.8.5-8/src/2.6.27/wacom_sys.c 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/src/2.6.27/wacom_sys.c 2009-12-31 01:05:15.000000000 +0100 @@ -73,9 +73,15 @@ static void wacom_sys_irq(struct urb *urb) { struct wacom *wacom = urb->context; - struct wacom_combo wcombo; + struct wacom_combo *wcombo; int retval; + wcombo = kzalloc(sizeof(struct wacom_combo), GFP_ATOMIC); + if (!wcombo) { + dbg("could not allocate memory in wacom_sys_irq"); + return; + } + switch (urb->status) { case 0: /* success */ @@ -85,17 +91,23 @@ case -ESHUTDOWN: /* this urb is terminated, clean up */ dbg("%s - urb shutting down with status: %d", __func__, urb->status); + kfree(wcombo); return; + + case -EOVERFLOW: + dbg("%s - urb overflow detected with size: %d", __func__, urb->actual_length); + goto exit; + default: dbg("%s - nonzero urb status received: %d", __func__, urb->status); goto exit; } - wcombo.wacom = wacom; - wcombo.urb = urb; + wcombo->wacom = wacom; + wcombo->urb = urb; - if (wacom_wac_irq(wacom->wacom_wac, (void *)&wcombo)) - input_sync(get_input_dev(&wcombo)); + if (wacom_wac_irq(wacom->wacom_wac, (void *)wcombo)) + input_sync(get_input_dev(wcombo)); exit: usb_mark_last_busy(wacom->usbdev); @@ -103,6 +115,8 @@ if (retval) err ("%s - usb_submit_urb failed with result %d", __func__, retval); + + kfree(wcombo); } void wacom_report_key(void *wcombo, unsigned int key_type, int key_data) @@ -181,6 +195,20 @@ mutex_unlock(&wacom->lock); } +void input_dev_bpt(struct input_dev *input_dev, struct wacom_wac *wacom_wac) +{ + if (wacom_wac->features->device_type == BTN_TOOL_DOUBLETAP) { + input_set_abs_params(input_dev, ABS_RX, 0, wacom_wac->features->x_phy, 0, 0); + input_set_abs_params(input_dev, ABS_RY, 0, wacom_wac->features->y_phy, 0, 0); + input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_DOUBLETAP); + input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_TRIPLETAP); + input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_2) | + BIT_MASK(BTN_3) | + BIT_MASK(BTN_BACK) | + BIT_MASK(BTN_FORWARD); + } +} + void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac) { input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_1) | @@ -352,17 +380,28 @@ features->pktlen = WACOM_PKGLEN_TPC2FG; features->device_type = BTN_TOOL_TRIPLETAP; } - features->x_max = - wacom_le16_to_cpu(&report[i + 3]); - features->x_phy = - wacom_le16_to_cpu(&report[i + 6]); - features->unit = report[i + 9]; - features->unitExpo = report[i + 11]; - i += 12; + if (features->type == BAMBOO_PT) { + /* need to reset back */ + features->pktlen = WACOM_PKGLEN_BBTOUCH; + features->x_max = + wacom_le16_to_cpu(&report[i + 5]); + features->x_phy = + wacom_le16_to_cpu(&report[i + 8]); + i += 15; + } else { + features->x_max = + wacom_le16_to_cpu(&report[i + 3]); + features->x_phy = + wacom_le16_to_cpu(&report[i + 6]); + features->unit = report[i + 9]; + features->unitExpo = report[i + 11]; + i += 12; + } } else if (pen) { /* penabled only accepts exact bytes of data */ - if (features->type == TABLETPC2FG) - features->pktlen = WACOM_PKGLEN_PENABLED; + if ((features->type == TABLETPC2FG) || + (features->type == BAMBOO_PT)) + features->pktlen = WACOM_PKGLEN_GRAPHIRE; features->device_type = BTN_TOOL_PEN; features->x_max = wacom_le16_to_cpu(&report[i + 3]); @@ -391,6 +430,12 @@ features->y_phy = wacom_le16_to_cpu(&report[i + 6]); i += 7; + } else if (features->type == BAMBOO_PT) { + features->y_max = + wacom_le16_to_cpu(&report[i + 3]); + features->y_phy = + wacom_le16_to_cpu(&report[i + 6]); + i += 12; } else { features->y_max = features->x_max; @@ -401,7 +446,7 @@ } else if (pen) { /* penabled only accepts exact bytes of data */ if (features->type == TABLETPC2FG) - features->pktlen = WACOM_PKGLEN_PENABLED; + features->pktlen = WACOM_PKGLEN_GRAPHIRE; features->device_type = BTN_TOOL_PEN; features->y_max = wacom_le16_to_cpu(&report[i + 3]); @@ -452,8 +497,10 @@ if (!rep_data) return error; - /* ask to report tablet data if it is 2FGT or not a Tablet PC */ - if (features->device_type == BTN_TOOL_TRIPLETAP) { + /* ask to report tablet data if it is 2FGT and not a 2FGT Tablet PC + * OR not a regular Tablet PC */ + if ((features->device_type == BTN_TOOL_TRIPLETAP) && + (features->type == TABLETPC2FG)) { do { rep_data[0] = 3; rep_data[1] = 4; @@ -493,8 +540,9 @@ /* default device to penabled */ features->device_type = BTN_TOOL_PEN; - /* only Tablet PCs need to retrieve the info */ - if ((features->type != TABLETPC) && (features->type != TABLETPC2FG)) + /* only Tablet PCs and devices with touch need to retrieve the info */ + if ((features->type != TABLETPC) && (features->type != TABLETPC2FG) + && (features->type != BAMBOO_PT)) goto out; if (usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/src/2.6.27/wacom_wac.c new/linuxwacom-0.8.5-9/src/2.6.27/wacom_wac.c --- old/linuxwacom-0.8.5-8/src/2.6.27/wacom_wac.c 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/src/2.6.27/wacom_wac.c 2009-12-31 01:05:15.000000000 +0100 @@ -28,7 +28,7 @@ wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[1])); wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[3])); wacom_report_abs(wcombo, ABS_PRESSURE, (signed char)data[6] + 127); - wacom_report_key(wcombo, BTN_TOUCH, ((signed char)data[6] -127)); + wacom_report_key(wcombo, BTN_TOUCH, ((signed char)data[6] > -127)); wacom_report_key(wcombo, BTN_STYLUS, (data[5] & 0x40)); } else { wacom_report_key(wcombo, wacom->tool[0], 0); @@ -43,7 +43,7 @@ wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[1])); wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[3])); wacom_report_abs(wcombo, ABS_PRESSURE, (signed char)data[6] + 127); - wacom_report_key(wcombo, BTN_TOUCH, ((signed char)data[6] -80) && !(data[5] & 0x20)); + wacom_report_key(wcombo, BTN_TOUCH, ((signed char)data[6] > -80) && !(data[5] & 0x20)); wacom_report_key(wcombo, BTN_STYLUS, (data[5] & 0x40)); break; default: @@ -67,9 +67,9 @@ if (prox) { wacom->id[0] = ERASER_DEVICE_ID; - pressure = (signed char)((data[7] << 1) | ((data[4] >2) & 1)); + pressure = (signed char)((data[7] << 1) | ((data[4] >> 2) & 1)); if (wacom->features->pressure_max > 255) - pressure = (pressure << 1) | ((data[4] >6) & 1); + pressure = (pressure << 1) | ((data[4] >> 6) & 1); pressure += (wacom->features->pressure_max + 1) / 2; /* @@ -150,80 +150,233 @@ return 1; } -static int wacom_bamboo_pt_irq(struct wacom_wac *wacom, void *wcombo) +static void wacom_bpt_finger_in(struct wacom_wac *wacom, void *wcombo, char *data, int idx) { - unsigned char *data = wacom->data; - int x, y, pressure = 0; + int x = 0, y = 0, pressure, i = idx; - if (data[0] != 2) { - dbg("wacom_bamboo_pt_irq: received unknown report #%d", data[0]); - return 0; + if (idx == 2) { + i = 0; } - if (data[1] & 0x80) { - /* in prox and not a pad data */ + pressure = (data[2 + (i * 9)] & 0xff); + x = wacom_be16_to_cpu ((unsigned char *)&data[3 + (i * 9)]) & 0x7ff; + y = wacom_be16_to_cpu ((unsigned char *)&data[5 + (i * 9)]) & 0x7ff; - if (data[1] & 0xf0) { - if (data[1] & 0x8) { /* rubber */ - wacom->tool[0] = BTN_TOOL_RUBBER; - wacom->id[0] = ERASER_DEVICE_ID; - } - else { /* pen */ - wacom->tool[0] = BTN_TOOL_PEN; - wacom->id[0] = STYLUS_DEVICE_ID; - } - } - x = wacom_le16_to_cpu(&data[2]); - y = wacom_le16_to_cpu(&data[4]); - wacom_report_abs(wcombo, ABS_X, x); - wacom_report_abs(wcombo, ABS_Y, y); - wacom_report_abs(wcombo, ABS_PRESSURE, pressure); - wacom_report_key(wcombo, BTN_TOUCH, data[1] & 0x01); - wacom_report_key(wcombo, BTN_STYLUS, data[1] & 0x02); - wacom_report_key(wcombo, BTN_STYLUS2, data[1] & 0x04); - wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]); /* report tool id */ - wacom_report_key(wcombo, wacom->tool[0], 1); - } else if (wacom->id[0]) { + wacom_report_abs(wcombo, ABS_X, x); + wacom_report_abs(wcombo, ABS_Y, y); + wacom_report_abs(wcombo, ABS_PRESSURE, pressure); + wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]); + wacom_report_key(wcombo, wacom->tool[i], 1); + + if (idx) + wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 0xf0); + else + wacom_report_key(wcombo, BTN_TOUCH, 1); +} + +static void wacom_bpt_touch_out(struct wacom_wac *wacom, void *wcombo, int idx) +{ + if (idx != 2) { wacom_report_abs(wcombo, ABS_X, 0); wacom_report_abs(wcombo, ABS_Y, 0); wacom_report_abs(wcombo, ABS_PRESSURE, 0); - wacom_report_key(wcombo, BTN_TOUCH, 0); - wacom_report_key(wcombo, BTN_STYLUS, 0); - wacom_report_key(wcombo, BTN_STYLUS2, 0); - wacom->id[0] = 0; - wacom_report_abs(wcombo, ABS_MISC, 0); /* reset tool id */ - wacom_report_key(wcombo, wacom->tool[0], 0); + wacom_report_abs(wcombo, ABS_MISC, 0); + wacom_report_key(wcombo, wacom->tool[idx], 0); + if (idx) + wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 0xf0); + else + wacom_report_key(wcombo, BTN_TOUCH, 0); } +} - /* send pad data */ - switch (wacom->features->type) { - case BAMBOO_PT: - if (data[8] & 0xff) { +static void wacom_bpt_touch_in(struct wacom_wac *wacom, void *wcombo) +{ + char *data = wacom->data; + static int firstFinger = 0; + static int secondFinger = 0; + static int thirdFinger = 0; + + wacom->tool[0] = BTN_TOOL_DOUBLETAP; + wacom->id[0] = TOUCH_DEVICE_ID; + wacom->tool[1] = BTN_TOOL_TRIPLETAP; + wacom->id[1] = (((data[3] & 0x80) >> 7) & 0x1) | + (((data[12] & 0x80) >> 6) & 0x2) | + ((((data[17] & 0x30) >> 4) == 3) ? 0x4 : 0x0); + + /* First finger down */ + if (data[3] & 0x80) { + wacom_bpt_finger_in(wacom, wcombo, data, 0); + firstFinger = 1; + } else if (firstFinger) { + wacom_bpt_touch_out(wacom, wcombo, 0); + firstFinger = 0; + } + + /* Second finger down */ + if (data[12] & 0x80) { + /* sync first finger data */ + if (firstFinger) + wacom_input_sync(wcombo); + + wacom_bpt_finger_in(wacom, wcombo, data, 1); + secondFinger = 1; + } else if (secondFinger) { + /* sync first finger data */ + if (firstFinger) + wacom_input_sync(wcombo); + + wacom_bpt_touch_out(wacom, wcombo, 1); + secondFinger = 0; + } + + if (((data[17] & 0x30) >> 4) == 3) { + /* sync ? */ + if (firstFinger && secondFinger) wacom_input_sync(wcombo); + wacom_bpt_finger_in(wacom, wcombo, data, 2); + thirdFinger = 1; + } else { + wacom_bpt_touch_out(wacom, wcombo, 2); + thirdFinger = 0; + } + + if (!(data[17] & 0x10)) { + firstFinger = 0; + secondFinger = 0; + thirdFinger = 0; + } +} + +static int wacom_bpt_irq(struct wacom_wac *wacom, void *wcombo) +{ + char *data = wacom->data; + int prox = 0, retval = 0; + static int stylusInProx = 0, touchInProx = 1, touchOut = 0; + struct urb *urb = ((struct wacom_combo *)wcombo)->urb; + + if (data[0] != WACOM_REPORT_PENABLED) { + dbg("wacom_bpt_irq: received unknown report #%d", data[0]); + goto exit; + } + + /* Touch packet */ + if (urb->actual_length == WACOM_PKGLEN_BBTOUCH) { + /* Check for pad data first or else it gets sent in with touch data */ + if (data[1]) { wacom->id[1] = PAD_DEVICE_ID; - wacom_report_key(wcombo, BTN_0, (data[7] & 0x08)); - wacom_report_key(wcombo, BTN_1, (data[7] & 0x20)); - wacom_report_key(wcombo, BTN_4, (data[7] & 0x10)); - wacom_report_key(wcombo, BTN_5, (data[7] & 0x40)); - wacom_report_abs(wcombo, ABS_WHEEL, (data[8] & 0x7f)); + wacom_report_key(wcombo, BTN_1, data[1] & 0x1); + wacom_report_key(wcombo, BTN_2, (data[1] & 0x2) >> 1); + wacom_report_key(wcombo, BTN_3, (data[1] & 0x4) >> 2); + wacom_report_key(wcombo, BTN_4, (data[1] & 0x8) >> 3); wacom_report_key(wcombo, BTN_TOOL_FINGER, 0xf0); wacom_report_abs(wcombo, ABS_MISC, wacom->id[1]); wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 0xf0); - } else if (wacom->id[1]) { - wacom_input_sync(wcombo); + } else if (wacom->id[1] == PAD_DEVICE_ID) { wacom->id[1] = 0; - wacom_report_key(wcombo, BTN_0, (data[7] & 0x08)); - wacom_report_key(wcombo, BTN_1, (data[7] & 0x20)); - wacom_report_key(wcombo, BTN_4, (data[7] & 0x10)); - wacom_report_key(wcombo, BTN_5, (data[7] & 0x40)); - wacom_report_abs(wcombo, ABS_WHEEL, (data[8] & 0x7f)); + wacom_report_key(wcombo, BTN_1, 0); + wacom_report_key(wcombo, BTN_2, 0); + wacom_report_key(wcombo, BTN_3, 0); + wacom_report_key(wcombo, BTN_4, 0); wacom_report_key(wcombo, BTN_TOOL_FINGER, 0); wacom_report_abs(wcombo, ABS_MISC, 0); wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 0xf0); } - break; + + prox = (data[17] & 0x30 >> 4); + if (!stylusInProx) { + if (prox) { + if (touchInProx) { + wacom_bpt_touch_in(wacom, wcombo); + touchOut = 1; + retval = 1; + goto exit; + } + } else { + if (wacom->id[1] & 0x1) { + wacom_bpt_touch_out(wacom, wcombo, 0); + /* sync first finger event */ + if ((wacom->id[1] & 0x2) || (wacom->id[1] & 0x4)) { + wacom_input_sync(wcombo); + } + } + if (wacom->id[1] & 0x2) { + wacom_bpt_touch_out(wacom, wcombo, 1); + } + if (wacom->id[1] & 0x4) { + wacom_bpt_touch_out(wacom, wcombo, 2); + } + touchOut = 0; + touchInProx = 1; + retval = 1; + goto exit; + } + } else if (touchOut || !prox) { /* force touch out-prox */ + wacom_bpt_touch_out(wacom, wcombo, 0); + + touchOut = 0; + touchInProx = 1; + retval = 1; + goto exit; + } + } else if (urb->actual_length == WACOM_PKGLEN_GRAPHIRE) { /* Penabled */ + int x, y, pressure, distance; + int tip, button_1, button_2; + int in_box, has_data, moving; + int eraser; + + tip = data[1] & 0x01; + button_1 = (data[1] & 0x02) >> 1; + button_2 = (data[1] & 0x04) >> 2; + eraser = (data[1] & 0x08) >> 3; + in_box = (data[1] & 0x10) >> 4; + has_data = (data[1] & 0x20) >> 5; + moving = (data[1] & 0x40) >> 6; + prox = (data[1] & 0x80) >> 7; + touchInProx = ~prox; + stylusInProx = prox; + + x = wacom_le16_to_cpu(&data[2]); + y = wacom_le16_to_cpu(&data[4]); + pressure = wacom_le16_to_cpu(&data[6]); + distance = data[8]; + + if (has_data && in_box) { + if (eraser) { + wacom->tool[0] = BTN_TOOL_RUBBER; + wacom->id[0] = ERASER_DEVICE_ID; + } else { + wacom->tool[0] = BTN_TOOL_PEN; + wacom->id[0] = STYLUS_DEVICE_ID; + } + wacom_report_abs(wcombo, ABS_X, x); + wacom_report_abs(wcombo, ABS_Y, y); + wacom_report_abs(wcombo, ABS_PRESSURE, pressure); + wacom_report_abs(wcombo, ABS_DISTANCE, distance); + wacom_report_key(wcombo, BTN_TOUCH, tip); + wacom_report_key(wcombo, BTN_STYLUS, button_1); + wacom_report_key(wcombo, BTN_STYLUS2, button_2); + wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]); /* report tool id */ + wacom_report_key(wcombo, wacom->tool[0], 1); + } else { + wacom_report_abs(wcombo, ABS_X, 0); + wacom_report_abs(wcombo, ABS_Y, 0); + wacom_report_abs(wcombo, ABS_PRESSURE, 0); + wacom_report_key(wcombo, BTN_TOUCH, 0); + wacom_report_key(wcombo, BTN_STYLUS, 0); + wacom_report_key(wcombo, BTN_STYLUS2, 0); + wacom->id[0] = 0; + wacom_report_abs(wcombo, ABS_MISC, 0); /* reset tool id */ + wacom_report_key(wcombo, wacom->tool[0], 0); + + touchInProx = 1; + } + wacom_report_key(wcombo, wacom->tool[0], in_box); + wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]); + + retval = 1; } - return 1; +exit: + return retval; } static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo) @@ -241,7 +394,7 @@ /* in prox and not a pad data */ penData = 1; - switch ((data[1] >5) & 3) { + switch ((data[1] >> 5) & 3) { case 0: /* Pen */ wacom->tool[0] = BTN_TOOL_PEN; @@ -317,7 +470,7 @@ wacom->id[1] = PAD_DEVICE_ID; wacom_report_key(wcombo, BTN_0, (data[7] & 0x40)); wacom_report_key(wcombo, BTN_4, (data[7] & 0x80)); - rw = ((data[7] & 0x18) >3) - ((data[7] & 0x20) >3); + rw = ((data[7] & 0x18) >> 3) - ((data[7] & 0x20) >> 3); wacom_report_rel(wcombo, REL_WHEEL, rw); wacom_report_key(wcombo, BTN_TOOL_FINGER, 0xf0); wacom_report_abs(wcombo, ABS_MISC, wacom->id[1]); @@ -388,9 +541,9 @@ /* serial number of the tool */ wacom->serial[idx] = ((data[3] & 0x0f) << 28) + (data[4] << 20) + (data[5] << 12) + - (data[6] << 4) + (data[7] >4); + (data[6] << 4) + (data[7] >> 4); - wacom->id[idx] = (data[2] << 4) | (data[3] >4); + wacom->id[idx] = (data[2] << 4) | (data[3] >> 4); switch (wacom->id[idx]) { case 0x812: /* Inking pen */ case 0x801: /* Intuos3 Inking pen */ @@ -497,12 +650,12 @@ /* general pen packet */ if ((data[1] & 0xb8) == 0xa0) { - t = (data[6] << 2) | ((data[7] >6) & 3); + t = (data[6] << 2) | ((data[7] >> 6) & 3); if (wacom->features->type >= INTUOS4S && wacom->features->type <= INTUOS4L) t = (t << 1) | (data[1] & 1); wacom_report_abs(wcombo, ABS_PRESSURE, t); wacom_report_abs(wcombo, ABS_TILT_X, - ((data[7] << 1) & 0x7e) | (data[8] >7)); + ((data[7] << 1) & 0x7e) | (data[8] >> 7)); wacom_report_abs(wcombo, ABS_TILT_Y, data[8] & 0x7f); wacom_report_key(wcombo, BTN_STYLUS, data[1] & 2); wacom_report_key(wcombo, BTN_STYLUS2, data[1] & 4); @@ -512,9 +665,9 @@ /* airbrush second packet */ if ((data[1] & 0xbc) == 0xb4) { wacom_report_abs(wcombo, ABS_WHEEL, - (data[6] << 2) | ((data[7] >6) & 3)); + (data[6] << 2) | ((data[7] >> 6) & 3)); wacom_report_abs(wcombo, ABS_TILT_X, - ((data[7] << 1) & 0x7e) | (data[8] >7)); + ((data[7] << 1) & 0x7e) | (data[8] >> 7)); wacom_report_abs(wcombo, ABS_TILT_Y, data[8] & 0x7f); } return; @@ -616,13 +769,13 @@ return 0; if (wacom->features->type >= INTUOS3S) { - wacom_report_abs(wcombo, ABS_X, (data[2] << 9) | (data[3] << 1) | ((data[9] >1) & 1)); + wacom_report_abs(wcombo, ABS_X, (data[2] << 9) | (data[3] << 1) | ((data[9] >> 1) & 1)); wacom_report_abs(wcombo, ABS_Y, (data[4] << 9) | (data[5] << 1) | (data[9] & 1)); - wacom_report_abs(wcombo, ABS_DISTANCE, ((data[9] >2) & 0x3f)); + wacom_report_abs(wcombo, ABS_DISTANCE, ((data[9] >> 2) & 0x3f)); } else { wacom_report_abs(wcombo, ABS_X, wacom_be16_to_cpu(&data[2])); wacom_report_abs(wcombo, ABS_Y, wacom_be16_to_cpu(&data[4])); - wacom_report_abs(wcombo, ABS_DISTANCE, ((data[9] >3) & 0x1f)); + wacom_report_abs(wcombo, ABS_DISTANCE, ((data[9] >> 3) & 0x1f)); } /* process general packets */ @@ -635,13 +788,13 @@ /* Rotation packet */ if (wacom->features->type >= INTUOS3S) { /* I3 marker pen rotation */ - t = (data[6] << 3) | ((data[7] >5) & 7); + t = (data[6] << 3) | ((data[7] >> 5) & 7); t = (data[7] & 0x20) ? ((t > 900) ? ((t-1) / 2 - 1350) : ((t-1) / 2 + 450)) : (450 - t / 2) ; wacom_report_abs(wcombo, ABS_Z, t); } else { /* 4D mouse rotation packet */ - t = (data[6] << 3) | ((data[7] >5) & 7); + t = (data[6] << 3) | ((data[7] >> 5) & 7); wacom_report_abs(wcombo, ABS_RZ, (data[7] & 0x20) ? ((t - 1) / 2) : -t / 2); } @@ -654,7 +807,7 @@ wacom_report_key(wcombo, BTN_SIDE, data[8] & 0x20); wacom_report_key(wcombo, BTN_EXTRA, data[8] & 0x10); - t = (data[6] << 2) | ((data[7] >6) & 3); + t = (data[6] << 2) | ((data[7] >> 6) & 3); wacom_report_abs(wcombo, ABS_THROTTLE, (data[8] & 0x08) ? -t : t); } else if (wacom->tool[idx] == BTN_TOOL_MOUSE) { @@ -663,13 +816,13 @@ wacom_report_key(wcombo, BTN_LEFT, data[6] & 0x01); wacom_report_key(wcombo, BTN_MIDDLE, data[6] & 0x02); wacom_report_key(wcombo, BTN_RIGHT, data[6] & 0x04); - wacom_report_rel(wcombo, REL_WHEEL, ((data[7] & 0x80) >7) - - ((data[7] & 0x40) >6)); + wacom_report_rel(wcombo, REL_WHEEL, ((data[7] & 0x80) >> 7) + - ((data[7] & 0x40) >> 6)); wacom_report_key(wcombo, BTN_SIDE, data[6] & 0x08); wacom_report_key(wcombo, BTN_EXTRA, data[6] & 0x10); wacom_report_abs(wcombo, ABS_TILT_X, - ((data[7] << 1) & 0x7e) | (data[8] >7)); + ((data[7] << 1) & 0x7e) | (data[8] >> 7)); wacom_report_abs(wcombo, ABS_TILT_Y, data[8] & 0x7f); } else { /* 2D mouse packet */ @@ -677,7 +830,7 @@ wacom_report_key(wcombo, BTN_MIDDLE, data[8] & 0x08); wacom_report_key(wcombo, BTN_RIGHT, data[8] & 0x10); wacom_report_rel(wcombo, REL_WHEEL, (data[8] & 0x01) - - ((data[8] & 0x02) >1)); + - ((data[8] & 0x02) >> 1)); /* I3 2D mouse side buttons */ if (wacom->features->type >= INTUOS3S && wacom->features->type <= INTUOS3L) { @@ -903,7 +1056,7 @@ return wacom_graphire_irq(wacom_wac, wcombo); case BAMBOO_PT: - return wacom_bamboo_pt_irq(wacom_wac, wcombo); + return wacom_bpt_irq(wacom_wac, wcombo); case PTU: return wacom_ptu_irq(wacom_wac, wcombo); @@ -932,8 +1085,9 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_wac) { switch (wacom_wac->features->type) { - case WACOM_MO: case BAMBOO_PT: + input_dev_bpt(input_dev, wacom_wac); + case WACOM_MO: input_dev_mo(input_dev, wacom_wac); case WACOM_G4: input_dev_g4(input_dev, wacom_wac); @@ -1042,13 +1196,14 @@ { "Wacom ISDv4 90", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPC }, { "Wacom ISDv4 93", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPC }, { "Wacom ISDv4 9A", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPC }, - { "Wacom ISDv4 9F", WACOM_PKGLEN_PENABLED, 26202, 16325, 255, 0, TABLETPC }, + { "Wacom ISDv4 9F", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPC }, { "Wacom ISDv4 E2", WACOM_PKGLEN_TPC2FG, 26202, 16325, 255, 0, TABLETPC2FG }, { "Wacom ISDv4 E3", WACOM_PKGLEN_TPC2FG, 26202, 16325, 255, 0, TABLETPC2FG }, - { "Wacom Bamboo P&T 4x5", WACOM_PKGLEN_GRAPHIRE, 14760, 9225, 1023, 63, BAMBOO_PT }, - { "Wacom Bamboo Pen 4x5", WACOM_PKGLEN_GRAPHIRE, 14732, 9144, 1023, 63, BAMBOO_PT }, - { "Wacom Bamboo Craft", WACOM_PKGLEN_GRAPHIRE, 14732, 9144, 1023, 63, BAMBOO_PT }, + { "Wacom Bamboo P&T 4x5", WACOM_PKGLEN_GRAPHIRE, 14720, 9200, 1023, 63, BAMBOO_PT }, + { "Wacom Bamboo Pen 4x5", WACOM_PKGLEN_GRAPHIRE, 14720, 9200, 1023, 63, BAMBOO_PT }, + { "Wacom Bamboo Craft", WACOM_PKGLEN_GRAPHIRE, 14720, 9200, 1023, 63, BAMBOO_PT }, { "Wacom Bamboo P&T 6x8", WACOM_PKGLEN_GRAPHIRE, 21648, 13530, 1023, 63, BAMBOO_PT }, + { "Wacom Bamboo Touch", WACOM_PKGLEN_GRAPHIRE, 14720, 9200, 1023, 63, BAMBOO_PT }, { "Wacom Intuos2 6x8", WACOM_PKGLEN_INTUOS, 20320, 16240, 1023, 31, INTUOS }, { } }; @@ -1120,6 +1275,7 @@ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xD4) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xD2) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xD3) }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xD0) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) }, { } }; @@ -1186,8 +1342,7 @@ return ret; } -/* TODO: Call this when recognizing a button 0 button press to change the ring - * LED +/* Call this when recognizing a button 0 button press to change the ring LED */ int set_scroll_wheel_led(struct usb_interface *intf, int num) { @@ -1221,7 +1376,7 @@ } while ((ret == -ETIMEDOUT || ret == -EPIPE) && c < WAC_LED_RETRIES); if (ret < 0) { - /* TODO: starting and stopping the transfer mode doesn't + /* starting and stopping the transfer mode doesn't * seem to have an effect on the successfull transfer * of icon data. If it did, we would want to try to stop * the transfer here after failure. @@ -1281,11 +1436,11 @@ /* also flip the first 4 bits with the last 4 bits */ temp = buf[j*cols + i] & 0xf0; buf[j*cols + i] <<= 4; - buf[j*cols + i] |= (temp >4) & 0x0f; + buf[j*cols + i] |= (temp >> 4) & 0x0f; temp = buf[(rows-j-1)*cols + i] & 0xf0; buf[(rows-j-1)*cols + i] <<= 4; - buf[(rows-j-1)*cols + i] |= (temp >4) & 0x0f; + buf[(rows-j-1)*cols + i] |= (temp >> 4) & 0x0f; } } @@ -1312,7 +1467,7 @@ switch (wacom->wacom_wac->features->type) { case INTUOS4S: printk(KERN_DEBUG "INTUOS4S: set_led not supported!\n"); - /* TODO: to support this, I need to know the dimensions */ + /* to support this, I need to know the dimensions */ r = -1; goto out; case INTUOS4: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/src/2.6.27/wacom_wac.h new/linuxwacom-0.8.5-9/src/2.6.27/wacom_wac.h --- old/linuxwacom-0.8.5-8/src/2.6.27/wacom_wac.h 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/src/2.6.27/wacom_wac.h 2009-12-31 01:05:15.000000000 +0100 @@ -17,9 +17,9 @@ #define WACOM_PKGLEN_GRAPHIRE 8 #define WACOM_PKGLEN_BBFUN 9 #define WACOM_PKGLEN_INTUOS 10 -#define WACOM_PKGLEN_PENABLED 8 #define WACOM_PKGLEN_TPC1FG 5 #define WACOM_PKGLEN_TPC2FG 14 +#define WACOM_PKGLEN_BBTOUCH 20 /* device IDs */ #define STYLUS_DEVICE_ID 0x02 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/src/wacomxi/wacomcpl-exec new/linuxwacom-0.8.5-9/src/wacomxi/wacomcpl-exec --- old/linuxwacom-0.8.5-8/src/wacomxi/wacomcpl-exec 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/src/wacomxi/wacomcpl-exec 2009-12-31 01:05:15.000000000 +0100 @@ -1920,6 +1920,13 @@ set numPadButtons($i) 4 set numPadRings($i) 1 } + + # Bamboo Pen and Touch + for { set i 208 } { $i <= 212 } { incr i 1 } { + set hasPad($i) 1 + set numPadButtons($i) 4 + } + # I3 set numPadButtons(176) 4 set numPadStrips(176) 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/src/xdrv/wcmCommon.c new/linuxwacom-0.8.5-9/src/xdrv/wcmCommon.c --- old/linuxwacom-0.8.5-8/src/xdrv/wcmCommon.c 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/src/xdrv/wcmCommon.c 2009-12-31 01:05:15.000000000 +0100 @@ -1170,6 +1170,69 @@ } } } + + /* process single finger events */ + if (ds.device_type == TOUCH_ID && common->wcmTouch && !common->wcmGesture) + { + WacomDeviceState* pds = &common->wcmTouchpadState; + WacomDevicePtr priv = common->wcmDevices; + + if (ds.proximity) + switch (common->wcmTouchpadMode) + { + case 0: + common->wcmTouchpadMode = 1; + common->wcmTouchpadState = ds; + common->wcmTouchpadState.sample = (int)GetTimeInMillis(); + break; + case 1: + if (GetTimeInMillis() - pds->sample <= 200) { + int xd = ds.x - pds->x; + int yd = ds.y - pds->y; + + if (xd*xd + yd*yd > 10*10) + common->wcmTouchpadMode = 2; + } else { + /* left button down */ + xf86PostButtonEvent(priv->local->dev, + priv->flags & ABSOLUTE_FLAG, + 1,1,0,priv->naxes, priv->oldX, + priv->oldY,0,0,0,0); + common->wcmTouchpadMode = 3; + } + break; + } + else { + switch (common->wcmTouchpadMode) + { + case 1: + if (GetTimeInMillis() - pds->sample <= 200) + { + /* left button down */ + xf86PostButtonEvent(priv->local->dev, + priv->flags & ABSOLUTE_FLAG, + 1,1,0,priv->naxes, priv->oldX, + priv->oldY,0,0,0,0); + /* left button up */ + xf86PostButtonEvent(priv->local->dev, + priv->flags & ABSOLUTE_FLAG, + 1,0,0,priv->naxes, priv->oldX, + priv->oldY,0,0,0,0); + } + break; + case 3: + /* left button up */ + xf86PostButtonEvent(priv->local->dev, + priv->flags & ABSOLUTE_FLAG, + 1,0,0,priv->naxes, priv->oldX, + priv->oldY,0,0,0,0); + } + common->wcmTouchpadMode = 0; + } + if (common->wcmTouchpadMode == 1 || common->wcmTouchpadMode == 2) + ds.buttons &= ~1; + } + /* everything else falls here */ commonDispatchDevice(common,channel,pChannel, suppress); ret: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/src/xdrv/wcmUSB.c new/linuxwacom-0.8.5-9/src/xdrv/wcmUSB.c --- old/linuxwacom-0.8.5-8/src/xdrv/wcmUSB.c 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/src/xdrv/wcmUSB.c 2009-12-31 01:05:15.000000000 +0100 @@ -826,7 +826,7 @@ static void usbParseEvent(LocalDevicePtr local, const struct input_event* event) { - int channel; + int channel = -1; WacomDevicePtr priv = (WacomDevicePtr)local->private; WacomCommonPtr common = priv->common; @@ -886,7 +886,7 @@ } /* ignore events without information */ - if (common->wcmEventCnt <= 2) + if (common->wcmEventCnt <= 2 && common->wcmLastToolSerial) { DBG(3, common->debugLevel, ErrorF("%s - usbParse: dropping empty event for serial %d\n", local->name, common->wcmLastToolSerial)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/src/xdrv/xf86Wacom.c new/linuxwacom-0.8.5-9/src/xdrv/xf86Wacom.c --- old/linuxwacom-0.8.5-8/src/xdrv/xf86Wacom.c 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/src/xdrv/xf86Wacom.c 2009-12-31 01:05:15.000000000 +0100 @@ -91,9 +91,10 @@ * 2009-12-08 47-pc0.8.5-6 - Add new serial ISDV4 devices * 2009-12-14 47-pc0.8.5-7 - Updated serial ISDV4 support * 2009-12-21 47-pc0.8.5-8 - Added local max and resolution for tool + * 2009-12-29 47-pc0.8.5-9 - Merged support for Bamboo P&T from Ayuthia */ -static const char identification[] = "$Identification: 47-0.8.5-8 $"; +static const char identification[] = "$Identification: 47-0.8.5-9 $"; /****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxwacom-0.8.5-8/src/xdrv/xf86WacomDefs.h new/linuxwacom-0.8.5-9/src/xdrv/xf86WacomDefs.h --- old/linuxwacom-0.8.5-8/src/xdrv/xf86WacomDefs.h 2009-12-23 00:26:09.000000000 +0100 +++ new/linuxwacom-0.8.5-9/src/xdrv/xf86WacomDefs.h 2009-12-31 01:05:15.000000000 +0100 @@ -415,6 +415,8 @@ int wcmTPCButtonDefault; /* Tablet PC button default */ int wcmTouchDefault; /* default touch to disable when not supported */ int wcmGestureMode; /* data is in Gesture Mode? */ + int wcmTouchpadMode; /* in touchpad mode? */ + WacomDeviceState wcmTouchpadState; /* inital state when in touchpad mode */ WacomDeviceState wcmGestureState[MAX_FINGERS]; /* inital state when in gesture mode */ int wcmGesture; /* disable/enable touch gesture */ int wcmGestureDefault; /* default touch gesture to disable when not supported */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 whois for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package whois for openSUSE:Factory checked in at Thu Jan 7 13:04:47 CET 2010. -------- --- whois/whois.changes 2009-08-13 11:19:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/whois/whois.changes 2010-01-04 14:22:54.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Jan 4 13:17:27 UTC 2010 - puzel(a)novell.com + +- update to whois-5.0.0 + * Added optional support for automatically transcoding the + output of servers. + * Automatically add --show-handles to queries for .dk domains. + * Normalize the querystring and convert it to punycode even if a + server is specified on the command line. + * Updated the .id, .is, .my, .sb and .tj TLD servers. + * Removed the .mm, .pw, .sr and .tp TLD servers. + * Cleaned up the horrible strings manipulation code. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- whois_4.7.36.tar.bz2 New: ---- whois_5.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ whois.spec ++++++ --- /var/tmp/diff_new_pack.XLVJzl/_old 2010-01-07 13:04:22.000000000 +0100 +++ /var/tmp/diff_new_pack.XLVJzl/_new 2010-01-07 13:04:22.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package whois (Version 4.7.36) +# spec file for package whois (Version 5.0.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,12 @@ Name: whois BuildRequires: libidn-devel -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Networking/Other Provides: ripe-whois-tools AutoReqProv: on Url: http://www.linux.it/~md/software/ -Version: 4.7.36 +Version: 5.0.0 Release: 1 Summary: Whois Client Program Source: %{name}_%{version}.tar.bz2 ++++++ whois-4.7.33-nb.patch ++++++ --- /var/tmp/diff_new_pack.XLVJzl/_old 2010-01-07 13:04:22.000000000 +0100 +++ /var/tmp/diff_new_pack.XLVJzl/_new 2010-01-07 13:04:22.000000000 +0100 @@ -1,13 +1,13 @@ Index: po/Makefile =================================================================== ---- po/Makefile.orig 2008-12-09 01:49:28.000000000 +0100 -+++ po/Makefile 2009-05-04 11:47:31.000000000 +0200 +--- po/Makefile.orig 2009-12-07 01:30:09.000000000 +0100 ++++ po/Makefile 2010-01-04 14:05:26.000000000 +0100 @@ -6,7 +6,7 @@ INSTALLNLSDIR=$(BASEDIR)$(prefix)/share/ PACKAGE = whois --CATALOGS = cs.mo de.mo el.mo es.mo eu.mo fr.mo it.mo ja.mo no.mo pl.mo pt_BR.mo ru.mo fi.mo -+CATALOGS = cs.mo de.mo el.mo es.mo eu.mo fr.mo it.mo ja.mo nb.mo pl.mo pt_BR.mo ru.mo fi.mo +-CATALOGS = cs.mo de.mo el.mo es.mo eu.mo fi.mo fr.mo it.mo ja.mo no.mo pl.mo pt_BR.mo ru.mo zh_CN.po ++CATALOGS = cs.mo de.mo el.mo es.mo eu.mo fi.mo fr.mo it.mo ja.mo nb.mo pl.mo pt_BR.mo ru.mo zh_CN.mo POTFILES=../whois.c ../mkpasswd.c ++++++ whois_4.7.36.tar.bz2 -> whois_5.0.0.tar.bz2 ++++++ ++++ 2152 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 valgrind for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package valgrind for openSUSE:Factory checked in at Thu Jan 7 13:04:08 CET 2010. -------- --- valgrind/valgrind.changes 2009-11-03 20:23:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/valgrind/valgrind.changes 2010-01-06 17:55:31.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Jan 6 17:54:54 CET 2010 - dmueller(a)suse.de + +- fix build against glibc 2.11 + +------------------------------------------------------------------- +Wed Dec 2 22:25:34 CET 2009 - dmueller(a)suse.de + +- update and reenable jit-register-unregister.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- jit-runtime-support.diff New: ---- glibc-211.diff jit-register-unregister.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valgrind.spec ++++++ --- /var/tmp/diff_new_pack.M5w1dl/_old 2010-01-07 13:04:01.000000000 +0100 +++ /var/tmp/diff_new_pack.M5w1dl/_new 2010-01-07 13:04:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package valgrind (Version 3.5.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,17 +23,18 @@ BuildRequires: gcc-32bit %endif Url: http://valgrind.org/ -License: GPL v2 only +License: GPLv2 Group: Development/Tools/Debuggers Summary: Valgrind Suite of Tools for Debugging and Profiling BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 3.5.0 -Release: 2 +Release: 3 Source0: %{name}-%{version}.tar.bz2 # svn di svn://svn.valgrind.org/valgrind/tags/VALGRIND_3_2_1 svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH > 3_2_BRANCH.diff # svn di svn://svn.valgrind.org/vex/tags/VEX_3_2_1 svn://svn.valgrind.org/vex/branches/VEX_3_2_BRANCH > VEX_3_2_BRANCH.diff -Patch1: jit-runtime-support.diff +Patch1: jit-register-unregister.diff Patch2: deprecated.diff +Patch3: glibc-211.diff Provides: callgrind = %version Obsoletes: callgrind < %version ExclusiveArch: %ix86 x86_64 ppc ppc64 @@ -73,7 +74,7 @@ Robert Walsh %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Valgrind Suite of Tools for Debugging and Profiling Group: Development/Tools/Debuggers Requires: %name = %version @@ -116,8 +117,9 @@ %setup -q -n %{name}-%{version} cd VEX cd .. -#%patch1 +%patch1 %patch2 +%patch3 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ glibc-211.diff ++++++ --- configure.in +++ configure.in @@ -656,6 +656,17 @@ ], GLIBC_VERSION="2.10") +AC_EGREP_CPP([GLIBC_211], [ +#include <features.h> +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11) + GLIBC_211 + #endif +#endif +], +GLIBC_VERSION="2.11") + + AC_EGREP_CPP([AIX5_LIBC], [ #include <standards.h> #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) @@ -742,6 +753,13 @@ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ;; + 2.11) + AC_MSG_RESULT(2.11 family) + AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.x]) + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; aix5) AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3]) @@ -755,7 +773,7 @@ *) AC_MSG_RESULT(unsupported version) - AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10]) + AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11]) AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) AC_MSG_ERROR([or Darwin libc]) ;; ++++++ jit-register-unregister.diff ++++++ Index: include/valgrind.h =================================================================== --- include/valgrind.h (revision 10894) +++ include/valgrind.h (working copy) @@ -3648,7 +3648,11 @@ VG_USERREQ__STACK_CHANGE = 0x1503, /* Wine support */ - VG_USERREQ__LOAD_PDB_DEBUGINFO = 0x1601 + VG_USERREQ__LOAD_PDB_DEBUGINFO = 0x1601, + + /* JIT support */ + VG_USERREQ__JIT_REGISTER_MAP = 0x1701, + VG_USERREQ__JIT_UNREGISTER_MAP = 0x1702 } Vg_ClientRequest; #if !defined(__GNUC__) @@ -4009,7 +4013,21 @@ fd, ptr, total_size, delta, 0); \ } +#define VALGRIND_JIT_REGISTER_MAP(name, start, end) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__JIT_REGISTER_MAP, \ + name, start, end, 0, 0); \ + } +#define VALGRIND_JIT_UNREGISTER_MAP(name, start) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__JIT_REGISTER_MAP, \ + start, 0, 0, 0, 0); \ + } + + #undef PLAT_x86_linux #undef PLAT_amd64_linux #undef PLAT_ppc32_linux Index: coregrind/m_debuginfo/debuginfo.c =================================================================== --- coregrind/m_debuginfo/debuginfo.c (revision 10894) +++ coregrind/m_debuginfo/debuginfo.c (working copy) @@ -47,6 +47,7 @@ #include "pub_core_oset.h" #include "pub_core_stacktrace.h" // VG_(get_StackTrace) XXX: circular dependency #include "pub_core_ume.h" +#include "pub_core_mallocfree.h" #include "priv_misc.h" /* dinfo_zalloc/free */ #include "priv_d3basics.h" /* ML_(pp_GX) */ @@ -1131,6 +1132,132 @@ #endif /* defined(VGO_aix5) */ +/* Storing and retrieving information caused by JITted code. TODO: + move somewhere more suitable. */ + +typedef + struct { + Char *name; + Addr start, end; + } + JitEntry; + +static JitEntry *jit_entries; +static Int jit_entries_size; +static Int jit_entry_count; + +#define JITSYMS_START_SIZE 128 +#define JITSYMS_INCREMENT 64 + +void VG_(register_jited_code) ( Char *name, Addr start, SizeT len) +{ + Int l, u, mid, slot, j; + JitEntry* e = NULL; + + if (jit_entry_count + 1 >= jit_entries_size) { + if (jit_entries == NULL) { + jit_entries = VG_(arena_calloc)( + VG_AR_DINFO, "jit-register", + JITSYMS_START_SIZE, sizeof(JitEntry) + ); + jit_entries_size = JITSYMS_START_SIZE; + } else { + jit_entries = VG_(arena_realloc)( + VG_AR_DINFO, "jit-register", jit_entries, + (jit_entries_size + JITSYMS_INCREMENT) + * sizeof(JitEntry) + ); + jit_entries_size += JITSYMS_INCREMENT; + } + } + l = 0; + u = jit_entry_count; + while (l < u) { + mid = (l + u) / 2; + e = &jit_entries [mid]; + if (e->start < start) { + l = mid + 1; + } else if (e->start > start) { + u = mid; + } else + break; + } + if (e == NULL) { + if (jit_entry_count != 0) { + /* this would be an error */ + } + slot = 0; + } else if (e->start < start) + slot = mid + 1; + else + slot = mid; + + if (e != NULL) { + for (j = jit_entry_count; j > mid+1; j--) + jit_entries [j] = jit_entries [j-1]; + } + + jit_entries [slot].name = VG_(strdup)("jit-register", name); + jit_entries [slot].start = start; + jit_entries [slot].end = start + len; + jit_entry_count++; +} + +void VG_(unregister_jited_code) ( Addr start ) +{ + Int l, u, mid; + JitEntry* e = NULL; + + l = 0; + u = jit_entry_count; + while (l < u) { + mid = (l + u) / 2; + e = &jit_entries [mid]; + + if (e->start < start) { + l = mid + 1; + } else if (e->start > start) { + u = mid; + } else { + break; + } + } + if (e != NULL && start == e->start){ + Int j; + VG_(free)(e->name); + for (j = mid + 1; j < jit_entry_count; j++) + jit_entries [j-1] = jit_entries [j]; + } +} + +static +JitEntry* jit_lookup ( Addr pc, Char* buf, Int nbuf ) +{ + Int l, u, mid; + JitEntry* e = NULL; + + l = 0; + u = jit_entry_count; + while (l < u) { + mid = (l + u) / 2; + e = &jit_entries [mid]; + + if (e->end < pc) { + l = mid + 1; + } else if (e->start > pc) { + u = mid; + } else { + break; + } + } + if (e != NULL && pc >= e->start && pc < e->end){ + VG_(strncpy_safely)(buf, e->name, nbuf); + return e; + } + return NULL; +} + + /*------------------------------------------------------------*/ /*--- ---*/ /*--- TOP LEVEL: QUERYING EXISTING DEBUG INFO ---*/ @@ -1263,8 +1390,19 @@ PtrdiffT offset; search_all_symtabs ( a, &di, &sno, match_anywhere_in_sym, findText ); - if (di == NULL) + if (di == NULL) + { + if (findText) + { + JitEntry* je = jit_lookup (a, buf, nbuf); + if (!je) + return False; + if (offsetP) + *offsetP = a - je->start; + return True; + } return False; + } VG_(demangle) ( do_cxx_demangling, do_z_demangling, di->symtab[sno].name, buf, nbuf ); Index: coregrind/pub_core_debuginfo.h =================================================================== --- coregrind/pub_core_debuginfo.h (revision 10894) +++ coregrind/pub_core_debuginfo.h (working copy) @@ -106,6 +106,10 @@ extern Bool VG_(get_fnname_no_cxx_demangle) ( Addr a, Char* buf, Int nbuf ); +/* Register/deregister symbols created by JITs. */ +extern void VG_(register_jited_code)( Char* name, Addr start, SizeT len ); +extern void VG_(unregister_jited_code)( Addr start ); + /* Use DWARF2/3 CFA information to do one step of stack unwinding. */ extern Bool VG_(use_CF_info) ( /*MOD*/Addr* ipP, /*MOD*/Addr* spP, Index: coregrind/m_scheduler/scheduler.c =================================================================== --- coregrind/m_scheduler/scheduler.c (revision 10894) +++ coregrind/m_scheduler/scheduler.c (working copy) @@ -1478,6 +1478,16 @@ goto my_default; } + case VG_USERREQ__JIT_REGISTER_MAP: + VG_(register_jited_code)( (Char*)arg[1], arg[2], arg[3] ); + SET_CLREQ_RETVAL( tid, 0 ); /* return value is meaningless */ + break; + + case VG_USERREQ__JIT_UNREGISTER_MAP: + VG_(unregister_jited_code)( arg[1] ); + SET_CLREQ_RETVAL( tid, 0 ); /* return value is meaningless */ + break; + default: my_default: if (os_client_request(tid, arg)) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 udev for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package udev for openSUSE:Factory checked in at Thu Jan 7 13:04:04 CET 2010. -------- --- udev/udev.changes 2009-12-03 14:55:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/udev/udev.changes 2009-12-15 02:13:17.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 15 02:13:04 CET 2009 - jengelh(a)medozas.de + +- add baselibs.conf as a source + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.xFRF3P/_old 2010-01-07 13:03:57.000000000 +0100 +++ /var/tmp/diff_new_pack.xFRF3P/_new 2010-01-07 13:03:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package udev (Version 149) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: udev Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Version: 149 -Release: 1 +Release: 2 License: GPLv2+ Group: System/Kernel Summary: A rule-based device node and kernel event manager @@ -36,6 +36,7 @@ BuildRequires: glib2-devel gobject-introspection-devel Source0: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.… Source1: udev-rpmlintrc +Source2: baselibs.conf Source60: boot.udev Source61: boot.udev_retry ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 tre for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package tre for openSUSE:Factory checked in at Thu Jan 7 13:03:49 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/tre/tre.changes 2009-12-10 13:32:43.000000000 +0100 @@ -0,0 +1,29 @@ +------------------------------------------------------------------- +Thu Dec 10 12:47:07 CET 2009 - pgajdos(a)suse.cz + +- updated to 0.8.0: + - Added tre_ prefix to all functions exported from libtre. This + changes the binary interface (ABI). The old source interface + (API) is still available in <tre/regex.h>. New programs should + use <tre/tre.h>. + + - Visual C++ 6 project files replaced with Visual Studio 2008 files. + + - Bug fixes. +- package renamed to tre, splitted out subpackage libtre5 + +------------------------------------------------------------------- +Thu Jun 18 11:05:33 CEST 2009 - pgajdos(a)suse.cz + +- updated to 0.7.6 (see NEWS) + +------------------------------------------------------------------- +Thu Jan 24 20:51:08 CET 2008 - coolo(a)suse.de + +- fix build + +------------------------------------------------------------------- +Sun Feb 25 12:28:33 CET 2007 - dmueller(a)suse.de + +- Initial package (0.7.5) + calling whatdependson for head-i586 New: ---- tre-0.8.0.tar.bz2 tre.changes tre.diff tre.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tre.spec ++++++ # # spec file for package tre (Version 0.8.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: tre Version: 0.8.0 Release: 1 License: LGPLv2.1+ Group: System/Libraries Source0: http://laurikari.net/tre/tre-%{version}.tar.bz2 Patch0: %{name}.diff Summary: POSIX compatible regexp library with approximate matching Url: http://laurikari.net/tre/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description TRE is a lightweight, robust, and efficient POSIX compatible regexp matching library with some exciting features such as approximate matching. Authors: -------- Ville Laurikari <vl(a)iki.fi> %package -n libtre5 License: GPL v2.1 or later Summary: POSIX compatible regexp library with approximate matching Group: System/Libraries Requires: %{name} = %{version} Obsoletes: libtre Provides: libtre %description -n libtre5 TRE is a lightweight, robust, and efficient POSIX compatible regexp matching library with some exciting features such as approximate matching. %post -n libtre5 -p /sbin/ldconfig %postun -n libtre5 -p /sbin/ldconfig %package devel License: LGPLv2.1+ Requires: libtre5 = %{version} Summary: POSIX compatible regexp library with approximate matching Group: Development/Libraries/C and C++ Obsoletes: libtre-devel Provides: libtre-devel %description devel TRE is a lightweight, robust, and efficient POSIX compatible regexp matching library with some exciting features such as approximate matching. Authors: -------- Ville Laurikari <vl(a)iki.fi> %package -n agrep License: NON-OSI-COMPLIANT(non-commercial) ; LGPLv2.1+ Summary: Another powerful grep with interesting features Group: Productivity/Text/Utilities %description -n agrep agrep is another powerful grep which has the ability to search for approximate patterns as well as block oriented search. Authors: -------- Sun Wu Udi Manber Burra Gopal %prep %setup -q -n tre-%{version} %patch0 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static --enable-shared make %{?jobs:-j%jobs} %install make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la rm -rf $RPM_BUILD_ROOT/usr/share/locale/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr (-, root, root) %doc ABOUT-NLS AUTHORS LICENSE NEWS README THANKS TODO %files -n libtre5 %defattr (-, root, root) %{_libdir}/libtre.so.* %files devel %defattr (-, root, root) %doc doc/default.css doc/tre-api.html doc/tre-syntax.html %{_includedir}/* %{_libdir}/libtre.so %{_libdir}/pkgconfig/* %files -n agrep %defattr (-, root, root) %{_bindir}/agrep %{_mandir}/man1/agrep.1.gz %changelog ++++++ tre.diff ++++++ diff -ru tre-0.7.5/lib/tre-match-approx.c tre-0.7.5.new/lib/tre-match-approx.c --- tre-0.7.5/lib/tre-match-approx.c 2006-12-08 19:07:03.000000000 +0000 +++ tre-0.7.5.new/lib/tre-match-approx.c 2008-01-24 19:47:12.000000000 +0000 @@ -23,24 +23,6 @@ #include <config.h> #endif /* HAVE_CONFIG_H */ -/* AIX requires this to be the first thing in the file. */ -#ifdef TRE_USE_ALLOCA -#ifndef __GNUC__ -# if HAVE_ALLOCA_H -# include <alloca.h> -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -#endif -#endif /* TRE_USE_ALLOCA */ - -#define __USE_STRING_INLINES #undef __NO_INLINE__ #include <assert.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit subversion for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package subversion for openSUSE:Factory checked in at Thu Jan 7 13:03:42 CET 2010. -------- --- subversion/subversion.changes 2009-10-22 23:32:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/subversion/subversion.changes 2010-01-04 13:13:12.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 4 13:12:51 CET 2010 - vuntz(a)opensuse.org + +- Change gnome-keyring-devel BuildRequires to + libgnome-keyring-devel on 11.3 and later, following the module + split upstream. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.20pDyA/_old 2010-01-07 13:03:23.000000000 +0100 +++ /var/tmp/diff_new_pack.20pDyA/_new 2010-01-07 13:03:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package subversion (Version 1.6.6) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 Pascal Bleser <pascal.bleser(a)opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -42,7 +42,7 @@ Name: subversion Version: 1.6.6 -Release: 1 +Release: 2 # in-tree SWIG version to use for the build: %define swig_version 1.3.36 %define sqlite_version 3.6.17 @@ -66,7 +66,12 @@ BuildRequires: cyrus-sasl-devel %if %with_gnome_keyring BuildRequires: dbus-1-devel -BuildRequires: glib2-devel gnome-keyring-devel +BuildRequires: glib2-devel +%if 0%{?suse_version} >= 1130 +BuildRequires: libgnome-keyring-devel +%else +BuildRequires: gnome-keyring-devel +%endif %endif # with_gnome_keyring %if %with_kde4_kwallet BuildRequires: dbus-1-devel @@ -178,7 +183,7 @@ %package devel -License: Apache Software License .. +License: ASLv.. Group: Development/Libraries/C and C++ Summary: Development package for Subversion developers Requires: subversion = %{version} @@ -192,7 +197,7 @@ %package tools -License: Apache Software License .. ; Subversion License, http://subversion.tigris.org/license-1.html +License: ASLv.. ; Subversion License, http://subversion.tigris.org/license-1.html Group: Development/Tools/Version Control Summary: Tools for Subversion @@ -218,7 +223,7 @@ %package perl -License: Apache Software License .. ; Subversion License, http://subversion.tigris.org/license-1.html +License: ASLv.. ; Subversion License, http://subversion.tigris.org/license-1.html Group: Development/Tools/Version Control Summary: Allows Perl scripts to directly use Subversion repositories. Requires: subversion = %{version} @@ -230,7 +235,7 @@ %package python -License: Apache Software License .. ; Subversion License, http://subversion.tigris.org/license-1.html +License: ASLv.. ; Subversion License, http://subversion.tigris.org/license-1.html Group: Development/Tools/Version Control Summary: Allows Python scripts to directly use Subversion repositories. Requires: subversion = %{version} @@ -270,7 +275,7 @@ %endif # with_ruby %package server -License: Apache Software License .. +License: ASLv.. Group: Development/Tools/Version Control Summary: Apache server module for Subversion server Requires: subversion = %{version} apache2 %{apache_mmn} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rsync for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package rsync for openSUSE:Factory checked in at Thu Jan 7 13:03:00 CET 2010. -------- --- rsync/rsync.changes 2009-08-21 13:16:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/rsync/rsync.changes 2010-01-04 15:27:13.000000000 +0100 @@ -1,0 +2,39 @@ +Mon Jan 4 14:21:21 UTC 2010 - puzel(a)novell.com + +- update to rsync-3.0.7 + - Fixed a bogus free when using --xattrs with --backup. + - Avoid an error when --dry-run was trying to stat a prior hard-link + file that hasn't really been created. + - Fixed a problem with --compress (-z) where the receiving side could + return the error "inflate (token) returned -5". + - Fixed a bug where --delete-during could delete in a directory before + it noticed that the sending side sent an I/O error for that + directory (both sides of the transfer must be at least 3.0.7). + - Improved --skip-compress's error handling of bad character-sets and + got rid of a lingering debug fprintf(). + - Fixed the daemon's conveyance of io_error value from the sender. + - An rsync daemon use seteuid() (when available) if it used setuid(). + - Get the permissions right on a --fake-super transferred directory + that needs more owner permissions to emulate root behavior. + - An absolute-path filter rule (i.e. with a '/' modifier) no longer + loses its modifier when sending the filter rules to the remote + rsync. + - Improved the "--delete does not work without -r or -d" message. + - Improved rsync's handling of --timeout to avoid a weird timeout case + where the sender could timeout even though it has recently written + data to the socket (but hasn't read data recently, due to the + writing). + - Some misc manpage improvements. + - Fixed the chmod-temp-dir testsuite on a system without /var/tmp. + - Make sure that a timeout specified in the daemon's config is used as + a maximum timeout value when the user also specifies a timeout. + - Improved the error-exit reporting when rsync gets an error trying to + cleanup after an error: the initial error is reported. + - The AIX sysacls routines will now return ENOSYS if ENOTSUP is + missing. + - Made our (only used if missing) getaddrinfo() routine use + inet_pton() (which we also provide) instead of inet_aton(). + - The exit-related debug messages now mention the program's role so it + is clear who output what message. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rsync-3.0.6.tar.bz2 rsync-patches-3.0.6.tar.bz2 New: ---- rsync-3.0.7.tar.bz2 rsync-patches-3.0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsync.spec ++++++ --- /var/tmp/diff_new_pack.egxVVG/_old 2010-01-07 13:02:28.000000000 +0100 +++ /var/tmp/diff_new_pack.egxVVG/_new 2010-01-07 13:02:28.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package rsync (Version 3.0.6) +# spec file for package rsync (Version 3.0.7) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,9 +21,9 @@ Name: rsync Summary: Replacement for RCP/mirror that has Many More Features -Version: 3.0.6 -Release: 2 -License: GPL v3 or later +Version: 3.0.7 +Release: 1 +License: GPLv3+ Group: Productivity/Networking/Other AutoReqProv: on Url: http://rsync.samba.org/ ++++++ rsync-3.0.6.tar.bz2 -> rsync-3.0.7.tar.bz2 ++++++ ++++ 26566 lines of diff (skipped) ++++++ rsync-patches-3.0.6.tar.bz2 -> rsync-patches-3.0.7.tar.bz2 ++++++ ++++ 5891 lines of diff (skipped) ++++++ rsyncd.rc ++++++ --- /var/tmp/diff_new_pack.egxVVG/_old 2010-01-07 13:02:29.000000000 +0100 +++ /var/tmp/diff_new_pack.egxVVG/_new 2010-01-07 13:02:29.000000000 +0100 @@ -22,6 +22,7 @@ # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Description: Start the rsync server daemon +# Short-Description: Start the rsync server daemon ### END INIT INFO RSYNCD_BIN=/usr/sbin/rsyncd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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