Fixing a circular build dependency.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Christian König <deathsim...@vodafone.de>
---
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 f68a54f..d4d3c90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1560,7 +1560,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)
{
--
1.7.5.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
