Date: Wed, 13 May 2015 22:20:44 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386272 - in head/emulators: virtualbox-ose virtualbox-ose-additions virtualbox-ose-kmod virtualbox-ose/files Message-ID: <201505132220.t4DMKiIR050491@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed May 13 22:20:43 2015 New Revision: 386272 URL: https://svnweb.freebsd.org/changeset/ports/386272 Log: Update to 4.3.28. Added: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile (contents, props changed) head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile.kmk (contents, props changed) head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri - copied unchanged from r386233, head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri2 (contents, props changed) head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-freebsd-drm-vboxvideo_drm.c (contents, props changed) Deleted: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-DrvACPI.cpp head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevAHCI.cpp head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevATA.cpp head/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-NetIf-freebsd.cpp head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-ldr-ldrELFRelocatable.cpp.h head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.cpp head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-mp-freebsd.cpp head/emulators/virtualbox-ose/files/patch-src-VBox-VMM-VMMR3-CPUMR3CpuId.cpp head/emulators/virtualbox-ose/files/patch-src-VBox-VMM-VMMR3-PDMDriver.cpp Modified: head/emulators/virtualbox-ose-additions/Makefile head/emulators/virtualbox-ose-additions/distinfo head/emulators/virtualbox-ose-kmod/Makefile head/emulators/virtualbox-ose-kmod/distinfo head/emulators/virtualbox-ose/Makefile head/emulators/virtualbox-ose/distinfo head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk Modified: head/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- head/emulators/virtualbox-ose-additions/Makefile Wed May 13 22:00:48 2015 (r386271) +++ head/emulators/virtualbox-ose-additions/Makefile Wed May 13 22:20:43 2015 (r386272) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.26 +DISTVERSION= 4.3.28 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ @@ -113,6 +113,14 @@ EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-s .endif .endif +.if ${OSVERSION} < 1001514 +EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri +.else +EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-freebsd-drm-Makefile +EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-freebsd-drm-Makefile.kmk +EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri2 +.endif + SUB_LIST+= KMODDIR=${KMODDIR} pre-everything:: Modified: head/emulators/virtualbox-ose-additions/distinfo ============================================================================== --- head/emulators/virtualbox-ose-additions/distinfo Wed May 13 22:00:48 2015 (r386271) +++ head/emulators/virtualbox-ose-additions/distinfo Wed May 13 22:20:43 2015 (r386272) @@ -1,2 +1,2 @@ -SHA256 (VirtualBox-4.3.26.tar.bz2) = e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961 -SIZE (VirtualBox-4.3.26.tar.bz2) = 102676804 +SHA256 (VirtualBox-4.3.28.tar.bz2) = e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 +SIZE (VirtualBox-4.3.28.tar.bz2) = 100092002 Modified: head/emulators/virtualbox-ose-kmod/Makefile ============================================================================== --- head/emulators/virtualbox-ose-kmod/Makefile Wed May 13 22:00:48 2015 (r386271) +++ head/emulators/virtualbox-ose-kmod/Makefile Wed May 13 22:20:43 2015 (r386272) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.26 +DISTVERSION= 4.3.28 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: head/emulators/virtualbox-ose-kmod/distinfo ============================================================================== --- head/emulators/virtualbox-ose-kmod/distinfo Wed May 13 22:00:48 2015 (r386271) +++ head/emulators/virtualbox-ose-kmod/distinfo Wed May 13 22:20:43 2015 (r386272) @@ -1,2 +1,2 @@ -SHA256 (VirtualBox-4.3.26.tar.bz2) = e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961 -SIZE (VirtualBox-4.3.26.tar.bz2) = 102676804 +SHA256 (VirtualBox-4.3.28.tar.bz2) = e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 +SIZE (VirtualBox-4.3.28.tar.bz2) = 100092002 Modified: head/emulators/virtualbox-ose/Makefile ============================================================================== --- head/emulators/virtualbox-ose/Makefile Wed May 13 22:00:48 2015 (r386271) +++ head/emulators/virtualbox-ose/Makefile Wed May 13 22:20:43 2015 (r386272) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.26 +DISTVERSION= 4.3.28 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: head/emulators/virtualbox-ose/distinfo ============================================================================== --- head/emulators/virtualbox-ose/distinfo Wed May 13 22:00:48 2015 (r386271) +++ head/emulators/virtualbox-ose/distinfo Wed May 13 22:20:43 2015 (r386272) @@ -1,4 +1,4 @@ -SHA256 (VirtualBox-4.3.26.tar.bz2) = e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961 -SIZE (VirtualBox-4.3.26.tar.bz2) = 102676804 -SHA256 (VBoxGuestAdditions_4.3.26.iso) = c5e46533a6ff8df177ed5c9098624f6cec46ca392bab16de2017195580088670 -SIZE (VBoxGuestAdditions_4.3.26.iso) = 58120192 +SHA256 (VirtualBox-4.3.28.tar.bz2) = e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 +SIZE (VirtualBox-4.3.28.tar.bz2) = 100092002 +SHA256 (VBoxGuestAdditions_4.3.28.iso) = 9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733 +SIZE (VBoxGuestAdditions_4.3.28.iso) = 58241024 Added: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile Wed May 13 22:20:43 2015 (r386272) @@ -0,0 +1,17 @@ +--- src/VBox/Additions/freebsd/drm/Makefile.orig 2015-03-16 13:00:32.000000000 -0400 ++++ src/VBox/Additions/freebsd/drm/Makefile 2015-03-27 18:18:03.432353000 -0400 +@@ -18,10 +18,10 @@ + + KMOD = vboxvideo + +-SRCS = \ +- vboxvideo_drm.c ++SRCS = vboxvideo_drm.c ++SRCS += device_if.h bus_if.h pci_if.h ++SRCS += opt_compat.h opt_drm.h opt_syscons.h + +-SRCS += device_if.h bus_if.h pci_if.h opt_drm.h ++CFLAGS+= -DVBOXVIDEO_DRM2 + + .include <bsd.kmod.mk> +- Added: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile.kmk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile.kmk Wed May 13 22:20:43 2015 (r386272) @@ -0,0 +1,38 @@ +--- src/VBox/Additions/freebsd/drm/Makefile.kmk.orig 2015-03-16 13:00:32.000000000 -0400 ++++ src/VBox/Additions/freebsd/drm/Makefile.kmk 2015-03-27 22:28:21.000000000 -0400 +@@ -46,6 +46,7 @@ + vboxvideo_drm_TEMPLATE = VBOXGUESTR0 + vboxvideo_drm_NAME = vboxvideo + vboxvideo_drm_DEFS = VBOX_WITH_HGCM VBOX_SVN_REV=$(VBOX_SVN_REV) ++vboxvideo_drm_DEFS += VBOXVIDEO_DRM2 + vboxvideo_drm_DEPS += $(VBOX_SVN_REV_KMK) + vboxvideo_drm_INCS.freebsd = \ + $(vboxvideo_drm_0_OUTDIR) \ +@@ -58,15 +59,24 @@ + $(PATH_STAGE)/gen-sys-hdrs/pci_if.h \ + $(PATH_STAGE)/gen-sys-hdrs/bus_if.h \ + $(PATH_STAGE)/gen-sys-hdrs/device_if.h \ +- $(vboxvideo_drm_0_OUTDIR)/opt_drm.h ++ $(vboxvideo_drm_0_OUTDIR)/opt_compat.h \ ++ $(vboxvideo_drm_0_OUTDIR)/opt_drm.h \ ++ $(vboxvideo_drm_0_OUTDIR)/opt_syscons.h + vboxvideo_drm_CLEAN.freebsd = $(vboxvideo_drm_DEPS) + + # +-# Header for DRM not included by us. ++# Headers for DRM not included by us. + # ++$$(vboxvideo_drm_0_OUTDIR)/opt_compat.h: ++ $(QUIET)$(MKDIR) -p $(vboxvideo_drm_0_OUTDIR) ++ $(QUIET)touch $(vboxvideo_drm_0_OUTDIR)/opt_compat.h ++ + $$(vboxvideo_drm_0_OUTDIR)/opt_drm.h: + $(QUIET)$(MKDIR) -p $(vboxvideo_drm_0_OUTDIR) + $(QUIET)touch $(vboxvideo_drm_0_OUTDIR)/opt_drm.h + +-include $(FILE_KBUILD_SUB_FOOTER) ++$$(vboxvideo_drm_0_OUTDIR)/opt_syscons.h: ++ $(QUIET)$(MKDIR) -p $(vboxvideo_drm_0_OUTDIR) ++ $(QUIET)touch $(vboxvideo_drm_0_OUTDIR)/opt_syscons.h + ++include $(FILE_KBUILD_SUB_FOOTER) Modified: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk ============================================================================== --- head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk Wed May 13 22:00:48 2015 (r386271) +++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk Wed May 13 22:20:43 2015 (r386272) @@ -1,6 +1,6 @@ ---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2013-11-29 14:20:43.000000000 -0500 -+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-12-16 13:47:34.000000000 -0500 -@@ -27,6 +27,9 @@ +--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2015-03-16 13:00:34.000000000 -0400 ++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2015-03-30 02:29:37.842678000 -0400 +@@ -20,6 +20,9 @@ vboxvideo_70_DEFS := \ IN_MODULE XORG_7X RENDER=1 IN_RT_STATIC Copied: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri (from r386233, head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri Wed May 13 22:20:43 2015 (r386272, copy of r386233, head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk) @@ -0,0 +1,168 @@ +--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2015-03-02 10:06:58.000000000 -0500 ++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2015-03-02 18:25:17.273964000 -0500 +@@ -26,7 +26,7 @@ + vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13 + vboxvideo_15_DEFS := \ + $(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_ +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_15_DEFS += \ + VBOX_DRI + endif +@@ -190,7 +190,7 @@ + vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10503000 +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_15_DEFS += \ + VBOX_DRI_OLD + endif +@@ -199,7 +199,7 @@ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3 + vboxvideo_drv_15_INCS += $(PATH_ROOT)/src/VBox/Runtime/include + vboxvideo_drv_15_SOURCES = $(vboxvideo_drv_13_SOURCES) +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_15_SOURCES += \ + vboxvideo_dri.c + endif +@@ -212,7 +212,7 @@ + vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10600000 +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_16_DEFS += \ + VBOX_DRI_OLD + endif +@@ -230,11 +230,19 @@ + vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10699000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_17_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_17_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7 + vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include + vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_13_SOURCES) ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_17_SOURCES += \ ++ vboxvideo_dri.c ++endif + if1of ($(KBUILD_TARGET), linux solaris) + vboxvideo_drv_17_SOURCES += \ + vboxvideo_dri2.c +@@ -248,6 +256,10 @@ + vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10800000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_18_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_18_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0 +@@ -262,6 +274,10 @@ + vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10900000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_19_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_19_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0 +@@ -276,6 +292,10 @@ + vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11000000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_110_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_110_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0 +@@ -290,6 +310,10 @@ + vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11100000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_111_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_111_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 +@@ -304,6 +328,10 @@ + vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11200000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_112_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_112_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0 +@@ -318,6 +346,10 @@ + vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11300000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_113_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_113_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0 +@@ -332,6 +364,10 @@ + vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11400000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_114_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_114_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0 +@@ -346,6 +382,10 @@ + vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11500000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_115_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_115_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.15.0 +@@ -360,6 +400,10 @@ + vboxvideo_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_116_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11600000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_116_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_116_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.16.0 +@@ -374,6 +418,10 @@ + vboxvideo_drv_117_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_117_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_117_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11700000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_117_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_117_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.17.1 Added: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri2 Wed May 13 22:20:43 2015 (r386272) @@ -0,0 +1,47 @@ +--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2015-03-16 13:00:34.000000000 -0400 ++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2015-03-30 02:29:06.707754000 -0400 +@@ -26,7 +26,7 @@ + vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13 + vboxvideo_15_DEFS := \ + $(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_ +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_15_DEFS += \ + VBOX_DRI + endif +@@ -190,7 +190,7 @@ + vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10503000 +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_15_DEFS += \ + VBOX_DRI_OLD + endif +@@ -199,7 +199,7 @@ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3 + vboxvideo_drv_15_INCS += $(PATH_ROOT)/src/VBox/Runtime/include + vboxvideo_drv_15_SOURCES = $(vboxvideo_drv_13_SOURCES) +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_15_SOURCES += \ + vboxvideo_dri.c + endif +@@ -212,7 +212,7 @@ + vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10600000 +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_16_DEFS += \ + VBOX_DRI_OLD + endif +@@ -235,7 +235,7 @@ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7 + vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include + vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_13_SOURCES) +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_17_SOURCES += \ + vboxvideo_dri2.c + endif Added: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-freebsd-drm-vboxvideo_drm.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-freebsd-drm-vboxvideo_drm.c Wed May 13 22:20:43 2015 (r386272) @@ -0,0 +1,77 @@ +--- src/VBox/Additions/freebsd/drm/vboxvideo_drm.c.orig 2015-03-16 13:00:32.000000000 -0400 ++++ src/VBox/Additions/freebsd/drm/vboxvideo_drm.c 2015-03-27 17:40:43.686690000 -0400 +@@ -54,8 +54,13 @@ + #include <sys/cdefs.h> + __FBSDID("$FreeBSD$"); + ++#ifdef VBOXVIDEO_DRM2 ++#include "dev/drm2/drmP.h" ++#include "dev/drm2/drm_pciids.h" ++#else + #include "dev/drm/drmP.h" + #include "dev/drm/drm_pciids.h" ++#endif + + #define DRIVER_AUTHOR "Oracle Corporation" + #define DRIVER_NAME "vboxvideo" +@@ -74,6 +79,54 @@ + vboxvideo_PCI_IDS + }; + ++#ifdef VBOXVIDEO_DRM2 ++ ++static struct drm_driver vboxvideo_info = { ++ .buf_priv_size = 1, /* No dev_priv */ ++ ++ .num_ioctls = 0, ++ ++ .name = DRIVER_NAME, ++ .desc = DRIVER_DESC, ++ .date = DRIVER_DATE, ++ .major = DRIVER_MAJOR, ++ .minor = DRIVER_MINOR, ++ .patchlevel = DRIVER_PATCHLEVEL, ++}; ++ ++static int ++vboxvideo_probe(device_t kdev) ++{ ++ return -drm_probe_helper(kdev, vboxvideo_pciidlist); ++} ++ ++static int ++vboxvideo_attach(device_t kdev) ++{ ++ return -drm_attach_helper(kdev, vboxvideo_pciidlist, &vboxvideo_info); ++} ++ ++static device_method_t vboxvideo_methods[] = { ++ /* Device interface */ ++ DEVMETHOD(device_probe, vboxvideo_probe), ++ DEVMETHOD(device_attach, vboxvideo_attach), ++ DEVMETHOD(device_detach, drm_generic_detach), ++ ++ DEVMETHOD_END ++}; ++ ++static driver_t vboxvideo_driver = { ++ "drmn", ++ vboxvideo_methods, ++ sizeof(struct drm_device) ++}; ++ ++extern devclass_t drm_devclass; ++DRIVER_MODULE(vboxvideo, vgapci, vboxvideo_driver, drm_devclass, 0, 0); ++MODULE_DEPEND(vboxvideo, drmn, 1, 1, 1); ++ ++#else /* !VBOXVIDEO_DRM2 */ ++ + static void vboxvideo_configure(struct drm_device *dev) + { + #if __FreeBSD_version >= 702000 +@@ -161,3 +214,5 @@ + DRIVER_MODULE(vboxvideo, pci, vboxvideo_driver, drm_devclass, 0, 0); + #endif + MODULE_DEPEND(vboxvideo, drm, 1, 1, 1); ++ ++#endif /* VBOXVIDEO_DRM2 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505132220.t4DMKiIR050491>