Merge lp:~oif-packaging/frame/ubuntu.v1.1.2 into lp:frame/ubuntu

[Henrik Rydberg]

[Henrik Rydberg (rydberg)]

Packaging for the evemu replay feature in utouch-frame-test-mtdev.

[Henrik Rydberg (rydberg)]

Added an xi-enabled version in the utouch unstable ppa. Test tool: utouch-frame-test-xi2

[Henrik Rydberg (rydberg)]

This branch was approved, merged and released already.

review: Approve

[Henrik Rydberg (rydberg)]

No it is not, sorry about that.

[Henrik Rydberg (rydberg)]

It seems the FFe has been approved, so a review of this branch and subsequent upload before adding more new stuff seems like a good idea.

[Chase Douglas (chasedouglas)]

Looks good to me. I think we should aim for oneiric with this though, so lets merge it and get it into a daily build. We can do an upstream release when we want to too.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-02-24 15:01:51 +0000
+++ ChangeLog	2011-03-16 07:08:31 +0000
@@ -1,4 +1,37 @@
 ------------------------------------------------------------
+revno: 29
+tags: v1.1.2
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-03-15 20:15:23 +0100
+message:
+  Release version 1.1.2
+  
+  Signed-off-by: Henrik Rydberg <[e-mail]>
+------------------------------------------------------------
+revno: 28
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-03-15 20:15:17 +0100
+message:
+  Allow replay of device data through utouch-frame
+  
+  This patch adds replay capabilities to test-mtdev.
+  If the specified device points to a valid evemu file,
+  the device properties will be extracted from that file
+  instead. Any appended event data will be replayed in
+  realtime. In practise, test-mtdev can be executed with
+  a test file.
+  
+  Signed-off-by: Henrik Rydberg <[e-mail]>
+------------------------------------------------------------
+revno: 27 [merge]
+committer: Stephen M. Webb <[e-mail]>
+branch nick: utouch-frame
+timestamp: Tue 2011-03-15 15:04:33 -0400
+message:
+  Added a dependency check on xorg-server-dev when building with xi2 support.
+------------------------------------------------------------
 revno: 26
 tags: v1.1.1
 committer: Henrik Rydberg <[e-mail]>
 
=== modified file 'configure'
--- configure	2011-02-24 15:03:01 +0000
+++ configure	2011-03-16 07:08:31 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Touch Frame Library 1.1.1.
+# Generated by GNU Autoconf 2.67 for Touch Frame Library 1.1.2.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@
 # Identity of this package.
 PACKAGE_NAME='Touch Frame Library'
 PACKAGE_TARNAME='utouch-frame'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='Touch Frame Library 1.1.1'
+PACKAGE_VERSION='1.1.2'
+PACKAGE_STRING='Touch Frame Library 1.1.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1440,7 +1440,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 Touch Frame Library 1.1.1 to adapt to many kinds of systems.
+\`configure' configures Touch Frame Library 1.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1510,7 +1510,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Touch Frame Library 1.1.1:";;
+     short | recursive ) echo "Configuration of Touch Frame Library 1.1.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1626,7 +1626,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Touch Frame Library configure 1.1.1
+Touch Frame Library configure 1.1.2
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1904,7 +1904,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Touch Frame Library $as_me 1.1.1, which was
+It was created by Touch Frame Library $as_me 1.1.2, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2724,7 +2724,7 @@
 
 # Define the identity of the package.
  PACKAGE='utouch-frame'
- VERSION='1.1.1'
+ VERSION='1.1.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11282,12 +11282,12 @@
     pkg_cv_EVEMU_CFLAGS="$EVEMU_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "utouch-evemu >= 1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu >= 1.0.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "utouch-evemu >= 1.0.5") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "utouch-evemu >= 1.0" 2>/dev/null`
+  pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "utouch-evemu >= 1.0.5" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11298,12 +11298,12 @@
     pkg_cv_EVEMU_LIBS="$EVEMU_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "utouch-evemu >= 1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu >= 1.0.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "utouch-evemu >= 1.0.5") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "utouch-evemu >= 1.0" 2>/dev/null`
+  pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "utouch-evemu >= 1.0.5" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11323,14 +11323,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "utouch-evemu >= 1.0" 2>&1`
+	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "utouch-evemu >= 1.0.5" 2>&1`
         else
-	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors "utouch-evemu >= 1.0" 2>&1`
+	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors "utouch-evemu >= 1.0.5" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EVEMU_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (utouch-evemu >= 1.0) were not met:
+	as_fn_error $? "Package requirements (utouch-evemu >= 1.0.5) were not met:
 
 $EVEMU_PKG_ERRORS
 
@@ -11389,12 +11389,21 @@
     pkg_cv_XINPUT_CFLAGS="$XINPUT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xext
+                             xi >= 1.4.1.99.1
+                             inputproto >= 2.0.99.1
+                             xorg-server\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "x11 xext
+                             xi >= 1.4.1.99.1
+                             inputproto >= 2.0.99.1
+                             xorg-server") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_XINPUT_CFLAGS=`$PKG_CONFIG --cflags "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1" 2>/dev/null`
+  pkg_cv_XINPUT_CFLAGS=`$PKG_CONFIG --cflags "x11 xext
+                             xi >= 1.4.1.99.1
+                             inputproto >= 2.0.99.1
+                             xorg-server" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11405,12 +11414,21 @@
     pkg_cv_XINPUT_LIBS="$XINPUT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xext
+                             xi >= 1.4.1.99.1
+                             inputproto >= 2.0.99.1
+                             xorg-server\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "x11 xext
+                             xi >= 1.4.1.99.1
+                             inputproto >= 2.0.99.1
+                             xorg-server") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_XINPUT_LIBS=`$PKG_CONFIG --libs "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1" 2>/dev/null`
+  pkg_cv_XINPUT_LIBS=`$PKG_CONFIG --libs "x11 xext
+                             xi >= 1.4.1.99.1
+                             inputproto >= 2.0.99.1
+                             xorg-server" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11430,14 +11448,23 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1" 2>&1`
+	        XINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xext
+                             xi >= 1.4.1.99.1
+                             inputproto >= 2.0.99.1
+                             xorg-server" 2>&1`
         else
-	        XINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1" 2>&1`
+	        XINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xext
+                             xi >= 1.4.1.99.1
+                             inputproto >= 2.0.99.1
+                             xorg-server" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XINPUT_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1) were not met:
+	as_fn_error $? "Package requirements (x11 xext
+                             xi >= 1.4.1.99.1
+                             inputproto >= 2.0.99.1
+                             xorg-server) were not met:
 
 $XINPUT_PKG_ERRORS
 
@@ -11470,6 +11497,7 @@
 
 fi
 
+
 fi
 
 # Extract the first word of "a2x", so it can be a program name with args.
@@ -12062,7 +12090,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Touch Frame Library $as_me 1.1.1, which was
+This file was extended by Touch Frame Library $as_me 1.1.2, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12128,7 +12156,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Touch Frame Library config.status 1.1.1
+Touch Frame Library config.status 1.1.2
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2011-02-24 15:03:01 +0000
+++ configure.ac	2011-03-16 07:08:31 +0000
@@ -1,7 +1,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([Touch Frame Library],
-        [1.1.1],
+        [1.1.2],
         [],
         [utouch-frame])
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -23,13 +23,17 @@
 AC_PROG_INSTALL
 
 PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.1])
-PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0])
+PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0.5])
 
 AC_ARG_WITH([xi], AS_HELP_STRING([--with-xi], [Build with XI2.1 support]))
 AM_CONDITIONAL([HAVE_XI], [test "x$with_xi" != "x"])
 
 AS_IF([test "x$with_xi" = "xyes"], [
-   PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.4.1.99.1] [inputproto >= 2.0.99.1])
+   PKG_CHECK_MODULES(XINPUT, x11 xext
+                             [xi >= 1.4.1.99.1]
+                             [inputproto >= 2.0.99.1]
+                             [xorg-server])
+
 ])
  
 AC_CHECK_PROG([ASCIIDOC], [a2x], [a2x])
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-02-24 16:17:17 +0000
+++ debian/changelog	2011-03-16 07:08:31 +0000
@@ -1,3 +1,11 @@
+utouch-frame (1.1.2-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Feature freeze exception LP: #735672
+  * Updated dependency evemu-1.0.5
+
+ -- Henrik Rydberg <[e-mail]>  Wed, 16 Mar 2011 08:08:58 +0100
+
 utouch-frame (1.1.1-0ubuntu1) natty; urgency=low
 
   [ Henrik Rydberg ]
 
=== modified file 'debian/control'
--- debian/control	2011-02-18 14:37:53 +0000
+++ debian/control	2011-03-16 07:08:31 +0000
@@ -13,7 +13,7 @@
                libtool,
                cdbs,
                libmtdev-dev (>= 1.1),
-               libutouch-evemu-dev (>= 1.0)
+               libutouch-evemu-dev (>= 1.0.5)
 Standards-Version: 3.9.1
 Vcs-Bzr: https://code.launchpad.net/~utouch-packaging/utouch-frame/ubuntu
 
 
=== modified file 'tools/utouch-frame-test-mtdev.1'
--- tools/utouch-frame-test-mtdev.1	2011-02-24 15:01:51 +0000
+++ tools/utouch-frame-test-mtdev.1	2011-03-16 07:08:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: utouch-frame-test-mtdev
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 02/24/2011
+.\"      Date: 03/15/2011
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "UTOUCH\-FRAME\-TEST\" "1" "02/24/2011" "\ \&" "\ \&"
+.TH "UTOUCH\-FRAME\-TEST\" "1" "03/15/2011" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'tools/utouch-frame-test-mtdev.c'
--- tools/utouch-frame-test-mtdev.c	2011-02-23 10:25:28 +0000
+++ tools/utouch-frame-test-mtdev.c	2011-03-16 07:08:31 +0000
@@ -36,25 +36,32 @@
 	struct evemu_device *evemu;
 	struct mtdev *mtdev;
 	utouch_frame_handle fh;
+	struct stat fs;
+	FILE *fptest;
+	int fd;
 };
 
-static int init_evemu(struct frame_test *test, int fd)
+static int init_evemu(struct frame_test *test)
 {
 	test->evemu = evemu_new(NULL);
 	if (!test->evemu)
 		return -1;
-	return evemu_extract(test->evemu, fd);
+	if (test->fptest)
+		return evemu_read(test->evemu, test->fptest) <= 0;
+	return evemu_extract(test->evemu, test->fd);
 }
 
-static int init_mtdev(struct frame_test *test, int fd)
+static int init_mtdev(struct frame_test *test)
 {
-	test->mtdev = mtdev_new_open(fd);
+	if (test->fptest)
+		return 0;
+	test->mtdev = mtdev_new_open(test->fd);
 	if (!test->mtdev)
 		return -1;
 	return 0;
 }
 
-static int init_frame(struct frame_test *test, int fd)
+static int init_frame(struct frame_test *test)
 {
 	test->fh = utouch_frame_new_engine(100, 32, 100);
 	if (!test->fh)
@@ -65,46 +72,71 @@
 static void destroy_all(struct frame_test *test)
 {
 	utouch_frame_delete_engine(test->fh);
-	mtdev_close_delete(test->mtdev);
+	if (test->mtdev)
+		mtdev_close_delete(test->mtdev);
 	evemu_delete(test->evemu);
+	if (test->fptest)
+		fclose(test->fptest);
+	else
+		ioctl(test->fd, EVIOCGRAB, 0);
+	close(test->fd);
 	memset(test, 0, sizeof(*test));
 }
 
-static void loop_device(struct frame_test *test, int fd)
+static void loop_device(struct frame_test *test)
 {
+	FILE * fp = test->fptest;
 	const struct utouch_frame *frame;
 	struct input_event ev;
 
-	while (!mtdev_idle(test->mtdev, fd, 5000)) {
-		while (mtdev_get(test->mtdev, fd, &ev, 1) > 0) {
+	if (fp) {
+		struct timeval evtime;
+		memset(&evtime, 0, sizeof(evtime));
+		while (evemu_read_event_realtime(fp, &ev, &evtime) > 0) {
 			frame = utouch_frame_pump_mtdev(test->fh, &ev);
 			if (frame)
 				report_frame(frame);
 		}
+	} else {
+		while (!mtdev_idle(test->mtdev, test->fd, 5000)) {
+			while (mtdev_get(test->mtdev, test->fd, &ev, 1) > 0) {
+				frame = utouch_frame_pump_mtdev(test->fh, &ev);
+				if (frame)
+					report_frame(frame);
+			}
+		}
 	}
 }
 
 int main(int argc, char *argv[])
 {
 	struct frame_test test;
-	int fd;
 
 	if (argc < 2) {
 		fprintf(stderr, "Usage: %s <device>\n", argv[0]);
 		return -1;
 	}
 
-	fd = open(argv[1], O_RDONLY | O_NONBLOCK);
-	if (fd < 0) {
+	memset(&test, 0, sizeof(test));
+
+	test.fd = open(argv[1], O_RDONLY | O_NONBLOCK);
+	if (test.fd < 0) {
 		fprintf(stderr, "error: could not open device\n");
 		return -1;
 	}
-	if (ioctl(fd, EVIOCGRAB, 1)) {
+	if (fstat(test.fd, &test.fs)) {
+		fprintf(stderr, "error: could not stat the device\n");
+		return -1;
+	}
+	if (!test.fs.st_rdev)
+		test.fptest = fdopen(test.fd, "r");
+
+	if (!test.fptest && ioctl(test.fd, EVIOCGRAB, 1)) {
 		fprintf(stderr, "error: could not grab the device\n");
 		return -1;
 	}
 
-	if (init_evemu(&test, fd)) {
+	if (init_evemu(&test)) {
 		fprintf(stderr, "error: could not describe device\n");
 		return -1;
 	}
@@ -115,19 +147,20 @@
 
 	fprintf(stderr, "device: %s\n", evemu_get_name(test.evemu));
 
-	if (init_mtdev(&test, fd)) {
+	if (init_mtdev(&test)) {
 		fprintf(stderr, "error: could not init mtdev\n");
 		return -1;
 	}
-	if (init_frame(&test, fd)) {
+	if (init_frame(&test)) {
 		fprintf(stderr, "error: could not init frame\n");
 		return -1;
 	}
 
 	report_device_caps(test.fh);
 
-	loop_device(&test, fd);
+	loop_device(&test);
 
 	destroy_all(&test);
+
 	return 0;
 }
 
=== modified file 'tools/utouch-frame-test-xi2.1'
--- tools/utouch-frame-test-xi2.1	2011-02-24 15:01:51 +0000
+++ tools/utouch-frame-test-xi2.1	2011-03-16 07:08:31 +0000
@@ -2,12 +2,12 @@
 .\"     Title: utouch-frame-test-xi2
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 02/24/2011
+.\"      Date: 03/15/2011
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "UTOUCH\-FRAME\-TEST\" "1" "02/24/2011" "\ \&" "\ \&"
+.TH "UTOUCH\-FRAME\-TEST\" "1" "03/15/2011" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------