Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
extras
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Openvibe Group
extras
Commits
9da0373a
Commit
9da0373a
authored
9 years ago
by
Jussi Lindgren
Browse files
Options
Downloads
Patches
Plain Diff
Kernel: Disabled aborts on X errors on Fedora
parent
2655fa82
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+4
-2
4 additions, 2 deletions
CMakeLists.txt
kernel/src/kernel/player/ovkCOgreVisualisation.cpp
+24
-0
24 additions, 0 deletions
kernel/src/kernel/player/ovkCOgreVisualisation.cpp
with
28 additions
and
2 deletions
CMakeLists.txt
+
4
−
2
View file @
9da0373a
...
...
@@ -112,11 +112,13 @@ ELSEIF(UNIX)
endif
()
if
(
EXISTS
"/etc/debian_version"
)
set
(
PLATFORM
"Debian"
)
set
(
PLATFORM
"Debian"
)
ADD_DEFINITIONS
(
"-DTARGET_OS_Linux_Debian"
)
endif
(
EXISTS
"/etc/debian_version"
)
if
(
EXISTS
"/etc/fedora-release"
)
set
(
PLATFORM
"Fedora"
)
set
(
PLATFORM
"Fedora"
)
ADD_DEFINITIONS
(
"-DTARGET_OS_Linux_Fedora"
)
endif
(
EXISTS
"/etc/fedora-release"
)
ELSE
(
WIN32
)
...
...
This diff is collapsed.
Click to expand it.
kernel/src/kernel/player/ovkCOgreVisualisation.cpp
+
24
−
0
View file @
9da0373a
...
...
@@ -11,6 +11,26 @@
#include
"Overlay/OgreOverlaySystem.h"
#endif
#if defined(TARGET_OS_Linux_Fedora)
// @FIXME this is an awful hack to avoid crashes on our Fedora CI running on CloudStack VM.
// It seems that there we get difficult to track X11 errors from inside Ogre that
// 1) abort the application
// 2) do not seem to appear on a non-VM computer
// 3) seem to be of no concern to the automatic testing?
// Hence we just specify a dummy error handler until we can solve the problem.
#include
<stdio.h>
#include
<X11/Xlib.h>
static
int
errorHandlerHack
(
Display
*
display
,
XErrorEvent
*
event
)
{
(
void
)
fprintf
(
stderr
,
"WARNING: Ignored Xlib error: error_code=%d, request_code=%d
\n
"
,
event
->
error_code
,
event
->
request_code
)
;
return
0
;
}
#endif
using
namespace
std
;
using
namespace
Ogre
;
using
namespace
OpenViBE
;
...
...
@@ -135,6 +155,10 @@ boolean COgreVisualisation::initializeOgre(void) throw (std::exception)
//init Ogre w/o creating a default window
m_pRoot
->
initialise
(
false
);
m_bOgreInitialised
=
true
;
#if defined(TARGET_OS_Linux_Fedora)
XSetErrorHandler
(
errorHandlerHack
);
#endif
}
#if (OGRE_VERSION_MAJOR > 1) || ((OGRE_VERSION_MAJOR == 1) && (OGRE_VERSION_MINOR >= 9))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment