summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-09-29 18:44:47 +0200
committerwm4 <wm4@nowhere>2017-09-29 18:44:47 +0200
commite544c3f7b3a4c77753b3762abf114cc56b44d9c4 (patch)
tree33070a47a765aa77b91df95f69a827fc98082eaf /wscript
parent6a69e897ffff9c654563a6f449e5e66ace3a58a4 (diff)
downloadmpv-e544c3f7b3a4c77753b3762abf114cc56b44d9c4.tar.bz2
mpv-e544c3f7b3a4c77753b3762abf114cc56b44d9c4.tar.xz
vaapi: change license to LGPL
Originally mpv vaapi support was based on the MPlayer-vaapi patches. These were never merged in upstream MPlayer. The license headers indicated they were GPL-only. Although the actual author agreed to relicensing, the company employing him to write this code did not, so the original code is unusable to us. Fortunately, vaapi support was refactored and rewritten several times, meaning little code is actually left. The previous commits removed or moved that to GPL-only code. Namely, vo_vaapi.c remains GPL-only. The other code went away or became unnecessary mainly because libavcodec itself gained the ability to manage the hw decoder, and libavutil provides code to manage vaapi surfaces. We also changed to mainly using EGL interop, making any of the old rendering code unnecessary. hwdec_vaglx.c is still GPL. It's possibly relicensable, because much of it was changed, but I'm not too sure and further investigation would be required. Also, this has been disabled by default for a while now, so bothering with this is a waste of time. This commit simply disables it at compile time as well in LGPL mode.
Diffstat (limited to 'wscript')
-rw-r--r--wscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/wscript b/wscript
index e7f09bb5b7..6707f77198 100644
--- a/wscript
+++ b/wscript
@@ -700,7 +700,7 @@ video_output_features = [
}, {
'name': '--vaapi',
'desc': 'VAAPI acceleration',
- 'deps': 'gpl && libdl && (x11 || wayland || egl-drm)',
+ 'deps': 'libdl && (x11 || wayland || egl-drm)',
'func': check_pkg_config('libva', '>= 0.36.0'),
}, {
'name': '--vaapi-x11',
@@ -720,7 +720,7 @@ video_output_features = [
}, {
'name': '--vaapi-glx',
'desc': 'VAAPI GLX',
- 'deps': 'vaapi-x11 && gl-x11',
+ 'deps': 'gpl && vaapi-x11 && gl-x11',
'func': check_true,
}, {
'name': '--vaapi-x-egl',