31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
|
--- VirtualBox-4.0.8_OSE.orig/Config.kmk 2011-05-16 18:32:40.000000000 +0200
|
||
|
|
+++ VirtualBox-4.0.8_OSE/Config.kmk 2011-05-28 17:34:35.884436301 +0200
|
||
|
|
@@ -486,7 +486,7 @@
|
||
|
|
# Enables the ffmpeg module for recording test runs.
|
||
|
|
# TODO: Enable this for normal build server builds?
|
||
|
|
#if1of ($(KBUILD_TARGET), linux)
|
||
|
|
-# VBOX_WITH_FFMPEG = 1
|
||
|
|
+VBOX_WITH_FFMPEG = 1
|
||
|
|
#endif
|
||
|
|
# Enable shared folders
|
||
|
|
VBOX_WITH_SHARED_FOLDERS = 1
|
||
|
|
@@ -892,7 +892,6 @@
|
||
|
|
endif
|
||
|
|
VBOX_WITH_TESTSUITE=
|
||
|
|
VBOX_WITH_INTEL_PXE=
|
||
|
|
- VBOX_WITH_FFMPEG=
|
||
|
|
ifn1of ($(KBUILD_TARGET), darwin linux solaris win)
|
||
|
|
VBOX_WITH_INSTALLER=
|
||
|
|
endif
|
||
|
|
--- VirtualBox-4.0.8_OSE.orig/src/libs/Makefile.kmk 2011-05-16 18:34:01.000000000 +0200
|
||
|
|
+++ VirtualBox-4.0.8_OSE/src/libs/Makefile.kmk 2011-05-28 17:47:24.224649687 +0200
|
||
|
|
@@ -72,7 +72,7 @@
|
||
|
|
endif
|
||
|
|
|
||
|
|
# FFmpeg for test videos.
|
||
|
|
- if defined(VBOX_WITH_FFMPEG) && !defined(VBOX_OSE) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_WITH_SDK)
|
||
|
|
+ if defined(VBOX_WITH_FFMPEG) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_WITH_SDK)
|
||
|
|
if1of ($(KBUILD_TARGET), darwin linux solaris)
|
||
|
|
include $(PATH_SUB_CURRENT)/ffmpeg-20060710/Makefile.kmk
|
||
|
|
endif
|