Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Load libGL using low-level function without requiring pyopengl #7029

Merged
merged 1 commit into from
May 6, 2018
Merged

PR: Load libGL using low-level function without requiring pyopengl #7029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,7 @@ def run(self):
'numpydoc',
# Packages for pyqt5 are only available in
# Python 3
'pyqt5<5.10;python_version>="3"',
# This is only needed for our wheels on Linux.
# See issue #3332
'pyopengl;platform_system=="Linux"'
'pyqt5<5.10;python_version>="3"'
]

extras_require = {
Expand Down
7 changes: 4 additions & 3 deletions spyder/app/start.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-

# Std imports
import ctypes
import os
import os.path as osp
import random
Expand All @@ -12,10 +13,10 @@
# See issue 5324
import zmq

# This import is needed to fix errors with OpenGL when installed using pip
# See issue 3332
# Load GL library to prevent segmentation faults on some Linux systems
# See issues 3226 and 3332
try:
from OpenGL import GL
ctypes.CDLL("libGL.so.1", mode=ctypes.RTLD_GLOBAL)
except:
pass

Expand Down