← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to .pc/18-system-xorg.patch/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/18-system-xorg.patch/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
1
 
# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $
 
1
# $Id: Makefile.kmk $
2
2
## @file
3
3
# Sub-Makefile for the VBox Linux Additions X.org graphics driver.
4
4
#
325
325
vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES)
326
326
 
327
327
 
 
328
#
 
329
# vboxvideo_drv_111
 
330
#
 
331
DLLS += vboxvideo_drv_111
 
332
vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
 
333
vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 
334
vboxvideo_drv_111_DEFS := $(vboxvideo_drv_15_DEFS)
 
335
## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 
336
vboxvideo_drv_111_INCS = \
 
337
        $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
 
338
        $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
 
339
        $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
 
340
        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
 
341
        $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
 
342
        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
 
343
        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
 
344
        $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
 
345
        $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
 
346
        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
 
347
        $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
 
348
        $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 \
 
349
        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
 
350
        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
 
351
vboxvideo_drv_111_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 
352
vboxvideo_drv_111_SOURCES := $(vboxvideo_drv_15_SOURCES)
 
353
 
 
354
 
328
355
# Check the undefined symbols in the X.Org modules against lists of allowed
329
356
# symbols.  Not very elegant, but it will catch problems early.
330
357
ifdef VBOX_WITH_TESTCASES
424
451
            $(vboxvideo_drv_110_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
425
452
        $(QUIET)$(APPEND) -t "$@" "done"
426
453
 
 
454
     TESTING += $(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run
 
455
     OTHERS += $(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run
 
456
$$(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run: $$(vboxvideo_drv_111_1_STAGE_TARGET)
 
457
        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
 
458
        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
 
459
            $(vboxvideo_drv_111_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
 
460
        $(QUIET)$(APPEND) -t "$@" "done"
 
461
 
427
462
    endif # ! VBOX_ONLY_SDK
428
463
   endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
429
464
  endif # eq ($(KBUILD_TARGET),linux)