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.2/src/gallium/targets/vdpau-r300/Makefile.orig     2013-01-26 10:33:04.632271133 +0100
  13 +++ Mesa-9.0.2/src/gallium/targets/vdpau-r300/Makefile  2013-01-26 10:37:16.755599223 +0100
  14 @@ -21,7 +21,7 @@
  15         $(COMMON_GALLIUM_SOURCES) \
  16         $(DRIVER_SOURCES)
  17
  18 -DRIVER_LIBS = $(LIBDRM_LIBS) $(RADEON_LIBS) -lXfixes
  19 +DRIVER_LIBS = $(LIBDRM_LIBS) $(RADEON_LIBS) -lXfixes -lxcb
  20
  21  include ../Makefile.vdpau
  22
  23 --- Mesa-9.0.2/src/gallium/targets/vdpau-r600/Makefile.orig     2013-01-26 10:33:04.635604465 +0100
  24 +++ Mesa-9.0.2/src/gallium/targets/vdpau-r600/Makefile  2013-01-26 10:38:39.152264160 +0100
  25 @@ -17,7 +17,7 @@
  26         $(COMMON_GALLIUM_SOURCES) \
  27         $(DRIVER_SOURCES)
  28
  29 -DRIVER_LIBS = $(LIBDRM_LIBS) $(RADEON_LIBS) -lXfixes
  30 +DRIVER_LIBS = $(LIBDRM_LIBS) $(RADEON_LIBS) -lXfixes -lxcb
  31
  32  include ../Makefile.vdpau
  33
  34 --- Mesa-9.0.2/src/gallium/targets/vdpau-radeonsi/Makefile.orig 2013-01-26 10:33:04.638937797 +0100
  35 +++ Mesa-9.0.2/src/gallium/targets/vdpau-radeonsi/Makefile      2013-01-26 10:39:56.732262545 +0100
  36 @@ -23,7 +23,7 @@
  37  DRIVER_DEFINES = \
  38         -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_NOOP
  39
  40 -DRIVER_LIBS = $(LIBDRM_LIBS) $(RADEON_LIBS) -lXfixes
  41 +DRIVER_LIBS = $(LIBDRM_LIBS) $(RADEON_LIBS) -lXfixes -lxcb
  42
  43  include ../Makefile.vdpau
  44
  45 --- p/src/gallium/targets/vdpau-softpipe/Makefile~      2012-05-10 22:56:51.000000000 +0200
  46 +++ p/src/gallium/targets/vdpau-softpipe/Makefile       2012-05-11 09:27:05.364159093 +0200
  47 @@ -14,7 +14,7 @@
  48  C_SOURCES = \
  49         $(TOP)/src/gallium/auxiliary/vl/vl_winsys_xsp.c
  50
  51 -DRIVER_LIBS =
  52 +DRIVER_LIBS = -lX11 -lXext
  53
  54  include ../Makefile.vdpau
  55
  56 --- Mesa-9.0.1/src/gallium/targets/xvmc-nouveau/Makefile.orig   2012-09-01 01:33:41.000000000 +0200
  57 +++ Mesa-9.0.1/src/gallium/targets/xvmc-nouveau/Makefile        2012-11-21 19:29:27.218929817 +0100
  58 @@ -5,6 +5,7 @@
  59
  60  PIPE_DRIVERS = \
  61         $(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
  62 +       $(TOP)/src/gallium/drivers/nv30/libnv30.a \
  63         $(TOP)/src/gallium/drivers/nv50/libnv50.a \
  64         $(TOP)/src/gallium/drivers/nvc0/libnvc0.a \
  65         $(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
  66 @@ -18,7 +19,7 @@
  67         $(COMMON_GALLIUM_SOURCES) \
  68         $(DRIVER_SOURCES)
  69
  70 -DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau --libs) -lXfixes
  71 +DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau libdrm --libs) -lXfixes -lXvMC -lxcb -lX11
  72
  73  DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
  74
  75 --- Mesa-9.0.2/src/gallium/targets/xvmc-r300/Makefile.orig      2013-01-26 10:33:04.628937800 +0100
  76 +++ Mesa-9.0.2/src/gallium/targets/xvmc-r300/Makefile   2013-01-26 10:36:06.578934005 +0100
  77 @@ -17,7 +17,7 @@
  78         $(COMMON_GALLIUM_SOURCES) \
  79         $(DRIVER_SOURCES)
  80
  81 -DRIVER_LIBS = $(LIBDRM_LIBS) $(RADEON_LIBS) -lXfixes
  82 +DRIVER_LIBS = $(LIBDRM_LIBS) $(RADEON_LIBS) -lXfixes -lXvMC -lX11 -lxcb
  83
  84  include ../Makefile.xvmc
  85
  86 --- Mesa-9.0.2/src/gallium/targets/xvmc-r600/Makefile.orig      2013-01-26 10:33:04.632271133 +0100
  87 +++ Mesa-9.0.2/src/gallium/targets/xvmc-r600/Makefile   2013-01-26 10:36:34.075600100 +0100
  88 @@ -17,7 +17,7 @@
  89         $(COMMON_GALLIUM_SOURCES) \
  90         $(DRIVER_SOURCES)
  91
  92 -DRIVER_LIBS = $(LIBDRM_LIBS) $(RADEON_LIBS) -lXfixes
  93 +DRIVER_LIBS = $(LIBDRM_LIBS) $(RADEON_LIBS) -lXfixes -lXvMC -lX11 -lxcb
  94
  95  include ../Makefile.xvmc
  96
  97 --- Mesa-8.0.1/src/gallium/targets/xvmc-softpipe/Makefile.orig  2012-02-15 00:44:00.000000000 +0100
  98 +++ Mesa-8.0.1/src/gallium/targets/xvmc-softpipe/Makefile       2012-03-11 12:35:53.273062913 +0100
  99 @@ -14,7 +14,7 @@
 100  C_SOURCES = \
 101         $(TOP)/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
 102
 103 -DRIVER_LIBS =
 104 +DRIVER_LIBS = -lXvMC -lXext -lX11
 105
 106  include ../Makefile.xvmc
 107
 108 --- Mesa-8.0.1/src/gallium/targets/xa-vmwgfx/Makefile.orig      2012-02-15 00:44:00.000000000 +0100
 109 +++ Mesa-8.0.1/src/gallium/targets/xa-vmwgfx/Makefile   2012-03-11 12:43:05.479747729 +0100
 110 @@ -30,6 +30,9 @@
 111  SOURCES = vmw_target.c
 112  OBJECTS = $(SOURCES:.c=.o)
 113
 114 +XA_LIBS = $(shell $(PKG_CONFIG) libdrm --libs)
 115 +XA_PC_REQ_PRIV = libdrm
 116 +
 117  ifeq ($(MESA_LLVM),1)
 118  LDFLAGS += $(LLVM_LDFLAGS)
 119  GALLIUM_AUXILIARIES += $(LLVM_LIBS)
 120 @@ -64,7 +67,7 @@
 121                 $(MKLIB_OPTIONS) \
 122                 -exports xa_symbols \
 123                  -install $(TOP)/$(LIB_DIR)/gallium \
 124 -               $(OBJECTS) $(XA_LIB_DEPS) $(GALLIUM_AUXILIARIES)
 125 +               $(OBJECTS) $(XA_LIB_DEPS) $(GALLIUM_AUXILIARIES) $(XA_LIBS)
 126
 127  # xa pkgconfig file
 128  pcedit = sed \
 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 $(DLOPEN_LIBS)
 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