Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=cc118b44389c3fd2c2f2d094ebb843ea003f887e
commit cc118b44389c3fd2c2f2d094ebb843ea003f887e Author: Marius Cirsta <[email protected]> Date: Sun Sep 11 00:23:55 2011 +0000 virtualbox-4.1.2-1-x86_64 * changed m8r * version bump * fix deps * now for x86_64 too diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index 3fed60f..f5ea308 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -1,29 +1,34 @@ # Compiling Time: 12.93 SBU -# Maintainer: Janos Kovacs <[email protected]> +# Maintainer: Marius Cirsta <[email protected]> # Contributor: AlexExtreme <[email protected]> pkgname=virtualbox realname=VirtualBox -pkgver=4.0.10 -pkgrel=2 -pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." +pkgver=4.1.2 +pkgrel=1 +pkgdesc="Oracle VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org"; -depends=('xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'qt' 'libidl' 'sdl' \ +depends=('xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'libidl' 'sdl' \ 'hal' 'alsa-lib' 'qt4-linguist' 'curl' 'libqtopengl' 'cdrtools') makedepends=('kernel-source' 'kernel-headers' 'openjdk') rodepends=('wget' 'virtualbox-modules') groups=('xapps-extra') -archs=('i686' '!x86_64') +archs=('i686' 'x86_64') up2date="lynx -dump ${url}|grep released|sed 's/.* \([0-9.]*\) .*/\1/;q'" source=(http://download.virtualbox.org/virtualbox/${pkgver}/${realname}-${pkgver}.tar.bz2 \ vboxsvc virtualbox get-vbox-additions README.Frugalware) _F_cd_path="${realname}-${pkgver}_OSE" options=('scriptlet' 'genscriptlet') -sha1sums=('eeb01e1cd814778f35abbd0b39ef725edbffb386' \ +sha1sums=('52e35e0400fb12a5277a6e126478bb8f53c3e46d' \ 'e32ebff11bb235b50f8826b70d85dbcf4a56aee4' \ '3c0c856b9ad5f186405e87cf6eac09f1060b62cd' \ 'cdc1df637db2531589de4b19aaa21d7a2d544afd' \ '155be5405f4c91e5c7f4a51b5bac8fc4760a894c') +if [ "$CARCH" == "x86_64" ]; then +makedepends=("${makedepends[@]}") +source=(${source[@]} vbox-x64.patch) +sha1sums=(${sha1sums[@]} 'c158d4a0a4e5e625aeafd445fbc40d953a0f2de4') +fi build() { Fcd @@ -35,6 +40,7 @@ build() { Fsed '-Werror$' '' Config.kmk Fsed '[ $OSE -ge 1 ] && check_makeself' '' configure # we don't have makeself Fsed 'smc-napa' 'smcnapa' src/VBox/Devices/PC/vbox.dsl + Fpatchall # Configure and load our options ./configure --disable-pulse --disable-hardening --disable-docs || Fdie @@ -43,7 +49,11 @@ build() { kmk all || Fdie # Install it - cd ${Fsrcdir}/${_F_cd_path}/out/linux.x86/release/bin || Fdie + if [ "$CARCH" == "x86_64" ]; then + cd ${Fsrcdir}/${_F_cd_path}/out/linux.amd64/release/bin || Fdie + else + cd ${Fsrcdir}/${_F_cd_path}/out/linux.x86/release/bin || Fdie + fi Fmkdir /usr/lib/VirtualBox rm -rf sdk src tst* testcase additions/src || Fdie rm -f vboxdrv.ko SUPInstall SUPUninstall || Fdie diff --git a/source/xapps-extra/virtualbox/vbox-x64.patch b/source/xapps-extra/virtualbox/vbox-x64.patch new file mode 100644 index 0000000..356315f --- /dev/null +++ b/source/xapps-extra/virtualbox/vbox-x64.patch @@ -0,0 +1,41 @@ +--- VirtualBox-4.1.2_OSE/configure 2011-09-10 23:42:17.000000000 +0000 ++++ VirtualBox-4.1.2_OSE.new/configure 2011-09-10 23:25:46.000000000 +0000 +@@ -1852,26 +1852,7 @@ + echo "compiling the following source file:" >> $LOG + cat $ODIR.tmp_src.c >> $LOG + echo "using the following command line:" >> $LOG +- echo "$CC -m32 -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.c" >> $LOG +- $CC -m32 -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.c >> $LOG 2>&1 +- if [ $? -ne 0 ]; then +- echo +- echo " Cannot compile 32-bit applications (missing headers and/or libraries)!" +- echo " Check the file $LOG for detailed error information." +- fail +- else +- echo "executing the binary" >> $LOG +- $ODIR.tmp_out 2> $ODIR.test_execute.log +- rc=$? +- cat $ODIR.test_execute.log >> $LOG +- if [ $rc -ne 0 ]; then +- echo +- echo " Cannot execute 32-bit applications! Either enable 32-bit support in the" +- echo " kernel configuration or use --disable-vmmraw to disable 32-bit guests." +- fail +- return 1 +- fi +- fi ++ echo "fw32-run gcc -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.c" >> $LOG + log_success "" + } + +--- VirtualBox-4.1.2_OSE/src/VBox/Makefile.kmk 2011-01-14 20:15:50.000000000 +0000 ++++ VirtualBox-4.1.2_OSE.new/src/VBox/Makefile.kmk 2011-09-10 22:34:53.000000000 +0000 +@@ -17,7 +17,7 @@ + + SUB_DEPTH = ../.. + include $(KBUILD_PATH)/subheader.kmk +- ++VBOX_WITH_RAW_MODE= + + ifdef VBOX_ONLY_ADDITIONS + include $(PATH_SUB_CURRENT)/Runtime/Makefile.kmk _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
