Date: Wed, 10 Dec 2014 20:22:54 +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: r374486 - in head/emulators: virtualbox-ose-additions virtualbox-ose/files Message-ID: <201412102022.sBAKMs1l093840@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Dec 10 20:22:53 2014 New Revision: 374486 URL: https://svnweb.freebsd.org/changeset/ports/374486 QAT: https://qat.redports.org/buildarchive/r374486/ Log: - Use pkgconf to detect X server version. [1] - Allow building vboxmouse for newer X servers. Submitted by: dumbbell (initial version) [1] Added: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk (contents, props changed) Modified: head/emulators/virtualbox-ose-additions/Makefile Modified: head/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- head/emulators/virtualbox-ose-additions/Makefile Wed Dec 10 20:12:13 2014 (r374485) +++ head/emulators/virtualbox-ose-additions/Makefile Wed Dec 10 20:22:53 2014 (r374486) @@ -88,8 +88,11 @@ VBOX_LIBS= VBoxOGL.so \ .if ${PORT_OPTIONS:MX11} BUILD_DEPENDS+= ${LOCALBASE}/bin/X:${PORTSDIR}/x11-servers/xorg-server -VBOX_WITH_X11= 1 USE_XORG= xcursor xmu inputproto xorg-server xrandr +USES+= pkgconfig +VBOX_WITH_X11= 1 +XORG_DRV_ABI= pkgconf --modversion xorg-server | \ + ${SED} -E -e 's/\.[0-9]+$$//' -e 's/\.//' .else VBOX_WITH_X11= .endif @@ -100,8 +103,6 @@ KMK_ARCH= freebsd.x86 KMK_ARCH= freebsd.${ARCH} .endif -XSERVER_ABI:= ${XSERVER_VER:S/.//:R} - .include <bsd.port.pre.mk> .if ${COMPILER_TYPE} == clang @@ -181,11 +182,11 @@ do-install: ${STAGEDIR}${PREFIX}/share/autostart/ ${MKDIR} ${STAGEDIR}${VIDEODIR} - ${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_${XSERVER_ABI}.so \ + ${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_$$(${XORG_DRV_ABI}).so \ ${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so ${MKDIR} ${STAGEDIR}${INPUTDIR} - ${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_${XSERVER_ABI}.so \ + ${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_$$(${XORG_DRV_ABI}).so \ ${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so .endif Added: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk Wed Dec 10 20:22:53 2014 (r374486) @@ -0,0 +1,62 @@ +--- src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig 2014-11-21 10:16:53.000000000 -0500 ++++ src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2014-12-10 14:10:02.000000000 -0500 +@@ -236,6 +236,50 @@ + vboxmouse_drv_112_SOURCES = \ + vboxmouse.c + ++DLLS += vboxmouse_drv_113 ++vboxmouse_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD ++vboxmouse_drv_113_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC ++## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local ++vboxmouse_drv_113_INCS := \ ++ $(vboxmouse_xorg_INCS) \ ++ $(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0 \ ++ $(PATH_SUB_CURRENT) ++vboxmouse_drv_113_SOURCES = \ ++ vboxmouse.c ++ ++DLLS += vboxmouse_drv_114 ++vboxmouse_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD ++vboxmouse_drv_114_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC ++## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local ++vboxmouse_drv_114_INCS := \ ++ $(vboxmouse_xorg_INCS) \ ++ $(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0 \ ++ $(PATH_SUB_CURRENT) ++vboxmouse_drv_114_SOURCES = \ ++ vboxmouse.c ++ ++DLLS += vboxmouse_drv_115 ++vboxmouse_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD ++vboxmouse_drv_115_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC ++## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local ++vboxmouse_drv_115_INCS := \ ++ $(vboxmouse_xorg_INCS) \ ++ $(VBOX_PATH_X11_ROOT)/xorg-server-1.15.0 \ ++ $(PATH_SUB_CURRENT) ++vboxmouse_drv_115_SOURCES = \ ++ vboxmouse.c ++ ++DLLS += vboxmouse_drv_116 ++vboxmouse_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD ++vboxmouse_drv_116_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC ++## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local ++vboxmouse_drv_116_INCS := \ ++ $(vboxmouse_xorg_INCS) \ ++ $(VBOX_PATH_X11_ROOT)/xorg-server-1.16.0 \ ++ $(PATH_SUB_CURRENT) ++vboxmouse_drv_116_SOURCES = \ ++ vboxmouse.c ++ + endif # neq ($(KBUILD_TARGET),linux) + + +@@ -284,7 +328,7 @@ + $(foreach ver, _70 _71 _13 _14 _15 _16, $(eval $(def_vboxmouse_test))) + + ifneq ($(KBUILD_TARGET), linux) +- $(foreach ver, _17 _18 _19 _110 _111 _112 _113, $(eval $(def_vboxmouse_test))) ++ $(foreach ver, _17 _18 _19 _110 _111 _112 _113 _114 _115 _116, $(eval $(def_vboxmouse_test))) + + endif # neq ($(KBUILD_TARGET),linux) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412102022.sBAKMs1l093840>