Mesa-link.patch

   1 --- Mesa-8.0.1/src/gallium/targets/vdpau-nouveau/Makefile.orig  2012-02-15 00:44:00.000000000 +0100
   2 +++ Mesa-8.0.1/src/gallium/targets/vdpau-nouveau/Makefile       2012-03-11 12:26:44.906377873 +0100
   3 @@ -19,7 +19,7 @@
   4         $(COMMON_GALLIUM_SOURCES) \
   5         $(DRIVER_SOURCES)
   6
   7 -DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau --libs) -lXfixes
   8 +DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau libdrm --libs) -lXfixes -lxcb
   9
  10  LINK_WITH_CXX=1
  11
  12 --- Mesa-9.0.1/src/gallium/targets/xvmc-nouveau/Makefile.orig   2012-09-01 01:33:41.000000000 +0200
  13 +++ Mesa-9.0.1/src/gallium/targets/xvmc-nouveau/Makefile        2012-11-21 19:29:27.218929817 +0100
  14 @@ -5,6 +5,7 @@
  15
  16  PIPE_DRIVERS = \
  17         $(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
  18 +       $(TOP)/src/gallium/drivers/nv30/libnv30.a \
  19         $(TOP)/src/gallium/drivers/nv50/libnv50.a \
  20         $(TOP)/src/gallium/drivers/nvc0/libnvc0.a \
  21         $(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
  22 @@ -18,7 +19,7 @@
  23         $(COMMON_GALLIUM_SOURCES) \
  24         $(DRIVER_SOURCES)
  25
  26 -DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau --libs) -lXfixes
  27 +DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau libdrm --libs) -lXfixes -lXvMC -lxcb -lX11
  28
  29  DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
  30
  31 --- Mesa-8.0.1/src/gallium/targets/xvmc-r300/Makefile.orig      2012-02-15 00:44:00.000000000 +0100
  32 +++ Mesa-8.0.1/src/gallium/targets/xvmc-r300/Makefile   2012-03-11 12:34:46.519728247 +0100
  33 @@ -17,7 +17,7 @@
  34         $(COMMON_GALLIUM_SOURCES) \
  35         $(DRIVER_SOURCES)
  36
  37 -DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
  38 +DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -lXvMC -ldrm_radeon -lX11 -lxcb
  39
  40  include ../Makefile.xvmc
  41
  42 --- Mesa-8.0.1/src/gallium/targets/xvmc-r600/Makefile.orig      2012-02-15 00:44:00.000000000 +0100
  43 +++ Mesa-8.0.1/src/gallium/targets/xvmc-r600/Makefile   2012-03-11 12:35:23.323061190 +0100
  44 @@ -17,7 +17,7 @@
  45         $(COMMON_GALLIUM_SOURCES) \
  46         $(DRIVER_SOURCES)
  47
  48 -DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
  49 +DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -lXvMC -ldrm_radeon -lX11 -lxcb
  50
  51  include ../Makefile.xvmc
  52
  53 --- Mesa-8.0.1/src/gallium/targets/xvmc-softpipe/Makefile.orig  2012-02-15 00:44:00.000000000 +0100
  54 +++ Mesa-8.0.1/src/gallium/targets/xvmc-softpipe/Makefile       2012-03-11 12:35:53.273062913 +0100
  55 @@ -14,7 +14,7 @@
  56  C_SOURCES = \
  57         $(TOP)/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
  58
  59 -DRIVER_LIBS =
  60 +DRIVER_LIBS = -lXvMC -lXext -lX11
  61
  62  include ../Makefile.xvmc
  63
  64 --- Mesa-8.0.1/src/gallium/targets/xa-vmwgfx/Makefile.orig      2012-02-15 00:44:00.000000000 +0100
  65 +++ Mesa-8.0.1/src/gallium/targets/xa-vmwgfx/Makefile   2012-03-11 12:43:05.479747729 +0100
  66 @@ -30,6 +30,9 @@
  67  SOURCES = vmw_target.c
  68  OBJECTS = $(SOURCES:.c=.o)
  69
  70 +XA_LIBS = $(shell $(PKG_CONFIG) libdrm --libs)
  71 +XA_PC_REQ_PRIV = libdrm
  72 +
  73  ifeq ($(MESA_LLVM),1)
  74  LDFLAGS += $(LLVM_LDFLAGS)
  75  GALLIUM_AUXILIARIES += $(LLVM_LIBS)
  76 @@ -64,7 +67,7 @@
  77                 $(MKLIB_OPTIONS) \
  78                 -exports xa_symbols \
  79                  -install $(TOP)/$(LIB_DIR)/gallium \
  80 -               $(OBJECTS) $(XA_LIB_DEPS) $(GALLIUM_AUXILIARIES)
  81 +               $(OBJECTS) $(XA_LIB_DEPS) $(GALLIUM_AUXILIARIES) $(XA_LIBS)
  82
  83  # xa pkgconfig file
  84  pcedit = sed \
  85
  86 --- m/src/gallium/targets/vdpau-r300/Makefile~  2012-05-10 22:56:51.000000000 +0200
  87 +++ m/src/gallium/targets/vdpau-r300/Makefile   2012-05-11 09:25:42.791993195 +0200
  88 @@ -21,7 +21,7 @@
  89         $(COMMON_GALLIUM_SOURCES) \
  90         $(DRIVER_SOURCES)
  91
  92 -DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
  93 +DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon -lxcb
  94
  95  include ../Makefile.vdpau
  96
  97 --- m/src/gallium/targets/vdpau-r600/Makefile~  2012-05-10 22:56:51.000000000 +0200
  98 +++ m/src/gallium/targets/vdpau-r600/Makefile   2012-05-11 09:26:14.899501899 +0200
  99 @@ -17,7 +17,7 @@
 100         $(COMMON_GALLIUM_SOURCES) \
 101         $(DRIVER_SOURCES)
 102
 103 -DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
 104 +DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon -lxcb
 105
 106  include ../Makefile.vdpau
 107
 108 --- p/src/gallium/targets/vdpau-softpipe/Makefile~      2012-05-10 22:56:51.000000000 +0200
 109 +++ p/src/gallium/targets/vdpau-softpipe/Makefile       2012-05-11 09:27:05.364159093 +0200
 110 @@ -14,7 +14,7 @@
 111  C_SOURCES = \
 112         $(TOP)/src/gallium/auxiliary/vl/vl_winsys_xsp.c
 113
 114 -DRIVER_LIBS =
 115 +DRIVER_LIBS = -lX11 -lXext
 116
 117  include ../Makefile.vdpau
 118
 119 --- p/src/gallium/targets/vdpau-radeonsi/Makefile~      2012-08-06 18:56:40.000000000 +0200
 120 +++ p/src/gallium/targets/vdpau-radeonsi/Makefile       2012-09-07 22:44:07.304997361 +0200
 121 @@ -23,7 +23,7 @@
 122  DRIVER_DEFINES = \
 123         -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_NOOP
 124
 125 -DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
 126 +DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon -lxcb
 127
 128  include ../Makefile.vdpau
 129
 130 --- p/src/mesa/libdricore/Makefile.am~  2012-08-26 21:00:26.000000000 +0200
 131 +++ p/src/mesa/libdricore/Makefile.am   2012-09-07 22:45:58.210981683 +0200
 132 @@ -46,7 +46,7 @@
 133         $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
 134         $(top_builddir)/src/glsl/builtin_function.cpp
 135  libdricore@VERSION@_la_LDFLAGS = -version-number 1:0
 136 -libdricore@VERSION@_la_LIBADD = libdricore-asm.la
 137 +libdricore@VERSION@_la_LIBADD = libdricore-asm.la -ldl
 138
 139  # This is separated from libdricore to avoid conflics in object
 140  # outputs between main/clip.c and sparc/clip.c.  The documented way to
 141 --- Mesa-9.0.1/src/gbm/Makefile.am.orig 2012-09-01 01:36:09.000000000 +0200
 142 +++ Mesa-9.0.1/src/gbm/Makefile.am      2012-11-21 20:22:20.668863673 +0100
 143 @@ -19,7 +19,7 @@
 144         main/backend.c \
 145         main/common.c
 146  libgbm_la_LDFLAGS = -version-info 1:0
 147 -libgbm_la_LIBADD = $(LIBUDEV_LIBS) $(LIBKMS_LIBS) $(DLOPEN_LIBS)
 148 +libgbm_la_LIBADD = $(LIBUDEV_LIBS) $(LIBKMS_LIBS) $(LIBDRM_LIBS) $(DLOPEN_LIBS)
 149
 150  if HAVE_EGL_PLATFORM_WAYLAND
 151  AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM