.gitignore | 3 ChangeLog | 92 ++++++++++++++++++ Makefile.am | 3 README | 20 ++++ configure.ac | 33 +----- debian/README.source | 73 ++++++++++++++ debian/changelog | 37 +++++++ debian/control | 10 -- debian/rules | 21 ++-- debian/xsfbs/xsfbs.mk | 54 ++++------- debian/xsfbs/xsfbs.sh | 245 -------------------------------------------------- man/elographics.man | 2 src/Makefile.am | 2 src/xf86Elo.c | 61 +++++++----- 14 files changed, 312 insertions(+), 344 deletions(-)
New commits: commit 9d575f2df4f2c7f8e0bd8eca9a4e33db34c133c7 Author: Cyril Brulebois <k...@debian.org> Date: Wed Oct 13 01:34:34 2010 +0200 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 1778fb1..030d704 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-input-elographics (1:1.2.3-5) UNRELEASED; urgency=low +xserver-xorg-input-elographics (1:1.2.3-5) experimental; urgency=low * Build against Xserver 1.9.1 rc1. - -- Cyril Brulebois <k...@debian.org> Wed, 13 Oct 2010 01:34:08 +0200 + -- Cyril Brulebois <k...@debian.org> Wed, 13 Oct 2010 01:34:30 +0200 xserver-xorg-input-elographics (1:1.2.3-4) unstable; urgency=medium commit 6d8749ea00348a87cf313900b2acb50fdde4397c Author: Cyril Brulebois <k...@debian.org> Date: Wed Oct 13 01:34:22 2010 +0200 Build against Xserver 1.9.1 rc1. diff --git a/debian/changelog b/debian/changelog index 61d5ea7..1778fb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-elographics (1:1.2.3-5) UNRELEASED; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois <k...@debian.org> Wed, 13 Oct 2010 01:34:08 +0200 + xserver-xorg-input-elographics (1:1.2.3-4) unstable; urgency=medium * Update xsfbs, use new ${xinpdriver:Depends} substvar. diff --git a/debian/control b/debian/control index 9759388..8134aff 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org Build-Depends: debhelper (>= 5), pkg-config, - xserver-xorg-dev (>= 2:1.7.6.901), + xserver-xorg-dev (>= 2:1.9.0.901), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, commit 733742a21f9f7ef62acdbcfdcb55fc332a3a563b Author: Julien Cristau <jcris...@debian.org> Date: Sat May 15 17:13:42 2010 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 1ddc3c9..61d5ea7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-input-elographics (1:1.2.3-4) UNRELEASED; urgency=low +xserver-xorg-input-elographics (1:1.2.3-4) unstable; urgency=medium * Update xsfbs, use new ${xinpdriver:Depends} substvar. - -- Julien Cristau <jcris...@debian.org> Sat, 15 May 2010 17:12:32 +0200 + -- Julien Cristau <jcris...@debian.org> Sat, 15 May 2010 17:13:37 +0200 xserver-xorg-input-elographics (1:1.2.3-3) unstable; urgency=low commit c9716fdceb3a5d2b963b8f3702f3c3bb474c2eaf Author: Julien Cristau <jcris...@debian.org> Date: Sat May 15 17:12:44 2010 +0200 Update xsfbs, use new ${xinpdriver:Depends} substvar. diff --git a/debian/changelog b/debian/changelog index a5d9406..1ddc3c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-elographics (1:1.2.3-4) UNRELEASED; urgency=low + + * Update xsfbs, use new ${xinpdriver:Depends} substvar. + + -- Julien Cristau <jcris...@debian.org> Sat, 15 May 2010 17:12:32 +0200 + xserver-xorg-input-elographics (1:1.2.3-3) unstable; urgency=low [ Timo Aaltonen ] diff --git a/debian/control b/debian/control index c9072b4..9759388 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org Build-Depends: debhelper (>= 5), pkg-config, - xserver-xorg-dev (>= 2:1.7), + xserver-xorg-dev (>= 2:1.7.6.901), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, @@ -20,7 +20,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-elograp Package: xserver-xorg-input-elographics Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends} Provides: ${xinpdriver:Provides} Replaces: xserver-xorg (<< 6.8.2-35) Description: X.Org X server -- ELOGraphics input driver commit c7dcea410f4318c0962746018560d96c5cb52383 Author: Mikhail Gusarov <dotted...@debian.org> Date: Fri May 7 18:58:55 2010 +0700 Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control diff --git a/debian/control b/debian/control index c3168b5..c9072b4 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,5 @@ Description: X.Org X server -- ELOGraphics input driver . More information about X.Org can be found at: <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This package is built from the X.org xf86-input-elographics driver module. commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <k...@debian.org> Date: Sun May 2 02:14:45 2010 +0200 Add xorg-driver-{video,input} to Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 77c4a39..3c59c20 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) # these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <jcris...@debian.org> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <jcris...@debian.org> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <k...@debian.org> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. commit ffcd3f208519a25243b37e127d0d28ac4373c937 Author: Brice Goglin <bgog...@debian.org> Date: Mon Mar 15 19:21:48 2010 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 108023c..a5d9406 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-elographics (1:1.2.3-3) UNRELEASED; urgency=low +xserver-xorg-input-elographics (1:1.2.3-3) unstable; urgency=low [ Timo Aaltonen ] * Build against Xserver 1.7. @@ -12,8 +12,9 @@ xserver-xorg-input-elographics (1:1.2.3-3) UNRELEASED; urgency=low * Bump Standards-Version to 3.8.4, no changes needed. * Pull from upstream master up to commit ac5366d6. + Fix build against Xserver 1.7, closes: #569462. + * Add myself to Uploaders. - -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:02 +0200 + -- Brice Goglin <bgog...@debian.org> Mon, 15 Mar 2010 19:21:24 +0100 xserver-xorg-input-elographics (1:1.2.3-2) unstable; urgency=low diff --git a/debian/control b/debian/control index df73d8a..c3168b5 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-input-elographics Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org> +Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org> Build-Depends: debhelper (>= 5), pkg-config, commit e122d87b03509d811dc3a8746d596397c924b98b Author: Brice Goglin <bgog...@debian.org> Date: Mon Mar 15 19:20:36 2010 +0100 New upstream release snapshot diff --git a/ChangeLog b/ChangeLog index 4fc3cc0..a5919f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,95 @@ +commit ac5366d6e1f26e6ceef3d062ab7df301d623cf54 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Dec 18 08:42:26 2009 +1000 + + Added support for GeneralTouch serial touchscreens. + + Signed-off-by: Ivan Afonichev <ivan.afonic...@gmail.com> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit b9531248d1b5d00b2ba941f576fc160ea5e1444b +Author: Michael Smith <msm...@cbnco.com> +Date: Tue Dec 15 15:01:29 2009 -0500 + + xf86EloReadInput(): fix xserver unresponsiveness during touch + + The fix for bug #14109 ensures all bytes are emptied from the OS buffer + by looping until xf86WaitForInput returns 0. This patch just changes + the timeout from 1 millisecond to 0: we don't want the X server to block + if there's no more serial data. + + It also removes the Vmin and Vtime options, which were making the calls + to read() block until a complete 10-byte packet buffer could be filled. + At 9600 bps, this could pause the X server for up to 9 ms. The code can + already handle partial buffers, so all we have to do is get rid of the + Vmin. + + Also, if xf86EloGetPacket() returns !Success, we should continue rather + than break so the xf86WaitForInput call can decide whether to exit, in + case there's more data in the buffer. + + Before the fix, glxgears was giving me about 390 FPS normally and down + to 140 FPS when dragging an empty area of the touchscreen. Now it's + basically unchanged when the touchscreen is in use (390 -> 385 FPS). + + X.Org Bug 14109 <https://bugs.freedesktop.org/show_bug.cgi?id=14109> + + Signed-off-by: Michael Smith <msm...@cbnco.com> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 60927fee86100e803f438036daeb94ba0b8e5db7 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Nov 20 09:12:22 2009 +1000 + + Remove unused bits from configure.ac + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 36d6b8efe232cc20afb74799f013c03cbb79a68b +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue Aug 18 15:36:07 2009 +1000 + + Reset local->private to NULL to avoid double-frees. (#23239) + + X.Org Bug 23239 <http://bugs.freedesktop.org/show_bug.cgi?id=23239> + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit a18af14b1df5271fbe3100df3fcb3a8811981ddf +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Jul 17 14:44:55 2009 +1000 + + Cope with XINPUT ABI 7. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit c97c9f470636e6caf4374a6930e5fe380f58b8bb +Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br> +Date: Mon Feb 2 19:06:55 2009 -0200 + + Janitor: make distcheck, .gitignore. + +commit 8230f8bb1f51adc038451fc124394ac72279b5ff +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Fri Jan 30 20:18:17 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + +commit e98045e8101b13720690352b757cdcc3bc806b02 +Author: Matthieu Herrb <matthieu.he...@laas.fr> +Date: Thu Jan 29 17:19:42 2009 +0100 + + Fix InputDriverRec allocation and freeing. + + This caused X server to access free()'d memory on exit path. + Thanks to msys.ch for providing a test machine. + +commit 6f3ca866c821b8fa49e2278cc1538352a95bb2a9 +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Fri Jan 9 16:12:34 2009 -0800 + + Remove xorgconfig & xorgcfg from See Also list in man page + commit 37cd09e99c7f5fa4ce7511b8ed171a3ae130300f Author: Peter Hutterer <peter.hutte...@redhat.com> Date: Tue Oct 21 15:33:43 2008 +1030 diff --git a/debian/changelog b/debian/changelog index 1688dc9..108023c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ xserver-xorg-input-elographics (1:1.2.3-3) UNRELEASED; urgency=low [ Brice Goglin ] * Bump Standards-Version to 3.8.4, no changes needed. + * Pull from upstream master up to commit ac5366d6. + + Fix build against Xserver 1.7, closes: #569462. -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:02 +0200 commit 1e23650f26c69bf868ff2bb6671ca8a6bbc3e3ad Author: Brice Goglin <bgog...@debian.org> Date: Mon Mar 15 19:16:59 2010 +0100 Bump Standards-Version to 3.8.4 diff --git a/debian/changelog b/debian/changelog index 80c777c..1688dc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ xserver-xorg-input-elographics (1:1.2.3-3) UNRELEASED; urgency=low [ Timo Aaltonen ] - * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. [ Julien Cristau ] @@ -9,6 +8,9 @@ xserver-xorg-input-elographics (1:1.2.3-3) UNRELEASED; urgency=low good reason. Thanks, Colin Watson! * Remove myself from Uploaders + [ Brice Goglin ] + * Bump Standards-Version to 3.8.4, no changes needed. + -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:02 +0200 xserver-xorg-input-elographics (1:1.2.3-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 4426de2..df73d8a 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-elographics Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-elographics.git commit 7a5fdd0cec171e3d287b91f8f1be39c019da97aa Author: Julien Cristau <jcris...@debian.org> Date: Sat Jan 23 01:46:29 2010 +0100 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index e2f2962..80c777c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xserver-xorg-input-elographics (1:1.2.3-3) UNRELEASED; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! + * Remove myself from Uploaders -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:02 +0200 diff --git a/debian/control b/debian/control index 9ad44df..4426de2 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-input-elographics Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org>, Julien Cristau <jcris...@debian.org> +Uploaders: David Nusinow <dnusi...@debian.org> Build-Depends: debhelper (>= 5), pkg-config, commit bb5923f7fa5e181b92a0583d31b646db6e9d8839 Author: Julien Cristau <jcris...@debian.org> Date: Sat Jan 16 16:48:41 2010 +0000 Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! diff --git a/debian/changelog b/debian/changelog index 1949bfe..e2f2962 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ xserver-xorg-input-elographics (1:1.2.3-3) UNRELEASED; urgency=low + [ Timo Aaltonen ] * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:02 +0200 xserver-xorg-input-elographics (1:1.2.3-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index e681ec1..29e2f28 100755 --- a/debian/rules +++ b/debian/rules @@ -35,17 +35,17 @@ confflags += --disable-static configure: autoreconf -vfi -obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure - mkdir -p obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ +build/config.status: configure + mkdir -p build + cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" build: build-stamp -build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status +build-stamp: build/config.status dh_testdir - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + cd build && $(MAKE) >$@ clean: @@ -57,7 +57,7 @@ clean: rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* rm -rf autom4te.cache */autom4te.cache - rm -rf obj-* + rm -rf build rm -f $$(find -name Makefile.in) rm -f compile config.guess config.sub configure depcomp install-sh rm -f ltmain.sh missing aclocal.m4 mkinstalldirs config.h.in @@ -70,7 +70,7 @@ install: build dh_clean -k dh_installdirs - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. binary-arch: build install serverabi commit ac5366d6e1f26e6ceef3d062ab7df301d623cf54 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Fri Dec 18 08:42:26 2009 +1000 Added support for GeneralTouch serial touchscreens. Signed-off-by: Ivan Afonichev <ivan.afonic...@gmail.com> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/src/xf86Elo.c b/src/xf86Elo.c index dbe1747..4077b22 100644 --- a/src/xf86Elo.c +++ b/src/xf86Elo.c @@ -907,8 +907,7 @@ xf86EloControl(DeviceIntPtr dev, xf86EloPrintIdent(reply, priv); } else { - ErrorF("Unable to ask Elographics touchscreen identification\n"); - goto not_success; + DBG(2, ErrorF("Unable to ask Elographics touchscreen identification... Maybe it's GeneralTouch touchscreen...\n")); } /* @@ -920,8 +919,7 @@ xf86EloControl(DeviceIntPtr dev, req[3] = ELO_TOUCH_MODE | ELO_STREAM_MODE | ELO_UNTOUCH_MODE; req[4] = ELO_TRACKING_MODE; if (xf86EloSendControl(req, local->fd) != Success) { - ErrorF("Unable to change Elographics touchscreen operating mode\n"); - goto not_success; + DBG(2, ErrorF("Unable to change Elographics touchscreen operating mode... Maybe it's GeneralTouch touchscreen...\n")); } /* @@ -932,12 +930,7 @@ xf86EloControl(DeviceIntPtr dev, req[2] = priv->untouch_delay; req[3] = priv->report_delay; if (xf86EloSendControl(req, local->fd) != Success) { - ErrorF("Unable to change Elographics touchscreen reports timings\n"); - -not_success: - SYSCALL(close(local->fd)); - local->fd = -1; - return !Success; + DBG(2, ErrorF("Unable to change Elographics touchscreen reports timings... Maybe it's GeneralTouch touchscreen...\n")); } } xf86AddEnabledDevice(local); commit b9531248d1b5d00b2ba941f576fc160ea5e1444b Author: Michael Smith <msm...@cbnco.com> Date: Tue Dec 15 15:01:29 2009 -0500 xf86EloReadInput(): fix xserver unresponsiveness during touch The fix for bug #14109 ensures all bytes are emptied from the OS buffer by looping until xf86WaitForInput returns 0. This patch just changes the timeout from 1 millisecond to 0: we don't want the X server to block if there's no more serial data. It also removes the Vmin and Vtime options, which were making the calls to read() block until a complete 10-byte packet buffer could be filled. At 9600 bps, this could pause the X server for up to 9 ms. The code can already handle partial buffers, so all we have to do is get rid of the Vmin. Also, if xf86EloGetPacket() returns !Success, we should continue rather than break so the xf86WaitForInput call can decide whether to exit, in case there's more data in the buffer. Before the fix, glxgears was giving me about 390 FPS normally and down to 140 FPS when dragging an empty area of the touchscreen. Now it's basically unchanged when the touchscreen is in use (390 -> 385 FPS). X.Org Bug 14109 <https://bugs.freedesktop.org/show_bug.cgi?id=14109> Signed-off-by: Michael Smith <msm...@cbnco.com> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/src/xf86Elo.c b/src/xf86Elo.c index ad88621..dbe1747 100644 --- a/src/xf86Elo.c +++ b/src/xf86Elo.c @@ -421,15 +421,17 @@ xf86EloReadInput(LocalDevicePtr local) #endif DBG(4, ErrorF("Entering ReadInput\n")); + /* - * Try to get a packet. + * Read bytes until there's no data left. We may have more or less than + * one packet worth of data in the OS buffer. */ - while (xf86WaitForInput(local->fd, ELO_MAX_WAIT/100) > 0) { + do { if(xf86EloGetPacket(priv->packet_buf, &priv->packet_buf_p, &priv->checksum, local->fd) != Success) - break; + continue; /* * Process only ELO_TOUCHs here. @@ -488,6 +490,7 @@ xf86EloReadInput(LocalDevicePtr local) (state == ELO_PRESS) ? "Press" : ((state == ELO_RELEASE) ? "Release" : "Stream"))); } } + while (xf86WaitForInput(local->fd, 0) > 0); /* don't wait, just check */ } @@ -1059,8 +1062,6 @@ static const char *default_options[] = { "StopBits", "1", "DataBits", "8", "Parity", "None", - "Vmin", "10", - "Vtime", "1", "FlowControl", "None", NULL }; commit 35e222db5c09fdf37b621853791ebceba66e1a6d Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Sat Dec 5 02:09:22 2009 +0200 Build against Xserver 1.7. diff --git a/debian/changelog b/debian/changelog index 903177e..1949bfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ xserver-xorg-input-elographics (1:1.2.3-3) UNRELEASED; urgency=low * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. - -- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 30 Nov 2009 11:46:08 +0200 + -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:02 +0200 xserver-xorg-input-elographics (1:1.2.3-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 7eabcd6..9ad44df 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Julien Cristau <jcris...@debian. Build-Depends: debhelper (>= 5), pkg-config, - xserver-xorg-dev (>= 2:1.5.99.901), + xserver-xorg-dev (>= 2:1.7), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, commit 0a42bc536db64ab11f6e3101b7df82369bc86be1 Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Mon Nov 30 11:46:32 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index 122cbcb..903177e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-elographics (1:1.2.3-3) UNRELEASED; urgency=low + + * Bump Standards-Version to 3.8.3. + + -- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 30 Nov 2009 11:46:08 +0200 + xserver-xorg-input-elographics (1:1.2.3-2) unstable; urgency=low * Allow parallel builds. diff --git a/debian/control b/debian/control index 718f831..7eabcd6 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.7.3 +Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-elographics Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-elographics.git commit 60927fee86100e803f438036daeb94ba0b8e5db7 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Fri Nov 20 09:12:22 2009 +1000 Remove unused bits from configure.ac Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/configure.ac b/configure.ac index ee0e0a6..d1b776c 100644 --- a/configure.ac +++ b/configure.ac @@ -45,24 +45,6 @@ XORG_CWARNFLAGS AH_TOP([#include "xorg-server.h"]) -#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers]) -# -#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput], -# [Build XInput support (default: yes)]), -# [XINPUT=$enableval],[XINPUT=yes]) -#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes") -#if test "x$XINPUT" = "xyes" ; then -# AC_DEFINE(XINPUT,1,[Enable XInput support]) -#fi -# -#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb], -# [Build XKB support (default: yes)]), -# [XKB=$enableval],[XKB=yes]) -#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes") -#if test "x$XKB" = "xyes" ; then -# AC_DEFINE(XKB,1,[Enable XKB support]) -#fi - AC_ARG_WITH(xorg-module-dir, AC_HELP_STRING([--with-xorg-module-dir=DIR], [Default xorg module directory [[default=$libdir/xorg/modules]]]), commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1 Author: Julien Cristau <jcris...@debian.org> Date: Fri Sep 25 16:39:23 2009 +0200 xsfbs.mk: remove more obsolete code We can use plain debconf-updatepo, and don't need to clean the 'imports' directory or shlibs.local. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 82eb45f..5e16b10 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc rm -rf $(STAMP_DIR) - rm -rf imports - dh_clean debian/shlibs.local \ - debian/po/pothead - -# Generate the debconf templates POT file header. -debian/po/pothead: debian/po/pothead.in - sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \ - -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@ - -# Update POT and PO files. -.PHONY: updatepo -updatepo: debian/po/pothead - debian/scripts/debconf-updatepo --pot-header=pothead --verbose + dh_clean # Remove files from the upstream source tree that we don't need, or which have # licensing problems. It must be run before creating the .orig.tar.gz. commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc Author: Julien Cristau <jcris...@debian.org> Date: Fri Sep 25 15:43:28 2009 +0200 xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage These variables aren't set anywhere. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 1f86848..82eb45f 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -176,7 +176,7 @@ cleanscripts: xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc - rm -rf $(STAMP_DIR) $(SOURCE_DIR) + rm -rf $(STAMP_DIR) rm -rf imports dh_clean debian/shlibs.local \ debian/po/pothead @@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ - -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \ <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ rm $$MAINTSCRIPT.tmp; \ fi; \ commit bda208ec00d0b7b3632f57fb27e014684cdf73ba Author: Julien Cristau <jcris...@debian.org> Date: Fri Sep 25 15:33:39 2009 +0200 xsfbs.sh: fix typo and remove svn keyword diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 45acd59..813fd8d 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -1,5 +1,3 @@ -# $Id$ - # This is the X Strike Force shell library for X Window System package # maintainer scripts. It serves to define shell functions commonly used by # such packages, and performs some error checking necessary for proper operation @@ -8,7 +6,7 @@ # removal tasks. # If you are reading this within a Debian package maintainer script (e.g., -# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can +# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can # skip past this library by scanning forward in this file to the string # "GOBSTOPPER". commit 5693792171d885769e58dcccc053c08b11acd12a Author: Julien Cristau <jcris...@debian.org> Date: Wed Aug 26 18:53:36 2009 +0200 xsfbs.mk: no need for shlibs.local diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index f0f8953..1f86848 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -# Generate the shlibs.local file. -debian/shlibs.local: - cat debian/*.shlibs >$@ - SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) commit 1f858adff1ce2687cf542dd9b69b81137412f8a4 Author: Julien Cristau <jcris...@debian.org> Date: Wed Aug 26 18:47:09 2009 +0200 xsfbs.sh: remove unused reject_whitespace function diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index b3f4bbe..45acd59 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -93,22 +93,6 @@ reject_nondigits () { done } -reject_whitespace () { - # syntax: reject_whitespace [ operand ] - # - # scan operand (typically a shell variable whose value cannot be trusted) for - # whitespace characters and barf if any are found - if [ -n "$1" ]; then - # does the operand contain any whitespace? - if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then - # can't use die(), because I want to avoid forward references - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \ - "possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - fi -} - reject_unlikely_path_chars () { # syntax: reject_unlikely_path_chars [ operand ... ] # commit 0dd71e12416aa7dc60ed68af8127e04609b125f4 Author: Julien Cristau <jcris...@debian.org> Date: Wed Aug 26 18:23:53 2009 +0200 xsfbs.sh: remove unused find_culprits function diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 7dbb196..b3f4bbe 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -199,53 +199,6 @@ usage_error () { exit $SHELL_LIB_USAGE_ERROR } -find_culprits () { - local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ - msg - - reject_whitespace "$1" - message "Searching for overlapping packages..." - dpkg_info_dir=/var/lib/dpkg/info - if [ -d $dpkg_info_dir ]; then - if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then - possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \ -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1p5oon-0001kk...@alioth.debian.org