[86549] trunk/dports/devel/plib

[ryandesign at macports.org]

Revision: 86549
          http://trac.macports.org/changeset/86549
Author:   ryandesign at macports.org
Date:     2011-10-28 03:45:00 -0700 (Fri, 28 Oct 2011)
Log Message:
-----------
plib: fix a bug in joystick support; see #31814

Modified Paths:
--------------
    trunk/dports/devel/plib/Portfile

Added Paths:
-----------
    trunk/dports/devel/plib/files/patch-src_js_jsMacOSX.cxx.diff

Modified: trunk/dports/devel/plib/Portfile
===================================================================
--- trunk/dports/devel/plib/Portfile	2011-10-28 10:11:28 UTC (rev 86548)
+++ trunk/dports/devel/plib/Portfile	2011-10-28 10:45:00 UTC (rev 86549)
@@ -5,6 +5,7 @@
 
 name                plib
 version             1.8.5
+revision            1
 categories          devel graphics games
 maintainers         nomaintainer
 description         A Suite of Portable Game Libraries
@@ -23,7 +24,9 @@
                     sha1 c2cf7e3e1e58f7b63dae4bb21e4fa82c3e4d4cfc \
                     rmd160 55019bf3758ec2542804d8e3994f4bed5a188e60
 
-patchfiles          patch-src_pui_puGLUT.h.diff patch-src_ssg_ssgLoadFLT.cxx.diff
+patchfiles          patch-src_js_jsMacOSX.cxx.diff \
+                    patch-src_pui_puGLUT.h.diff \
+                    patch-src_ssg_ssgLoadFLT.cxx.diff
 
 platform darwin 8 {
     patchfiles-delete   patch-src_ssg_ssgLoadFLT.cxx.diff

Added: trunk/dports/devel/plib/files/patch-src_js_jsMacOSX.cxx.diff
===================================================================
--- trunk/dports/devel/plib/files/patch-src_js_jsMacOSX.cxx.diff	                        (rev 0)
+++ trunk/dports/devel/plib/files/patch-src_js_jsMacOSX.cxx.diff	2011-10-28 10:45:00 UTC (rev 86549)
@@ -0,0 +1,16 @@
+--- src/js/jsMacOSX.cxx.orig	2011-10-28 10:30:30.000000000 +0100
++++ src/js/jsMacOSX.cxx	2011-10-28 10:31:50.000000000 +0100
+@@ -261,8 +261,11 @@
+ 
+ void jsJoystick::close()
+ {
+-	if (os->hidDev != NULL)  (*(os->hidDev))->close(os->hidDev);
+-	if (os) delete os;
++    if (os) {
++        if (os->hidDev)  (*(os->hidDev))->close(os->hidDev);
++        delete os;
++        os = NULL;
++    }
+ }
+ 
+ /** element enumerator function : pass NULL for top-level*/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111028/38d58b29/attachment.html>