Package: blender
Version: 2.49.2~dfsg-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch
Hi,
I've made the following changes to the patch 50_debian_build_config to make the
package build in Ubuntu, where --as-needed and not indirect linking is now the
default (like in binutils-gold).
*** /tmp/tmpxpTWI0
At the end, it's only activating again libstdc++ and add libavutil. If you are
interested in applying it in Debian, just tell me so, and I'll wait before
uploading the fix in Ubuntu.
Thanks,
Fabrice
-- System Information:
Debian Release: squeeze/sid
APT prefers maverick-updates
APT policy: (500, 'maverick-updates'), (500, 'maverick-security'), (500,
'maverick-proposed'), (500, 'maverick')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.35-24-generic (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u blender-2.49.2~dfsg/debian/patches/50_debian_build_config blender-2.49.2~dfsg/debian/patches/50_debian_build_config
--- blender-2.49.2~dfsg/debian/patches/50_debian_build_config
+++ blender-2.49.2~dfsg/debian/patches/50_debian_build_config
@@ -1,5 +1,7 @@
---- a/config/linux2-config.py
-+++ b/config/linux2-config.py
+Index: blender-2.49.2~dfsg/config/linux2-config.py
+===================================================================
+--- blender-2.49.2~dfsg.orig/config/linux2-config.py 2010-12-10 06:11:41.991566997 +0100
++++ blender-2.49.2~dfsg/config/linux2-config.py 2010-12-10 06:26:41.811567002 +0100
@@ -1,4 +1,7 @@
-LCGDIR = '../lib/linux2'
+# Needed for pkg-config calls.
@@ -32,7 +34,7 @@
BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now.
BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
-+BF_FFMPEG_LIB = commands.getoutput('pkg-config --libs libavcodec libavformat vorbisenc libswscale libavdevice') + ' -lgsm' + ' -lopenjpeg'
++BF_FFMPEG_LIB = commands.getoutput('pkg-config --libs libavcodec libavformat vorbisenc libswscale libavdevice libavutil') + ' -lgsm' + ' -lopenjpeg'
+
+import sys
+if sys.platform == 'linux2':
@@ -41,17 +43,15 @@
# Mesa Libs should go here if your using them as well....
WITH_BF_STATICOPENGL = False
BF_OPENGL = '/usr'
-@@ -195,7 +205,8 @@ CC_WARN = ['-Wall']
+@@ -196,6 +206,7 @@ CC_WARN = ['-Wall']
##FIX_STUBS_WARNINGS = -Wno-unused
--LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
+LINK = CXX
-+LLIBS = ['util', 'c', 'm', 'dl', 'pthread']
+ LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS)
-
-@@ -206,9 +217,9 @@ BF_PROFILE_LINKFLAGS = ['-pg']
+@@ -207,9 +218,9 @@ BF_PROFILE_LINKFLAGS = ['-pg']
BF_DEBUG = False
BF_DEBUG_CCFLAGS = ['-g']
