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
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
|
Description: use system libjpeg
Author: Gianfranco Costamagna <locutusofborg@debian.org>
Last-Update: 2025-09-16
Index: virtualbox/src/libs/Makefile.kmk
===================================================================
--- virtualbox.orig/src/libs/Makefile.kmk
+++ virtualbox/src/libs/Makefile.kmk
@@ -69,7 +69,8 @@ endif
if (defined(VBOX_WITH_VRDP) || defined(VBOX_WITH_USB_VIDEO_IMPL)) \
&& !defined(VBOX_ONLY_ADDITIONS) \
&& !defined(VBOX_ONLY_SDK) \
- && !defined(VBOX_ONLY_VALIDATIONKIT)
+ && !defined(VBOX_ONLY_VALIDATIONKIT) \
+ && ("$(SDK_VBoxJpeg_INCS)" == "$(SDK_VBoxLibJpeg_DEFAULT_INCS)")
include $(PATH_SUB_CURRENT)/libjpeg-turbo-3.1.0/Makefile.kmk
endif
Index: virtualbox/Config.kmk
===================================================================
--- virtualbox.orig/Config.kmk
+++ virtualbox/Config.kmk
@@ -3139,9 +3139,6 @@ VBOX_PATH_X11_ROOT = $(PATH_ROOT)/s
# Miscellaneous includes
#
VBOX_GRAPHICS_INCS = $(PATH_ROOT)/include/VBox/Graphics
-VBOX_JPEG_INCS = \
- $(PATH_ROOT)/src/libs/libjpeg-turbo-3.1.0/src \
- $(PATH_ROOT)/src/libs/libjpeg-turbo-3.1.0
# The icons to use.
@@ -5255,6 +5252,16 @@ SDK_VBoxLibXml2_DEFS.win ?= WIN32 _
# Note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link
# libxml against VBoxRT
+# libjpeg
+SDK_VBoxLibJpeg := libjpeg for dll linking.
+SDK_VBoxLibJpeg_DEFAULT_INCS ?= $(PATH_ROOT)/src/libs/libjpeg-turbo-3.1.0/src \
+ $(PATH_ROOT)/src/libs/libjpeg-turbo-3.1.0
+SDK_VBoxLibJpeg_INCS ?= $(SDK_VBoxLibJpeg_DEFAULT_INCS)
+SDK_VBoxLibJpeg_LIBS ?= $(PATH_STAGE_LIB)/VBox-libjpeg$(VBOX_SUFF_LIB) \
+ $(PATH_STAGE_LIB)/VBox-libjpeg12$(VBOX_SUFF_LIB) \
+ $(PATH_STAGE_LIB)/VBox-libjpeg16$(VBOX_SUFF_LIB)
+
+
# zlib
SDK_VBoxZlib := zlib for dll linking.
SDK_VBoxZlib_VBOX_DEFAULT_INCS := $(PATH_ROOT)/src/libs/zlib-1.3.1
Index: virtualbox/configure
===================================================================
--- virtualbox.orig/configure
+++ virtualbox/configure
@@ -111,11 +111,13 @@ WITH_LIBOGG=1
WITH_LIBVORBIS=1
WITH_LIBTPMS=1
WITH_LIBLZMA=1
+WITH_LIBJPEG=1
BUILD_LIBXML2=
BUILD_LIBCURL=
BUILD_LIBSSL=
BUILD_LIBVPX=
BUILD_LIBTPMS=
+BUILD_LIBJPEG=
if [ "$OS" = "darwin" ]; then # Do not use the /opt/local version of this! We end up using the wrong iconv.h then.
BUILD_LIBLZMA=1
else
@@ -1906,6 +1908,46 @@ EOF
fi
}
+#
+# Check for libjpeg
+#
+check_libjpeg()
+{
+ if [ -z "$BUILD_LIBJPEG" ]; then
+ test_header libjpeg
+ if which_wrapper pkg-config > /dev/null; then
+ libjpeg_ver=`pkg-config libjpeg --modversion 2>> $LOG`
+ if [ $? -eq 0 ]; then
+ FLGJPEG=`pkg-config libjpeg --cflags`
+ INCJPEG=`strip_I "$FLGJPEG"`
+ LIBJPEG=`pkg-config libjpeg --libs`
+ fi
+ cat > $ODIR.tmp_src.cc << EOF
+#include <cstddef>
+#include <cstdio>
+#include <jpeglib.h>
+extern "C" int main(void)
+{
+#ifndef JPEG_LIB_VERSION
+#error JPEG_LIB_VERSION not defined
+#endif
+ printf("found, OK.\n");
+ return 0;
+}
+EOF
+ [ -n "$INCJPEG" ] && I_INCJPEG=`prefix_I "$INCJPEG"`
+ if test_compile "$LIBJPEG $I_INCJPEG" libjpeg libjpeg nofatal; then
+ if test_execute; then
+ cnf_append "SDK_VBoxLibJpeg_INCS" "$INCJPEG"
+ cnf_append "SDK_VBoxLibJpeg_LIBS" "`strip_l "$LIBJPEG"`"
+ fi
+ else
+ echo "not found -- building libjpeg from in-tree code."
+ fi
+ fi
+ fi
+}
+
#
# Check whether static libstdc++ is installed. This library is required
@@ -2488,8 +2530,9 @@ EOF
[ $OSE -eq 0 ] && echo " --disable-extpack don't build the extpack"
[ $WITH_DOCS -eq 1 ] && echo " --disable-docs don't build the documentation"
[ $WITH_LIBVPX -eq 1 ] && echo " --disable-libvpx don't use libvpx for video capturing"
-[ $WITH_LIBVORBIS -eq 0 ] && echo " --enable-libvorbis enable system libvorbis"
+[ $WITH_LIBVORBIS -eq 0 ] && echo " --enable-libvorbis enable system libvorbis"
[ $WITH_LIBOGG -eq 0 ] && echo " --enable-libogg enable system libogg"
+[ $WITH_LIBJPEG -eq 0 ] && echo " --enable-libjpeg enable system libjpeg"
[ $WITH_LIBTPMS -eq 1 ] && echo " --disable-libtpms don't use libtpms for TPM emulation"
[ $WITH_LIBLZMA -eq 1 ] && echo " --disable-liblzma don't use liblzma"
[ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking"
@@ -2744,6 +2787,9 @@ for option in "$@"; do
--enable-libogg)
WITH_LIBOGG=1
;;
+ --enable-libjpeg)
+ WITH_LIBJPEG=1
+ ;;
--enable-libvorbis)
WITH_LIBVORBIS=1
;;
@@ -2950,6 +2996,10 @@ if [ $WITH_LIBOGG -eq 0 -o $WITH_LIBVORB
cnf_append "VBOX_WITH_AUDIO_RECORDING" ""
fi
+if [ $WITH_LIBJPEG -eq 0 ]; then
+ cnf_append "VBOX_WITH_LIBJPEG" ""
+fi
+
# Darwin-specific
[ "$OS" = "darwin" ] && check_darwinversion
# the tools
@@ -2974,6 +3024,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
[ $WITH_LIBVORBIS -eq 1 ] && check_libvorbis
[ $WITH_LIBTPMS -eq 1 ] && check_libtpms
[ $WITH_LIBLZMA -eq 1 ] && check_liblzma
+ [ $WITH_LIBJPEG -eq 1 ] && check_libjpeg
[ "$OS" != "darwin" ] && check_png
[ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
if [ $WITH_SDL -eq 1 ]; then
diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk
index 39ea9b709..94ad88c21 100644
--- a/src/VBox/Devices/Makefile.kmk
+++ b/src/VBox/Devices/Makefile.kmk
@@ -508,7 +508,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SU
if defined(VBOX_WITH_USB_VIDEO_IMPL)
VBoxDD_DEFS += VBOX_WITH_USB_VIDEO_IMPL
VBoxDD_INCS += \
- $(VBOX_JPEG_INCS)
+ $(SDK_VBoxLibJpeg_INCS)
VBoxDD_SOURCES += \
Video/UsbWebcam.cpp \
Video/UsbWebcamDesc.cpp \
@@ -523,10 +523,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SU
Video/HostWebcam-v4l2.cpp
VBoxDD_SOURCES.win += \
Video/HostWebcam-win.cpp
- VBoxDD_LIBS += \
- $(PATH_STAGE_LIB)/VBox-libjpeg$(VBOX_SUFF_LIB) \
- $(PATH_STAGE_LIB)/VBox-libjpeg12$(VBOX_SUFF_LIB) \
- $(PATH_STAGE_LIB)/VBox-libjpeg16$(VBOX_SUFF_LIB)
+ VBoxDD_LIBS += $(SDK_VBoxLibJpeg_LIBS)
VBoxDD_LIBS.win += \
strmiids.lib
VBoxDD_LDFLAGS.darwin += \
diff --git a/src/VBox/RDP/server/Makefile.kmk b/src/VBox/RDP/server/Makefile.kmk
index d47132cc7..25af13bf9 100644
--- a/src/VBox/RDP/server/Makefile.kmk
+++ b/src/VBox/RDP/server/Makefile.kmk
@@ -40,11 +40,8 @@ VBoxVRDP_LIBS = $(LIB_RUNTIME)
VBoxVRDP_SDKS = VBoxOpenSsl
VBoxVRDP_DEFS = IN_VRDP
VBoxVRDP_DEFS += NOVOL
-VBoxVRDP_INCS += $(VBOX_JPEG_INCS) $(VBOX_GRAPHICS_INCS)
-VBoxVRDP_LIBS += \
- $(PATH_STAGE_LIB)/VBox-libjpeg$(VBOX_SUFF_LIB) \
- $(PATH_STAGE_LIB)/VBox-libjpeg12$(VBOX_SUFF_LIB) \
- $(PATH_STAGE_LIB)/VBox-libjpeg16$(VBOX_SUFF_LIB)
+VBoxVRDP_INCS += $(SDK_VBoxLibJpeg_INCS) $(VBOX_GRAPHICS_INCS)
+VBoxVRDP_LIBS += $(SDK_VBoxLibJpeg_LIBS)
ifdef VBOX_WITH_VRDP_ENABLE_LOGREL
VBoxVRDP_DEFS += VRDP_ENABLE_LOGREL
diff --git a/src/VBox/RDP/server/jpegtest/Makefile.kmk b/src/VBox/RDP/server/jpegtest/Makefile.kmk
index 160855fe2..1ec2e12de 100644
--- a/src/VBox/RDP/server/jpegtest/Makefile.kmk
+++ b/src/VBox/RDP/server/jpegtest/Makefile.kmk
@@ -38,11 +38,8 @@ ifdef TJ
jpegtest_INCS += $(PATH_ROOT)/src/libs/libjpeg-turbo-1.0.0/win
jpegtest_LIBS += $(PATH_STAGE_LIB)/VBox-libjpeg-t$(VBOX_SUFF_LIB)
else
- jpegtest_INCS += $(VBOX_JPEG_INCS) $(VBOX_GRAPHICS_INCS)
- jpegtest_LIBS += \
- $(PATH_STAGE_LIB)/VBox-libjpeg$(VBOX_SUFF_LIB) \
- $(PATH_STAGE_LIB)/VBox-libjpeg12$(VBOX_SUFF_LIB) \
- $(PATH_STAGE_LIB)/VBox-libjpeg16$(VBOX_SUFF_LIB)
+ jpegtest_INCS += $(SDK_VBoxLibJpeg_INCS) $(VBOX_GRAPHICS_INCS)
+ jpegtest_LIBS += $(SDK_VBoxLibJpeg_LIBS)
endif
ifneq ($(KBUILD_TARGET),win)
jpegtest_CXXFLAGS += -Wno-unused-function -Wno-multichar
|
