Version 0.9.7

INRIA · Jun 1, 2016 · f7f7686 · f7f7686
1 parent a74fddb
commit f7f7686
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 17 deletions.
diff --git a/bindings/Node/libpointing/package.json b/bindings/Node/libpointing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "libpointing",
 
-  "version": "0.9.6",
+  "version": "0.9.7",
 
   "description": "An open-source cross-platform library to get raw events from pointing devices and master transfer functions",
 

diff --git a/bindings/Node/server/server.js b/bindings/Node/server/server.js
@@ -19,23 +19,14 @@ var pointing = require("libpointing");
 
 var manager = new pointing.PointingDeviceManager();
 var dManager = new pointing.DisplayDeviceManager();
+
 /*
 app.use('/static', express.static('static'));
 app.get('/', function(req, res) {
   res.sendFile(__dirname + '/index.html');
 });
 */
 
-function uriIsOK(deviceDescriptor) {
-  var ls = ['Keyboard', 'osxhid://0/AppleMikeyHIDDriver', 'osxhid:/USB/1d182000/AppleUSBMultitouchDriver', 'BNBTrackpadDevice', 'AppleUSBTCButtons'];
-  for (var i = 0; i < ls.length; i++) {
-    if (deviceDescriptor.devURI.indexOf(ls[i]) != -1) {
-      return false;
-    }
-  }
-  return true;
-}
-
 function logPointingDevice(desc, wasAdded) {
   console.log(new Date().toString() + ': device ' + (wasAdded ? 'added' : 'removed'));
   console.log('\twith URI: ' + desc.devURI);
@@ -68,10 +59,7 @@ io.on('connection', function(socket) {
   });
 
   socket.on('pointingDeviceList', function() {
-  	var ls = manager.deviceList.filter(function(deviceDescriptor) {
-      return uriIsOK(deviceDescriptor);
-    });
-    socket.emit('pointingDeviceList', ls);
+    socket.emit('pointingDeviceList', manager.deviceList);
   });
 
   socket.on('displayDeviceList', function() {

diff --git a/building-and-packaging/mac/create-formula b/building-and-packaging/mac/create-formula
@@ -49,7 +49,12 @@ to_subs = 'sha256 ' + '"' + sha256_val + '"'
 replaced = re.sub('sha256 ".*"', to_subs, replaced, 1)
 
 os.chdir(HOMEBREW_REPO)
+os.system("git remote add upstream https://github.com/Homebrew/homebrew-core.git")
+os.system("git fetch upstream")
+os.system("git checkout -b libpointing origin/master")
+os.system("git rebase upstream/master") # Update with upstream
 os.system("git checkout -b libpointing origin/libpointing")
+os.system("git rebase origin/master") # Update with master
 print "Making changes to the formula description in " + HOMEBREW_REPO_FILE
 with open(os.path.join(HERE, HOMEBREW_REPO_FILE), "w") as ruby_file:
     ruby_file.write(replaced)

diff --git a/building-and-packaging/mac/prepare b/building-and-packaging/mac/prepare
@@ -38,7 +38,7 @@ CPPFLAGS = [
     "-I%s"%INC,
     ]
 CXXFLAGS = [
-    "-mmacosx-version-min=10.7"
+    "-mmacosx-version-min=10.7 -std=c++11"
     ]
 
 LDFLAGS = [

diff --git a/pointing/pointing.h b/pointing/pointing.h
@@ -45,7 +45,7 @@
 
 #define LIBPOINTING_VER_MAJOR   0
 #define LIBPOINTING_VER_MINOR   9
-#define LIBPOINTING_VER_RELEASE 6
+#define LIBPOINTING_VER_RELEASE 7
 
 #define LIBPOINTING_VER_STRING	LIBPOINTING_VER_STRINGNUM(LIBPOINTING_VER_MAJOR) "."  \
 				LIBPOINTING_VER_STRINGNUM(LIBPOINTING_VER_MINOR) "."  \