summaryrefslogtreecommitdiff
path: root/emulators/virtualbox-ose/files/patch-configure
diff options
context:
space:
mode:
authorBeat Gaetzi <beat@FreeBSD.org>2010-01-13 08:03:17 +0000
committerBeat Gaetzi <beat@FreeBSD.org>2010-01-13 08:03:17 +0000
commit078a3145868546becb1f18ad4ff3f84b346ab7ae (patch)
tree4bc52f53b8d0d76da7646866e5ecebe1d952923d /emulators/virtualbox-ose/files/patch-configure
parent- Update to 1.4.0 (diff)
emulators/virtualbox:
- Remove emulators/virtualbox port. Renamed to emulators/virtualbox-ose and seperate port for the kernel modules created: emulators/virtualbox-ose-kmod. emulators/virtualbox-ose: - Update to 3.1.2 - Update guest additions to 3.1.2 - Port has been renamed to virtualbox-ose to reflect that we are using the OSE version. [1] - Added proper PulseAudio support for FreeBSD [2] - procfs is not required anymore because vbox uses sysctl(3) now [3] - Update pkg-message to reflect recent changes - Add nox's FreeBSD host networking patches that are now also in the upstream vbox svn (modulo vbox variable naming style adjustments:) http://lists.freebsd.org/pipermail/freebsd-emulation/2010-January/007260.html http://www.virtualbox.org/changeset/25698 1. Allow direct tap networking again (for users that need the best network performance and/or need more complex network setups, like when they want to use routing instead of bridging to e.g. protect from guests messing with the lan's arp tables; a tap + routing + proxy arp example is in the above freebsd-emulation posting.) 2. Enable vbox' shared mac feature when using bridged mode on a wifi interface, together with the virtualbox-ose-kmod change this should fix bridged mode for wifi users. [4] emulators/virtualbox-ose-kmod: - Update to 3.1.2 - Add rc.d script to load kernel modules - Fix build with a non-standard location for the system source [5] - Merge aeichner's vboxnetflt fix committed to upstream vbox svn (thanks!) that makes the shared mac feature enabled above actually work on FreeBSD hosts. [6] Please see http://wiki.freebsd.org/VirtualBox for update instructions. Many thanks to the VirtualBox developers, all tester, patch submitter and the whole vbox@ team. PR: ports/141630 [2] Noticed by: mm@ [1] Submitted by: Noriyoshi Kawano <bowie AT nrik.jp> [2], Baptiste Daroussin <baptiste.daroussin AT gmail.com> [3] and Bernhard Froehlich <decke AT bluelife.at> [3], nox@ [4], scf@ [5] Obtained from: http://www.virtualbox.org/changeset/25699 [6] On behalf of: vbox@ (decke, dhn, itetcu, miwi, nox)
Diffstat (limited to 'emulators/virtualbox-ose/files/patch-configure')
-rw-r--r--emulators/virtualbox-ose/files/patch-configure56
1 files changed, 51 insertions, 5 deletions
diff --git a/emulators/virtualbox-ose/files/patch-configure b/emulators/virtualbox-ose/files/patch-configure
index c6532c3db606..a4aaf507ccc9 100644
--- a/emulators/virtualbox-ose/files/patch-configure
+++ b/emulators/virtualbox-ose/files/patch-configure
@@ -1,15 +1,33 @@
---- configure.orgi 2009-05-31 13:43:50.000000000 +0200
-+++ configure 2009-05-31 13:45:47.000000000 +0200
-@@ -102,7 +102,7 @@
- XSLTPROC="xsltproc"
+--- configure.orig 2009-12-17 15:23:05.000000000 +0100
++++ configure 2009-12-21 14:25:45.000000000 +0100
+@@ -107,7 +107,7 @@
GENISOIMAGE="genisoimage"
MKISOFS="mkisofs"
+ INCCRYPTO=""
-LIBCRYPTO="-lcrypto"
+LIBCRYPTO="-lcrypto -lssl"
LIBPTHREAD="-lpthread"
LIBCAP="-lcap"
GSOAP=""
-@@ -1698,7 +1698,7 @@
+@@ -125,6 +125,8 @@
+ if [ "$OS" = "freebsd" ]; then
+ INCCURL="-I/usr/local/include"
+ LIBCURL="-L/usr/local/lib -lcurl"
++ INCPULSE="-I/usr/local/include"
++ LIBPULSE="-L/usr/local/lib"
+ else
+ INCCURL=""
+ LIBCURL="-lcurl"
+@@ -1181,7 +1183,7 @@
+ #endif
+ }
+ EOF
+- if test_compile "-lpulse" pulse pulse; then
++ if test_compile "$INCPULSE $LIBPULSE -lpulse" pulse pulse; then
+ test_execute
+ fi
+ }
+@@ -1773,7 +1775,7 @@
cat $ODIR.tmp_src.cc >> $LOG
echo "using the following command line:" >> $LOG
echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so" >> $LOG
@@ -18,3 +36,31 @@
if [ $? -eq 0 ]; then
found=1
break
+@@ -2315,6 +2317,15 @@
+ [ $WITH_QT4 -eq 1 ] && check_qt4
+ [ $WITH_PYTHON -eq 1 ] && check_python
+
++# PulseAudio
++if [ "$OS" = "linux" -o "$OS" = "freebsd" ]; then
++ if [ $WITH_PULSE -eq 1 ]; then
++ check_pulse
++ else
++ cnf_append "VBOX_WITH_PULSE" ""
++ fi
++fi
++
+ # Linux-specific
+ if [ "$OS" = "linux" ]; then
+ # don't check for the static libstdc++ in the PUEL version as we build the
+@@ -2332,11 +2343,6 @@
+ else
+ cnf_append "VBOX_WITH_ALSA" ""
+ fi
+- if [ $WITH_PULSE -eq 1 ]; then
+- check_pulse
+- else
+- cnf_append "VBOX_WITH_PULSE" ""
+- fi
+ if [ $WITH_DBUS -eq 0 ]; then
+ cnf_append "VBOX_WITH_DBUS" ""
+ fi