From owner-svn-ports-all@FreeBSD.ORG Wed Nov 26 19:55:53 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82FB749A; Wed, 26 Nov 2014 19:55:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E2F19EF; Wed, 26 Nov 2014 19:55:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQJtrrm033766; Wed, 26 Nov 2014 19:55:53 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQJtrF8033764; Wed, 26 Nov 2014 19:55:53 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201411261955.sAQJtrF8033764@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Wed, 26 Nov 2014 19:55:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373459 - in head/emulators: virtualbox-ose-additions virtualbox-ose/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 19:55:53 -0000 Author: jkim Date: Wed Nov 26 19:55:52 2014 New Revision: 373459 URL: https://svnweb.freebsd.org/changeset/ports/373459 QAT: https://qat.redports.org/buildarchive/r373459/ Log: Do not use DRI2 as we did not port vboxvideo.ko for DRM2/KMS yet. PR: 194324 Modified: head/emulators/virtualbox-ose-additions/Makefile head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk Modified: head/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- head/emulators/virtualbox-ose-additions/Makefile Wed Nov 26 19:48:24 2014 (r373458) +++ head/emulators/virtualbox-ose-additions/Makefile Wed Nov 26 19:55:52 2014 (r373459) @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 4.3.20 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk ============================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk Wed Nov 26 19:48:24 2014 (r373458) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk Wed Nov 26 19:55:52 2014 (r373459) @@ -1,5 +1,5 @@ ---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2014-11-24 19:16:07.000000000 -0500 -+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2014-11-24 19:22:38.000000000 -0500 +--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2014-11-26 01:38:10.000000000 -0500 ++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2014-11-26 01:45:20.000000000 -0500 @@ -36,7 +36,7 @@ vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13 vboxvideo_15_DEFS := \ @@ -78,70 +78,80 @@ vboxvideo_drv_19_INCS = \ $(vboxvideo_xorg_INCS) \ $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0 -@@ -291,7 +307,11 @@ +@@ -287,6 +303,10 @@ + vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000 ++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 - vboxvideo_drv_110_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_13_SOURCES) -+if1of ($(KBUILD_TARGET), freebsd linux solaris) -+ vboxvideo_drv_110_SOURCES += \ -+ vboxvideo_dri2.c +@@ -301,6 +321,10 @@ + vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_111_DEFS += \ ++ VBOX_DRI_OLD +endif - - - # -@@ -305,7 +325,7 @@ + vboxvideo_drv_111_INCS = \ $(vboxvideo_xorg_INCS) \ $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 - vboxvideo_drv_111_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_111_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_111_SOURCES := $(vboxvideo_drv_110_SOURCES) - - - # -@@ -319,7 +339,7 @@ +@@ -315,6 +339,10 @@ + vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000 ++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 - vboxvideo_drv_112_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_112_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_112_SOURCES := $(vboxvideo_drv_110_SOURCES) - - - # -@@ -333,7 +353,7 @@ +@@ -329,6 +357,10 @@ + vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000 ++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 - vboxvideo_drv_113_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_113_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_113_SOURCES := $(vboxvideo_drv_110_SOURCES) - - - # -@@ -347,7 +367,7 @@ +@@ -343,6 +375,10 @@ + vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101400000 ++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 - vboxvideo_drv_114_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_114_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_114_SOURCES := $(vboxvideo_drv_110_SOURCES) - - - # -@@ -361,7 +381,7 @@ +@@ -357,6 +393,10 @@ + vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101500000 ++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 - vboxvideo_drv_115_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_115_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_115_SOURCES := $(vboxvideo_drv_110_SOURCES) - - - # -@@ -375,7 +395,7 @@ +@@ -371,6 +411,10 @@ + vboxvideo_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_116_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101600000 ++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 - vboxvideo_drv_116_INCS += $(PATH_ROOT)/src/VBox/Runtime/include --vboxvideo_drv_116_SOURCES := $(vboxvideo_drv_17_SOURCES) -+vboxvideo_drv_116_SOURCES := $(vboxvideo_drv_110_SOURCES) - - - ifdef VBOX_USE_SYSTEM_XORG_HEADERS