~ubuntu-branches/ubuntu/natty/xserver-xorg-video-intel/natty-updates

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Christopher James Halse Rogers
  • Date: 2011-03-02 14:12:35 UTC
  • mfrom: (1.5.16 sid)
  • Revision ID: james.westby@ubuntu.com-20110302141235-iyt9pwza5mtt90a3
Tags: 2:2.14.0-4ubuntu1
* Merge from Debian unstable.  Remaining Ubuntu changes:
  - debian/apport-gpu-error-intel.py:
  - debian/control:
  - debian/rules:
  - debian/xserver-xorg-video-intel.install:
  - debian/xserver-xorg-video-intel.udev
    + Add apport hook, triggered on udev GPU error event
  - debian/control:
    + Drop [linux-any] qualifier on libudev-dev build-dep to work around
      pbuilder bug.
  - debian/patches/101_copy-fb.patch:
    + Plymouth integration patch
  - debian/patches/107_solid_nullptr_check.patch:
    + Check null return from uxa_acquire_solid()
  - debian/patches/109_dont_reconstruct_glyph_cache_on_rotate.patch:
    + Fix font corruption (missing glyphs) on rotated screens.
  - debian/patches/110_warnings_cleanup.patch:
  - debian/patches/114_warnings_cleanup_part_2.patch:
    + Cherry picks to fix a large number of build warnings.
  - debian/patches/111_fix_clipped_window_plane_offset.patch:
  - 112_fix_error_in_4c4ad555.patch: 
    + Fix issue where vertical green line and strange colors shows up when
      playing gstreamer with certain videos, when dragged.  (LP 460677)
  - debian/patches/113_remove_broken_max_base_addresses.patch:
    +  Fixes GPU lockup during login with 
       "Bad length (4) in MI_DISPLAY_BUFFER_INFO, [3, 3]" error messages
          listed in the gpu dump text. (LP 710321)
  - debian/patches/115_quell_vblank_counter_failed.patch:
    +  Don't fill up Xorg.0.log with 
       "get vblank counter failed: Invalid argument" warnings.
         5 is enough.  (LP 710594)
  - debian/xserver-xorg-video-intel.preinst.in:
  - debian/xserver-xorg-video-intel.postinst.in:
    + Remove obsolete /etc/modprobe.d/i915-kms.conf file on upgrades.  KMS
      is the kernel default.
* Pull prerequisite commit into 
  109_dont_reconstruct_glyph_cache_on_rotate.patch.  We mostly didn't notice
  because the copy-fb codepath initialises the resources itself.  Fixes
  Pixmap assert on Xserver startup when copy-fb fails, such as on hybrid
  graphics systems. (LP: #718620)
* debian/control:
  - Dropped Ubuntu change: remove a bunch of Conflicts/Replaces against 
    packages last seen in Hardy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#!/usr/bin/make -f
2
 
# debian/rules for the Debian xserver-xorg-driver-i810 package.
3
 
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
4
 
# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
5
 
# Copyright © 2005 David Nusinow <dnusinow@debian.org>
6
 
 
7
 
# Uncomment this to turn on verbose mode.
8
 
#export DH_VERBOSE=1
9
 
 
10
 
include debian/xsfbs/xsfbs.mk
11
 
 
12
 
CFLAGS = -Wall -g
13
 
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
14
 
        CFLAGS += -O0
15
 
else
16
 
        CFLAGS += -O2
17
 
endif
18
 
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
19
 
        NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
20
 
        MAKEFLAGS += -j$(NUMJOBS)
21
 
endif
22
 
 
23
 
DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
24
 
DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
25
 
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
26
 
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
27
 
        confflags += --build=$(DEB_HOST_GNU_TYPE)
28
 
else
29
 
        confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
30
 
endif
31
 
 
32
 
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
33
 
confflags += --disable-static
34
 
 
35
 
configure: $(STAMP_DIR)/patch
36
 
        dh_testdir
37
 
        autoreconf -vfi
38
 
 
39
 
build/config.status: configure
40
 
        dh_testdir
41
 
        test -d build || mkdir build
42
 
        cd build && \
43
 
        ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
44
 
                     --infodir=\$${prefix}/share/info $(confflags) \
45
 
                     CFLAGS="$(CFLAGS)" 
46
 
 
47
 
.PHONY: build
48
 
build: build-stamp
49
 
build-stamp: build/config.status
50
 
        dh_testdir
51
 
        cd build && $(MAKE)
52
 
        >$@
53
 
 
54
 
clean: xsfclean
55
 
        dh_testdir
56
 
        dh_testroot
57
 
        rm -f build-stamp
58
 
 
59
 
        rm -f config.cache config.log config.status
60
 
        rm -f */config.cache */config.log */config.status
61
 
        rm -f conftest* */conftest*
62
 
        rm -rf autom4te.cache */autom4te.cache
63
 
        rm -rf build
64
 
        rm -f $$(find -name Makefile.in)
65
 
        rm -f compile config.guess config.sub configure depcomp install-sh
66
 
        rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs
67
 
        rm -f m4/lt* m4/libtool.m4
68
 
 
69
 
        dh_clean
70
 
 
71
 
install: build
72
 
        dh_testdir
73
 
        dh_testroot
74
 
        dh_clean -k
75
 
        dh_installdirs usr/share/apport
76
 
 
77
 
        cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
2
 
 
3
# Install in debian/tmp to retain control through dh_install:
 
4
override_dh_auto_install:
 
5
        dh_auto_install --destdir=debian/tmp
78
6
        install -d $(CURDIR)/debian/tmp/usr/share/apport
79
7
        install -m 755 debian/apport-gpu-error-intel.py $(CURDIR)/debian/tmp/usr/share/apport
80
8
 
81
 
# Build architecture-dependent files here.
82
 
binary-arch: DH_OPTIONS=-s
83
 
binary-arch: build install serverabi
84
 
        dh_testdir
85
 
        dh_testroot
 
9
# Kill *.la files, and forget no-one:
 
10
override_dh_install:
 
11
        find debian/tmp -name '*.la' -delete
 
12
        dh_install --fail-missing
86
13
 
87
 
        dh_installdocs README NEWS
88
 
        dh_installchangelogs
89
 
        dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=usr/share/man/man4
90
 
        dh_installman
91
 
        dh_installudev
92
 
        dh_link
 
14
# Debug package:
 
15
override_dh_strip:
93
16
        dh_strip --dbg-package=xserver-xorg-video-intel-dbg
94
 
        dh_compress
95
 
        dh_fixperms
96
 
        dh_makeshlibs
 
17
 
 
18
# That's a plugin, use appropriate warning level:
 
19
override_dh_shlibdeps:
97
20
        dh_shlibdeps -- --warnings=6
98
 
        dh_installdeb
99
 
        dh_gencontrol
100
 
        dh_md5sums
101
 
        dh_builddeb
102
 
 
103
 
# Build architecture-independent files here.
104
 
binary-indep:
105
 
        # nothing to do
106
 
 
107
 
binary: binary-indep binary-arch
108
 
.PHONY: build clean binary-indep binary-arch binary install
 
21
 
 
22
%:
 
23
        dh $@ --with quilt,autoreconf,xsf --builddirectory=build/