[SCM] ois/master: Add patch to fix FTBFS with GCC 4.7.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Apr 6 07:25:41 UTC 2012


The following commit has been merged in the master branch:
commit 5886dbd399359c5a6ca7aa738e9542bb5c0ec9f4
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Apr 6 09:25:09 2012 +0200

    Add patch to fix FTBFS with GCC 4.7.
    
    Closes: #667309

diff --git a/debian/patches/gcc47.diff b/debian/patches/gcc47.diff
new file mode 100644
index 0000000..bdbb7b5
--- /dev/null
+++ b/debian/patches/gcc47.diff
@@ -0,0 +1,51 @@
+Description: Add missing #include <unistd.h> to prevent build failure with GCC4.7.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667309
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded:
+ https://sourceforge.net/tracker/?func=detail&aid=3515396&group_id=149835&atid=775955
+---
+ demos/FFConsoleDemo.cpp           |    1 +
+ demos/OISConsole.cpp              |    1 +
+ src/linux/LinuxForceFeedback.cpp  |    1 +
+ src/linux/LinuxJoyStickEvents.cpp |    1 +
+ 4 files changed, 4 insertions(+)
+
+--- ois.orig/src/linux/LinuxJoyStickEvents.cpp
++++ ois/src/linux/LinuxJoyStickEvents.cpp
+@@ -30,6 +30,7 @@ restrictions:
+ #include "OISEvents.h"
+ #include "OISException.h"
+ 
++#include <unistd.h>
+ #include <fcntl.h>        //Needed to Open a file descriptor
+ #include <cassert>	
+ #include <linux/input.h>
+--- ois.orig/src/linux/LinuxForceFeedback.cpp
++++ ois/src/linux/LinuxForceFeedback.cpp
+@@ -26,6 +26,7 @@ restrictions:
+ #include <cstdlib>
+ #include <errno.h>
+ #include <memory.h>
++#include <unistd.h>
+ 
+ using namespace OIS;
+ 
+--- ois.orig/demos/OISConsole.cpp
++++ ois/demos/OISConsole.cpp
+@@ -12,6 +12,7 @@
+ #include <iostream>
+ #include <vector>
+ #include <sstream>
++#include <unistd.h>
+ 
+ ////////////////////////////////////Needed Windows Headers////////////
+ #if defined OIS_WIN32_PLATFORM
+--- ois.orig/demos/FFConsoleDemo.cpp
++++ ois/demos/FFConsoleDemo.cpp
+@@ -1,5 +1,6 @@
+ #include "OIS.h"
+ 
++#include <unistd.h>
+ #include <math.h>
+ #include <cstdlib>
+ #include <iostream>
diff --git a/debian/patches/series b/debian/patches/series
index 8cb5789..8d26d1c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 autotools.diff
 console.patch
+gcc47.diff

-- 
ois packaging



More information about the pkg-multimedia-commits mailing list