Skip to content

Commit

Permalink
Fix VAAPI dependency check uncovered by ce56ef0
Browse files Browse the repository at this point in the history
Would cause compilation failure if some VAAPI headers weren't installed

[cherry-picked from 75c011a]
  • Loading branch information
jyavenard committed Apr 20, 2012
1 parent 6230f81 commit 85445d4
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions mythtv/configure
Expand Up @@ -1663,7 +1663,7 @@ zlib_encoder_select="zlib"
zmbv_decoder_select="zlib" zmbv_decoder_select="zlib"
zmbv_encoder_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" vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"


# parsers # parsers
Expand Down Expand Up @@ -1796,7 +1796,7 @@ v4l1_deps="backend v4l2 linux_videodev_h"
vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h" vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
xrandr_deps="x11" xrandr_deps="x11"
xv_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" asi_deps="backend"


<<BLOCKQUOTE <<BLOCKQUOTE
Expand Down Expand Up @@ -3956,12 +3956,9 @@ if enabled crystalhd; then
disable crystalhd; disable crystalhd;
fi fi


if enabled vaapi; then if enabled vaapi && enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h; then
enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h || disable vaapi check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" ||
if enabled vaapi; then { echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; }
check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" ||
{ echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; }
fi
fi fi


if enabled dxva2; then if enabled dxva2; then
Expand Down

0 comments on commit 85445d4

Please sign in to comment.