Media
/
libva-utils
mirror of https://github.com/intel/libva-utils.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

configure: libva-xyz should be same version as detected libva 

This will help prevent erroneous linking to mixed versions
of libva-xyz window system libraries that may not be binary
compatible.  For example,
 1. User installs libva-dev from distro packages that
    provides all libva-xyz.pc/.so window system libraries.
 2. Then, user compiles and installs libva from source with 1
    or more [auto] disabled libva-xyz window system libraries.
 3. Finally, user compiles libva-utils from source, but configure
    finds a mix of distro installed and user compiled
    libva-xyz window system libraries and encounters linker
    error when not binary compatible with user installed
    libva.so.

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
This commit is contained in:
U. Artie Eoff 2023-03-31 16:27:17 -04:00 committed by Xiang, Haihao
parent 4cd4308c39
commit 71919fc27e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -142,9 +142,6 @@ if test "X$CC-cc" != "X"; then
fi
AM_CONDITIONAL(USE_SSP, test "$ssp_cc" = "yes")
# Check for DRM (mandatory)
PKG_CHECK_MODULES([LIBVA_DRM], [libva-drm libdrm])
# Check for libva (for dynamic linking)
LIBVA_API_MIN_VERSION=libva_api_min_version
PKG_CHECK_MODULES([LIBVA], [libva >= $LIBVA_API_MIN_VERSION])
@ -155,7 +152,8 @@ VA_MAJOR_VERSION=`echo "$LIBVA_API_VERSION" | cut -d'.' -f1`
VA_MINOR_VERSION=`echo "$LIBVA_API_VERSION" | cut -d'.' -f2`
VA_MICRO_VERSION=`echo "$LIBVA_API_VERSION" | cut -d'.' -f3`
# Check for DRM (mandatory)
PKG_CHECK_MODULES([LIBVA_DRM], [libdrm libva-drm = $LIBVA_API_VERSION])
USE_DRM="no"
if test "$enable_drm" = "yes"; then
@ -167,7 +165,7 @@ AM_CONDITIONAL(USE_DRM, test "$USE_DRM" = "yes")
# Check for X11
USE_X11="no"
if test "x$enable_x11" != "xno"; then
PKG_CHECK_MODULES([X11], [x11 libva-x11],
PKG_CHECK_MODULES([X11], [x11 libva-x11 = $LIBVA_API_VERSION],
[USE_X11="yes"], [:])
if test "x$USE_X11" = "xno" -a "x$enable_x11" = "xyes"; then
@ -186,7 +184,7 @@ AC_SUBST(WAYLAND_API_VERSION)
USE_WAYLAND="no"
if test "x$enable_wayland" != "xno"; then
PKG_CHECK_MODULES([WAYLAND], [wayland-client >= wayland_api_version libva-wayland],
PKG_CHECK_MODULES([WAYLAND], [wayland-client >= wayland_api_version libva-wayland = $LIBVA_API_VERSION],
[USE_WAYLAND="yes"], [:])
if test "x$USE_WAYLAND" = "xno" -a "x$enable_wayland" = "xyes"; then