Merge remote-tracking branch 'dave/master'

* dave/master: xbmc: needs nasm to build.
2011-12-06 11:54:03 +01:00 · 2011-12-06 11:54:03 +01:00 · 1a8a8b159d
commit 1a8a8b159d
parent 52bb5686e3 5004a85082
2 changed files with 2 additions and 0 deletions
--- a/srcpkgs/xbmc/template
+++ b/srcpkgs/xbmc/template
@ -80,6 +80,7 @@ Add_dependency build boost-devel
 Add_dependency build libcurl-devel
 Add_dependency build libva-devel
 Add_dependency build libvdpau-devel
+Add_dependency build nasm

 do_configure() {
 	export GIT_REV="-XBPS"
--- a/srcpkgs/xbmc/xbmc.rshlibs
+++ b/srcpkgs/xbmc/xbmc.rshlibs
@ -59,3 +59,4 @@ libmad.so.0
 libfontconfig.so.1
 libglib-2.0.so.0
 libpython2.7.so.1.0
+ld-linux.so.2