-diff -urN VirtualBox-2.0.0.orig/configure VirtualBox-2.0.0/configure
---- VirtualBox-2.0.0.orig/configure 2008-09-03 16:59:10.000000000 +0200
-+++ VirtualBox-2.0.0/configure 2008-09-04 20:04:52.000000000 +0200
-@@ -69,11 +69,7 @@
- INCPNG=""
+--- VirtualBox-2.1.2_OSE/configure.orig 2009-01-21 16:07:11.000000000 +0100
++++ VirtualBox-2.1.2_OSE/configure 2009-01-22 15:25:14.000000000 +0100
+@@ -94,11 +94,7 @@
LIBPNG="-lpng"
+ PKGCONFIG="`which_wrapper pkg-config`"
PYTHONDIR="/usr /usr/local"
-QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3"
-QT3DIR="$QT3DIR /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt"
KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
DEVDIR="`cd \`dirname $0\`; pwd`/tools"
if [ -d "/lib/modules/`uname -r`/build" ]; then
-@@ -215,8 +211,8 @@
+@@ -219,8 +215,8 @@
echo "compiling the following source file:" >> $LOG
cat .tmp_src.cc >> $LOG
echo "using the following command line:" >> $LOG
if [ $? -ne 0 ]; then
if [ -z "$4" ]; then
echo
-@@ -1236,37 +1232,25 @@
+@@ -1208,37 +1204,25 @@
}
EOF
found_qt=0
if [ $? -ne 0 ]; then
log_failure "not found"
fail
-@@ -1343,21 +1327,19 @@
+@@ -1321,21 +1305,19 @@
#endif
}
EOF
fi
fi
if [ -n "$foundqt4" ]; then
-@@ -1375,7 +1375,7 @@
+@@ -1372,7 +1354,7 @@
cnf_append "VBOX_WITH_QT4_SUN" "1"
fi
test_header "Qt4 devtools"
if which_wrapper "$q/bin/moc" > /dev/null; then
moc_ver=`$q/bin/moc -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
if [ $? -ne 0 ]; then
-@@ -1765,8 +1745,6 @@
+@@ -1796,8 +1778,6 @@
--with-iasl=PATH location of the iasl compiler [$IASL]
--with-linux=DIR Linux kernel source directory [$LINUX]
--with-mkisofs=PATH location of mkisofs [$MKISOFS]
- --with-qt-dir=DIR directory for Qt3 headers/libraries [$QT3DIR]
- --with-qt4-dir=DIR directory for Qt4 headers/libraries [pkgconfig]
+ --with-gsoap-dir=PATH directory for SOAP compiler (soapcpp2 and wsdl2h)
Build type:
- -d, --build-debug build with debugging symbols and assertions
-@@ -1809,13 +1787,6 @@
+@@ -1838,13 +1818,6 @@
exit 1
fi
;;
- QT4DIR=`echo $option | cut -d'=' -f2`
- QT4DIR_PKGCONFIG=0
- ;;
- --with-iasl=*)
- IASL=`echo $option | cut -d'=' -f2`
+ --with-gsoap-dir=*)
+ GSOAP=`echo $option | cut -d'=' -f2`
;;
--- /dev/null
+--- /dev/null 2009-01-22 12:52:06.498125436 +0100
++++ VirtualBox-2.1.0/src/VBox/HostDrivers/Support/linux/export_modules 2008-09-01 14:23:30.000000000 +0200
+@@ -0,0 +1,93 @@
++#!/bin/sh
++
++#
++# Create a tar archive containing the sources of the vboxdrv kernel module
++#
++# Copyright (C) 2007 Sun Microsystems, Inc.
++#
++# This file is part of VirtualBox Open Source Edition (OSE), as
++# available from http://www.virtualbox.org. This file is free software;
++# you can redistribute it and/or modify it under the terms of the GNU
++# General Public License (GPL) as published by the Free Software
++# Foundation, in version 2 as it comes in the "COPYING" file of the
++# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
++# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
++#
++# The contents of this file may alternatively be used under the terms
++# of the Common Development and Distribution License Version 1.0
++# (CDDL) only, as it comes in the "COPYING.CDDL" file of the
++# VirtualBox OSE distribution, in which case the provisions of the
++# CDDL are applicable instead of those of the GPL.
++#
++# You may elect to license modified versions of this file under the
++# terms and conditions of either the GPL or the CDDL or both.
++#
++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
++# Clara, CA 95054 USA or visit http://www.sun.com if you need
++# additional information or have any questions.
++#
++
++if [ -z "$1" ]; then
++ echo "Usage: $0 <filename.tar.gz> [--without-hardening]"
++ echo " Export VirtualBox kernel modules to <filename.tar.gz>"
++ exit 1
++fi
++
++VBOX_WITH_HARDENING=1
++if [ "$2" = "--without-hardening" ]; then
++ VBOX_WITH_HARDENING=
++fi
++
++PATH_TMP="`cd \`dirname $1\`; pwd`/.vbox_modules"
++PATH_OUT=$PATH_TMP
++FILE_OUT="`cd \`dirname $1\`; pwd`/`basename $1`"
++PATH_ROOT="`cd \`dirname $0\`/../../../../..; pwd`"
++PATH_VBOXDRV="$PATH_ROOT/src/VBox/HostDrivers/Support"
++
++VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
++VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
++VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
++VBOX_VERSION_STRING=$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
++
++. $PATH_VBOXDRV/linux/files_vboxdrv
++
++# Temporary path for creating the modules, will be removed later
++mkdir $PATH_TMP || exit 1
++
++# Create auto-generated version file, needed by all modules
++echo "#ifndef __version_generated_h__" > $PATH_TMP/version-generated.h
++echo "#define __version_generated_h__" >> $PATH_TMP/version-generated.h
++echo "" >> $PATH_TMP/version-generated.h
++echo "#define VBOX_VERSION_MAJOR $VBOX_VERSION_MAJOR" >> $PATH_TMP/version-generated.h
++echo "#define VBOX_VERSION_MINOR $VBOX_VERSION_MINOR" >> $PATH_TMP/version-generated.h
++echo "#define VBOX_VERSION_BUILD $VBOX_VERSION_BUILD" >> $PATH_TMP/version-generated.h
++echo "#define VBOX_VERSION_STRING \"$VBOX_VERSION_STRING\"" >> $PATH_TMP/version-generated.h
++echo "" >> $PATH_TMP/version-generated.h
++echo "#endif" >> $PATH_TMP/version-generated.h
++
++# vboxdrv (VirtualBox host kernel module)
++mkdir $PATH_TMP/vboxdrv || exit 1
++for f in $FILES_VBOXDRV_NOBIN; do
++ install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxdrv/`echo $f|cut -d'>' -f2`"
++done
++for f in $FILES_VBOXDRV_BIN; do
++ install -D -m 0755 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxdrv/`echo $f|cut -d'>' -f2`"
++done
++sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_VBOXDRV/linux/build_in_tmp > $PATH_TMP/vboxdrv/build_in_tmp
++chmod 0755 $PATH_TMP/vboxdrv/build_in_tmp
++sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_VBOXDRV/linux/dkms.conf > $PATH_TMP/vboxdrv/dkms.conf
++if [ -n "$VBOX_WITH_HARDENING" ]; then
++ cat $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
++else
++ sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
++fi
++
++# Only temporary, omit from archive
++rm $PATH_TMP/version-generated.h
++
++# Create the archive
++tar -czf $FILE_OUT -C $PATH_TMP . || exit 1
++
++# Remove the temporary directory
++rm -r $PATH_TMP
++
%define _enable_debug_packages 0
%endif
-%define rel 4
+%define rel 1
%define pname VirtualBox
Summary: VirtualBox OSE - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox OSE - wirtualizator sprzętu x86
Name: %{pname}%{_alt_kernel}
-Version: 2.1.0
+Version: 2.1.2
Release: %{rel}
License: GPL v2
Group: Applications/Emulators
#Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-OSE.tar.bz2
Source0: %{pname}-%{version}-OSE.tar.bz2
-# Source0-md5: bcd403d97e2caf8a634584df34766a4d
+# Source0-md5: ce1360945d65a79dbea1bec997c25c00
#Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
Source1: UserManual.pdf
-# Source1-md5: 61f8fa9321b65f8b2e50cfc076d671cb
+# Source1-md5: 6637b80b4e175035dba5a1efd89a0498
#Source2: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
Source2: VBoxGuestAdditions_%{version}.iso
-# Source2-md5: f6514091a6cca90cdc22591a789ed9b0
+# Source2-md5: 4c02fdb1b4e7f2d5ce7bb0ab8eca33d9
Source3: %{pname}-vboxdrv.init
Source4: %{pname}-vboxadd.init
Source5: %{pname}-vboxnetflt.init
Patch2: %{pname}-shared-libstdc++.patch
Patch3: %{pname}-disable-xclient-build.patch
Patch4: %{pname}-configure-spaces.patch
-Patch5: %{pname}-build_fix.patch
+Patch5: %{pname}-export_modules.patch
Patch6: %{pname}-vboxnetflt_export.patch
URL: http://www.virtualbox.org/
BuildRequires: rpmbuild(macros) >= 1.379
Sterownik grafiki dla systemu gościa w VirtualBoksie OSE.
%prep
-%setup -q -n %{pname}-%{version}
+%setup -q -n %{pname}-%{version}_OSE
%patch0 -p1
%patch1 -p1
%patch2 -p1
%endif
%patch4 -p1
-%patch5 -p0
+%patch5 -p1
+chmod +x src/VBox/HostDrivers/Support/linux/export_modules
%patch6 -p1
cat <<'EOF' > udev.conf
chmod 755 ../src/VBox/HostDrivers/VBoxNetFlt/linux/export_modules
../src/VBox/HostDrivers/VBoxNetFlt/linux/export_modules modules.tar.gz && \
tar -zxf modules.tar.gz && rm -f modules.tar.gz
-sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxdrv/Makefile
+#sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxdrv/Makefile
%build
%if %{with userspace}
./configure \
--with-gcc="%{__cc}" \
-%if "%{pld_release}" == "th"
- --with-gcc-compat="gcc-3.4" \
-%endif
-%if "%{pld_release}" == "ti"
- --with-gcc-compat="gcc3" \
-%endif
--with-g++="%{__cxx}" \
--disable-hardening \
--disable-kmods \
projects / packages / VirtualBox.git / commitdiff