Mesa (pipe-video): r300g/g3dvl: Fix build error and correct Makefile for xvmc lib

[Cooper Yuan]

Module: Mesa
Branch: pipe-video
Commit: 4d65133e8691e51a17aa896d5bb40022cfae5a62
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d65133e8691e51a17aa896d5bb40022cfae5a62

Author: Cooper Yuan <cooperyuan at gmail.com>
Date:   Mon Feb  1 17:53:46 2010 +0800

r300g/g3dvl: Fix build error and correct Makefile for xvmc lib

---

 src/gallium/winsys/drm/radeon/core/radeon_drm.c |    5 +++--
 src/gallium/winsys/g3dvl/drm/radeon/Makefile    |    9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/gallium/winsys/drm/radeon/core/radeon_drm.c b/src/gallium/winsys/drm/radeon/core/radeon_drm.c
index cbbdcf2..e2b451d 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_drm.c
+++ b/src/gallium/winsys/drm/radeon/core/radeon_drm.c
@@ -30,6 +30,7 @@
  */
 
 #include "radeon_drm.h"
+#include "r300_video_context.h"
 
 /* Helper function to do the ioctls needed for setup and init. */
 static void do_ioctls(int fd, struct radeon_winsys* winsys)
@@ -139,13 +140,13 @@ radeon_create_video_context(struct drm_api *api, struct pipe_screen *pscreen,
 {
     struct radeon_winsys *winsys = (struct radeon_winsys*)pscreen->winsys;
     struct pipe_context *pipe;
-    struct pipe_video_context pvctx;
+    struct pipe_video_context *pvctx;
 
     pipe = radeon_create_context(api, pscreen);
     if (!pipe)
         return NULL;
 
-    pvctx = r300_video_create(pipe, profile, chroma_format, width, height, i);
+    pvctx = r300_video_create(pipe, profile, chroma_format, width, height, 0);
 }
 
 boolean radeon_buffer_from_texture(struct drm_api* api,
diff --git a/src/gallium/winsys/g3dvl/drm/radeon/Makefile b/src/gallium/winsys/g3dvl/drm/radeon/Makefile
index 6768119..0f7fd1c 100644
--- a/src/gallium/winsys/g3dvl/drm/radeon/Makefile
+++ b/src/gallium/winsys/g3dvl/drm/radeon/Makefile
@@ -7,12 +7,13 @@ include $(TOP)/configs/current
 C_SOURCES =
 
 DRIVER_INCLUDES = $(shell pkg-config libdrm libdrm_radeon --cflags-only-I) \
-                   -I$(TOP)/src/gallium/winsys/drm/nouveau \
-DRIVER_DEFINES = $(shell pkg-config libdrm libdrm_nouveau --cflags-only-other)
+                   -I$(TOP)/src/gallium/winsys/drm/radeon \
+DRIVER_DEFINES = $(shell pkg-config libdrm libdrm_radeon --cflags-only-other)
 
 PIPE_DRIVERS = \
-	$(TOP)/src/gallium/winsys/drm/radeon/drm/libradeondrm.a \
-	$(TOP)/src/gallium/drivers/radeon/libradeon.a \
+	$(TOP)/src/gallium/winsys/drm/radeon/core/libradeonwinsys.a \
+	$(TOP)/src/gallium/drivers/r300/libr300.a \
+        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
 
 DRIVER_LIB_DEPS += $(shell pkg-config libdrm_radeon --libs)