Author: gb
Date: Mon Feb 12 11:51:51 2007
New Revision: 118892
Modified:
packages/cooker/virtualbox/current/SOURCES/vbox-1.3.3-mdvconfig.patch
packages/cooker/virtualbox/current/SPECS/virtualbox.spec
Log:
- SVN updates (2007/02/09):
* additional 64-bit fixes
* asynchronous packets transmission in NIC code
Modified: packages/cooker/virtualbox/current/SOURCES/vbox-1.3.3-mdvconfig.patch
==============================================================================
--- packages/cooker/virtualbox/current/SOURCES/vbox-1.3.3-mdvconfig.patch
(original)
+++ packages/cooker/virtualbox/current/SOURCES/vbox-1.3.3-mdvconfig.patch
Mon Feb 12 11:51:51 2007
@@ -1,69 +1,6 @@
---- vbox-1.3.3/kBuild/sdks/LIBSDL.kmk.mdvconfig 2007-01-26
12:08:46.000000000 +0100
-+++ vbox-1.3.3/kBuild/sdks/LIBSDL.kmk 2007-01-27 09:54:14.000000000 +0100
-@@ -37,9 +37,9 @@ ifndef PATH_SDK_LIBSDL
- else
- # Search in the typical unix places.
- PATH_SDK_LIBSDL := $(firstword $(wildcard \
-- /lib/libSDL.* \
-- /usr/lib/libSDL.* \
-- /usr/local/lib/libSDL.* \
-+ /$(LIBPATH_LIB)/libSDL.* \
-+ /usr/$(LIBPATH_LIB)/libSDL.* \
-+ /usr/local/$(LIBPATH_LIB)/libSDL.* \
- /opt/lib/libSDL.* \
- /opt/local/lib/libSDL.* \
- /sw/lib/libSDL.* \
-@@ -107,7 +107,7 @@ else
- SDK_LIBSDL_LIBS ?= \
- $(LIB_SDK_LIBSDL_SDL)
- SDK_LIBSDL_LIBPATH ?= \
-- $(PATH_SDK_LIBSDL)/lib
-+ $(PATH_SDK_LIBSDL)/$(LIBPATH_LIB)
-
- else # ASSUMES Unix like system
- LIB_SDK_LIBSDL_SDLMAIN ?= SDLmain
-@@ -129,6 +129,6 @@ else
- SDK_LIBSDL_LIBS ?= \
- $(LIB_SDK_LIBSDL_SDL)
- SDK_LIBSDL_LIBPATH ?= \
-- $(PATH_SDK_LIBSDL)/lib
-+ $(PATH_SDK_LIBSDL)/$(LIBPATH_LIB)
- endif
- endif
---- vbox-1.3.3/src/VBox/Frontends/VBoxBFE/Makefile.mdvconfig 2007-01-23
10:30:49.000000000 +0100
-+++ vbox-1.3.3/src/VBox/Frontends/VBoxBFE/Makefile 2007-01-27
09:37:04.000000000 +0100
-@@ -113,7 +113,7 @@ VBoxBFE_LDFLAGS.darwin = -framework Foun
-
- VBoxBFE_LIBPATH.linux = \
- $(LIBPATH_XPCOM) \
-- /usr/X11R6/lib
-+ $(LIBPATH_X11)
-
-
- VBoxBFE_CXXFLAGS.win = \
---- vbox-1.3.3/src/VBox/Frontends/VBoxSDL/Makefile.mdvconfig 2007-01-23
10:30:49.000000000 +0100
-+++ vbox-1.3.3/src/VBox/Frontends/VBoxSDL/Makefile 2007-01-27
09:37:04.000000000 +0100
-@@ -84,7 +84,7 @@ ifdef VBOX_OPENGL
- endif
- VBoxSDL_LIBPATH.linux = \
- $(LIBPATH_XPCOM) \
-- /usr/X11R6/lib
-+ $(LIBPATH_X11)
- VBoxSDL_CXXFLAGS.win = \
- -EHsc
- VBoxSDL_CXXFLAGS.linux = \
-@@ -121,7 +121,7 @@ ifdef VBOX_OPENGL
- tstSDL_LIBS.linux += GL
- endif
- tstSDL_LIBPATH.linux = \
-- /usr/X11R6/lib
-+ $(LIBPATH_X11)
- tstSDL_LDFLAGS.darwin = \
- -framework Foundation -framework AppKit
-
---- vbox-1.3.3/src/VBox/HostDrivers/Support/linux/Makefile.mdvconfig
2007-01-26 12:08:41.000000000 +0100
-+++ vbox-1.3.3/src/VBox/HostDrivers/Support/linux/Makefile 2007-01-27
09:37:04.000000000 +0100
-@@ -59,9 +63,14 @@ endif
+--- vbox-1.3.3/src/VBox/HostDrivers/Support/linux/Makefile.mdvconfig
2007-02-02 09:17:23.000000000 -0500
++++ vbox-1.3.3/src/VBox/HostDrivers/Support/linux/Makefile 2007-02-12
07:30:07.000000000 -0500
+@@ -64,9 +64,14 @@ endif
ifneq ($(MAKECMDGOALS),clean)
@@ -79,7 +16,7 @@
ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
KERN_DIR := /usr/src/linux
ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-@@ -86,7 +95,7 @@ endif
+@@ -95,7 +100,7 @@ endif
# module install dir.
ifndef MODULE_DIR
@@ -88,47 +25,73 @@
ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
MODULE_DIR := $(MODULE_DIR_TST)/misc
else
---- vbox-1.3.3/configure.mdvconfig 2007-01-23 10:31:10.000000000 +0100
-+++ vbox-1.3.3/configure 2007-01-27 09:46:09.000000000 +0100
-@@ -51,7 +51,7 @@ INCZ=""
- LIBZ="-lz"
- INCPNG=""
- LIBPNG="-lpng"
--QTDIR="/usr/qt/3 /usr/share/qt3"
-+QTDIR="/usr/lib/qt3 /usr/qt/3 /usr/share/qt3"
- KBUILDDIR="`cd $(dirname $0); pwd`/kBuild"
- DEVDIR="`cd $(dirname $0); pwd`/tools"
- if [ -d /lib/modules/`uname -r`/build ]; then
-@@ -759,7 +759,7 @@ extern "C" int main(void)
+--- vbox-1.3.3/kBuild/sdks/LIBSDL.kmk.mdvconfig 2007-02-12
06:10:15.000000000 -0500
++++ vbox-1.3.3/kBuild/sdks/LIBSDL.kmk 2007-02-12 07:34:31.000000000 -0500
+@@ -38,18 +38,12 @@ ifndef PATH_SDK_LIBSDL
+ # Search in the typical unix places.
+ ifeq ($(filter-out %64,$(BUILD_TARGET_ARCH)),)
+ PATH_SDK_LIBSDL := $(firstword $(wildcard \
+- /lib64/libSDL.* \
+- /lib/libSDL.* \
+- /usr/lib64/libSDL.* \
+- /usr/lib/libSDL.* \
+- /usr/local/lib64/libSDL.* \
+- /usr/local/lib/libSDL.* \
+- /opt/lib64/libSDL.* \
+- /opt/lib/libSDL.* \
+- /opt/local/lib64/libSDL.* \
+- /opt/local/lib/libSDL.* \
+- /sw/lib64/libSDL.* \
+- /sw/lib/libSDL.* \
++ /$(LIBPATH_LIB)/libSDL.* \
++ /usr/$(LIBPATH_LIB)/libSDL.* \
++ /usr/local/$(LIBPATH_LIB)/libSDL.* \
++ /opt/$(LIBPATH_LIB)/libSDL.* \
++ /opt/local/$(LIBPATH_LIB)/libSDL.* \
++ /sw/$(LIBPATH_LIB)/libSDL.* \
+ ) )
+ else
+ PATH_SDK_LIBSDL := $(firstword $(wildcard \
+@@ -152,6 +146,6 @@ else
+ SDK_LIBSDL_LIBS ?= \
+ $(LIB_SDK_LIBSDL_SDL)
+ SDK_LIBSDL_LIBPATH ?= \
+- $(PATH_SDK_LIBSDL)/lib
++ $(PATH_SDK_LIBSDL)/$(LIBPATH_LIB)
+ endif
+ endif
+--- vbox-1.3.3/configure.mdvconfig 2007-02-12 06:09:59.000000000 -0500
++++ vbox-1.3.3/configure 2007-02-12 07:38:10.000000000 -0500
+@@ -787,7 +787,7 @@ extern "C" int main(void)
return 0;
}
' > .tmp_src.cc
- if test_compile $LIBXCURSOR Xcursor Xcursor; then
-+ if test_compile "$LIBXCURSOR ${LIBPATH_X11:+-L$LIBPATH_X11}" Xcursor
Xcursor; then
++ if test_compile "$LIBXCURSOR ${VBOX_LIBPATH_X11:+-L$VBOX_LIBPATH_X11}"
Xcursor Xcursor; then
log_success "found"
cnf_append "LIB_XCURSOR" `echo $LIBXCURSOR|sed 's+-l++'`
fi
-@@ -789,7 +789,7 @@ extern "C" int main(void)
+@@ -817,7 +817,7 @@ extern "C" int main(void)
XDestroyWindow(dpy, win);
}
' > .tmp_src.cc
- if test_compile "$LIBX11" Xlibs Xlibs; then
-+ if test_compile "$LIBX11 ${LIBPATH_X11:+-L$LIBPATH_X11}" Xlibs Xlibs; then
++ if test_compile "$LIBX11 ${VBOX_LIBPATH_X11:+-L$VBOX_LIBPATH_X11}" Xlibs
Xlibs; then
log_success "found"
fi
}
-@@ -822,8 +822,8 @@ extern "C" int main(void)
+@@ -850,8 +850,8 @@ extern "C" int main(void)
echo "compiling the following source file:" >> $LOG
cat .tmp_src.cc >> $LOG
echo "using the following command line:" >> $LOG
-- echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc \"-I$q/include -L$q/lib
-lqt-mt\"" >> $LOG
+- echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib
-lqt-mt" >> $LOG
- $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib -lqt-mt >>
$LOG 2>&1
-+ echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc \"-I$q/include
-L$q/${LIBPATH_LIB:-lib} -lqt-mt\"" >> $LOG
++ echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include
-L$q/${LIBPATH_LIB:-lib} -lqt-mt" >> $LOG
+ $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include
-L$q/${LIBPATH_LIB:-lib} -lqt-mt >> $LOG 2>&1
if (($?==0)); then
if test_execute; then
cnf_append "QTDIR" `cd $q ; pwd`
-@@ -855,6 +855,7 @@ extern "C" int main(void)
+@@ -883,6 +883,7 @@ extern "C" int main(void)
#
function check_linux()
{
@@ -136,7 +99,7 @@
test_header "Linux kernel sources"
echo '
#include <linux/version.h>
-@@ -1081,16 +1082,25 @@ check_kbuild
+@@ -1109,16 +1110,25 @@ check_kbuild
if (($OSE)); then
cnf_append "VBOX_OSE" "1"
cnf_append "VBOX_WITH_TESTSUITE" ""
@@ -156,32 +119,38 @@
+if test -n "$LIBPATH_LIB"; then
+ cnf_append "LIBPATH_LIB" "$LIBPATH_LIB"
+fi
-+if test -n "$LIBPATH_X11"; then
-+ cnf_append "LIBPATH_X11" "$LIBPATH_X11"
++if test -n "$VBOX_LIBPATH_X11"; then
++ cnf_append "VBOX_LIBPATH_X11" "$VBOX_LIBPATH_X11"
+fi
+
# append the tools directory to the default search path
echo "$PATH" | grep -q "$DEVDIR_BIN" || PATH="$PATH:$DEVDIR_BIN"
---- vbox-1.3.3/Config.kmk.mdvconfig 2007-01-26 12:08:42.000000000 +0100
-+++ vbox-1.3.3/Config.kmk 2007-01-27 09:40:00.000000000 +0100
-@@ -639,6 +639,8 @@ endif
+--- vbox-1.3.3/Config.kmk.mdvconfig 2007-02-12 06:09:59.000000000 -0500
++++ vbox-1.3.3/Config.kmk 2007-02-12 07:38:15.000000000 -0500
+@@ -648,6 +648,7 @@ endif
LIB_UUID ?= uuid
LIB_PTHREAD ?= pthread
LIB_XCURSOR ?= Xcursor
+LIBPATH_LIB ?= lib
-+LIBPATH_X11 ?= /usr/X11R6/$(LIBPATH_LIB)
## Enable C++ electric fence heap.
#LIB_RUNTIME += $(LIB_RUNTIME_EF) $(LIB_RUNTIME)
-@@ -1544,8 +1546,8 @@ else # the gcc guys:
+@@ -714,7 +715,7 @@ endif
+
+ # The X11 LIBPATH. (The amd64 hack is for RHEL4.)
+ ifeq ($(BUILD_TARGET_ARCH),amd64)
+- VBOX_LIBPATH_X11 ?= /usr/X11R6/lib64 /usr/X11R6/lib
++ VBOX_LIBPATH_X11 ?= /usr/X11R6/$(LIBPATH_LIB)
+ else
+ VBOX_LIBPATH_X11 ?= /usr/X11R6/lib
+ endif
+@@ -1603,7 +1604,7 @@ else # the gcc guys:
$(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB)
TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
- $(VBOX_PATH_QT)/lib \
-- /usr/X11R6/lib
+ $(VBOX_PATH_QT)/$(LIBPATH_LIB) \
-+ $(LIBPATH_X11)
+ $(VBOX_LIBPATH_X11)
endif
-
Modified: packages/cooker/virtualbox/current/SPECS/virtualbox.spec
==============================================================================
--- packages/cooker/virtualbox/current/SPECS/virtualbox.spec (original)
+++ packages/cooker/virtualbox/current/SPECS/virtualbox.spec Mon Feb 12
11:51:51 2007
@@ -1,7 +1,7 @@
%define name virtualbox
-%define ver 1.3.3
-%define rel 1
-%define svndate 20070202
+%define ver 1.3.3
+%define rel 1
+%define svndate 20070209
%define version %{ver}%{?svndate:.%{svndate}}
%define release %mkrel %{rel}
%define kname vboxdrv
@@ -32,8 +32,7 @@
Source11: virtualbox.16.png
Source12: virtualbox.48.png
Patch0: vbox-1.3.3-mdvconfig.patch
-Patch1: vbox-1.3.3-64bit-fixes.patch
-Patch2: vbox-1.3.3-disable-nmi.patch
+Patch1: vbox-1.3.3-disable-nmi.patch
License: GPL
Group: Emulators
Url: http://www.virtualbox.org/
@@ -74,14 +73,10 @@
%prep
%setup -q -n %{pkgname}-%{ver}
%patch0 -p1 -b .mdvconfig
-%patch1 -p1 -b .64bit-fixes
-%patch2 -p1 -b .disable-nmi
+%patch1 -p1 -b .disable-nmi
%build
export LIBPATH_LIB="%{_lib}"
-%if %{mdkversion} < 200700
-export LIBPATH_X11="/usr/X11R6/%{_lib}"
-%endif
./configure
. ./env.sh
kmk %_smp_mflags all
