rpms/blender/devel blender-2.49.config, 1.1, 1.2 blender.spec, 1.112, 1.113

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19143

Modified Files:
	blender-2.49.config blender.spec 
Log Message:
Try to build agains more system libraries as possible


Index: blender-2.49.config
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-2.49.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- blender-2.49.config	1 Jun 2009 20:04:41 -0000	1.1
+++ blender-2.49.config	2 Jun 2009 16:56:01 -0000	1.2
@@ -26,8 +26,8 @@ BF_OPENEXR_LIB = 'Half IlmImf Iex Imath 
 
 WITH_BF_JPEG = 'true'
 BF_JPEG = '/usr'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
+BF_JPEG_INC = '${BF_JPEG}/include/openjpeg'
+BF_JPEG_LIB = ['openjpeg', 'jpeg']
 
 WITH_BF_PNG = 'true'
 BF_PNG = '/usr'
@@ -50,16 +50,16 @@ BF_GETTEXT_LIB = 'gettextlib'
 BF_GETTEXT_LIBPATH = '@LIB@'
 
 WITH_BF_FTGL = 'true'
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
+BF_FTGL = '/usr'
+BF_FTGL_INC = '${BF_FTGL}/include/FTGL'
+BF_FTGL_LIB = 'ftgl'
 
 WITH_BF_GAMEENGINE='true'
 
-WITH_BF_ODE = 'false'
-BF_ODE = LCGDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
+WITH_BF_ODE = 'true'
+BF_ODE = '/usr'
+BF_ODE_INC = '${BF_ODE}/include/ode'
+BF_ODE_LIB = 'ode'
 
 WITH_BF_BULLET = 'true'
 BF_BULLET = '#extern/bullet2/src/'
@@ -70,6 +70,8 @@ BF_SOLID = '#extern/solid'
 BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
+WITH_BF_OPENJPEG = 'true'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LCGDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
@@ -99,9 +101,9 @@ BF_QUICKTIME_INC = '${BF_QUICKTIME}/incl
 # enable ffmpeg  support
 WITH_BF_FFMPEG = 'false'  # -DWITH_FFMPEG
 BF_FFMPEG = '/usr'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include/ffmpeg ${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH='@LIB@'
-BF_FFMPEG_LIB = 'avformat avcodec avutil'
+BF_FFMPEG_LIB = 'avformat avcodec avutil swscale avdevice'
 
 # Mesa Libs should go here if your using them as well....
 WITH_BF_STATICOPENGL = 'false'
@@ -150,6 +152,5 @@ BF_DEBUG_FLAGS = ''
 BF_BUILDDIR = 'build/linux2'
 BF_INSTALLDIR='install/linux2'
 
-
 #Link against pthread
 PLATFORM_LINKFLAGS = ['-pthread']


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- blender.spec	1 Jun 2009 20:04:41 -0000	1.112
+++ blender.spec	2 Jun 2009 16:56:01 -0000	1.113
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.49
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -62,6 +62,12 @@ BuildRequires:  OpenEXR-devel
 BuildRequires:  glew-devel
 BuildRequires:	fontpackages-devel
 
+BuildRequires:	fftw-devel
+BuildRequires:	ftgl-devel
+BuildRequires:	ode-devel
+BuildRequires:	openjpeg-devel
+
+
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
@@ -106,6 +112,14 @@ Blender Geaming Engine.
 %patch100 -p1
 %patch101 -p1
 
+rm -rf extern/fftw
+rm -rf extern/ftgl
+rm -rf extern/glew
+rm -rf extern/libopenjpeg
+rm -rf extern/libredcode
+rm -rf extern/ode
+rm -rf extern/xvidcore
+
 PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
 
 sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \
@@ -227,6 +241,9 @@ update-desktop-database %{_datadir}/appl
 %{_bindir}/blenderplayer.bin
 
 %changelog
+* Tue Jun  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-2
+- Try to build agains more system libraries as possible
+
 * Mon Jun  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-1
 - New upstream release