From c2e2b58a58880c9b9f189fc154205e99144e9502 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Tue, 24 Jan 2012 12:19:59 +0100 Subject: [PATCH] st/xvmc: remove xorg-server dependency MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixing a circular build dependency. NOTE: This is a candidate for the 8.0 branch. Signed-off-by: Christian König --- 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 18a40fceade..2472cc141b3 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 190442990c8..c5aa0c35213 100644 --- a/src/gallium/state_trackers/xorg/xvmc/subpicture.c +++ b/src/gallium/state_trackers/xorg/xvmc/subpicture.c @@ -29,7 +29,6 @@ #include #include -#include #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) { -- 2.30.2