diff options
| author | miwi <miwi@FreeBSD.org> | 2008-05-30 21:43:35 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-05-30 21:43:35 +0800 |
| commit | 11120145f5237aaab1ee3372f99d1b3514b9201c (patch) | |
| tree | 26bb05441bc53a55e1102e2fb0286e222f4ea2c6 /x11-toolkits/plib/files | |
| parent | ff0a6ef89d8110f49b7c697c110e50171ce1058c (diff) | |
| download | freebsd-ports-gnome-11120145f5237aaab1ee3372f99d1b3514b9201c.tar.gz freebsd-ports-gnome-11120145f5237aaab1ee3372f99d1b3514b9201c.tar.zst freebsd-ports-gnome-11120145f5237aaab1ee3372f99d1b3514b9201c.zip | |
- Update to 1.8.5
PR: 124046
Submitted by: Ports Fury
Diffstat (limited to 'x11-toolkits/plib/files')
| -rw-r--r-- | x11-toolkits/plib/files/patch-src::sl::slPortability.h | 11 | ||||
| -rw-r--r-- | x11-toolkits/plib/files/patch-src_js_jsBSD.cxx | 48 | ||||
| -rw-r--r-- | x11-toolkits/plib/files/patch-src_ssgAux_ssgaSky.h | 20 |
3 files changed, 0 insertions, 79 deletions
diff --git a/x11-toolkits/plib/files/patch-src::sl::slPortability.h b/x11-toolkits/plib/files/patch-src::sl::slPortability.h deleted file mode 100644 index b48641b6ae12..000000000000 --- a/x11-toolkits/plib/files/patch-src::sl::slPortability.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/sl/slPortability.h.orig Sat Sep 7 17:54:59 2002 -+++ ./src/sl/slPortability.h Sat Sep 7 17:55:22 2002 -@@ -74,7 +74,7 @@ - # if defined(__linux__) - # include <linux/soundcard.h> - # elif defined(__FreeBSD__) --# include <machine/soundcard.h> -+# include <sys/soundcard.h> - # else - /* - Tom thinks this file may be <sys/soundcard.h> under some diff --git a/x11-toolkits/plib/files/patch-src_js_jsBSD.cxx b/x11-toolkits/plib/files/patch-src_js_jsBSD.cxx deleted file mode 100644 index 12bfa1f86e75..000000000000 --- a/x11-toolkits/plib/files/patch-src_js_jsBSD.cxx +++ /dev/null @@ -1,48 +0,0 @@ ---- src/js/jsBSD.cxx.orig Wed Jan 12 02:22:26 2005 -+++ src/js/jsBSD.cxx Wed Dec 7 10:35:27 2005 -@@ -44,6 +44,8 @@ - #define HAVE_USB_JS 1 - #endif - -+#include <string.h> -+#include <errno.h> - #include <sys/ioctl.h> - #if defined(__FreeBSD__) - # include <sys/joystick.h> -@@ -312,7 +314,7 @@ - int buttons [ _JS_MAX_AXES ] ; - - rawRead ( buttons, axes ) ; -- error = axes[0] < -1000000000.0f ; -+ error = axes[0] < -1000000000.0f && axes[1] < -1000000000.0f ; - if ( error ) - return ; - -@@ -321,7 +323,11 @@ - joyfile = fopen ( joyfname, "r" ) ; - error = ( joyfile == NULL ) ; - if ( error ) -+ { -+ ulSetError ( UL_WARNING, "unable to open calibration file %s (%s), joystick %i disabled (you can generate the calibration file with the plib-jscal utility)", -+ joyfname, strerror ( errno ), id + 1 ); - return ; -+ } - - noargs = fscanf ( joyfile, "%d%f%f%f%f%f%f", &in_no_axes, - &min [ 0 ], ¢er [ 0 ], &max [ 0 ], -@@ -445,8 +451,13 @@ - - if ( axes != NULL ) - { -- axes[0] = (float) os->ajs.x ; -- axes[1] = (float) os->ajs.y ; -+ if ( os->ajs.x >= -1000000000 ) -+ os->cache_axes[0] = os->ajs.x; -+ if ( os->ajs.y >= -1000000000 ) -+ os->cache_axes[1] = os->ajs.y; -+ -+ axes[0] = os->cache_axes[0]; -+ axes[1] = os->cache_axes[1]; - } - - return; diff --git a/x11-toolkits/plib/files/patch-src_ssgAux_ssgaSky.h b/x11-toolkits/plib/files/patch-src_ssgAux_ssgaSky.h deleted file mode 100644 index 7b3c18351dd9..000000000000 --- a/x11-toolkits/plib/files/patch-src_ssgAux_ssgaSky.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/ssgAux/ssgaSky.h.orig Fri Apr 6 03:58:33 2007 -+++ src/ssgAux/ssgaSky.h Fri Apr 6 03:58:45 2007 -@@ -104,7 +104,7 @@ - ssgaCelestialBodyList ( int init = 3 ) - : ssgSimpleList ( sizeof(ssgaCelestialBody*), init ) { } - -- ssgaCelestialBodyList::~ssgaCelestialBodyList () { removeAll(); } -+ ~ssgaCelestialBodyList () { removeAll(); } - - int getNum (void) { return total ; } - -@@ -192,7 +192,7 @@ - ssgaCloudLayerList ( int init = 3 ) - : ssgSimpleList ( sizeof(ssgaCloudLayer*), init ) { } - -- ssgaCloudLayerList::~ssgaCloudLayerList () { removeAll(); } -+ ~ssgaCloudLayerList () { removeAll(); } - - int getNum (void) { return total ; } - |