Attachment 189473 Details for Bug 200764 – Patch3.diff

[patch] Patch3.diff

Patch3.diff (text/plain), 5.89 KB, created by Andriy Voskoboinyk on 2018-01-06 21:28:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2018-01-06 21:28:45 UTC

Size: 5.89 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 458243)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	virtualbox-ose
> PORTVERSION=	5.2.4
>+PORTREVISION=	1
> CATEGORIES=	emulators
> MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
> DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
>@@ -18,9 +19,9 @@
> 		xsltproc:textproc/libxslt \
> 		kmk:devel/kBuild \
> 		gtar:archivers/gtar \
>-		cdrecord:sysutils/cdrtools
>+		cdrecord:sysutils/cdrtools \
>+		libIDL-config-2:devel/libIDL
> LIB_DEPENDS=	libpng.so:graphics/png \
>-		libxslt.so:textproc/libxslt \
> 		libcurl.so:ftp/curl
> RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod \
> 		cdrecord:sysutils/cdrtools
>@@ -29,9 +30,9 @@
> CPE_PRODUCT=	vm_virtualbox
> 
> WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
>-ONLY_FOR_ARCHS=	i386 amd64
>+ONLY_FOR_ARCHS=	amd64 i386
> USES=		compiler:c++14-lang cpe iconv pkgconfig ssl tar:bzip2
>-USE_GNOME=	libidl libxml2
>+USE_GNOME=	libxml2
> 
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-java --passive-mesa
>@@ -58,7 +59,6 @@
> OPTIONS_DEFINE=	ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO \
> 		PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
> OPTIONS_DEFAULT=	DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
>-OPTIONS_SUB=	yes
> 
> DEBUG_DESC=	Debug symbols, additional logs and assertions
> GUESTADDITIONS_DESC=	Build with Guest Additions
>@@ -71,6 +71,15 @@
> VPX_DESC=	Use vpx for video capturing
> WEBSERVICE_DESC=	Build Webservice
> 
>+MANUAL_USE=		TEX=dvipsk:build,formats:build
>+PYTHON_USES=		python:2.7
>+PYTHON_USE=		PYTHON=distutils,noegginfo,noflavors
>+PYTHON_USES_OFF=	python:build
>+QT5_USE=		QT5=buildtools_build,core,dbus,gui,linguisttools_build
>+QT5_USE+=		QT5=opengl,printsupport,widgets,x11extras XORG=xcb
>+X11_USE=		GL=gl SDL=sdl
>+X11_USE+=		XORG=inputproto,x11,xext,xcursor,xinerama,xt,xmu
>+
> ALSA_CONFIGURE_OFF=	--disable-alsa
> ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
> DBUS_CONFIGURE_OFF=	--disable-dbus
>@@ -88,11 +97,14 @@
> VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
> VPX_CONFIGURE_OFF=	--disable-libvpx
> VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
>+QT5_CONFIGURE_ON=	--enable-qt5
>+QT5_CONFIGURE_OFF=	--disable-qt
> X11_CONFIGURE_OFF=	--build-headless
> 
> ENV=
> .export ENV
> 
>+OPTIONS_SUB=	yes
> PLIST_SUB=	GUEST_VER=${PORTVERSION} \
> 		PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
> 		VBOXGROUP=${VBOXGROUP}
>@@ -143,32 +155,21 @@
> .if ${PORT_OPTIONS:MMANUAL}
> DBKXMLDIR=	${LOCALBASE}/share/xml/docbook/4.4
> DBKXSLDIR=	${LOCALBASE}/share/xsl/docbook
>-USE_TEX=	dvipsk:build formats:build
> .endif
> 
> .if ${PORT_OPTIONS:MPYTHON}
>-USES+=		python
>-USE_PYTHON=	distutils noegginfo noflavors
> PYDISTUTILS_PKGNAME=	vboxapi
> PYDISTUTILS_PKGVERSION=	1.0
>-.else
>-USES+=		python:build
> .endif
> 
> .if ${PORT_OPTIONS:MQT5}
>-CONFIGURE_ARGS+=	--enable-qt5
> PLIST_SUB+=	QT=""
> QT_NONSTANDARD=	yes
>-USE_GL=		gl
>-USE_QT5=	buildtools_build core dbus gui linguisttools_build opengl
>-USE_QT5+=	printsupport widgets x11extras
>-USE_XORG=	xcb
> INSTALLS_ICONS=	yes
> VBOX_PROGS+=	VirtualBox
> VBOX_UTILS+=	VBoxTestOGL
> VBOX_WITH_QT=	1
> .else
>-CONFIGURE_ARGS+=	--disable-qt
> PLIST_SUB+=	QT="@comment "
> .endif
> 
>@@ -180,8 +181,6 @@
> .endif
> 
> .if ${PORT_OPTIONS:MX11}
>-USE_SDL=	sdl
>-USE_XORG+=	inputproto x11 xcursor xext xinerama xmu xt
> VBOX_PROGS+=	VBoxSDL
> .endif
> 
>@@ -303,7 +302,11 @@
> 	@${REINPLACE_CMD} \
> 	    -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
> 	    -e 's|SUPPYTHONLIBS=.*|SUPPYTHONLIBS="${PYTHON_VERSION}${PYTHON_ABIVER}"|' \
>+	    -e 's|\[ $$WITH_X11    -eq 1 \] && check_xrandr||' \
>+	    -e 's|#include <GL/glu.h>||' \
> 	    ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|#include <GL/glu.h>||' \
>+	    ${WRKSRC}/src/VBox/GuestHost/OpenGL/include/chromium.h
> .if empty(ICONV_LIB)
> 	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \
> 	    ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
>@@ -325,7 +328,9 @@
> .endif
> 
> do-install:
>+.if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
> 	${MKDIR} ${STAGEDIR}${DATADIR}/sdk
>+.endif
> 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom && \
> 	    ${COPYTREE_SHARE} "idl samples" ${STAGEDIR}${DATADIR}
> 
>@@ -334,9 +339,12 @@
> 	    ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox
> 
> 	${MKDIR} ${STAGEDIR}${VBOX_DIR}
>-	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \
>+	cd ${KMK_BUILDDIR}/bin && ${FIND} . -type f -name "*.so" \
>+	    -exec ${STRIP_CMD} {} \; && ${COPYTREE_SHARE} \
> 	    "*.fd *.r0 *.rc *.so components" ${STAGEDIR}${VBOX_DIR}
>+.if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
> 	${RLN} ${STAGEDIR}${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
>+.endif
> 
> 	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \
> 	    ${STAGEDIR}${VBOX_DIR}
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 458243)
>+++ files/patch-configure	(working copy)
>@@ -25,6 +25,16 @@
>        elif [ $cc_maj -lt 4 \
>               -o $ $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" $ \
>               -o $ $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS"  = "darwin" $ \
>+@@ -1114,6 +1116,9 @@ extern "C" int main(int argc, char** arg
>+   printf("found version %d.%d.%d",
>+          SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);
>+ #if SDL_VERSION_ATLEAST(1,2,7)
>++#if !defined(SDL_VIDEO_DRIVER_X11)
>++#error SDL must be compiled with X11 support
>++#endif
>+   printf(", OK.\n");
>+   return 0;
>+ #else
> @@ -1233,7 +1240,7 @@ extern "C" int main(void)
>  #endif
>  }
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 458243)
>+++ pkg-plist	(working copy)
>@@ -424,7 +424,7 @@
> lib/virtualbox/VMMRC.rc
> %%QT%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VirtualBox
> %%QT%%lib/virtualbox/VirtualBox.so
>-lib/virtualbox/sdk
>+%%SDK%%lib/virtualbox/sdk
> %%WEBSERVICE%%lib/virtualbox/vboxwebsrv
> %%WEBSERVICE%%lib/virtualbox/webtest
> %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html

Actions: View | Diff

Attachments on bug 200764: 157612 | 157613 | 159668 | 159669 | 159670 | 159694 | 189473 | 189474 | 189475