rpms/blender/F-10 blender-2.49.config, 1.1, 1.2 blender-wrapper, 1.7, 1.8 blender.spec, 1.94, 1.95
Jochen Schmitt
s4504kr at fedoraproject.org
Wed Jun 3 16:33:25 UTC 2009
Author: s4504kr
Update of /cvs/extras/rpms/blender/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8971
Modified Files:
blender-2.49.config blender-wrapper blender.spec
Log Message:
Some rework on the blender wrapper script
Index: blender-2.49.config
===================================================================
RCS file: /cvs/extras/rpms/blender/F-10/blender-2.49.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- blender-2.49.config 2 Jun 2009 15:40:12 -0000 1.1
+++ blender-2.49.config 3 Jun 2009 16:32:55 -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'
@@ -51,15 +51,15 @@ BF_GETTEXT_LIBPATH = '@LIB@'
WITH_BF_FTGL = 'true'
BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_INC = '${BF_FTGL}/include/'
BF_FTGL_LIB = 'extern_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-wrapper
===================================================================
RCS file: /cvs/extras/rpms/blender/F-10/blender-wrapper,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- blender-wrapper 17 May 2009 18:40:16 -0000 1.7
+++ blender-wrapper 3 Jun 2009 16:32:55 -0000 1.8
@@ -36,9 +36,9 @@ if [ ! -d ~/.blender ]; then
ln -sf /usr/share/blender/scripts/bpymodules ~/.blender/scripts/pbymodules
ln -sf /usr/share/blender/scripts/* ~/.blender/scripts/
- if [ -d /usr/lib64/$blend/plugins ]; then
- ln -sf /usr/lib64/$blend/plugins/sequence ~/.blender/plugins/sequence
- ln -sf /usr/lib64/$blend/plugins/texture ~/.blender/plugin/textrure
+ if [ -d /usr/lib64/blender/plugins ]; then
+ ln -sf /usr/lib64/blender/plugins/sequence ~/.blender/plugins/sequence
+ ln -sf /usr/lib64/blender/plugins/texture ~/.blender/plugins/texture
fi
fi
@@ -79,12 +79,12 @@ elif [ -d /usr/lib/blender/scripts ] ; t
fi
-if [ -d /usr/lib64/$blend/plugins ]; then
- ln -sf /usr/lib64/$blend/plugins/sequence ~/.blender/plugins/sequence
- ln -sf /usr/lib64/$blend/plugins/texture ~/.blender/plugins/texture
-elif [ -d /usr/lib/$blend/plugins ]; then
- ln -sf /usr/lib/$blend/plugins/sequence ~/.blender/plugins/sequence
- ln -sf /usr/lib/$blend/plugins/texture ~/.blender/plugins/texture
+if [ -d /usr/lib64/blender/plugins ]; then
+ ln -sf /usr/lib64/blender/plugins/sequence ~/.blender/plugins/sequence
+ ln -sf /usr/lib64/blender/plugins/texture ~/.blender/plugins/texture
+elif [ -d /usr/lib/blender/plugins ]; then
+ ln -sf /usr/lib/blender/plugins/sequence ~/.blender/plugins/sequence
+ ln -sf /usr/lib/blender/plugins/texture ~/.blender/plugins/texture
fi
/usr/bin/${blend}.bin $@
Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-10/blender.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- blender.spec 2 Jun 2009 15:40:12 -0000 1.94
+++ blender.spec 3 Jun 2009 16:32:55 -0000 1.95
@@ -5,7 +5,7 @@
Name: blender
Version: 2.49
-Release: 1%{?dist}
+Release: 4%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -32,6 +32,7 @@ Source8: blender-2.49.config
Patch1: blender-2.49-scons.patch
Patch2: blender-2.44-bid.patch
+# Both patches are forwarded to upstream via email
Patch100: blender-2.46rc3-cve-2008-1103-1.patch
Patch101: blender-2.48a-cve-2008-4863.patch
@@ -62,6 +63,12 @@ BuildRequires: OpenEXR-devel
BuildRequires: glew-devel
BuildRequires: fontpackages-devel
+BuildRequires: fftw-devel
+#BuildRequires: ftgl-devel
+BuildRequires: ode-devel
+BuildRequires: openjpeg-devel
+#BuildRequires: qhull-devel
+
Requires(post): desktop-file-utils
Requires(post): shared-mime-info
Requires(postun): desktop-file-utils
@@ -106,6 +113,14 @@ Blender Geaming Engine.
%patch100 -p1
%patch101 -p1
+#rm -rf extern/bFTGL
+rm -rf extern/fftw
+rm -rf extern/glew
+rm -rf extern/libopenjpeg
+#rm -rf extern/qhull
+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 +242,12 @@ update-desktop-database %{_datadir}/appl
%{_bindir}/blenderplayer.bin
%changelog
+* Wed Jun 3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-4
+- Rework on the blender wrapper script
+
+* Tue Jun 2 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-3
+- 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
More information about the fedora-extras-commits
mailing list