1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
|
--- configure.orig 2025-04-11 11:59:42 UTC
+++ configure
@@ -154,10 +154,14 @@ if [ "$OS" = "freebsd" ]; then
if [ "$OS" = "freebsd" ]; then
INCCURL="-I/usr/local/include"
LIBCURL="-L/usr/local/lib -lcurl"
+ INCALSA="-I/usr/local/include"
+ LIBALSA="-L/usr/local/lib"
INCPULSE="-I/usr/local/include"
LIBPULSE="-L/usr/local/lib"
INCPNG="-I/usr/local/include"
LIBPNG="-L/usr/local/lib -lpng"
+ INCVNCSERVER="-I/usr/local/include"
+ LIBVNCSERVER="-L/usr/local/lib"
else
INCCURL=""
LIBCURL="-lcurl"
@@ -1207,6 +1211,9 @@ extern "C" int main(int argc, char** argv)
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
@@ -1291,7 +1298,7 @@ EOF
#endif
}
EOF
- if test_compile "-lasound" asound asound; then
+ if test_compile "$INCALSA $LIBALSA -lasound" asound asound; then
test_execute
fi
}
@@ -1605,6 +1612,7 @@ EOF
FLGQT5=`pkg-config Qt5Core --cflags`
# gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
[ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11"
+ FLGQT5="$FLGQT5 -std=c++11"
INCQT5=`strip_I "$FLGQT5"`
LIBDIR5=`pkg-config Qt5Core --variable=libdir`
LIBQT5=`pkg-config Qt5Core Qt5Gui --libs`
@@ -1861,9 +1869,9 @@ check_libvorbis()
if which_wrapper pkg-config > /dev/null; then
libvorbis_ver=`pkg-config vorbis --modversion 2>> $LOG`
if [ $? -eq 0 ]; then
- FLGVRB=`pkg-config vorbis --cflags`
+ FLGVRB=`pkg-config vorbis vorbisenc --cflags`
INCVRB=`strip_I "$FLGVRB"`
- LIBVRB=`pkg-config vorbis --libs`
+ LIBVRB=`pkg-config vorbis vorbisenc --libs`
fi
cat > $ODIR.tmp_src.cc << EOF
#include <cstdio>
@@ -1913,7 +1921,7 @@ EOF
return 0;
}
EOF
- [ -n "$INCOGG" ] && I_INCVRB=`prefix_I "$INCOGG"`
+ [ -n "$INCOGG" ] && I_INCOGG=`prefix_I "$INCOGG"`
if test_compile "$LIBOGG $I_INCOGG" ogg ogg nofatal; then
if test_execute; then
cnf_append "SDK_VBoxLibOgg_INCS" "$INCOGG"
@@ -2180,8 +2188,8 @@ EOF
echo "compiling the following source file:" >> $LOG
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
+ echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so -pthread" >> $LOG
+ $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
@@ -2297,7 +2305,7 @@ check_gsoap()
else
cnf_append "VBOX_GSOAP_CXX_SOURCES" ""
fi
- cnf_append "VBOX_GSOAP_CXX_LIBS" "`strip_l "$GSOAP_CXX_LIBS"`"
+ cnf_append "VBOX_GSOAP_CXX_LIBS" "`strip_l "$GSOAP_CXX_LIBS"` z"
gsoap_version=`pkg-config gsoapssl++ --modversion`
log_success "found version $gsoap_version"
return
@@ -2661,7 +2669,7 @@ for option in "$@"; do
--with-openssl-dir=*)
OPENSSLDIR=`echo $option | cut -d'=' -f2`
INCCRYPTO="-I${OPENSSLDIR}/include"
- LIBCRYPTO="${OPENSSLDIR}/lib/libssl.a ${OPENSSLDIR}/lib/libcrypto.a"
+ LIBCRYPTO="-L${OPENSSLDIR}/lib -lssl -lcrypto"
# On Darwin (at least for macports) static OpenSSL also needs zlib.
[ "$OS" = "darwin" ] && LIBCRYPTO="$LIBCRYPTO ${OPENSSLDIR}/lib/libz.a"
# On Linux static OpenSSL typically needs a few additional libraries.
@@ -3028,12 +3036,22 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
[ $WITH_JAVA -eq 1 ] && check_java
# PulseAudio
- if [ $WITH_PULSE -eq 1 ]; then
- check_pulse
- elif [ $WITH_PULSE -eq 0 ]; then # Force disabling PulseAudio.
- cnf_append "VBOX_WITH_AUDIO_PULSE" ""
- elif [ $WITH_PULSE -eq 2 ]; then # --enable-pulse was passed, force PulseAudio.
- cnf_append "VBOX_WITH_AUDIO_PULSE" "1"
+ if [ "$OS" = "linux" -o "$OS" = "freebsd" -o "$OS" = "netbsd" ]; then
+ if [ $WITH_ALSA -eq 1 ]; then
+ check_alsa
+ else
+ cnf_append "VBOX_WITH_AUDIO_ALSA" ""
+ fi
+ if [ $WITH_PULSE -eq 1 ]; then
+ check_pulse
+ elif [ $WITH_PULSE -eq 0 ]; then # Force disabling PulseAudio.
+ cnf_append "VBOX_WITH_AUDIO_PULSE" ""
+ elif [ $WITH_PULSE -eq 2 ]; then # --enable-pulse was passed, force PulseAudio.
+ cnf_append "VBOX_WITH_AUDIO_PULSE" "1"
+ fi
+ if [ $WITH_DBUS -eq 0 ]; then
+ cnf_append "VBOX_WITH_DBUS" ""
+ fi
fi
fi
@@ -3049,14 +3067,6 @@ if [ "$OS" = "linux" ]; then
cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
fi
if [ $ONLY_ADDITIONS -eq 0 ]; then
- if [ $WITH_ALSA -eq 1 ]; then
- check_alsa
- else
- cnf_append "VBOX_WITH_AUDIO_ALSA" ""
- fi
- if [ $WITH_DBUS -eq 0 ]; then
- cnf_append "VBOX_WITH_DBUS" ""
- fi
if [ $WITH_DEVMAPPER -eq 1 ]; then
check_libdevmapper
else
|
