diff options
| author | Julien ROZO | 2008-01-04 21:17:33 +0100 |
|---|---|---|
| committer | Julien ROZO | 2008-01-04 21:17:33 +0100 |
| commit | 0d74402dff713d62c3a5876a954b52ce0cc01ff6 (patch) | |
| tree | 68c3d48507f465595bf9ed7a4e2d5c0a1c31c0aa | |
| parent | a995636ceb9a44565670d2734f33920ca8f5ebf4 (diff) | |
virtualbox: pulseaudio is now an optional dependency, removed Xcursor.patch as it's no longer needed
| -rwxr-xr-x | utils/virtualbox/BUILD | 10 | ||||
| -rwxr-xr-x | utils/virtualbox/DEPENDS | 8 | ||||
| -rw-r--r-- | utils/virtualbox/HISTORY | 5 | ||||
| -rw-r--r-- | utils/virtualbox/Xcursor.patch | 10 |
4 files changed, 12 insertions, 21 deletions
diff --git a/utils/virtualbox/BUILD b/utils/virtualbox/BUILD index 76be21324f..78ab2bc015 100755 --- a/utils/virtualbox/BUILD +++ b/utils/virtualbox/BUILD @@ -1,11 +1,3 @@ -./configure && - -# patch to make this spell compiling with libxcursor from xorg-modular -# this patch must be applied after configure is run -if check_if_xorg_modular_libs ; then - cd $SOURCE_DIRECTORY && - patch -p0 < $SCRIPT_DIRECTORY/Xcursor.patch -fi && - +./configure $OPTS && source ./env.sh && kmk all diff --git a/utils/virtualbox/DEPENDS b/utils/virtualbox/DEPENDS index fb6b72155b..ea1bf33534 100755 --- a/utils/virtualbox/DEPENDS +++ b/utils/virtualbox/DEPENDS @@ -4,5 +4,9 @@ depends dev86 && depends iasl && depends xalan-c && depends sdl && -depends pulseaudio && -depends X11-LIBS +depends X11-LIBS && + +optional_depends pulseaudio \ + "" \ + "--disable-pulse" \ + "for PulseAudio output support" diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY index a170d02475..ccd726ab65 100644 --- a/utils/virtualbox/HISTORY +++ b/utils/virtualbox/HISTORY @@ -1,3 +1,8 @@ +2008-01-04 Julien "_kaze_" ROZO <julien@rozo.org> + * DEPENDS: pulseaudio is now an optional dependency + * BUILD: added $OPTS to configure, removed patch for Xcursor from xorg-modular + * Xcursor.patch: removed, no longer needed + 2008-01-01 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 1.5.4 * DEPENDS: added pulseaudio diff --git a/utils/virtualbox/Xcursor.patch b/utils/virtualbox/Xcursor.patch deleted file mode 100644 index 8e2ec05f99..0000000000 --- a/utils/virtualbox/Xcursor.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Config.kmk.orig 2007-09-11 01:11:29.000000000 +0200 -+++ Config.kmk 2007-09-11 01:12:23.000000000 +0200 -@@ -2048,6 +2048,7 @@ else # the gcc guys: - TEMPLATE_VBOXQTGUIEXE_LIBS += \ - Xext \ - X11 \ -+ Xcursor \ - m \ - $(LIB_PTHREAD) - TEMPLATE_VBOXQTGUIEXE_LIBPATH += \ |