mirror of
https://git.freebsd.org/ports.git
synced 2025-07-11 22:39:16 -04:00
2a547baa1b
Changelog from VirtualBox is available here: http://www.virtualbox.org/wiki/Changelog Changes in the port: - VirtualBox and Guest Additions iso updated to 3.1.4 - Add UNIQUENAME to fix options file clashes between the virtualbox ports [0] - Fixed vtophys problems on CURRENT and STABLE kernes newer than January 23th [1] - Fixed page double wiring issue in rtR0MemObjNativeAllocPage [2] PR: ports/143361 [0] Submitted by: Martin Birgmeier <martin.birgmeier AT aon.at> [0] Alexander Eichner <Alexander.Eichner AT Sun.COM> [1] Thanks To: All testers on emulation@ and current@ [1] Giovanni Trematerra <giovanni.trematerra AT gmail.com> [1] Ian Freislich <ianf AT clue.co.za> [1] Reported by: Alan Cox <alc AT cs dot rice dot edu> [2]
66 lines
1.8 KiB
Text
66 lines
1.8 KiB
Text
--- configure.orig 2010-01-28 16:34:50.000000000 +0100
|
|
+++ configure 2010-01-28 22:16:50.000000000 +0100
|
|
@@ -107,7 +107,7 @@
|
|
GENISOIMAGE="genisoimage"
|
|
MKISOFS="mkisofs"
|
|
INCCRYPTO=""
|
|
-LIBCRYPTO="-lcrypto"
|
|
+LIBCRYPTO="-lcrypto -lssl"
|
|
LIBPTHREAD="-lpthread"
|
|
LIBCAP="-lcap"
|
|
GSOAP=""
|
|
@@ -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
|
|
- $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so >> $LOG 2>&1
|
|
+ $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so -pthread >> $LOG 2>&1
|
|
if [ $? -eq 0 ]; then
|
|
found=1
|
|
break
|
|
@@ -2318,6 +2320,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
|
|
@@ -2335,11 +2346,6 @@
|
|
else
|
|
cnf_append "VBOX_WITH_ALSA" ""
|
|
fi
|
|
- if [ $WITH_PULSE -eq 1 ]; then
|
|
- check_pulse
|
|
- elif [ $WITH_PULSE -eq 0 ]; then
|
|
- cnf_append "VBOX_WITH_PULSE" ""
|
|
- fi
|
|
if [ $WITH_DBUS -eq 0 ]; then
|
|
cnf_append "VBOX_WITH_DBUS" ""
|
|
fi
|