upload tizen2.0 source

diff --git a/debian/changelog b/debian/changelog
index f45efac..c6c0520 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+xserver-xorg-input-gesture (0.1.0-7) unstable; urgency=low
+
+  * do not install libtool files
+  * Git: slp/pkgs/xorg/driver/xserver-xorg-input-gesture
+  * Tag: xserver-xorg-input-gesture_0.1.0-7
+
+ -- SooChan Lim <sc1.lim@samsung.com>  Fri, 18 May 2012 09:27:37 +0900
+
+xserver-xorg-input-gesture (0.1.0-6) unstable; urgency=low
+
+  * Fix a bug : gesture driver doesn't work properly when id of multitouch devices is not consecutive
+  * Git: slp/pkgs/xorg/driver/xserver-xorg-input-gesture
+  * Tag: xserver-xorg-input-gesture_0.1.0-6
+
+ -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 02 Jan 2012 20:43:41 +0900
+
+xserver-xorg-input-gesture (0.1.0-5) unstable; urgency=low
+
+  * Implement multi-finger pinchrotation
+  * Git: slp/pkgs/xorg/driver/xserver-xorg-input-gesture
+  * Tag: xserver-xorg-input-gesture_0.1.0-5
+
+ -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 20 Dec 2011 13:15:05 +0900
+
 xserver-xorg-input-gesture (0.1.0-4) unstable; urgency=low
 
   * Exception handling routine added. This commit is to fix Xorg BS problem at booting time.

diff --git a/debian/control b/debian/control
index aeced7a..19f809e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-gesture
 Section: x11
 Priority: optional
 Maintainer: Sung-Jin Park <sj76.park@samsung.com>, Sangjin Lee <lsj119.@samsung.com>
-Uploaders: Sung-Jin Park <sj76.park@samsung.com>
+Uploaders: Sung-Jin Park <sj76.park@samsung.com>, SooChan Lim <sc1.lim@samsung.com>
 Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 1.9.3-19slp2), x11proto-core-dev, dpkg-dev (>= 1.14.17), automake, libtool, xutils-dev (>= 1:7.3~1), libpixman-1-dev, x11proto-gesture-dev (>= 0.1.0-1)
 #Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 1.6.99.900), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, x11proto-kb-dev, libxkbfile-dev, dpkg-dev (>= 1.14.17), automake, libtool, xutils-dev (>= 1:7.3~1)
 Standards-Version: 3.8.3

diff --git a/debian/xserver-xorg-input-gesture.install b/debian/xserver-xorg-input-gesture.install
index 1002d70..4ac2576 100644 (file)
--- a/debian/xserver-xorg-input-gesture.install
+++ b/debian/xserver-xorg-input-gesture.install
@@ -1,2 +1 @@
 usr/lib/xorg/modules/input/*.so
-usr/lib/xorg/modules/input/*.la

diff --git a/packaging/xorg-x11-drv-input-gesture.spec b/packaging/xorg-x11-drv-gesture.spec
similarity index 70%
rename from packaging/xorg-x11-drv-input-gesture.spec
rename to packaging/xorg-x11-drv-gesture.spec
index 14cd9bb..fcd7cc8 100644 (file)
--- a/packaging/xorg-x11-drv-input-gesture.spec
+++ b/packaging/xorg-x11-drv-gesture.spec
@@ -1,13 +1,13 @@
-Name:       xorg-x11-drv-input-gesture
+#sbs-git:slp/pkgs/xorg/driver/xserver-xorg-input-gesture xorg-x11-drv-gesture 0.1.0 fb1092a8ea453d658b38d5c28e67a58462d7c931
+Name:  xorg-x11-drv-gesture
 Summary:    X.Org X server -- Xserver gesture driver
-Version:       0.1.0
+Version: 0.1.0
 Release:    4
 Group:      System/X Hardware Support
 License:    MIT
 Source0:    %{name}-%{version}.tar.gz
-Requires:   xserver-xorg-core
 BuildRequires:  pkgconfig(xorg-server)
-BuildRequires:  pkgconfig(gestureproto)
+BuildRequires:  xorg-x11-proto-gesture
 BuildRequires:  pkgconfig(xproto)
 BuildRequires:  pkgconfig(inputproto)
 BuildRequires:  pkgconfig(xorg-macros)
@@ -23,7 +23,7 @@ Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
-xorg-x11-drv-input-gesture development files
+xorg-x11-drv-gesture development files
 
 
 %prep
@@ -33,6 +33,7 @@ xorg-x11-drv-input-gesture development files
 
 autoreconf -vfi
 ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+#./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info CFLAGS="$CFLAGS -D__DETAIL_DEBUG__ -D__DEBUG_EVENT_HANDLER__ " LDFLAGS="$LDFLAGS"
 
 make %{?jobs:-j%jobs}
 

diff --git a/src/gesture.c b/src/gesture.c
index 6f41e66..fa3928a 100755 (executable)
--- a/src/gesture.c
+++ b/src/gesture.c
@@ -73,7 +73,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <xorg/mi.h>
 
 //Basic functions
-static InputInfoPtr GesturePreInit(InputDriverPtr  drv, IDevPtr dev, int flags);
+static InputInfoPtr GesturePreInit(InputDriverPtr  drv, InputInfoPtr pInfo, int flags);
 static void GestureUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
 static pointer GesturePlug(pointer module, pointer options, int *errmaj, int  *errmin);
 static void GestureUnplug(pointer p);
@@ -812,7 +812,7 @@ cleanup_pinchrotation:
 
        if( g_pGesture->filter_mask == GESTURE_FILTER_MASK_ALL )
        {
-#ifdef __DETAIL_DEBUG__
+#if 1//def __DETAIL_DEBUG__
                ErrorF("[GroupPinchRotation][cleanup] GestureFlushOrDrop() !\n");
 #endif//__DETAIL_DEBUG__
 
@@ -2779,46 +2779,43 @@ GestureUnplug(pointer p)
 }
 
 static InputInfoPtr
-GesturePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+GesturePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
 {
-    InputInfoPtr        pInfo;
+    int rc = BadAlloc;
     GestureDevicePtr    pGesture;
 
-    if (!(pInfo = xf86AllocateInput(drv, 0)))
-        return NULL;
-
     pGesture = calloc(1, sizeof(GestureDeviceRec));
+
     if (!pGesture) {
         pInfo->private = NULL;
-        xf86DeleteInput(pInfo, 0);
-        return NULL;
+        //xf86DeleteInput(pInfo, 0);
+        goto error;
     }
 
     g_pGesture = pGesture;
     pInfo->private = pGesture;
-    pInfo->name = xstrdup(dev->identifier);
     pInfo->flags = 0;
-    pInfo->type_name = XI_MOUSE; /* see XI.h */
-    pInfo->conf_idev = dev;
     pInfo->read_input = GestureReadInput; /* new data avl */
     pInfo->switch_mode = NULL; /* toggle absolute/relative mode */
     pInfo->device_control = GestureControl; /* enable/disable dev */
     /* process driver specific options */
-    pGesture->device = xf86SetStrOption(dev->commonOptions, "Device", "/dev/null");
-    pGesture->is_active = xf86SetIntOption(dev->commonOptions, "Activate", 0);
+    pGesture->device = xf86SetStrOption(pInfo->options, "Device", "/dev/null");
+    pGesture->is_active = xf86SetIntOption(pInfo->options, "Activate", 0);
     pGesture->gestureWin = None;
 
     xf86Msg(X_INFO, "%s: Using device %s.\n", pInfo->name, pGesture->device);
 
     /* process generic options */
-    xf86CollectInputOptions(pInfo, NULL, NULL);
+    xf86CollectInputOptions(pInfo, NULL);
     xf86ProcessCommonOptions(pInfo, pInfo->options);
 
     pInfo->fd = -1;
-    pInfo->flags |= XI86_POINTER_CAPABLE;
-    pInfo->flags |= XI86_OPEN_ON_INIT;
-    pInfo->flags |= XI86_CONFIGURED;
-    return pInfo;
+    return Success;
+
+error:
+    if (pInfo->fd >= 0)
+        close(pInfo->fd);
+    return rc;
 }
 
 static void