Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2f3428a682d1faacd007d26ef8d0264ed053efa2
commit 2f3428a682d1faacd007d26ef8d0264ed053efa2 Author: James Buren <r...@frugalware.org> Date: Tue Sep 13 01:19:28 2011 -0500 virtualbox-4.1.2-3-i686 * release bump * add x86_64 patch to primary sources * only patch on x86_64 * add dependency on virtualbox-modules again diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index d8863bf..05d12bd 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -5,31 +5,26 @@ pkgname=virtualbox realname=VirtualBox pkgver=4.1.2 -pkgrel=2 +pkgrel=3 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' 'libidl' 'sdl' \ 'hal' 'alsa-lib' 'qt4-linguist' 'curl' 'libqtopengl' 'cdrtools') makedepends=('kernel-source' 'kernel-headers' 'openjdk') +rodepends=('wget' "virtualbox-modules=$pkgver") groups=('xapps-extra') 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) + vboxsvc virtualbox get-vbox-additions README.Frugalware vbox-x64.patch) _F_cd_path="${realname}-${pkgver}_OSE" options=('scriptlet' 'genscriptlet') sha1sums=('52e35e0400fb12a5277a6e126478bb8f53c3e46d' \ 'e32ebff11bb235b50f8826b70d85dbcf4a56aee4' \ '3c0c856b9ad5f186405e87cf6eac09f1060b62cd' \ 'cdc1df637db2531589de4b19aaa21d7a2d544afd' \ - '155be5405f4c91e5c7f4a51b5bac8fc4760a894c') -if [ "$CARCH" == "x86_64" ]; then - makedepends=("${makedepends[@]}") - source=(${source[@]} vbox-x64.patch) - sha1sums=(${sha1sums[@]} 'c158d4a0a4e5e625aeafd445fbc40d953a0f2de4') -else - rodepends=('wget' 'virtualbox-modules') -fi + '155be5405f4c91e5c7f4a51b5bac8fc4760a894c' \ + '0652b6281691f0f043a4ffab5a8c27203945c7cc') build() { Fcd @@ -41,7 +36,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 + [ "$CARCH" == "x86_64" ] && Fpatch vbox-x64.patch # Configure and load our options ./configure --disable-pulse --disable-hardening --disable-docs || Fdie diff --git a/source/xapps-extra/virtualbox/vbox-x64.patch b/source/xapps-extra/virtualbox/vbox-x64.patch index 356315f..35c8528 100644 --- a/source/xapps-extra/virtualbox/vbox-x64.patch +++ b/source/xapps-extra/virtualbox/vbox-x64.patch @@ -24,7 +24,6 @@ - return 1 - fi - fi -+ echo "fw32-run gcc -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.c" >> $LOG log_success "" } _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
