Merge lp:~tomasgroth/openlp/vlc-win-fix into lp:openlp/2.2

Proposed by Tomas Groth
Status: Merged
Merged at revision: 2565
Proposed branch: lp:~tomasgroth/openlp/vlc-win-fix
Merge into: lp:openlp/2.2
Diff against target: 11 lines (+1/-0)
1 file modified
openlp/core/ui/media/vendor/vlc.py (+1/-0)
To merge this branch: bzr merge lp:~tomasgroth/openlp/vlc-win-fix
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+275557@code.launchpad.net

Description of the change

Implement a workaround for a PyInstaller 3.0 bug to load vlc.

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) wrote :

lp:~tomasgroth/openlp/vlc-win-fix (revision 2563)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1153/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1076/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1017/
[SUCCESS] https//ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/864/
[SUCCESS] https//ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/461/
[SUCCESS] https//ci.openlp.io/job/Branch-05a-Code_Analysis/582/
[SUCCESS] https//ci.openlp.io/job/Branch-05b-Test_Coverage/453/

Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
Revision history for this message
Tomas Groth (tomasgroth) wrote :

The issue seems to have been solved in PyInstallers current git. See https://github.com/pyinstaller/pyinstaller/issues/1609 and https://github.com/pyinstaller/pyinstaller/issues/1620.
Don't know if there is any need for merging this then...

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Was this actually fixed? Do we need ElderP to try?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openlp/core/ui/media/vendor/vlc.py'
--- openlp/core/ui/media/vendor/vlc.py 2015-09-03 19:11:08 +0000
+++ openlp/core/ui/media/vendor/vlc.py 2015-10-23 17:27:00 +0000
@@ -107,6 +107,7 @@
107 except OSError: # may fail107 except OSError: # may fail
108 dll = ctypes.CDLL('libvlc.so.5')108 dll = ctypes.CDLL('libvlc.so.5')
109 elif sys.platform.startswith('win'):109 elif sys.platform.startswith('win'):
110 ctypes.windll.kernel32.SetDllDirectoryW(None)
110 p = find_library('libvlc.dll')111 p = find_library('libvlc.dll')
111 if p is None:112 if p is None:
112 try: # some registry settings113 try: # some registry settings

Subscribers

People subscribed via source and target branches

to all changes: