rpms/blender/EL-5 blender-2.44-scons.patch,1.2,1.3

Lubomir Rintel lkundrak at fedoraproject.org
Sat Dec 27 09:57:39 UTC 2008


Author: lkundrak

Update of /cvs/pkgs/rpms/blender/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6681

Modified Files:
	blender-2.44-scons.patch 
Log Message:
Fix the scons patch broken by my previous commit

blender-2.44-scons.patch:

Index: blender-2.44-scons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/blender/EL-5/blender-2.44-scons.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blender-2.44-scons.patch	27 Dec 2008 09:12:03 -0000	1.2
+++ blender-2.44-scons.patch	27 Dec 2008 09:57:09 -0000	1.3
@@ -10,18 +10,14 @@
  # disable elbeem (fluidsim) compilation?
  if env['BF_NO_ELBEEM'] == 1:
      env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
-diff -up blender-2.45/tools/btools.py.scons blender-2.45/tools/btools.py
---- blender-2.45/tools/btools.py.scons	2007-09-18 07:00:48.000000000 +0200
-+++ blender-2.45/tools/btools.py	2008-12-27 10:08:37.000000000 +0100
-@@ -1,7 +1,10 @@
- import os
- import os.path
- import SCons.Options
--import SCons.Options.BoolOption
-+try:
-+    import SCons.Options.BoolOption
-+except ImportError:
-+    pass
- try:
-     import subprocess
- except ImportError:
+--- blender-2.44/SConstruct.orig	2007-05-07 18:09:40.000000000 +0200
++++ blender-2.44/SConstruct	2007-05-20 22:52:13.000000000 +0200
+@@ -237,7 +242,7 @@
+ 
+         def CheckFreeAlut(context,env):
+             context.Message( B.bc.OKGREEN + "Linux platform detected:\n  checking for FreeAlut... " + B.bc.ENDC )
+-            env['LIBS'] = 'alut'
++            env['LIBS'] = ['alut', 'openal']
+             result = context.TryLink(mylib_test_source_file, '.c')
+             context.Result(result)
+             return result




More information about the fedora-extras-commits mailing list