~ubuntu-branches/ubuntu/precise/mesa/precise-updates

« back to all changes in this revision

Viewing changes to src/gallium/targets/gbm/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Christopher James Halse Rogers
  • Date: 2011-08-04 16:25:08 UTC
  • mfrom: (1.2.37 upstream)
  • Revision ID: james.westby@ubuntu.com-20110804162508-kujg82moxerjg1kk
Tags: 7.11-0ubuntu1
* Fake merge from Debian experimental, updating previous changelog entries.
  New upstream release fixes infrequent X crash (LP: #800778).
  Remaining Ubuntu changes:
 - debian/control
    + Drop lesstif-dev from Build-Depends; it's in Universe.
    + Comment out GLw libs since it depends on lesstif-dev.
    + Drop i686 swx11 libgl package.
    + Add libdrm-dev to mesa-common-dev Depends.
    + Drop libwayland-dev from Build-Depends; it's in Universe.
    + Update Breaks for Ubuntu versions
    + Enable llvm on armel as well as i386 and amd64
  - debian/rules
    + Use --disable-glw for swx11 targets too.
    + Don't enable motif for swx11 targets.
    + Use lzma compression for binary debs to save CD space.
    + Drop unloved mach64 driver.
    + Use --enable-shared-dricore to claw back CD space.
    + Enable llvmpipe software rasteriser.
    + Enable llvm on armel as well as i386 and amd64
  - debian/patches
    + 100_no_abi_tag.patch
    + 101_ubuntu_hidden_glname.patch
    + 103_savage-expose_fbmodes_with_nonzero_alpha.patch
  - rules, libgl1-mesa-{glx,dev,swx11,swx11-dev}.install.in,
    libgl1-mesa-{glx,swx11}.{postinst,prerm}.in, libgl1-mesa-dev.links.in:
    Install libGL.so* in /usr/lib/mesa to allow things to work with
    alternatives.
  - debian/not-installed:
    + Drop i686 files; we don't build 686-optimised packages in the first
      place.
  - debian/gbp.conf
    + Point at Ubuntu branch to make git-buildpackage less narky.
  - 113_fix_tls.diff: Fix crashes in unrelated code due to TLS usage.
  - debian/patches/111_export_searchdirs_in_dripc.diff:
    + Add drisearchdirs variable to dri.pc so the Xserver can pick up the
      alternate DRI driver dirs.
  - debian/patches/115_llvm_dynamic_linking.diff
    + Dynamically link DRI drivers to libllvm.  Saves ~6MiB per DRI driver.
  - debian/patches/116_use_shared_galliumcore.diff:
  - debian/libgl1-mesa-dri.install.in:
    + Link gallium DRI drivers against shared gallium routines to save CD
      space.
* debian/rules:
* debian/libgl1-mesa-dri-experimental.install.{i386,amd64}.in
  - Explicitly install i915g only when it has been built, matching what is
    done with r300g.
* debian/rules:
* debian/control:
* debian/libegl1-mesa{,-dev}.install.in:
* debian/libegl1-mesa.symbols:
  - Enable the Wayland EGL backend.
* debian/rules:
* debian/libegl1-mesa.{postinst,prerm,install}.in:
* debian/libegl1-mesa-dev.{install,links}.in:
* debian/libgles{1,2}-mesa.install.in:
* debian/libgles{1,2}-mesa-dev.links.in:
* debian/libopenvg1-mesa{,-dev}.install.in:
* debian/libopenvg1-mesa-dev.links.in:
  - Use alternatives for libEGL to match the handling of libGL.
    libEGL (and associated GL|ES and OpenVG libraries) now live in
    /usr/lib/$MULTIARCH/mesa-egl.  (LP: #812639)
* debian/patches/118_fix_24bpp_software_rendering.diff:
  - Cherry pick upstream patch from master fixing graphical corruption when
    using a 24bpp framebuffer and software rendering. (LP: #810339)
* debian/rules:
* debian/clean:
  - Generate xmlpool pot file and clean up other po files for
    pkgbinarymangler's benefit (LP: #410264).
* debian/patches/119_r600g_gnome_shell_rendering_fix.diff:
  - Cherry pick upstream commit fixing rendering corruption in gnome-shell
    (and therefore likely Unity as well).

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
GBM_LIBS = $(LIBUDEV_LIBS) $(LIBDRM_LIB) \
19
19
           $(TOP)/src/gallium/state_trackers/gbm/libgbm.a \
20
20
           $(TOP)/src/gallium/drivers/identity/libidentity.a \
 
21
           $(TOP)/src/gallium/drivers/galahad/libgalahad.a \
21
22
           $(TOP)/src/gallium/drivers/trace/libtrace.a \
22
23
           $(TOP)/src/gallium/drivers/rbug/librbug.a \
23
24
           $(GALLIUM_AUXILIARIES)
37
38
        -I$(TOP)/src/gallium/include \
38
39
        -I$(TOP)/src/gallium/winsys
39
40
 
40
 
pipe_LIBS = $(LIBDRM_LIB) \
 
41
pipe_LIBS = \
41
42
        $(TOP)/src/gallium/drivers/identity/libidentity.a \
42
43
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
43
44
        $(TOP)/src/gallium/drivers/rbug/librbug.a \
44
45
        $(GALLIUM_AUXILIARIES)
45
46
 
46
 
pipe_CLFLAGS = $(LIBDRM_CFLAGS)
 
47
# as if we are DRI modules
 
48
pipe_SYS = $(DRI_LIB_DEPS)
 
49
 
 
50
pipe_CLFLAGS = \
 
51
        -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD \
 
52
        $(LIBDRM_CFLAGS)
47
53
 
48
54
pipe_LDFLAGS = -Wl,--no-undefined
49
55
 
50
56
# i915 pipe driver
51
 
i915_LIBS = -ldrm_intel \
 
57
i915_LIBS = \
52
58
        $(TOP)/src/gallium/winsys/i915/drm/libi915drm.a \
53
59
        $(TOP)/src/gallium/drivers/i915/libi915.a
 
60
i915_SYS = -ldrm_intel
54
61
 
55
62
# i965 pipe driver
56
 
i965_LIBS = -ldrm_intel \
 
63
i965_LIBS = \
57
64
        $(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \
58
65
        $(TOP)/src/gallium/drivers/i965/libi965.a \
59
66
        $(TOP)/src/gallium/winsys/sw/wrapper/libwsw.a
 
67
i965_SYS = -ldrm_intel
60
68
 
61
69
# nouveau pipe driver
62
 
nouveau_LIBS = -ldrm_nouveau \
 
70
nouveau_LIBS = \
63
71
        $(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
64
72
        $(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
65
73
        $(TOP)/src/gallium/drivers/nv50/libnv50.a \
66
74
        $(TOP)/src/gallium/drivers/nvc0/libnvc0.a \
67
75
        $(TOP)/src/gallium/drivers/nouveau/libnouveau.a
 
76
nouveau_SYS = -ldrm_nouveau
68
77
 
69
78
# r300 pipe driver
70
 
r300_LIBS = -ldrm \
 
79
r300_LIBS = \
71
80
        $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
72
81
        $(TOP)/src/gallium/drivers/r300/libr300.a
 
82
r300_SYS = -ldrm_radeon
73
83
 
74
84
# r600 pipe driver
75
 
r600_LIBS = -ldrm -ldrm_radeon \
 
85
r600_LIBS = \
76
86
        $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \
77
87
        $(TOP)/src/gallium/drivers/r600/libr600.a
 
88
r600_SYS = -ldrm_radeon
78
89
 
79
90
# vmwgfx pipe driver
80
91
vmwgfx_LIBS = \
83
94
 
84
95
# LLVM
85
96
ifeq ($(MESA_LLVM),1)
86
 
pipe_LIBS += $(LLVM_LIBS)
 
97
pipe_LIBS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
 
98
pipe_SYS += $(LLVM_LIBS)
87
99
pipe_LDFLAGS += $(LLVM_LDFLAGS)
88
100
endif
89
101
 
140
152
        $(MKLIB) -o $@ -noprefix -linker '$(CC)' \
141
153
                -ldflags '-L$(TOP)/$(LIB_DIR) $(pipe_LDFLAGS) $(LDFLAGS)' \
142
154
                $(MKLIB_OPTIONS) $< \
143
 
                -Wl,--start-group $($*_LIBS) $(pipe_LIBS) -Wl,--end-group
 
155
                -Wl,--start-group $(pipe_LIBS) $($*_LIBS) -Wl,--end-group \
 
156
                $(pipe_SYS) $($*_SYS)
144
157
 
145
158
$(pipe_OBJECTS): %.o: %.c
146
159
        $(CC) -c -o $@ $< $(pipe_INCLUDES) $(pipe_CFLAGS) $(CFLAGS)