Author: gb
Date: Mon Feb 12 17:03:22 2007
New Revision: 119895
Added:
packages/cooker/virtualbox/current/SOURCES/VirtualBox-OSE-1.3.4-futex.patch
packages/cooker/virtualbox/current/SOURCES/VirtualBox-OSE-1.3.4-mdvconfig.patch
packages/cooker/virtualbox/current/SOURCES/VirtualBox-OSE-1.3.4.tar.bz2
(contents, props changed)
Removed:
packages/cooker/virtualbox/current/SOURCES/vbox-1.3.3-20070209.tar.bz2
packages/cooker/virtualbox/current/SOURCES/vbox-1.3.3-mdvconfig.patch
Modified:
packages/cooker/virtualbox/current/SPECS/virtualbox.spec
Log:
- 1.3.4
Added:
packages/cooker/virtualbox/current/SOURCES/VirtualBox-OSE-1.3.4-futex.patch
==============================================================================
--- (empty file)
+++ packages/cooker/virtualbox/current/SOURCES/VirtualBox-OSE-1.3.4-futex.patch
Mon Feb 12 17:03:22 2007
@@ -0,0 +1,22 @@
+--- VirtualBox-OSE-1.3.4/src/VBox/Runtime/r3/linux/sems-linux.cpp.futex
2007-02-11 17:08:14.000000000 +0100
++++ VirtualBox-OSE-1.3.4/src/VBox/Runtime/r3/linux/sems-linux.cpp
2007-02-12 18:51:29.000000000 +0100
+@@ -34,7 +34,9 @@
+ #include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/syscall.h>
+-#include <linux/futex.h>
++
++#define FUTEX_WAIT 0
++#define FUTEX_WAKE 1
+
+
+
/*******************************************************************************
+@@ -111,7 +113,7 @@ struct RTSEMRWINTERNAL
+ static long sys_futex(int32_t volatile *uaddr, int op, int val, struct
timespec *utime, int32_t *uaddr2, int val3)
+ {
+ errno = 0;
+- long rc = syscall(__NR_futex, uaddr, op, val, utime, uaddr2, val3);
++ long rc = syscall(SYS_futex, uaddr, op, val, utime, uaddr2, val3);
+ if (rc < 0)
+ {
+ Assert(rc == -1);
Added:
packages/cooker/virtualbox/current/SOURCES/VirtualBox-OSE-1.3.4-mdvconfig.patch
==============================================================================
--- (empty file)
+++
packages/cooker/virtualbox/current/SOURCES/VirtualBox-OSE-1.3.4-mdvconfig.patch
Mon Feb 12 17:03:22 2007
@@ -0,0 +1,156 @@
+--- VirtualBox-OSE-1.3.4/kBuild/sdks/LIBSDL.kmk.mdvconfig 2007-02-09
13:04:09.000000000 +0100
++++ VirtualBox-OSE-1.3.4/kBuild/sdks/LIBSDL.kmk 2007-02-12
18:38:47.000000000 +0100
+@@ -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
+--- VirtualBox-OSE-1.3.4/src/VBox/HostDrivers/Support/linux/Makefile.mdvconfig
2007-01-31 13:20:46.000000000 +0100
++++ VirtualBox-OSE-1.3.4/src/VBox/HostDrivers/Support/linux/Makefile
2007-02-12 18:38:47.000000000 +0100
+@@ -64,9 +64,14 @@ endif
+
+ ifneq ($(MAKECMDGOALS),clean)
+
++# kernel version-release tag
++ifndef KERNELRELEASE
++ KERNELRELEASE := $(shell uname -r)
++endif
++
+ # kernel base directory
+ ifndef $(KERN_DIR)
+- KERN_DIR := /lib/modules/$(shell uname -r)/build
++ KERN_DIR := /lib/modules/$(KERNELRELEASE)/build
+ 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)
+@@ -95,7 +100,7 @@ endif
+
+ # module install dir.
+ ifndef MODULE_DIR
+- MODULE_DIR_TST := /lib/modules/$(shell uname -r)
++ MODULE_DIR_TST := /lib/modules/$(KERNELRELEASE)
+ ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
+ MODULE_DIR := $(MODULE_DIR_TST)/misc
+ else
+--- VirtualBox-OSE-1.3.4/configure.mdvconfig 2007-02-11 17:08:14.000000000
+0100
++++ VirtualBox-OSE-1.3.4/configure 2007-02-12 18:40:42.000000000 +0100
+@@ -45,7 +45,7 @@ LIBSDL="-lSDL"
+ LIBSDLMAIN="-lSDLmain"
+ LIBCRYPTO="-lcrypto"
+ LIBPTHREAD="-lpthread"
+-LIBX11="-L/usr/X11R6/lib -lXext -lX11"
++LIBX11="-L/usr/X11R6/${LIBPATH_LIB:-lib} -lXext -lX11"
+ LIBXCURSOR="-lXcursor"
+ INCZ=""
+ LIBZ="-lz"
+@@ -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 ${VBOX_LIBPATH_X11:+-L$VBOX_LIBPATH_X11}" Xlibs
Xlibs; then
+ log_success "found"
+ fi
+ }
+@@ -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
+- $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
++ $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`
+@@ -883,6 +883,7 @@ extern "C" int main(void)
+ #
+ function check_linux()
+ {
++ return 0
+ test_header "Linux kernel sources"
+ echo '
+ #include <linux/version.h>
+@@ -1109,16 +1110,25 @@ check_kbuild
+ if (($OSE)); then
+ cnf_append "VBOX_OSE" "1"
+ cnf_append "VBOX_WITH_TESTSUITE" ""
++ cnf_append "VBOX_WITH_VBOXDRV" ""
+ cnf_append "VBOX_WITH_WIN32_ADDITIONS" ""
+
+ if [ "$OS" = "linux" ]; then
+- cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
++ cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
+ else
+ cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
+ fi
+ echo >> $CNF
+ fi
+
++# extra path overrides
++if test -n "$LIBPATH_LIB"; then
++ cnf_append "LIBPATH_LIB" "$LIBPATH_LIB"
++fi
++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"
+
+--- VirtualBox-OSE-1.3.4/Config.kmk.mdvconfig 2007-02-11 18:15:54.000000000
+0100
++++ VirtualBox-OSE-1.3.4/Config.kmk 2007-02-12 18:38:47.000000000 +0100
+@@ -646,6 +646,7 @@ endif
+ LIB_UUID ?= uuid
+ LIB_PTHREAD ?= pthread
+ LIB_XCURSOR ?= Xcursor
++LIBPATH_LIB ?= lib
+
+ ## Enable C++ electric fence heap.
+ #LIB_RUNTIME += $(LIB_RUNTIME_EF) $(LIB_RUNTIME)
+@@ -712,7 +713,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
+@@ -1601,7 +1602,7 @@ else # the gcc guys:
+ $(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB)
+
+ TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
+- $(VBOX_PATH_QT)/lib \
++ $(VBOX_PATH_QT)/$(LIBPATH_LIB) \
+ $(VBOX_LIBPATH_X11)
+
+ endif
Added: packages/cooker/virtualbox/current/SOURCES/VirtualBox-OSE-1.3.4.tar.bz2
==============================================================================
Binary file. No diff available.
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
17:03:22 2007
@@ -1,11 +1,11 @@
%define name virtualbox
-%define ver 1.3.3
+%define ver 1.3.4
%define rel 1
-%define svndate 20070209
+#define svndate 20070209
%define version %{ver}%{?svndate:.%{svndate}}
%define release %mkrel %{rel}
%define kname vboxdrv
-%define pkgname vbox
+%define pkgname VirtualBox-OSE
%define pkgver %{ver}%{?svndate:-%{svndate}}
%define vboxdir %{_libdir}/%{name}
@@ -31,8 +31,9 @@
Source10: virtualbox.png
Source11: virtualbox.16.png
Source12: virtualbox.48.png
-Patch0: vbox-1.3.3-mdvconfig.patch
+Patch0: VirtualBox-OSE-1.3.4-mdvconfig.patch
Patch1: vbox-1.3.3-disable-nmi.patch
+Patch2: VirtualBox-OSE-1.3.4-futex.patch
License: GPL
Group: Emulators
Url: http://www.virtualbox.org/
@@ -74,6 +75,7 @@
%setup -q -n %{pkgname}-%{ver}
%patch0 -p1 -b .mdvconfig
%patch1 -p1 -b .disable-nmi
+%patch2 -p1 -b .futex
%build
export LIBPATH_LIB="%{_lib}"
