From b2a669af8b609c849667e76735486586ccfcea22 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: May 20 2007 20:36:33 +0000 Subject: New upstream release --- diff --git a/blender-2.42.config b/blender-2.42.config deleted file mode 100644 index 3718420..0000000 --- a/blender-2.42.config +++ /dev/null @@ -1,153 +0,0 @@ -LCGDIR = 'lib/linux2' -BF_PYTHON = '/usr' -BF_PYTHON_VERSION = '2.5' -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'] diff --git a/blender-2.44.config b/blender-2.44.config new file mode 100644 index 0000000..5e37492 --- /dev/null +++ b/blender-2.44.config @@ -0,0 +1,153 @@ +LCGDIR = 'lib/linux2' +BF_PYTHON = '/usr' +BF_PYTHON_VERSION = '@PYVER@' +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 = '@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/bullet2/src/' +BF_BULLET_INC = '${BF_BULLET} ${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='@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 = '@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'] diff --git a/blender.spec b/blender.spec index 456fb5b..b0a4f37 100644 --- a/blender.spec +++ b/blender.spec @@ -1,9 +1,10 @@ %define blenderlib %{_datadir}/blender %define plugins %{_libdir}/blender/plugins +%define pyver %(%{__python} -c "import sys ; print sys.version[:3]") Name: blender -Version: 2.42a -Release: 24%{?dist} +Version: 2.44 +Release: 1%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -15,15 +16,15 @@ URL: http://www.blender.org # wget http://download.blender.org/source/blender-%{version}.tar.gz # tar -zxv blender-%{version}.tar.gz # rm -rf blender-%{version}/extern/ffmpeg -# tar -zcf blender-%{version}.tar.gz blender-%{version}/ -Source0: blender-%{version}.tar.gz +# tar -zcf blender-%{version}-noffmpeg.tar.gz blender-%{version}/ +Source0: blender-%{version}-noffmpeg.tar.gz Source1: http://bane.servebeer.com/programming/blender/import-3ds-0.7.py Source2: http://bane.servebeer.com/programming/blender/export-3ds-0.71.py Source3: blender.png Source4: blender.desktop Source5: blender.xml Source6: blender-wrapper -Source7: blender-2.42.config +Source7: blender-2.44.config Patch1: blender-2.42-scons.patch @@ -52,13 +53,13 @@ BuildRequires: mesa-libGLU-devel buildRequires: freetype-devel BuildRequires: OpenEXR-devel +Requires: python-abi = %{pyver} + Requires(post): desktop-file-utils Requires(post): shared-mime-info Requires(postun): desktop-file-utils Requires(postun): shared-mime-info -ExcludeArch: x86_64 ppc64 - %description Blender is the essential software solution you need for 3D, from modeling, animation, rendering and post-production to interactive creation and playback. @@ -69,9 +70,10 @@ secure, multi-platform content to the web, CD-ROMs, and other media. %prep %setup -q %patch1 -p1 +sed -e 's|@LIB@|%{_libdir}|g' -e 's/@PYVER@/%{pyver}/g' \ + <%{SOURCE7} >user-config.py %build -cp %{SOURCE7} user-config.py # # Don't use $RPM_OPT_FLAGS (see #199418) @@ -126,8 +128,6 @@ 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 -rm ${RPM_BUILD_ROOT}/%{blenderlib}/scripts/kmz_ImportWithMesh.* - # # Install plugins # @@ -170,6 +170,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/mime/packages/blender.xml %changelog +* Tue May 15 2007 Jochen Schmitt 2.44-1 +- New upstream release + * Wed May 9 2007 Jochen Schmitt 2.42a-24 - Remove ffmpeg lib during a legal issue (#239476) diff --git a/sources b/sources index b06d145..95f89e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0743395066be7e02c946cdfeb2049ed1 blender-2.42a.tar.gz +c078195e1563bb95b7b228f3f679c48d blender-2.44-noffmpeg.tar.gz