Hello list, I'm about to commit the attached patches, they add checks that the correct development packages are installed before enabling the different state trackers.
Since me and autoconf are in a fight for several years now please take a look and check that I'm not doing anything stupid. Christian.
>From 801f8e828581cd593f7f76054bca5ebb0a60e84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <[email protected]> Date: Thu, 14 Jul 2011 12:42:17 +0200 Subject: [PATCH 1/3] g3dvl: check for existense of XvMC header/libs Building the XvMC state tracker only works when the header/libs are available. --- configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c3047d6..d8e4e90 100644 --- a/configure.ac +++ b/configure.ac @@ -1511,7 +1511,7 @@ if test "x$enable_gallium_g3dvl" = xyes; then fi if test "x$enable_xvmc" = xauto; then - enable_xvmc=yes + PKG_CHECK_EXISTS([xvmc], [enable_xvmc=yes], [enable_xvmc=no]) fi if test "x$enable_vdpau" = xauto; then @@ -1523,8 +1523,8 @@ if test "x$enable_gallium_g3dvl" = xyes; then fi fi -#TODO: Check for xvmc libs/headers if test "x$enable_xvmc" = xyes; then + PKG_CHECK_MODULES([XVMC], [xvmc >= 1.0.6]) GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg/xvmc" HAVE_ST_XVMC="yes" fi -- 1.7.4.1
>From 82fd6b5a85af222e7a7cb9c8b03a9057fcc5b06e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <[email protected]> Date: Thu, 14 Jul 2011 13:57:23 +0200 Subject: [PATCH 2/3] g3dvl: check for existense of VDPAU header/libs Building the VDPAU state tracker only works when the header/libs are available. --- configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d8e4e90..c469645 100644 --- a/configure.ac +++ b/configure.ac @@ -1515,7 +1515,7 @@ if test "x$enable_gallium_g3dvl" = xyes; then fi if test "x$enable_vdpau" = xauto; then - enable_vdpau=yes + PKG_CHECK_EXISTS([vdpau], [enable_vdpau=yes], [enable_vdpau=no]) fi if test "x$enable_va" = xauto; then @@ -1529,8 +1529,8 @@ if test "x$enable_xvmc" = xyes; then HAVE_ST_XVMC="yes" fi -#TODO: Check for vdpau libs/headers if test "x$enable_vdpau" = xyes; then + PKG_CHECK_MODULES([VDPAU], [vdpau >= 0.4.1]) GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vdpau" HAVE_ST_VDPAU="yes" fi -- 1.7.4.1
>From 86c685c22271c48542cf2ff8644039b79bf0a174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <[email protected]> Date: Thu, 14 Jul 2011 14:09:25 +0200 Subject: [PATCH 3/3] g3dvl: check for existense of VA API header/libs Building the VA state tracker only works when the header/libs are available. Also add a warning that the state tracker is currently undmaintained. --- configure.ac | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index c469645..cf55f7b 100644 --- a/configure.ac +++ b/configure.ac @@ -1519,6 +1519,8 @@ if test "x$enable_gallium_g3dvl" = xyes; then fi if test "x$enable_va" = xauto; then + #don't enable vaapi state tracker even if package exists + #PKG_CHECK_EXISTS([libva], [enable_vdpau=yes], [enable_vdpau=no]) enable_va=no fi fi @@ -1535,8 +1537,9 @@ if test "x$enable_vdpau" = xyes; then HAVE_ST_VDPAU="yes" fi -#TODO: Check for va libs/headers if test "x$enable_va" = xyes; then + PKG_CHECK_MODULES([LIBVA], [libva = 0.31.1]) + AC_MSG_WARN([vaapi state tracker currently unmaintained]) GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS va" HAVE_ST_VA="yes" fi -- 1.7.4.1
_______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
