1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00

Fix build with libva 2.1.0 (r461668).

Obtained from:	0d710edb06
This commit is contained in:
Tijl Coosemans 2018-02-15 15:10:37 +00:00
parent 3b1875b273
commit e55a9fc97b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=461929

View File

@ -6,13 +6,13 @@
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= \$VAAPI_REQ libva < 0.99.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libva >= $VAAPI_REQ libva < 0.99.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= \$VAAPI_REQ libva <= 1.0.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libva >= $VAAPI_REQ libva <= 1.0.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= \$VAAPI_REQ libva != 0.99.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libva >= $VAAPI_REQ libva != 0.99.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBVA_CFLAGS=`$PKG_CONFIG --cflags "libva >= $VAAPI_REQ libva < 0.99.0" 2>/dev/null`
+ pkg_cv_LIBVA_CFLAGS=`$PKG_CONFIG --cflags "libva >= $VAAPI_REQ libva <= 1.0.0" 2>/dev/null`
+ pkg_cv_LIBVA_CFLAGS=`$PKG_CONFIG --cflags "libva >= $VAAPI_REQ libva != 0.99.0" 2>/dev/null`
else
pkg_failed=yes
fi
@ -22,13 +22,13 @@
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= \$VAAPI_REQ libva < 0.99.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libva >= $VAAPI_REQ libva < 0.99.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= \$VAAPI_REQ libva < 1.00.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libva >= $VAAPI_REQ libva <= 1.0.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libva >= \$VAAPI_REQ libva != 0.99.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libva >= $VAAPI_REQ libva != 0.99.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBVA_LIBS=`$PKG_CONFIG --libs "libva >= $VAAPI_REQ libva < 0.99.0" 2>/dev/null`
+ pkg_cv_LIBVA_LIBS=`$PKG_CONFIG --libs "libva >= $VAAPI_REQ libva <= 1.0.0" 2>/dev/null`
+ pkg_cv_LIBVA_LIBS=`$PKG_CONFIG --libs "libva >= $VAAPI_REQ libva != 0.99.0" 2>/dev/null`
else
pkg_failed=yes
fi
@ -37,16 +37,16 @@
fi
if test $_pkg_short_errors_supported = yes; then
- LIBVA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libva >= $VAAPI_REQ libva < 0.99.0"`
+ LIBVA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libva >= $VAAPI_REQ libva <= 1.0.0"`
+ LIBVA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libva >= $VAAPI_REQ libva != 0.99.0"`
else
- LIBVA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libva >= $VAAPI_REQ libva < 0.99.0"`
+ LIBVA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libva >= $VAAPI_REQ libva <= 1.0.0"`
+ LIBVA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libva >= $VAAPI_REQ libva != 0.99.0"`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBVA_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libva >= $VAAPI_REQ libva < 0.99.0) were not met:
+ as_fn_error $? "Package requirements (libva >= $VAAPI_REQ libva <= 1.0.0) were not met:
+ as_fn_error $? "Package requirements (libva >= $VAAPI_REQ libva != 0.99.0) were not met:
$LIBVA_PKG_ERRORS