Skip to content
Browse files

Fix VAAPI dependency check uncovered by ce56ef0

Would cause compilation failure if some VAAPI headers weren't installed
  • Loading branch information...
1 parent d732b79 commit 75c011a88fa75b452175df7c9bfaaba35538febc @jyavenard jyavenard committed Apr 14, 2012
Showing with 5 additions and 8 deletions.
  1. +5 −8 mythtv/configure
View
13 mythtv/configure
@@ -1663,7 +1663,7 @@ zlib_encoder_select="zlib"
zmbv_decoder_select="zlib"
zmbv_encoder_select="zlib"
-vaapi_deps="va_va_h"
+vaapi_deps="va_va_h va_va_glx_h va_va_x11_h"
vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
# parsers
@@ -1796,7 +1796,7 @@ v4l1_deps="backend v4l2 linux_videodev_h"
vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
xrandr_deps="x11"
xv_deps="x11"
-vaapi_deps="x11 opengl"
+vaapi_deps="x11 opengl va_va_h va_va_glx_h va_va_x11_h"
asi_deps="backend"
<<BLOCKQUOTE
@@ -3956,12 +3956,9 @@ if enabled crystalhd; then
disable crystalhd;
fi
-if enabled vaapi; then
- enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h || disable vaapi
- if enabled vaapi; then
- check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" ||
- { echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; }
- fi
+if enabled vaapi && enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h; then
+ check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" ||
+ { echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; }
fi
if enabled dxva2; then

0 comments on commit 75c011a

Please sign in to comment.
Something went wrong with that request. Please try again.