[Lunar-commits] <moonbase> blender: Fixing this make failure;

[Dennis `stumbles` Veatch]

commit 4714a700e54646e07433e01b2953b8196a3c4aae
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Wed Sep 9 06:58:07 2009 -0400

    blender: Fixing this make failure;
    
    Linking library ==> 'libextern_libmp3lame.a'
    yasm -Iextern/xvidcore/src/image/x86_asm/ -I../../src/ -f elf -DMARK_FUNCS -o
    /sources/blender-2.5-22645/build/linux2/extern/xvidcore/src/image/x86_asm/
    colorspace_yuyv_mmx.o extern/xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm
    yasm: FATAL: unable to open include file `nasm.inc'
    scons: *** [/sources/blender-2.5-22645/build/linux2/extern/xvidcore/src/image
    /x86_asm/colorspace_yuyv_mmx.o] Error
    
    It the includes path nasm.inc in the wrong place, needs to be serveral levels
    up. So lets just cp nasm.inc in its tree.
---
 graphics/blender/BUILD |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/graphics/blender/BUILD b/graphics/blender/BUILD
index c90091a..5a006ba 100644
--- a/graphics/blender/BUILD
+++ b/graphics/blender/BUILD
@@ -2,6 +2,12 @@
 
   sedit "s:2.5:2.6:" config/linux2-config.py &&
 
+# Much of the xvidcore includes incorrectly reference the path for nasm.inc
+# So lets just copy it everywhere in the xvidcore tree. Revisit on next bump.
+  cd extern/xvidcore/src/ &&
+  find . -type d -exec cp -v nasm.inc '{}' \; &&
+  cd $SOURCE_DIRECTORY &&
+
   if ! module_installed freealut; then
     sedit "s;WITH_BF_OPENAL = 'true';WITH_BF_OPENAL = 'false';" config/linux2-config.py
   fi &&