]>
Commit | Line | Data |
---|---|---|
46cee963 AM |
1 | --- Mesa-9.1/src/gallium/targets/xa-vmwgfx/Makefile.am~ 2013-02-22 23:28:22.000000000 +0100 |
2 | +++ Mesa-9.1/src/gallium/targets/xa-vmwgfx/Makefile.am 2013-02-26 19:51:30.938891682 +0100 | |
3 | @@ -45,7 +45,8 @@ | |
4 | $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \ | |
5 | $(top_builddir)/src/gallium/drivers/svga/libsvga.la \ | |
6 | $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ | |
7 | - $(top_builddir)/src/gallium/drivers/rbug/librbug.la | |
8 | + $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ | |
9 | + $(LIBDRM_LIBS) | |
10 | ||
11 | nodist_EXTRA_libxatracker_la_SOURCES = dummy.cpp | |
12 | ||
13 | --- Mesa-9.1/src/gbm/Makefile.am~ 2013-02-16 02:32:00.000000000 +0100 | |
14 | +++ Mesa-9.1/src/gbm/Makefile.am 2013-02-26 19:53:54.295673416 +0100 | |
52c8419a JB |
15 | @@ -19,7 +19,7 @@ |
16 | main/backend.c \ | |
17 | main/common.c | |
18 | libgbm_la_LDFLAGS = -version-info 1:0 | |
19 | -libgbm_la_LIBADD = $(LIBUDEV_LIBS) $(LIBKMS_LIBS) $(DLOPEN_LIBS) | |
46cee963 | 20 | +libgbm_la_LIBADD = $(LIBUDEV_LIBS) $(LIBKMS_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIBS) |
52c8419a JB |
21 | |
22 | if HAVE_EGL_PLATFORM_WAYLAND | |
23 | AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM | |
c668a28b JB |
24 | --- Mesa-9.1/src/gallium/targets/xvmc-nouveau/Makefile.am.orig 2013-02-20 01:26:22.000000000 +0100 |
25 | +++ Mesa-9.1/src/gallium/targets/xvmc-nouveau/Makefile.am 2013-02-27 20:42:00.199549898 +0100 | |
26 | @@ -48,6 +48,7 @@ | |
27 | $(top_builddir)/src/gallium/auxiliary/libgallium.la \ | |
28 | $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \ | |
29 | $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ | |
30 | + $(top_builddir)/src/gallium/drivers/nv30/libnv30.la \ | |
31 | $(top_builddir)/src/gallium/drivers/nv50/libnv50.la \ | |
32 | $(top_builddir)/src/gallium/drivers/nvc0/libnvc0.la \ | |
33 | $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \ | |
34 | --- Mesa-9.1/src/mesa/libdricore/Makefile.am.orig 2013-02-20 01:26:22.000000000 +0100 | |
35 | +++ Mesa-9.1/src/mesa/libdricore/Makefile.am 2013-02-27 20:43:01.806214222 +0100 | |
36 | @@ -42,6 +42,7 @@ | |
37 | libdricore@VERSION@_la_LDFLAGS = -version-number 1:0 | |
38 | libdricore@VERSION@_la_LIBADD = \ | |
39 | ../program/libdricore_program.la \ | |
40 | + $(DLOPEN_LIBS) | |
41 | $() | |
42 | ||
43 | if HAVE_X86_ASM | |
d9ca63e3 JB |
44 | --- Mesa-9.1/src/gallium/targets/vdpau-softpipe/Makefile.am.orig 2013-02-20 01:26:22.000000000 +0100 |
45 | +++ Mesa-9.1/src/gallium/targets/vdpau-softpipe/Makefile.am 2013-02-28 15:46:37.886610941 +0100 | |
46 | @@ -35,7 +35,7 @@ | |
47 | vdpau_LTLIBRARIES = libvdpau_softpipe.la | |
48 | ||
49 | libvdpau_softpipe_la_SOURCES = \ | |
50 | - $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c | |
51 | + $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_xsp.c | |
52 | ||
53 | libvdpau_softpipe_la_LDFLAGS = \ | |
54 | -module \ |