[96944] trunk/dports/emulators/virtualbox
royliu at macports.org
royliu at macports.org
Wed Aug 22 09:19:43 PDT 2012
Revision: 96944
https://trac.macports.org/changeset/96944
Author: royliu at macports.org
Date: 2012-08-22 09:19:39 -0700 (Wed, 22 Aug 2012)
Log Message:
-----------
virtualbox: update to 4.1.20 and enable building for Mountain Lion
Modified Paths:
--------------
trunk/dports/emulators/virtualbox/Portfile
trunk/dports/emulators/virtualbox/files/patch-build.diff
trunk/dports/emulators/virtualbox/files/patch-vde.diff
Added Paths:
-----------
trunk/dports/emulators/virtualbox/files/patch-glext.h.diff
Modified: trunk/dports/emulators/virtualbox/Portfile
===================================================================
--- trunk/dports/emulators/virtualbox/Portfile 2012-08-22 15:22:15 UTC (rev 96943)
+++ trunk/dports/emulators/virtualbox/Portfile 2012-08-22 16:19:39 UTC (rev 96944)
@@ -4,11 +4,11 @@
PortSystem 1.0
name virtualbox
-version 4.1.18
+version 4.1.20
# Note: On virtualbox version changes please update the checksums of all
# subports, and update extension_pack_build to match the current build
# of the extension pack.
-set extension_pack_build 78361
+set extension_pack_build 80170
categories emulators
platforms darwin
@@ -47,8 +47,8 @@
distname VirtualBox-${version}
use_bzip2 yes
- checksums rmd160 d3681745fdda27d884efe2faf1258a1fa0058a78 \
- sha256 e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7
+ checksums rmd160 ba91d9284c47bac69d064f9bdf98a152fab7672b \
+ sha256 b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb
depends_lib-append port:curl \
port:libidl \
@@ -58,6 +58,7 @@
path:lib/pkgconfig/sdl.pc:libsdl
patchfiles patch-build.diff \
+ patch-glext.h.diff \
patch-startup.diff
configure.compiler gcc-4.2
@@ -92,9 +93,7 @@
reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" \
${worksrcpath}/LocalConfig.kmk
- # TODO: The deployment target should be set dynamically, but, because of incompatibilities
- # with OpenGL headers in 10.7, it's fixed at 10.6 for now.
- reinplace "s|@MACOSX_DEPLOYMENT_TARGET@|10.6|g" \
+ reinplace "s|@MACOSX_DEPLOYMENT_TARGET@|10.[expr [lindex [split ${macosx_deployment_target} "."] 1] - 1]|g" \
${worksrcpath}/LocalConfig.kmk
reinplace "s|@KEXT_DIR@|${prefix}${kext_dir}|g" \
${worksrcpath}/src/VBox/Installer/darwin/VBoxStartupItems/VirtualBox/VirtualBox
@@ -202,8 +201,8 @@
distfiles VBoxGuestAdditions_${version}.iso
- checksums rmd160 d2ec9130a0235ce38bb702779b6ab722e3ff684c \
- sha256 0b670a698dcb427ebf69cdec1e040b26e93538e1ca76f58506c1db70308152ff
+ checksums rmd160 52741ca396fb507dcebfb4af04df61e567d2bba3 \
+ sha256 04ab744725c17db441077ef471eeb41db5fc6e4569ac54e6c4f52923737b0494
depends_run port:virtualbox
@@ -259,8 +258,8 @@
distname ${name_extpack}-${version}
- checksums rmd160 d2ddd423cc799309d2a352d92b13aae20ec83628 \
- sha256 1c8cf8d67d9adf75fd02d529c03ee2f960ec4be08970fd8030ba7912ef1e3198
+ checksums rmd160 84c1662501fe7be803f3ab470cfc6b2a3739414c \
+ sha256 3aa9a2d65e63b8fcf3fc02070bde23d27f4e061953c8c8f1a1e1d492244bfa2a
worksrcdir ${name_extpack}
extract.suffix .vbox-extpack
Modified: trunk/dports/emulators/virtualbox/files/patch-build.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-build.diff 2012-08-22 15:22:15 UTC (rev 96943)
+++ trunk/dports/emulators/virtualbox/files/patch-build.diff 2012-08-22 16:19:39 UTC (rev 96944)
@@ -52,14 +52,14 @@
VBOX_GCC32_CHECK_CXX = $(2)
else
VBOX_GCC_CHECK_CC = $(shell \
-- if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
-+ if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(1) -S -xc /dev/null > /dev/null 2>&1; \
+- if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(subst -Wno-,-W,$(1)) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
++ if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(subst -Wno-,-W,$(1)) -S -xc /dev/null > /dev/null 2>&1; \
then echo "$(1)"; \
else echo "$(2)"; fi; )
VBOX_GCC_CHECK_CXX = $(shell \
-- if $(TOOL_$(VBOX_GCC_TOOL)_CXX) $(1) -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1; \
-+ if $(TOOL_$(VBOX_GCC_TOOL)_CXX) $(1) -S -xc++ /dev/null > /dev/null 2>&1; \
+- if $(TOOL_$(VBOX_GCC_TOOL)_CXX) $(subst -Wno-,-W,$(1)) -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1; \
++ if $(TOOL_$(VBOX_GCC_TOOL)_CXX) $(subst -Wno-,-W,$(1)) -S -xc++ /dev/null > /dev/null 2>&1; \
then echo "$(1)"; \
else echo "$(2)"; fi; )
@@ -75,7 +75,7 @@
then echo "$(1)"; \
else echo "$(2)"; fi; )
endif
-@@ -3939,25 +3951,6 @@
+@@ -3950,25 +3962,6 @@
# be cleaned up properly later some time (not important now).
#
ifeq ($(VBOX_PATH_QT4),)
@@ -289,8 +289,21 @@
fi
else
log_failure "qt4 not working"
-@@ -2015,17 +1949,36 @@
+@@ -2013,19 +1947,49 @@
+ test_header "Darwin version"
+ darwin_ver=`uname -r`
case "$darwin_ver" in
++ 12\.*)
++ darwin_ver="10.8" # Mountain Lion
++
++ if { test -d "/Developer/SDKs/MacOSX10.7.sdk"; } then
++ sdk="/Developer/SDKs/MacOSX10.7.sdk"
++ else
++ sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
++ fi
++
++ CXX_FLAGS="-mmacosx-version-min=10.7 -isysroot $sdk -Wl,-syslibroot,$sdk"
++ ;;
11\.*)
darwin_ver="10.7" # Lion
- sdk=/Developer/SDKs/MacOSX10.6.sdk
@@ -409,3 +422,23 @@
$(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )
+--- src/libs/xpcom18a4/python/Makefile.kmk.orig 2012-08-21 20:52:14.000000000 -0400
++++ src/libs/xpcom18a4/python/Makefile.kmk 2012-08-21 20:53:59.000000000 -0400
+@@ -33,15 +33,11 @@ ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
+ VBOX_PYTHON25_INC = $(VBOX_PATH_MACOSX_SDK)/usr/include/python2.5
+ VBOX_PYTHON25_LIB = $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.5.dylib
+ endif
+- if !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
+- && ( !defined(VBOX_OSE) \
+- || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib)" != "")
++ ifdef VBOX_PATH_MACOSX_SDK_10_6
+ VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/include/python2.6
+ VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib
+ endif
+- if !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7) \
+- && ( defined(VBOX_NOT_OSE_LATER_SOMETIME) \
+- || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib)" != "")
++ ifdef VBOX_PATH_MACOSX_SDK_10_7
+ VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/include/python2.7
+ VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib
+ endif
Added: trunk/dports/emulators/virtualbox/files/patch-glext.h.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-glext.h.diff (rev 0)
+++ trunk/dports/emulators/virtualbox/files/patch-glext.h.diff 2012-08-22 16:19:39 UTC (rev 96944)
@@ -0,0 +1,28 @@
+--- src/VBox/GuestHost/OpenGL/include/GL/glext.h.orig 2012-08-21 20:52:14.000000000 -0400
++++ src/VBox/GuestHost/OpenGL/include/GL/glext.h 2012-08-21 20:53:59.000000000 -0400
+@@ -3722,6 +3722,25 @@
+ typedef ptrdiff_t GLsizeiptrARB;
+ #endif
+
++/* VBox: HACK ALERT! When building the host side against Mac OS X 10.7 headers,
++ /Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/OpenGL.framework/Headers/gltypes.h
++ is included and it typedefs GLhandleARB differently. In 10.6 and earlier,
++ gl.h was included instead of gltypes.h (new file) avoiding the conflicting
++ typedef in Headers/glext.h.
++
++ Since sizeof the gltypes.h typedef is 64-bit on 64-bit platforms, we're in
++ trouble if the type is used for anything important. Fortunately, the
++ conflict only occurs in three files: renderspu_config.c, renderspu_cocoa.c
++ and renderspu_cocoa_helper.m. */
++#ifdef RT_OS_DARWIN
++# ifndef MAC_OS_X_VERSION_MIN_REQUIRED
++# error "MAC_OS_X_VERSION_MIN_REQUIRED is not defined"
++# endif
++# if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 && defined(__gltypes_h_)
++# define GLhandleARB VBoxGLhandleARB
++# endif
++#endif
++
+ #ifndef GL_ARB_shader_objects
+ /* GL types for handling shader object handles and program/shader text */
+ typedef char GLcharARB; /* native character */
Modified: trunk/dports/emulators/virtualbox/files/patch-vde.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-vde.diff 2012-08-22 15:22:15 UTC (rev 96943)
+++ trunk/dports/emulators/virtualbox/files/patch-vde.diff 2012-08-22 16:19:39 UTC (rev 96944)
@@ -1,6 +1,6 @@
--- configure.orig 2011-08-15 19:38:16.000000000 -0500
+++ configure 2011-08-15 19:38:16.000000000 -0500
-@@ -2521,7 +2521,7 @@
+@@ -2532,7 +2532,7 @@
fi
# VDE
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120822/6a5e66a8/attachment.html>
More information about the macports-changes
mailing list