rpms/libsynaptics/F-10 Shm_0_15_2, NONE, 1.1 libsynaptics-0.14.6c-driverver.patch, NONE, 1.1 libsynaptics.spec, 1.9, 1.10
Orion Poplawski
orion at fedoraproject.org
Sat Dec 6 15:46:23 UTC 2008
- Previous message (by thread): rpms/libsynaptics/F-9 Shm_0_15_1, NONE, 1.1 libsynaptics-0.14.6c-driverver.patch, NONE, 1.1 libsynaptics.spec, 1.7, 1.8
- Next message (by thread): rpms/brasero/devel .cvsignore, 1.13, 1.14 brasero.spec, 1.30, 1.31 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/pkgs/rpms/libsynaptics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5936
Modified Files:
libsynaptics.spec
Added Files:
Shm_0_15_2 libsynaptics-0.14.6c-driverver.patch
Log Message:
* Sat Dec 6 2008 Orion Poplawski <orion at cora.nwra.com> - 0.14.6c-6
- Support synaptics versioin 0.15.2
--- NEW FILE Shm_0_15_2 ---
/*
* Permission to use, copy, modify, distribute, and sell this software
* and its documentation for any purpose is hereby granted without
* fee, provided that the above copyright notice appear in all copies
* and that both that copyright notice and this permission notice
* appear in supporting documentation, and that the name of Red Hat
* not be used in advertising or publicity pertaining to distribution
* of the software without specific, written prior permission. Red
* Hat makes no representations about the suitability of this software
* for any purpose. It is provided "as is" without express or implied
* warranty.
*
* THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
* NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef SHM_15_2
#define SHM_15_2
#include <X11/Xdefs.h>
typedef enum {
F1_CLICK1 = 0, /* Click left, one finger */
F2_CLICK1, /* Click left, two fingers */
F3_CLICK1, /* Click left, three fingers */
MAX_CLICK
} ClickFingerEvent;
typedef struct
{
int version; /* Driver version */
/* Current device state */
int x, y; /* actual x, y coordinates */
int z; /* pressure value */
int numFingers; /* number of fingers */
int fingerWidth; /* finger width value */
int left, right, up, down; /* left/right/up/down buttons */
Bool multi[8];
Bool middle;
int guest_left, guest_mid, guest_right; /* guest device buttons */
int guest_dx, guest_dy; /* guest device movement */
/* Probed hardware properties */
SynapticsHwInfo synhw;
/* Parameter data */
int left_edge, right_edge, top_edge, bottom_edge; /* edge coordinates absolute */
int finger_low, finger_high, finger_press; /* finger detection values in Z-values */
int tap_time;
int tap_move; /* max. tapping time and movement in packets and coord. */
int single_tap_timeout; /* timeout to recognize a single tap */
int tap_time_2; /* max. tapping time for double taps */
int click_time; /* The duration of a single click */
Bool fast_taps; /* Faster reaction to single taps */
int emulate_mid_button_time; /* Max time between left and right button presses to
emulate a middle button press. */
int emulate_twofinger_z; /* pressure threshold to emulate two finger touch (for Alps) */
int scroll_dist_vert; /* Scrolling distance in absolute coordinates */
int scroll_dist_horiz; /* Scrolling distance in absolute coordinates */
Bool scroll_edge_vert; /* Enable/disable vertical scrolling on right edge */
Bool scroll_edge_horiz; /* Enable/disable horizontal scrolling on left edge */
Bool scroll_edge_corner; /* Enable/disable continuous edge scrolling when in the corner */
Bool scroll_twofinger_vert; /* Enable/disable vertical two-finger scrolling */
Bool scroll_twofinger_horiz; /* Enable/disable horizontal two-finger scrolling */
Bool special_scroll_area_right; /* Enable/disable autodetection right special scroll area */
double min_speed, max_speed, accl; /* movement parameters */
double trackstick_speed; /* trackstick mode speed */
int edge_motion_min_z; /* finger pressure at which minimum edge motion speed is set */
int edge_motion_max_z; /* finger pressure at which maximum edge motion speed is set */
int edge_motion_min_speed; /* slowest setting for edge motion speed */
int edge_motion_max_speed; /* fastest setting for edge motion speed */
Bool edge_motion_use_always; /* If false, egde motion is used only when dragging */
Bool updown_button_scrolling; /* Up/Down-Button scrolling or middle/double-click */
Bool leftright_button_scrolling; /* Left/right-button scrolling, or two lots of middle button */
Bool updown_button_repeat; /* If up/down button being used to scroll, auto-repeat?*/
Bool leftright_button_repeat; /* If left/right button being used to scroll, auto-repeat? */
int scroll_button_repeat; /* time, in milliseconds, between scroll events being
* sent when holding down scroll buttons */
int touchpad_off; /* Switches the touchpad off
* 0 : Not off
* 1 : Off
* 2 : Only tapping and scrolling off
*/
Bool guestmouse_off; /* Switches the guest mouse off */
Bool locked_drags; /* Enable locked drags */
int locked_drag_time; /* timeout for locked drags */
int tap_action[MAX_TAP]; /* Button to report on tap events */
int click_action[MAX_CLICK]; /* Button to report on click with fingers */
Bool circular_scrolling; /* Enable circular scrolling */
double scroll_dist_circ; /* Scrolling angle radians */
int circular_trigger; /* Trigger area for circular scrolling */
Bool circular_pad; /* Edge has an oval or circular shape */
Bool palm_detect; /* Enable Palm Detection */
int palm_min_width; /* Palm detection width */
int palm_min_z; /* Palm detection depth */
double coasting_speed; /* Coasting threshold scrolling speed */
int press_motion_min_z; /* finger pressure at which minimum pressure motion factor is applied */
int press_motion_max_z; /* finger pressure at which maximum pressure motion factor is applied */
double press_motion_min_factor; /* factor applied on speed when finger pressure is at minimum */
double press_motion_max_factor; /* factor applied on speed when finger pressure is at minimum */
Bool grab_event_device; /* grab event device for exclusive use? */
} ShmSegment_0_15_2;
#endif /* SHM_15_2 */
libsynaptics-0.14.6c-driverver.patch:
--- NEW FILE libsynaptics-0.14.6c-driverver.patch ---
--- libsynaptics-0.14.6c/Makefile.in.driverver 2007-02-05 16:07:35.000000000 -0700
+++ libsynaptics-0.14.6c/Makefile.in 2008-12-06 07:39:14.000000000 -0700
@@ -217,7 +217,7 @@
libsynaptics_la_SOURCES = pad.cpp pad.h synaptics.h syndebug.h synshm.h
libsynaptics_la_LDFLAGS = -version-info $(LIBRARY_VERSION)
library_includedir = $(includedir)/synaptics
-library_include_HEADERS = pad.h Shm_0_14_4 Shm_0_14_5 Shm_0_14_6 synaptics.h syndebug.h synparam.h synshm.h
+library_include_HEADERS = pad.h Shm_0_14_4 Shm_0_14_5 Shm_0_14_6 Shm_0_15_2 synaptics.h syndebug.h synparam.h synshm.h
padtest_SOURCES = padtest.cpp synaptics.h
padtest_LDADD = libsynaptics.la
all: all-am
--- libsynaptics-0.14.6c/pad.cpp.driverver 2008-12-05 22:16:51.000000000 -0700
+++ libsynaptics-0.14.6c/pad.cpp 2008-12-06 07:41:45.000000000 -0700
@@ -529,6 +529,10 @@
sizeOfShm = sizeof( ShmSegment_0_14_6 );
break;
+ case ( VER( 0, 15, 2 ) ):
+ sizeOfShm = sizeof( ShmSegment_0_15_2 );
+ break;
+
//
// TODO insert upcoming driver versions
//
--- libsynaptics-0.14.6c/synshm.h.driverver 2007-01-10 14:15:15.000000000 -0700
+++ libsynaptics-0.14.6c/synshm.h 2008-12-06 07:40:09.000000000 -0700
@@ -10,6 +10,7 @@
#include "Shm_0_14_4"
#include "Shm_0_14_5"
#include "Shm_0_14_6"
+ #include "Shm_0_15_2"
// for getting the driver version
typedef struct
@@ -25,6 +26,7 @@
ShmSegment_0_14_4 _0_14_4;
ShmSegment_0_14_5 _0_14_5;
ShmSegment_0_14_6 _0_14_6;
+ ShmSegment_0_15_2 _0_15_2;
// TODO make an entry for upcoming versions :)
} SynShm;
Index: libsynaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsynaptics/F-10/libsynaptics.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libsynaptics.spec 5 Aug 2008 23:06:45 -0000 1.9
+++ libsynaptics.spec 6 Dec 2008 15:45:53 -0000 1.10
@@ -1,13 +1,15 @@
Name: libsynaptics
Version: 0.14.6c
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Synaptics touchpad driver library
Group: Development/Libraries
License: GPLv2
URL: http://qsynaptics.sourceforge.net/
Source0: http://qsynaptics.sourceforge.net/libsynaptics-%{version}.tar.bz2
+Source1: Shm_0_15_2
Patch0: libsynaptics-0.14.6c-gcc43.patch
+Patch1: libsynaptics-0.14.6c-driverver.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xorg-x11-proto-devel
@@ -30,7 +32,9 @@
%prep
%setup -q
+cp %SOURCE1 .
%patch0 -p1 -b .gcc43
+%patch1 -p1 -b .driverver
%build
@@ -60,6 +64,9 @@
%changelog
+* Sat Dec 6 2008 Orion Poplawski <orion at cora.nwra.com> - 0.14.6c-6
+- Support synaptics versioin 0.15.2
+
* Tue Aug 5 2008 Orion Poplawski <orion at cora.nwra.com> - 0.14.6c-5
- Change patch to patch0
- Previous message (by thread): rpms/libsynaptics/F-9 Shm_0_15_1, NONE, 1.1 libsynaptics-0.14.6c-driverver.patch, NONE, 1.1 libsynaptics.spec, 1.7, 1.8
- Next message (by thread): rpms/brasero/devel .cvsignore, 1.13, 1.14 brasero.spec, 1.30, 1.31 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list