Module: Mesa Branch: master Commit: c2e2b58a58880c9b9f189fc154205e99144e9502 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c2e2b58a58880c9b9f189fc154205e99144e9502
Author: Christian König <[email protected]> Date: Tue Jan 24 12:19:59 2012 +0100 st/xvmc: remove xorg-server dependency Fixing a circular build dependency. NOTE: This is a candidate for the 8.0 branch. Signed-off-by: Christian König <[email protected]> --- configure.ac | 2 +- src/gallium/state_trackers/xorg/xvmc/subpicture.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 18a40fc..2472cc1 100644 --- a/configure.ac +++ b/configure.ac @@ -1586,7 +1586,7 @@ if test "x$enable_gallium_g3dvl" = xyes; then fi if test "x$enable_xvmc" = xyes; then - PKG_CHECK_MODULES([XVMC], [xvmc >= 1.0.6 xorg-server]) + PKG_CHECK_MODULES([XVMC], [xvmc >= 1.0.6]) GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg/xvmc" HAVE_ST_XVMC="yes" fi diff --git a/src/gallium/state_trackers/xorg/xvmc/subpicture.c b/src/gallium/state_trackers/xorg/xvmc/subpicture.c index 1904429..c5aa0c3 100644 --- a/src/gallium/state_trackers/xorg/xvmc/subpicture.c +++ b/src/gallium/state_trackers/xorg/xvmc/subpicture.c @@ -29,7 +29,6 @@ #include <X11/Xlibint.h> #include <X11/extensions/XvMClib.h> -#include <xorg/fourcc.h> #include "pipe/p_screen.h" #include "pipe/p_video_decoder.h" @@ -46,6 +45,8 @@ #include "xvmc_private.h" #define FOURCC_RGB 0x0000003 +#define FOURCC_AI44 0x34344941 +#define FOURCC_IA44 0x34344149 static enum pipe_format XvIDToPipe(int xvimage_id) { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
