rpms/blender/devel blender-2.42-scons.patch, NONE, 1.1 blender-2.42.config, NONE, 1.1 blender-wrapper, NONE, 1.1 blender.spec, 1.19, 1.20 sources, 1.8, 1.9 blender-2.37-x86_64.patch, 1.1, NONE blender-2.41-alut.patch, 1.1, NONE
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Mon Jul 17 18:28:58 UTC 2006
Author: s4504kr
Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv956
Modified Files:
blender.spec sources
Added Files:
blender-2.42-scons.patch blender-2.42.config blender-wrapper
Removed Files:
blender-2.37-x86_64.patch blender-2.41-alut.patch
Log Message:
New upstream release
blender-2.42-scons.patch:
--- NEW FILE blender-2.42-scons.patch ---
--- blender2.42/SConstruct.org 2006-06-23 20:52:31.000000000 +0200
+++ blender2.42/SConstruct 2006-07-17 19:09:52.000000000 +0200
@@ -166,6 +166,8 @@
printdebug = B.arguments.get('BF_LISTDEBUG', 0)
+env['CCFLAGS'] = env['CCFLAGS'].split()
+
# see if this linux distro has libalut
if env['OURPLATFORM'] == 'linux2' :
@@ -181,7 +183,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
--- NEW FILE blender-2.42.config ---
LCGDIR = 'lib/linux2'
BF_PYTHON = '/usr'
BF_PYTHON_VERSION = '2.4'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
WITH_BF_OPENAL = 'true'
BF_OPENAL = '/usr'
BF_OPENAL_INC = '${BF_OPENAL}/include'
BF_OPENAL_LIB = 'openal'
WITH_BF_SDL = 'true'
BF_SDL = '/usr' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
WITH_BF_FMOD = 'false'
BF_FMOD = LCGDIR + '/fmod'
WITH_BF_OPENEXR = 'true'
BF_OPENEXR = '/usr'
BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
WITH_BF_JPEG = 'true'
BF_JPEG = '/usr'
BF_JPEG_INC = '${BF_JPEG}/include'
BF_JPEG_LIB = 'jpeg'
WITH_BF_PNG = 'true'
BF_PNG = '/usr'
BF_PNG_INC = '${BF_PNG}/include'
BF_PNG_LIB = 'png'
BF_TIFF = '/usr'
BF_TIFF_INC = '${BF_TIFF}/include'
WITH_BF_ZLIB = 'true'
BF_ZLIB = '/usr'
BF_ZLIB_INC = '${BF_ZLIB}/include'
BF_ZLIB_LIB = 'z'
WITH_BF_INTERNATIONAL = 'true'
BF_GETTEXT = '/usr'
BF_GETTEXT_INC = '${BF_GETTEXT}/include'
BF_GETTEXT_LIB = 'gettextlib'
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_FTGL = 'true'
BF_FTGL = '#extern/bFTGL'
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_BULLET = 'true'
BF_BULLET = '#extern/bullet'
BF_BULLET_INC = '${BF_BULLET}/LinearMath ${BF_BULLET}/BulletDynamics ${BF_BULLET}/Bullet'
BF_BULLET_LIB = 'extern_bullet'
BF_SOLID = '#extern/solid'
BF_SOLID_INC = '${BF_SOLID}'
BF_SOLID_LIB = 'extern_solid'
#WITH_BF_NSPR = 'true'
#BF_NSPR = $(LCGDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
#BF_NSPR_LIB =
# Uncomment the following line to use Mozilla inplace of netscape
#CPPFLAGS += -DMOZ_NOT_NET
# Location of MOZILLA/Netscape header files...
#BF_MOZILLA = $(LCGDIR)/mozilla
#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
#BF_MOZILLA_LIB =
# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
# if this is not set.
#
# Be paranoid regarding library creation (do not update archives)
#BF_PARANOID = 'true'
# enable freetype2 support for text objects
BF_FREETYPE = '/usr'
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
# enable ffmpeg support
WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG
BF_FFMPEG = '/usr'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
BF_FFMPEG_LIBPATH='$(BF_FFMPEG)/lib'
BF_FFMPEG_LIB = 'avformat avcodec avutil'
# Mesa Libs should go here if your using them as well....
WITH_BF_STATICOPENGL = 'false'
BF_OPENGL = '/usr'
BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIB = 'GL GLU X11 Xi'
BF_OPENGL_LIBPATH = '/usr/lib'
BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a'
##
CC = 'gcc'
CXX = 'g++'
##ifeq ($CPU),alpha)
## CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
CPPFLAGS = ['-DXP_UNIX']
CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
REL_CFLAGS = ['-O2']
REL_CCFLAGS = ['-O2']
##BF_DEPEND = 'true'
##
##AR = ar
##ARFLAGS = ruv
##ARFLAGSQUIET = ru
##
C_WARN = '-Wall -Wno-char-subscripts'
CC_WARN = '-Wall'
##FIX_STUBS_WARNINGS = -Wno-unused
LLIBS = 'util c m dl pthread stdc++'
##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS)
BF_PROFILE_FLAGS = ['-pg','-g']
BF_PROFILE = 'false'
BF_DEBUG = 'false'
BF_DEBUG_FLAGS = ''
BF_BUILDDIR = 'build/linux2'
BF_INSTALLDIR='install/linux2'
#Link against pthread
PLATFORM_LINKFLAGS = ['-pthread']
--- NEW FILE blender-wrapper ---
#!/bin/sh
#
# A wrapper script for Blender
#
# In case user's home directory doesn't contain ~/.blender, copy it
# from /usr/share/blender
if [ ! -d ~/.blender ]; then
install -d ~/.blender
ln -sf /usr/share/blender/locale ~/.blender
ln -sf /usr/share/blender/.Blanguages ~/.blender
ln -sf /usr/share/blender/.bfont.ttf ~/.blender
cp -a /usr/share/blender/bpydata ~/.blender
cp -a /usr/share/blender/VERSION ~/.blender
install -d ~/.blender/plugins/sequence
install -d ~/.blender/plugins/texture
install -d ~/.blender/scripts
ln -sf /usr/share/blender/scripts/* ~/.blender/scripts/
fi
#
# In case the user's ~/.blender came from older versions, some files
# should be reinstalled.
#
if [ $(cat ~/.blender/VERSION) != $(cat /usr/share/blender/VERSION) ]; then
cp -a /usr/share/blender/bpydata ~/.blender
ln -sf /usr/share/blender/scripts/* ~/.blender/scripts/
cp -a /usr/share/blender/VERSION ~/.blender
fi
#
# Fully update the plugins every time blender is launched.
#
for s in /usr/share/blender/scripts/* ; do
s=`basename $s`
if [ ! -e ~/.blender/scripts/$s ] ; then
ln -sf /usr/share/blender/scripts/$s ~/.blender/scripts/
fi
done
/usr/bin/blender.bin $@
Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- blender.spec 19 Feb 2006 19:09:51 -0000 1.19
+++ blender.spec 17 Jul 2006 18:28:58 -0000 1.20
@@ -1,6 +1,9 @@
+%define blenderlib %{_datadir}/blender
+%define plugins %{_libdir}/blender/plugins
+
Name: blender
-Version: 2.41
-Release: 3%{?dist}
+Version: 2.42
+Release: 1%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -13,9 +16,10 @@
Source3: blender.png
Source4: blender.desktop
Source5: blender.xml
+Source6: blender-wrapper
+Source7: blender-2.42.config
-# Patch0: blender-2.37-x86_64.patch
-Patch1: blender-2.41-alut.patch
+Patch1: blender-2.42-scons.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,24 +58,62 @@
%prep
-%setup -q -n blender
-# %patch0 -p1 -b .x86_64
+%setup -q -n blender2.42
%patch1 -p1
%build
-sed -i "s/use_openal =.*/use_openal = 'true'/g;" SConstruct
-scons
+cp %{SOURCE7} user-config.py
+scons %{?_smp_mflags} BF_QUIET=0 CCFLAGS="$RPM_OPT_FLAGS"
+
+install -d release/plugins/include
+install -m 644 source/blender/blenpluginapi/*.h release/plugins/include
+
+chmod +x release/plugins/bmake
+make -C release/plugins/
%install
rm -rf ${RPM_BUILD_ROOT}
-install -D -m0755 blender ${RPM_BUILD_ROOT}/%{_bindir}/blender
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/blender/scripts/
-install -p -D -m0644 release/scripts/*.py ${RPM_BUILD_ROOT}%{_datadir}/blender/scripts/
-install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/blender/scripts/import-3ds-0.7.py
-install -p -D -m0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/blender/scripts/export-3ds-0.71.py
-install -p -D -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/blender.png
-install -p -D -m0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/blender.xml
+
+install -D -m 755 build/linux2/bin/blender ${RPM_BUILD_ROOT}/%{_bindir}/blender.bin
+
+install -D -m 755 %{SOURCE6} ${RPM_BUILD_ROOT}/%{_bindir}/blender
+
+# install -D -m 755 blenderplayer ${RPM_BUILD_ROOT}/%{_bindir}/blenderplayer
+
+#
+# Install miscellanous files to /usr/lib/blender
+#
+
+mkdir -p ${RPM_BUILD_ROOT}/%{blenderlib}
+
+cp -a release/scripts/bpydata ${RPM_BUILD_ROOT}/%{blenderlib}
+cp -a release/scripts ${RPM_BUILD_ROOT}/%{blenderlib}
+cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{blenderlib}
+
+install -p -D -m 644 release/scripts/*.py ${RPM_BUILD_ROOT}/%{blenderlib}
+
+install -m 644 release/VERSION ${RPM_BUILD_ROOT}/%{blenderlib}
+install -m 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}/%{blenderlib}
+install -m 644 bin/.blender/.bfont.ttf ${RPM_BUILD_ROOT}/%{blenderlib}
+
+install -p -D -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{blenderlib}/import-3ds-0.7.py
+install -p -D -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{blenderlib}/export-3ds-0.71.py
+
+install -p -D -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/blender.png
+
+install -p -D -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/blender.xml
+
+#
+# Install plugins
+#
+
+install -d ${RPM_BUILD_ROOT}/%{plugins}/sequence
+install -d ${RPM_BUILD_ROOT}/%{plugins}/texture
+
+install -m 644 release/plugins/sequence/*.so ${RPM_BUILD_ROOT}/%{plugins}/sequence
+install -m 655 release/plugins/texture/*.so ${RPM_BUILD_ROOT}/%{plugins}/texture
+
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category X-Fedora \
@@ -98,13 +140,17 @@
%{_bindir}/*
%{_datadir}/applications/fedora-blender.desktop
%{_datadir}/pixmaps/*.png
-%{_datadir}/blender/
+%{blenderlib}/
+%ghost %{blenderlib}/*.pyo
+%{plugins}/
%{_datadir}/mime/packages/blender.xml
-
%changelog
+* Sun Jul 16 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42-1
+- New upstream release.
+
* Sun Feb 19 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.41-3
-- Rebuild for FC5
+- Rebuild for FC-5.
* Mon Feb 6 2006 Jochen Schmitt <Jochen herr-schmitt.de> 2.41-2
- Add freealut as dependancy.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 29 Jan 2006 20:42:58 -0000 1.8
+++ sources 17 Jul 2006 18:28:58 -0000 1.9
@@ -1 +1 @@
-f6b54ff73c37aaca4d3f5babdd156fbf blender-2.41.tar.gz
+232d714a64c3a2208f0ea999fe4a2440 blender-2.42.tar.gz
--- blender-2.37-x86_64.patch DELETED ---
--- blender-2.41-alut.patch DELETED ---
More information about the fedora-extras-commits
mailing list