Date: Mon, 12 Sep 2016 22:52:05 +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: r421965 - in head/emulators: virtualbox-ose virtualbox-ose-additions virtualbox-ose-additions/files virtualbox-ose-kmod virtualbox-ose/files Message-ID: <201609122252.u8CMq5fu046176@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Mon Sep 12 22:52:05 2016 New Revision: 421965 URL: https://svnweb.freebsd.org/changeset/ports/421965 Log: Update to 5.1.6. Added: head/emulators/virtualbox-ose-additions/files/vboxvideo.conf (contents, props changed) Deleted: head/emulators/virtualbox-ose-additions/files/pkg-post-install.in head/emulators/virtualbox-ose-additions/files/pkg-pre-deinstall.in head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp Modified: head/emulators/virtualbox-ose-additions/Makefile head/emulators/virtualbox-ose-additions/distinfo head/emulators/virtualbox-ose-additions/pkg-plist 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/patch-configure Modified: head/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- head/emulators/virtualbox-ose-additions/Makefile Mon Sep 12 21:55:06 2016 (r421964) +++ head/emulators/virtualbox-ose-additions/Makefile Mon Sep 12 22:52:05 2016 (r421965) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.1.4 +PORTVERSION= 5.1.6 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX= -additions @@ -76,9 +76,6 @@ MAKE_ARGS+= DEBUG_FLAGS="-O1 -g" .endif .if ${PORT_OPTIONS:MOPENGL} -PKGPOSTINSTALL= ${WRKDIR}/pkg-post-install -PKGPREDEINSTALL= ${WRKDIR}/pkg-pre-deinstall -SUB_FILES= pkg-post-install pkg-pre-deinstall USE_XORG= xcomposite xdamage xfixes USE_GL= gl VBOX_LIBS= VBoxEGL.so \ @@ -208,6 +205,8 @@ do-install: .endif .if ${PORT_OPTIONS:MOPENGL} + ${INSTALL_DATA} ${FILESDIR}/vboxvideo.conf \ + ${STAGEDIR}${PREFIX}/etc/libmap.d/ ${INSTALL_DATA} ${VBOX_LIBS:S|^|${VBOX_BIN}/|} \ ${STAGEDIR}${PREFIX}/lib/ .endif Modified: head/emulators/virtualbox-ose-additions/distinfo ============================================================================== --- head/emulators/virtualbox-ose-additions/distinfo Mon Sep 12 21:55:06 2016 (r421964) +++ head/emulators/virtualbox-ose-additions/distinfo Mon Sep 12 22:52:05 2016 (r421965) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472243715 -SHA256 (VirtualBox-5.1.4.tar.bz2) = b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf -SIZE (VirtualBox-5.1.4.tar.bz2) = 114642581 +TIMESTAMP = 1473714391 +SHA256 (VirtualBox-5.1.6.tar.bz2) = 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911 +SIZE (VirtualBox-5.1.6.tar.bz2) = 114669517 Added: head/emulators/virtualbox-ose-additions/files/vboxvideo.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose-additions/files/vboxvideo.conf Mon Sep 12 22:52:05 2016 (r421965) @@ -0,0 +1,2 @@ +libEGL.so.1 VBoxEGL.so +libGL.so.1 VBoxOGL.so Modified: head/emulators/virtualbox-ose-additions/pkg-plist ============================================================================== --- head/emulators/virtualbox-ose-additions/pkg-plist Mon Sep 12 21:55:06 2016 (r421964) +++ head/emulators/virtualbox-ose-additions/pkg-plist Mon Sep 12 22:52:05 2016 (r421965) @@ -1,5 +1,6 @@ %%X11%%bin/VBoxClient %%X11%%bin/VBoxClient-all +%%OPENGL%%etc/libmap.d/vboxvideo.conf %%X11%%etc/xdg/autostart/vboxclient.desktop %%OPENGL%%lib/VBoxEGL.so %%OPENGL%%lib/VBoxOGL.so Modified: head/emulators/virtualbox-ose-kmod/Makefile ============================================================================== --- head/emulators/virtualbox-ose-kmod/Makefile Mon Sep 12 21:55:06 2016 (r421964) +++ head/emulators/virtualbox-ose-kmod/Makefile Mon Sep 12 22:52:05 2016 (r421965) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.1.4 +PORTVERSION= 5.1.6 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX= -kmod Modified: head/emulators/virtualbox-ose-kmod/distinfo ============================================================================== --- head/emulators/virtualbox-ose-kmod/distinfo Mon Sep 12 21:55:06 2016 (r421964) +++ head/emulators/virtualbox-ose-kmod/distinfo Mon Sep 12 22:52:05 2016 (r421965) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472243715 -SHA256 (VirtualBox-5.1.4.tar.bz2) = b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf -SIZE (VirtualBox-5.1.4.tar.bz2) = 114642581 +TIMESTAMP = 1473714391 +SHA256 (VirtualBox-5.1.6.tar.bz2) = 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911 +SIZE (VirtualBox-5.1.6.tar.bz2) = 114669517 Modified: head/emulators/virtualbox-ose/Makefile ============================================================================== --- head/emulators/virtualbox-ose/Makefile Mon Sep 12 21:55:06 2016 (r421964) +++ head/emulators/virtualbox-ose/Makefile Mon Sep 12 22:52:05 2016 (r421965) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.1.4 +PORTVERSION= 5.1.6 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} @@ -280,12 +280,6 @@ post-patch: ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_VALIDATIONKIT =' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk -.if empty(PORT_OPTIONS:MALSA) - @${ECHO} 'VBOX_WITH_AUDIO_ALSA =' >> ${WRKSRC}/LocalConfig.kmk -.endif -.if empty(PORT_OPTIONS:MPULSEAUDIO) - @${ECHO} 'VBOX_WITH_AUDIO_PULSE =' >> ${WRKSRC}/LocalConfig.kmk -.endif .if ${PORT_OPTIONS:MQT4} @${ECHO} 'TOOL_QT4_BIN_SUFF = -qt4' >> ${WRKSRC}/LocalConfig.kmk .endif Modified: head/emulators/virtualbox-ose/distinfo ============================================================================== --- head/emulators/virtualbox-ose/distinfo Mon Sep 12 21:55:06 2016 (r421964) +++ head/emulators/virtualbox-ose/distinfo Mon Sep 12 22:52:05 2016 (r421965) @@ -1,5 +1,5 @@ -TIMESTAMP = 1472243715 -SHA256 (VirtualBox-5.1.4.tar.bz2) = b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf -SIZE (VirtualBox-5.1.4.tar.bz2) = 114642581 -SHA256 (VBoxGuestAdditions_5.1.4.iso) = e385b698338003595f6cdeee7b631ec6713058ba1227d1f2a1da342bdf741982 -SIZE (VBoxGuestAdditions_5.1.4.iso) = 59262976 +TIMESTAMP = 1473714391 +SHA256 (VirtualBox-5.1.6.tar.bz2) = 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911 +SIZE (VirtualBox-5.1.6.tar.bz2) = 114669517 +SHA256 (VBoxGuestAdditions_5.1.6.iso) = cbcf9b9b1000e09911b3d20e1efe529aef8a945cf130f6abffc14a39522cc1ed +SIZE (VBoxGuestAdditions_5.1.6.iso) = 59258880 Modified: head/emulators/virtualbox-ose/files/patch-configure ============================================================================== --- head/emulators/virtualbox-ose/files/patch-configure Mon Sep 12 21:55:06 2016 (r421964) +++ head/emulators/virtualbox-ose/files/patch-configure Mon Sep 12 22:52:05 2016 (r421965) @@ -1,4 +1,4 @@ ---- configure.orig 2016-08-16 19:55:20 UTC +--- configure.orig 2016-09-12 16:11:24 UTC +++ configure @@ -140,10 +140,14 @@ CXX_FLAGS="" if [ "$OS" = "freebsd" ]; then @@ -54,7 +54,7 @@ ;; --with-ow-dir=*) WATCOM=`echo $option | cut -d'=' -f2` -@@ -2942,8 +2949,15 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then +@@ -2944,13 +2951,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then [ $WITH_PYTHON -eq 1 ] && check_python [ $WITH_JAVA -eq 1 ] && check_java @@ -63,22 +63,27 @@ + if [ $WITH_ALSA -eq 1 ]; then + check_alsa + else -+ cnf_append "VBOX_WITH_ALSA" "" -+ fi -+ if [ $WITH_DBUS -eq 0 ]; then -+ cnf_append "VBOX_WITH_DBUS" "" ++ cnf_append "VBOX_WITH_AUDIO_ALSA" "" + fi if [ $WITH_PULSE -eq 1 ]; then check_pulse elif [ $WITH_PULSE -eq 0 ]; then -@@ -2965,14 +2979,6 @@ if [ "$OS" = "linux" ]; then + cnf_append "VBOX_WITH_AUDIO_PULSE" "" + fi ++ if [ $WITH_DBUS -eq 0 ]; then ++ cnf_append "VBOX_WITH_DBUS" "" ++ fi + fi + fi + +@@ -2967,14 +2981,6 @@ if [ "$OS" = "linux" ]; then cnf_append "VBOX_WITH_ADDITION_DRIVERS" "" fi if [ $ONLY_ADDITIONS -eq 0 ]; then - if [ $WITH_ALSA -eq 1 ]; then - check_alsa - else -- cnf_append "VBOX_WITH_ALSA" "" +- cnf_append "VBOX_WITH_AUDIO_ALSA" "" - fi - if [ $WITH_DBUS -eq 0 ]; then - cnf_append "VBOX_WITH_DBUS" ""
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609122252.u8CMq5fu046176>