aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--x11/libsynaptics/Makefile2
-rw-r--r--x11/libsynaptics/distinfo6
-rw-r--r--x11/libsynaptics/files/patch-pad.cpp19
-rw-r--r--x11/libsynaptics/pkg-plist2
4 files changed, 16 insertions, 13 deletions
diff --git a/x11/libsynaptics/Makefile b/x11/libsynaptics/Makefile
index 9a1fe4a92d07..d3debc96a8f1 100644
--- a/x11/libsynaptics/Makefile
+++ b/x11/libsynaptics/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libsynaptics
-PORTVERSION= 0.14.4d
+PORTVERSION= 0.14.6b
CATEGORIES= x11
MASTER_SITES= http://qsynaptics.sourceforge.net/
diff --git a/x11/libsynaptics/distinfo b/x11/libsynaptics/distinfo
index 8afaf5e33f43..0f14fa58501f 100644
--- a/x11/libsynaptics/distinfo
+++ b/x11/libsynaptics/distinfo
@@ -1,3 +1,3 @@
-MD5 (libsynaptics-0.14.4d.tar.bz2) = 1df76861480200343d7de52237e54249
-SHA256 (libsynaptics-0.14.4d.tar.bz2) = b2b7088d58fabba1d8a1be2ab21b8c8290cf91342e2d66bfe8d7ee09a299fe9d
-SIZE (libsynaptics-0.14.4d.tar.bz2) = 218980
+MD5 (libsynaptics-0.14.6b.tar.bz2) = 6ea2b72829df76138a9a1f03faeda438
+SHA256 (libsynaptics-0.14.6b.tar.bz2) = 05fd6d067a735e0534968acdad3276a87b7180f3c118e1cb75301132357c560f
+SIZE (libsynaptics-0.14.6b.tar.bz2) = 273936
diff --git a/x11/libsynaptics/files/patch-pad.cpp b/x11/libsynaptics/files/patch-pad.cpp
index 133cb7a5c40a..5da9ac8020d2 100644
--- a/x11/libsynaptics/files/patch-pad.cpp
+++ b/x11/libsynaptics/files/patch-pad.cpp
@@ -1,6 +1,6 @@
---- pad.cpp.orig Thu Apr 27 00:53:03 2006
-+++ pad.cpp Thu Apr 27 01:26:18 2006
-@@ -15,11 +15,13 @@
+--- pad.cpp.orig Thu Sep 14 13:51:00 2006
++++ pad.cpp Thu Sep 14 13:53:35 2006
+@@ -15,12 +15,14 @@
#include "version.h"
#include <X11/Xdefs.h> // for typedef Bool
@@ -8,6 +8,7 @@
#include <sys/shm.h>
#include <stdlib.h>
+#include <stdio.h>
+ #include <unistd.h>
#include <pthread.h>
-static pthread_mutex_t lock;
@@ -15,7 +16,7 @@
#define PAROFF( verId, par ) \
offsetof( SynShm, verId ) + offsetof( ShmSegment##verId, par )
-@@ -31,7 +33,7 @@
+@@ -32,7 +34,7 @@
p.max_val = max;
#define NODRIVERVER VER( 0, 0, 0 )
@@ -24,7 +25,7 @@
//
-@@ -81,7 +83,7 @@
+@@ -82,7 +84,7 @@
mSelf = new Synaptics::Pad(); // call constructor
else
{
@@ -33,7 +34,7 @@
return;
}
-@@ -310,7 +312,7 @@
+@@ -333,7 +335,7 @@
PadType pt = PT_NONE;
// FIXME: detection just based on the assumption that the driver will register as unknown
@@ -42,7 +43,7 @@
pt = PT_UNKNOWN;
else
{
-@@ -345,19 +347,19 @@
+@@ -368,19 +370,19 @@
{
Param p = mSupportedDriver[ DRIVERSTR ][ param ];
@@ -65,7 +66,7 @@
{
rd = *(double*)(((char*)mSynShm) + p.offset );
RETURN( rd );
-@@ -376,7 +378,7 @@
+@@ -399,7 +401,7 @@
{
Param p = mSupportedDriver[ DRIVERSTR ][ param ];
@@ -74,7 +75,7 @@
{
if ( p.type == PT_BOOL )
(*(Bool*)(((char*)mSynShm) + p.offset)) = (Bool)v;
-@@ -391,7 +393,7 @@
+@@ -414,7 +416,7 @@
}
}
// instead of RETURN(void)
diff --git a/x11/libsynaptics/pkg-plist b/x11/libsynaptics/pkg-plist
index 324b447e979b..30a1775d7c3b 100644
--- a/x11/libsynaptics/pkg-plist
+++ b/x11/libsynaptics/pkg-plist
@@ -1,4 +1,6 @@
include/synaptics/Shm_0_14_4
+include/synaptics/Shm_0_14_5
+include/synaptics/Shm_0_14_6
include/synaptics/pad.h
include/synaptics/synaptics.h
include/synaptics/syndebug.h