diff --git a/Makefile b/Makefile deleted file mode 100644 index f62b24c..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: blender -# $Id: Makefile,v 1.1 2004/11/08 04:06:47 cvsextras Exp $ -NAME := blender -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/blender-2.37-x86_64.patch b/blender-2.37-x86_64.patch deleted file mode 100644 index 73bd42b..0000000 --- a/blender-2.37-x86_64.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- blender/source/gameengine/Expressions/KX_HashedPtr.cpp.x86_64 2004-03-22 17:01:28.000000000 -0500 -+++ blender/source/gameengine/Expressions/KX_HashedPtr.cpp 2005-06-05 10:09:48.000000000 -0400 -@@ -57,5 +57,5 @@ - - unsigned int CHashedPtr::hash() const - { -- return KX_Hash((unsigned int) m_valptr); -+ return KX_Hash((unsigned int)((unsigned long) m_valptr & 0x00000000FFFFFFFF)); - } ---- blender/source/gameengine/Ketsji/KX_WorldIpoController.cpp.x86_64 2005-03-09 14:45:59.000000000 -0500 -+++ blender/source/gameengine/Ketsji/KX_WorldIpoController.cpp 2005-06-05 10:09:48.000000000 -0400 -@@ -92,10 +92,10 @@ - iporeplica->AddInterpolator(copyipo); - - MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget(); -- int orgbase = (int)this; -- int orgloc = (int)scaal; -- int offset = orgloc-orgbase; -- int newaddrbase = (int)iporeplica + offset; -+ long orgbase = (long)this; -+ long orgloc = (long)scaal; -+ long offset = orgloc-orgbase; -+ long newaddrbase = (long)iporeplica + offset; - MT_Scalar* blaptr = (MT_Scalar*) newaddrbase; - copyipo->SetNewTarget((MT_Scalar*)blaptr); - } ---- blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp.x86_64 2004-03-22 17:01:52.000000000 -0500 -+++ blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp 2005-06-05 10:09:48.000000000 -0400 -@@ -87,10 +87,10 @@ - iporeplica->AddInterpolator(copyipo); - - MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget(); -- int orgbase = (int)this; -- int orgloc = (int)scaal; -- int offset = orgloc-orgbase; -- int newaddrbase = (int)iporeplica + offset; -+ long orgbase = (long)this; -+ long orgloc = (long)scaal; -+ long offset = orgloc-orgbase; -+ long newaddrbase = (long)iporeplica + offset; - MT_Scalar* blaptr = (MT_Scalar*) newaddrbase; - copyipo->SetNewTarget((MT_Scalar*)blaptr); - } ---- blender/source/gameengine/Ketsji/KX_LightIpoSGController.cpp.x86_64 2004-03-22 17:01:52.000000000 -0500 -+++ blender/source/gameengine/Ketsji/KX_LightIpoSGController.cpp 2005-06-05 10:09:48.000000000 -0400 -@@ -97,10 +97,10 @@ - iporeplica->AddInterpolator(copyipo); - - MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget(); -- int orgbase = (int)this; -- int orgloc = (int)scaal; -- int offset = orgloc-orgbase; -- int newaddrbase = (int)iporeplica + offset; -+ long orgbase = (long)this; -+ long orgloc = (long)scaal; -+ long offset = orgloc-orgbase; -+ long newaddrbase = (long)iporeplica + offset; - MT_Scalar* blaptr = (MT_Scalar*) newaddrbase; - copyipo->SetNewTarget((MT_Scalar*)blaptr); - } ---- blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp.x86_64 2005-03-25 05:33:37.000000000 -0500 -+++ blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp 2005-06-05 10:09:48.000000000 -0400 -@@ -168,10 +168,10 @@ - iporeplica->AddInterpolator(copyipo); - - MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget(); -- int orgbase = (int)&m_ipo_xform; -- int orgloc = (int)scaal; -- int offset = orgloc-orgbase; -- int newaddrbase = (int)&iporeplica->m_ipo_xform; -+ long orgbase = (long)&m_ipo_xform; -+ long orgloc = (long)scaal; -+ long offset = orgloc-orgbase; -+ long newaddrbase = (long)&iporeplica->m_ipo_xform; - newaddrbase += offset; - MT_Scalar* blaptr = (MT_Scalar*) newaddrbase; - copyipo->SetNewTarget((MT_Scalar*)blaptr); ---- blender/source/gameengine/Ketsji/KX_GameObject.cpp.x86_64 2005-04-18 07:44:21.000000000 -0400 -+++ blender/source/gameengine/Ketsji/KX_GameObject.cpp 2005-06-05 10:09:48.000000000 -0400 -@@ -1069,10 +1069,10 @@ - PyObject* kwds) - { - KX_IPhysicsController* ctrl = GetPhysicsController(); -- int physid=0; -+ long physid=0; - if (ctrl) - { -- physid= (int)ctrl->GetUserData(); -+ physid= (long)ctrl->GetUserData(); - } - return PyInt_FromLong(physid); - } ---- blender/source/gameengine/Ketsji/KX_CameraIpoSGController.cpp.x86_64 2004-07-21 20:26:34.000000000 -0400 -+++ blender/source/gameengine/Ketsji/KX_CameraIpoSGController.cpp 2005-06-05 10:09:48.000000000 -0400 -@@ -92,10 +92,10 @@ - iporeplica->AddInterpolator(copyipo); - - MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget(); -- int orgbase = (int)this; -- int orgloc = (int)scaal; -- int offset = orgloc-orgbase; -- int newaddrbase = (int)iporeplica + offset; -+ long orgbase = (long)this; -+ long orgloc = (long)scaal; -+ long offset = orgloc-orgbase; -+ long newaddrbase = (long)iporeplica + offset; - MT_Scalar* blaptr = (MT_Scalar*) newaddrbase; - copyipo->SetNewTarget((MT_Scalar*)blaptr); - } ---- blender/source/kernel/gen_system/GEN_HashedPtr.h.x86_64 2002-12-27 08:11:00.000000000 -0500 -+++ blender/source/kernel/gen_system/GEN_HashedPtr.h 2005-06-05 10:09:48.000000000 -0400 -@@ -40,7 +40,7 @@ - void* m_valptr; - public: - GEN_HashedPtr(void* val) : m_valptr(val) {}; -- unsigned int hash() const { return GEN_Hash((unsigned int) m_valptr);}; -+ unsigned int hash() const { return GEN_Hash((unsigned int)((unsigned long) m_valptr & 0x00000000FFFFFFFF));}; - inline friend bool operator ==(const GEN_HashedPtr & rhs, const GEN_HashedPtr & lhs) { return rhs.m_valptr == lhs.m_valptr;}; - }; - diff --git a/blender-2.44-bid.patch b/blender-2.44-bid.patch deleted file mode 100644 index e6acba8..0000000 --- a/blender-2.44-bid.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- blender-2.44/release/plugins/bmake.bid 2004-12-27 20:28:48.000000000 +0100 -+++ blender-2.44/release/plugins/bmake 2007-08-09 18:13:34.000000000 +0200 -@@ -60,10 +60,10 @@ elif ( test $UNAME = "OpenBSD" ) then - LDFLAGS="-Bshareable"; - elif ( test $UNAME = "Linux" ) then - CC="gcc"; -- CFLAGS="-fPIC -funsigned-char -O2"; -+ CFLAGS="${RPM_OPT_FLAGS} -fPIC -funsigned-char"; - -- LD="ld"; -- LDFLAGS="-Bshareable"; -+ LD="gcc"; -+ LDFLAGS="--shared ${RPM_OPT_FLAGS}"; - elif ( test $UNAME = "SunOS" ) then - CC="cc"; - CFLAGS="-O"; diff --git a/blender-2.44-scons.patch b/blender-2.44-scons.patch deleted file mode 100644 index 5afb80f..0000000 --- a/blender-2.44-scons.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- blender-2.44/SConstruct.orig 2007-05-07 18:09:40.000000000 +0200 -+++ blender-2.44/SConstruct 2007-05-20 22:52:13.000000000 +0200 -@@ -237,7 +242,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 diff --git a/blender-2.45-cve-2008-1102.patch b/blender-2.45-cve-2008-1102.patch deleted file mode 100644 index 43015b3..0000000 --- a/blender-2.45-cve-2008-1102.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up blender-2.45/source/blender/imbuf/intern/radiance_hdr.c.csv blender-2.45/source/blender/imbuf/intern/radiance_hdr.c ---- blender-2.45/source/blender/imbuf/intern/radiance_hdr.c.csv 2008-04-24 16:22:36.000000000 +0200 -+++ blender-2.45/source/blender/imbuf/intern/radiance_hdr.c 2008-04-24 16:25:59.000000000 +0200 -@@ -191,7 +191,8 @@ struct ImBuf *imb_loadhdr(unsigned char - } - } - if (found) { -- sscanf((char*)&mem[x+1], "%s %d %s %d", (char*)&oriY, &height, (char*)&oriX, &width); -+ if (sscanf((char *)&mem[x+1], "%79s %d %79s %d", (char*)&oriY, &height, -+ (char*)&oriX, &width) != 4) return NULL; - - /* find end of this line, data right behind it */ - ptr = (unsigned char *)strchr((char*)&mem[x+1], '\n'); diff --git a/blender-2.45-gcc43.patch b/blender-2.45-gcc43.patch deleted file mode 100644 index 6aa444e..0000000 --- a/blender-2.45-gcc43.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -up blender-2.45/source/blender/yafray/intern/yafray_Render.cpp.gcc43 blender-2.45/source/blender/yafray/intern/yafray_Render.cpp ---- blender-2.45/source/blender/yafray/intern/yafray_Render.cpp.gcc43 2007-09-18 06:58:44.000000000 +0200 -+++ blender-2.45/source/blender/yafray/intern/yafray_Render.cpp 2008-01-17 20:49:05.000000000 +0100 -@@ -8,6 +8,8 @@ - - #include - -+#include -+ - using namespace std; - - void yafrayRender_t::clearAll() -diff -up blender-2.45/source/blender/yafray/intern/export_File.cpp.gcc43 blender-2.45/source/blender/yafray/intern/export_File.cpp ---- blender-2.45/source/blender/yafray/intern/export_File.cpp.gcc43 2007-09-18 06:58:44.000000000 +0200 -+++ blender-2.45/source/blender/yafray/intern/export_File.cpp 2008-01-17 20:49:05.000000000 +0100 -@@ -2,6 +2,8 @@ - - #include - -+#include -+ - using namespace std; - - static string command_path = ""; -diff -up blender-2.45/source/blender/yafray/intern/export_Plugin.cpp.gcc43 blender-2.45/source/blender/yafray/intern/export_Plugin.cpp ---- blender-2.45/source/blender/yafray/intern/export_Plugin.cpp.gcc43 2007-09-18 06:58:44.000000000 +0200 -+++ blender-2.45/source/blender/yafray/intern/export_Plugin.cpp 2008-01-17 20:49:05.000000000 +0100 -@@ -1,6 +1,9 @@ - #include "export_Plugin.h" - - #include -+ -+#include -+ - using namespace std; - - -diff -up blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp.gcc43 blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp ---- blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp.gcc43 2008-01-17 20:56:36.000000000 +0100 -+++ blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp 2008-01-17 20:57:03.000000000 +0100 -@@ -32,6 +32,8 @@ - - #include "GPC_KeyboardDevice.h" - -+#include -+ - /** - * NextFrame toggles currentTable with previousTable, - * and copies relevant event information from previous to current table -diff -up blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h.gcc43 blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h ---- blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h.gcc43 2007-09-18 06:58:17.000000000 +0200 -+++ blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h 2008-01-17 20:49:05.000000000 +0100 -@@ -56,7 +56,7 @@ - # undef GL_ARB_vertex_program - #endif - --#include "glext.h" -+// #include "glext.h" - - #include "EXT_separate_specular_color.h" - #include "ARB_multitexture.h" -diff -up blender-2.45/intern/string/STR_String.h.gcc43 blender-2.45/intern/string/STR_String.h ---- blender-2.45/intern/string/STR_String.h.gcc43 2007-09-18 06:58:01.000000000 +0200 -+++ blender-2.45/intern/string/STR_String.h 2008-01-17 20:49:05.000000000 +0100 -@@ -47,6 +47,10 @@ - - #include - #include -+ -+#include -+#include -+ - using namespace std; - - -diff -up blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp.gcc43 blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp ---- blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp.gcc43 2007-09-18 06:57:51.000000000 +0200 -+++ blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp 2008-01-17 20:49:05.000000000 +0100 -@@ -42,6 +42,8 @@ - #include - #endif - -+#include -+#include - - // For obscure full screen mode stuuf - // lifted verbatim from blut. diff --git a/blender-2.45-sc.patch b/blender-2.45-sc.patch deleted file mode 100644 index a461aa4..0000000 --- a/blender-2.45-sc.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up blender-2.45/tools/btools.py.scons blender-2.45/tools/btools.py ---- blender-2.45/tools/btools.py.scons 2007-09-18 07:00:48.000000000 +0200 -+++ blender-2.45/tools/btools.py 2008-04-27 21:23:27.000000000 +0200 -@@ -1,7 +1,10 @@ - import os - import os.path - import SCons.Options --import SCons.Options.BoolOption -+try: -+ import SCons.Options.BoolOption -+except ImportError: -+ pass - try: - import subprocess - except ImportError: diff --git a/blender-2.45-yafray.patch b/blender-2.45-yafray.patch deleted file mode 100644 index 3c64b90..0000000 --- a/blender-2.45-yafray.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- blender-2.45/source/blender/yafray/intern/export_Plugin.cpp.orig 2007-09-18 05:58:44.000000000 +0100 -+++ blender-2.45/source/blender/yafray/intern/export_Plugin.cpp 2008-02-05 14:32:07.000000000 +0000 -@@ -97,8 +97,8 @@ - #else - static char *alternative[]= - { -- "/usr/local/lib/", -- "/usr/lib/", -+ "/usr/local/lib64/", -+ "/usr/lib64/", - NULL - }; - -@@ -120,8 +120,8 @@ - #else - static char *alternative[]= - { -- "/usr/local/lib/yafray", -- "/usr/lib/yafray", -+ "/usr/local/lib64/yafray", -+ "/usr/lib64/yafray", - NULL - }; - diff --git a/blender.desktop b/blender.desktop deleted file mode 100644 index aa50e0e..0000000 --- a/blender.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Blender -Comment=3D modeling, animation, rendering and post-production -Exec=blender -w -Icon=blender.png -Terminal=false -Type=Application -Categories=Graphics;Application; -MimeType=application/x-blender; diff --git a/blender.png b/blender.png deleted file mode 100644 index f0278dd..0000000 Binary files a/blender.png and /dev/null differ diff --git a/blender.spec b/blender.spec deleted file mode 100644 index 43f0037..0000000 --- a/blender.spec +++ /dev/null @@ -1,472 +0,0 @@ -%define blenderlib %{_datadir}/blender -%define plugins %{_libdir}/blender/plugins - -Name: blender -Version: 2.45 -Release: 13%{?dist}.1 - -Summary: 3D modeling, animation, rendering and post-production - -Group: Applications/Multimedia -License: GPLv2 -URL: http://www.blender.org -# During a Legel issue (#239476) the package contains a cusromized -# source package created as fellow. -# 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}-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.44.config - -Patch1: blender-2.44-scons.patch -Patch2: blender-2.44-bid.patch -Patch3: blender-2.45-gcc43.patch -Patch4: blender-2.45-yafray.patch -Patch5: blender-2.45-sc.patch - -Patch100: blender-2.45-cve-2008-1102.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: desktop-file-utils -BuildRequires: esound-devel -BuildRequires: freeglut-devel -BuildRequires: gettext-devel -BuildRequires: libjpeg-devel -BuildRequires: libogg-devel -BuildRequires: libpng-devel -BuildRequires: libtool -BuildRequires: libvorbis-devel -BuildRequires: freealut-devel -BuildRequires: openssl-devel -BuildRequires: python-devel -BuildRequires: scons -BuildRequires: SDL-devel -BuildRequires: zlib-devel -BuildRequires: libtiff-devel -BuildRequires: libXi-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -buildRequires: freetype-devel -BuildRequires: OpenEXR-devel - -Requires(post): desktop-file-utils -Requires(post): shared-mime-info -Requires(postun): desktop-file-utils -Requires(postun): shared-mime-info - -%description -Blender is the essential software solution you need for 3D, from modeling, -animation, rendering and post-production to interactive creation and playback. - -Professionals and novices can easily and inexpensively publish stand-alone, -secure, multi-platform content to the web, CD-ROMs, and other media. - -This version doesn't contains ffmpeg support, so that any features may be not -available. - -%prep -%setup -q -%patch1 -p1 -b .org -%patch2 -p1 -b .bid -%patch3 -p1 -b .gcc43 -%patch5 -p1 -b .scons - - -%if "%{?_lib}" == "lib64" -%patch4 -p1 -%endif - -%patch100 -p1 -b .cve - -PYVER=$(%{__python} -c "import sys ; print sys.version[:3]") - -sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \ - <%{SOURCE7} >user-config.py - -%build - -# -# Don't use $RPM_OPT_FLAGS (see #199418) -# - -scons %{?_smp_mflags} blenderplayer BF_QUIET=0 - -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 -m 755 build/linux2/bin/blender ${RPM_BUILD_ROOT}/%{_bindir}/blender.bin - -install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}/%{_bindir}/blenderplayer - -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} - -pushd bin/.blender/locale -mv pt_br pt_BR -mv zh_cn uh_CN -rm -rf $(find -name '.svn' -print) -popd - -cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir} - -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 \ - %{SOURCE4} - -%find_lang %name - -%clean -rm -rf ${RPM_BUILD_ROOT} - -%post -update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - - -%postun -update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - - -%files -f %name.lang -%defattr(-,root,root,-) -%doc COPYING README doc/python-dev-guide.txt doc/GPL-license.txt doc/bf-members.txt -%{_bindir}/* -%{_datadir}/applications/fedora-blender.desktop -%{_datadir}/pixmaps/*.png -%{blenderlib}/ -%{_libdir}/blender/ -%{_datadir}/mime/packages/blender.xml - -%changelog -* Mon May 5 2008 Jochen Schmitt 2.45-13.1 -- Initial EPEL-4 package - -* Sun Apr 27 2008 Jochen Schmitt 2.45-13 -- More generic patch for scons issue - -* Thu Apr 24 2008 Jochen Schmitt 2.45-12 -- Fix odd scons compatibility issue - -* Thu Apr 24 2008 Jochen Schmitt 2.45-11 -- Fix CVS-2008-1102 (#443937) - -* Wed Mar 12 2008 Jochen Schmitt 2.45-10 -- Clarification of restrictions caused by legal issues - -* Tue Mar 4 2008 Jochen Schmitt 2.45-9 -- Apply yafray patch only on 64-bit systems - -* Thu Feb 28 2008 Jochen Schmitt 2.45-8 -- Fix yafray load bug (#451571) - -* Sun Feb 10 2008 Jochen Schmitt 2.45-7 -- Rebuild for gcc-4.3 - -* Sat Jan 26 2008 Alex Lancaster 2.45-6 -- Rebuild for new gettext - -* Thu Jan 17 2008 Jochen Schmitt 2.45-5 -- Fix gcc-4.3 related issues - -* Tue Oct 16 2007 Jochen Schmitt 2.45-4 -- Rebuild again for OpenEXR - -* Sun Oct 14 2007 Jochen Schmitt 2.45-3 -- Rebuild - -* Sun Sep 23 2007 Jochen Schmitt 2.45-2 -- Change method how to determinate python version - -* Thu Sep 20 2007 Jochen Schmitt 2.45-1 -- New upstream release - -* Thu Aug 9 2007 Jochen Schmitt 2.44-8 -- Fix koji-python issue - -* Wed Aug 8 2007 Jochen Schmitt 2.44-6 -- Changing license tag -- Add python as an BR - -* Mon May 21 2007 Jochen Schmitt 2.44-4 -- Use of $$RPM_OPT_FLAGS to compile blender - -* Sun May 20 2007 Jochen Schmitt 2.44-2 -- Increase release number - -* 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) - -* Tue May 8 2007 Jochen Schmitt 2.42a-23 -- Exclude ppc64 arch - -* Mon May 7 2007 Jochen Schmitt 2.42a-21 -- Fix security issue (#239338) - -* Sun Apr 22 2007 Jochen Schmitt 2.42a-20 -- Romove package from the x86_64 arch (#237423) - -* Mon Jan 8 2007 Jochen Schmitt 2.42a-18 -- Rebult - -* Thu Dec 14 2006 Jochen Schmitt 2.42a-17 -- Replace x86-patch with one from the blender project - -* Thu Dec 14 2006 Jochen Schmitt 2.42a-16 -- Rebuild - -* Tue Dec 12 2006 Jochen Schmitt 2.42a-12 -- Fix typo - -* Tue Dec 12 2006 Jochen Schmitt 2.42a-11 -- Try x64-patch for complle with python-2.5 - -* Tue Dec 12 2006 Jochen Schmitt 2.42a-10 -- Exclude x86_64 arch (#219329) - -* Mon Dec 11 2006 Jochen Schmitt 2.42a-9 -- New build to solve broken deps - -* Wed Nov 29 2006 Jochen Schmitt 2.42a-6 -- Rebuild to solve broken deps - -* Tue Oct 31 2006 Jochen Schmitt 2.42a-5 -- Rebuilt to fix broken deps - -* Mon Oct 16 2006 Jochen Schmitt 2.42a-4 -- /usr/lib/blender should own by the package - -* Wed Oct 11 2006 Jochen Schmitt 2.42a-3 -- Correct invalid locale paths (#210209) - -* Wed Sep 13 2006 Jochen Schmitt 2.42a-2 -- Update to new upstream release - -* Tue Sep 12 2006 Jochen Schmitt 2.42-10 -- Rebuild to solve broken deps - -* Sun Sep 3 2006 Jochen Schmitt 2.42-9 -- Rebuild for FC-6 - -* Thu Aug 10 2006 Jochen Schmitt 2.42-7 -- Remove %%ghost for pyo files for fullfilling new packaging guidelines - -* Thu Aug 10 2006 Jochen Schmitt 2.42-6 -- Rebuilt to solve broken deps - -* Wed Jul 26 2006 Jochen Schmitt 2.42-5 -- Fix symlink in blender-wrapper to locale - -* Thu Jul 20 2006 Jochen Schmitt 2.42-4 -- Fix UI Problem (#199418) - -* Mon Jul 17 2006 Jochen Schmitt 2.42-3 -- Fix some BR stuff. - -* Sun Jul 16 2006 Jochen Schmitt 2.42-1 -- New upstream release. - -* Sun Feb 19 2006 Jochen Schmitt 2.41-3 -- Rebuild for FC-5. - -* Mon Feb 6 2006 Jochen Schmitt 2.41-2 -- Add freealut as dependancy. - -* Sun Jan 30 2006 Jochen Schmitt 2.41-1 -- Update to new upstream release. - -* Wed Jan 18 2006 Jochen Schmitt 2.40-2 -- New upstream release. -- adapting to mudular X. -- add libtiff-devel as BuildRequires. - -* Mon Jun 6 2005 Toshio Kuratomi 2.37-3 -- Bump release for development. - -* Sun Jun 5 2005 Toshio Kuratomi 2.37-2 -- Patch to fix compilation errors on x86_64. - -* Sun Jun 5 2005 Toshio Kuratomi 2.37-1 -- Update to 2.37. -- Drop gcc4 patch. - -* Mon May 16 2005 Toshio Kuratomi 2.36-3 -- Bump and rebuild now that scons is available on all platforms. - -* Sat May 14 2005 Toshio Kuratomi 2.36-2 -- Fix a gcc4 error. - -* Fri May 13 2005 Toshio Kuratomi 2.36-1 -- Update to 2.36. -- Rebuild with new gcc4. - -* Fri Apr 7 2005 Michael Schwendt -- rebuilt - -* Mon Nov 15 2004 Phillip Compton 2.35-1 -- 2.35. - -* Thu Nov 11 2004 Phillip Compton 2.34-0.fdr.3 -- Mime-type corrections for FC3. -- Dropped redundent BR XFree86-devel. - -* Thu Aug 05 2004 Phillip Compton 0:2.34-0.fdr.2 -- blender.applications file. -- blender.xml file. -- post/postun update-mime-database. - -* Thu Aug 05 2004 Phillip Compton 0:2.34-0.fdr.1 -- Updated to 2.34. - -* Thu Aug 05 2004 Phillip Compton 0:2.33-0.fdr.2.a -- Include 3ds import/export scripts. -- Added mime info. -- Added mime icon (from yattacier theme). - -* Wed Aug 04 2004 Phillip Compton 0:2.33-0.fdr.1.a -- 2.33a. -- Now building with scons. - -* Tue Feb 10 2004 Phillip Compton 0:2.32-0.fdr.2 -- Now including scripts. - -* Thu Feb 05 2004 Phillip Compton 0:2.32-0.fdr.1 -- Updated to 2.32. - -* Sun Jan 11 2004 Phillip Compton 0:2.31-0.fdr.3.a -- --enable-openal. -- --disable-rpath. -- remove --enable-international. -- modify .desktop to execute with -w. - -* Thu Dec 04 2003 Phillip Compton 0:2.31-0.fdr.2.a -- Updated to 2.31a. - -* Sun Nov 30 2003 Phillip Compton 0:2.31-0.fdr.1 -- Updated to 2.31. -- enable-international. - -* Tue Nov 18 2003 Phillip Compton 0:2.30-0.fdr.1 -- Updated to 2.30. - -* Fri Oct 10 2003 Phillip Compton 0:2.28-0.fdr.5.c -- Updated to 2.28c. - -* Tue Oct 07 2003 Phillip Compton 0:2.28-0.fdr.4.a -- Removed BuildReq smpeg-devel - -* Mon Sep 15 2003 Phillip Compton 0:2.28-0.fdr.3.a -- Moved 'a' out of version according to naming guidelines. - -* Fri Sep 12 2003 Phillip Compton 0:2.28a-0.fdr.2 -- changed file permission on tarball. -- dropped redundant messages about aclocal, etc. -- configure --disable-shared. -- automake --foreign. -- added doc/python-dev-guide.txt doc/GPL-license.txt doc/bf-members.txt to %%doc. - -* Wed Sep 10 2003 Phillip Compton 0:2.28a-0.fdr.1 -- Updated to 2.28a. - -* Wed Aug 13 2003 Phillip Compton 0:2.28-0.fdr.2 -- New Icon. - -* Thu Jul 24 2003 Phillip Compton 0:2.28-0.fdr.1 -- Updated to 2.28. -- BuildReq libvorbis-devel. -- BuildReq smpeg-devel. -- BuildReq esound-devel. -- BuildReq libogg-devel. -- BuildReq vorbis-tools. -- BuildReq openal-devel -- BuildReq libtool - -* Mon May 26 2003 Phillip Compton 0:2.27-0.fdr.2 -- Removed post/postun ldconfig. -- Added autoconf workaround. - -* Mon May 19 2003 Phillip Compton 0:2.27-0.fdr.1 -- Updated to 2.27. -- Removed devel package. - -* Wed Apr 09 2003 Phillip Compton 0:2.26-0.fdr.9 -- Corrected devel Group. - -* Tue Apr 01 2003 Phillip Compton 0:2.26-0.fdr.8 -- Added desktop-file-utils to BuildRequires. -- Changed category to X-Fedora-Extra. - -* Mon Mar 31 2003 Phillip Compton 0:2.26-0.fdr.7 -- Added Missing BuildRequires. - -* Sun Mar 30 2003 Phillip Compton 0:2.26-0.fdr.6 -- Cleaned up BuildRequires. -- Added Epoch:0. - -* Sat Mar 22 2003 Phillip Compton 2.26-0.fdr.5 -- Spec file cleanup. - -* Sat Mar 08 2003 Phillip Compton 2.26-1.fdr.4 -- Spec file cleanup. - -* Wed Feb 26 2003 Phillip Compton 2.26-1.fedora.3 -- Spec file cleanup. - -* Thu Feb 20 2003 Warren Togami -- Add BuildRequires python-devel - -* Wed Feb 19 2003 Phillip Compton -- Initial RPM release. diff --git a/blender.xml b/blender.xml deleted file mode 100644 index 7cee114..0000000 --- a/blender.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - Blender Scene - - - diff --git a/branch b/branch deleted file mode 100644 index 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4 diff --git a/export-3ds-0.71.py b/export-3ds-0.71.py deleted file mode 100644 index 221e4c0..0000000 --- a/export-3ds-0.71.py +++ /dev/null @@ -1,744 +0,0 @@ -#!BPY - -""" -Name: '3D Studio' -Blender: 233 -Group: 'Export' -Tip: 'Export to 3DS file format. (.3ds)' -""" - - - -###################################################### -# 3ds Importer -# By: Bob Holcomb and Richard L�rk�ng -# Date: 22 APR 04 -# Ver: 0.7 -###################################################### -# This script imports a 3ds file and the materials -# into blender for editing. Hopefully -# this will make it into a future version as an import -# feature of the menu. Loader is based on 3ds loader -# from www.gametutorials.com(Thanks DigiBen). -###################################################### - -###################################################### -# Importing modules -###################################################### - -import Blender -from Blender import NMesh, Scene, Object, Material -from Blender.BGL import * -from Blender.Draw import * -from Blender.Window import * -from Blender.Image import * -from Blender.Material import * - -import sys, struct, string, types, math -from types import * - -import os -from os import path - - -###################################################### -# Data Structures -###################################################### - -#Some of the chunks that we will see -#----- Primary Chunk, at the beginning of each file -PRIMARY=19789 #0x4D4D - -#------ Main Chunks -OBJECTINFO=15677 #0x3D3D // This gives the version of the mesh and is found right before the material and object information -VERSION=2 #0x0002 // This gives the version of the .3ds file -EDITKEYFRAME=45056 #0xB000 // This is the header for all of the key frame info - -#------ sub defines of OBJECTINFO -MATERIAL=45055 #0xAFFF // This stored the texture info -OBJECT=16384 #0x4000 // This stores the faces, vertices, etc... - -#------ sub defines of MATERIAL -MATNAME=40960 #0xA000 // This holds the material name -MATAMBIENT=40976 #0xA010 -MATDIFFUSE=40992 #0xA020 // This holds the color of the object/material -MATSPECULAR=41008 #0xA030 -MATMAP=41472 #0xA200 // This is a header for a new material -MATMAPFILE=41728 #0xA300 // This holds the file name of the texture - -RGB1=17 #0x0011 -RGB2=18 #0x0012 - -OBJECT_MESH=16640 #0x4100 // This lets us know that we are reading a new object - -#------ sub defines of OBJECT_MESH -OBJECT_VERTICES=16656 #0x4110 // The objects vertices -OBJECT_FACES=16672 #0x4120 // The objects faces -OBJECT_MATERIAL=16688 #0x4130 // This is found if the object has a material, either texture map or color -OBJECT_UV=16704 #0x4140 // The UV texture coordinates -OBJECT_TRANS_MATRIX=16736 #0x4160 // The translation matrix of the object 54 bytes - -def point_by_matrix(p, m): - return [p[0] * m[0][0] + p[1] * m[1][0] + p[2] * m[2][0] + m[3][0], - p[0] * m[0][1] + p[1] * m[1][1] + p[2] * m[2][1] + m[3][1], - p[0] * m[0][2] + p[1] * m[1][2] + p[2] * m[2][2] + m[3][2]] - -#the chunk class -class chunk: - ID=0 - size=0 - - def __init__(self): - self.ID=0 - self.size=0 - - def get_size(self): - self.size=6 - - def write(self, file): - binary_format="=15): - result=Blender.Draw.PupMenu("Cannot assign more than 16 materials to a mesh: Continue?%t|OK") - break; - else: - mesh.addMaterial(mat) - material_found=1 - print "found material: ",mat.name - - #figure out what material index this is for the mesh - for mat_counter in range(0,len(mesh.materials)): - if mesh.materials[mat_counter].name==material_name: - mat_index=mat_counter - print "material index: ",mat_index - - #break out of this for loop so we don't accidentally set material_found back to 0 - break - else: - material_found=0 - #print "Not matching: ", mat.name, " and ", material_name - - if(material_found==1): - #read the number of faces using this material - temp_data=file.read(struct.calcsize("H")) - data=struct.unpack("H", temp_data) - new_chunk.bytes_read+=2 - num_faces_using_mat=data[0] - print "number of faces using this material: ", num_faces_using_mat - - #list of faces using mat - for face_counter in range(0,num_faces_using_mat): - temp_data=file.read(struct.calcsize("H")) - new_chunk.bytes_read+=2 - data=struct.unpack("H", temp_data) - #print "face #: ", data[0] - mesh.faces[data[0]].materialIndex=mat_index - - else: - #read past the information about the material you couldn't find - print "Couldn't find material. Reading past face material info" - buffer_size=new_chunk.length-new_chunk.bytes_read - binary_format=str(buffer_size)+"c" - temp_data=file.read(struct.calcsize(binary_format)) - new_chunk.bytes_read+=buffer_size - - print "object mat: bytes read: ", new_chunk.bytes_read - - elif (new_chunk.ID==OBJECT_UV): - print "Found an OBJECT_UV chunk" - print "object uv: lenght: ", new_chunk.length - temp_data=file.read(struct.calcsize("H")) - data=struct.unpack("H", temp_data) - new_chunk.bytes_read+=2 - num_uv=data[0] - print "number of UV: ", num_uv - - for counter in range(0,num_uv): - temp_data=file.read(struct.calcsize("2f")) - new_chunk.bytes_read+=8 #2 float x 4 bytes each - data=struct.unpack("2f", temp_data) - #insert the insert the UV coords in the vertex data - mesh.verts[counter].uvco[0]=data[0] - mesh.verts[counter].uvco[1]=data[1] - #turn on the sticky UV coords for this mesh - mesh.hasVertexUV(1) - print "object uv: bytes read: ", new_chunk.bytes_read - - else: - print "Found some other Object chunk: ",hex(new_chunk.ID) - print "object faces: length: ", new_chunk.length - buffer_size=new_chunk.length-new_chunk.bytes_read - binary_format=str(buffer_size)+"c" - temp_data=file.read(struct.calcsize(binary_format)) - new_chunk.bytes_read+=buffer_size - print "object other: bytes read: ", new_chunk.bytes_read - - previous_chunk.bytes_read+=new_chunk.bytes_read - print "Bytes left in this Object chunk: ", previous_chunk.length-previous_chunk.bytes_read - -def process_next_material_chunk(file, previous_chunk, mat): - new_chunk=chunk() - temp_chunk=chunk() - - while (previous_chunk.bytes_read3): - print "Non-Fatal Error: Version greater than 3, may not load correctly: ", version - - #is it an object info chunk? - elif (new_chunk.ID==OBJECTINFO): - print "found an OBJECTINFO chunk" - print "object info: lenght: ", new_chunk.length - #recursively go through the rest of the file - process_next_chunk(file, new_chunk) - - #keep track of how much we read in the main chunk - new_chunk.bytes_read+=temp_chunk.bytes_read - - #is it an object chunk? - elif (new_chunk.ID==OBJECT): - print "found an OBJECT chunk" - print "object length: ", new_chunk.length - #make a mesh - mesh=NMesh.New() - mesh.name=str(read_string(file)) - print "mesh name: ", mesh.name - #plus one for the null character that gets removed - new_chunk.bytes_read+=(len(mesh.name)+1) - - process_next_object_chunk(file, new_chunk, mesh) - - #put the object into blender at the cursor location - mesh_obj=NMesh.PutRaw(mesh) - cursor_pos=Blender.Window.GetCursorPos() - mesh_obj.setLocation(float(cursor_pos[0]),float(cursor_pos[1]),float(cursor_pos[2])) - - #is it a material chunk? - elif (new_chunk.ID==MATERIAL): - print "found a MATERIAL chunk" - - material=Material.New() - process_next_material_chunk(file, new_chunk, material) - - else: #(new_chunk.ID!=VERSION or new_chunk.ID!=OBJECTINFO or new_chunk.ID!=OBJECT or new_chunk.ID!=MATERIAL): - print "skipping to end of this chunk" - buffer_size=new_chunk.length-new_chunk.bytes_read - binary_format=str(buffer_size)+"c" - temp_data=file.read(struct.calcsize(binary_format)) - new_chunk.bytes_read+=buffer_size - - - #update the previous chunk bytes read - previous_chunk.bytes_read+=new_chunk.bytes_read - print "Bytes left in this chunk: ", previous_chunk.length-previous_chunk.bytes_read - - -def load_3ds (filename): - - current_chunk=chunk() - - file=open(filename,"rb") - - #here we go! - print "reading the first chunk" - read_chunk(file, current_chunk) - if (current_chunk.ID!=PRIMARY): - print "Fatal Error: Not a valid 3ds file: ", filename - Exit() - - process_next_chunk(file, current_chunk) - - file.close() - - -#*********************************************** -# MAIN -#*********************************************** - - -def my_callback(filename): - load_3ds(filename) - -Blender.Window.FileSelector(my_callback, "Import 3DS") diff --git a/sources b/sources deleted file mode 100644 index e7816a3..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -2f88b8a5860f6919bd72dc9946a55f3b blender-2.45-noffmpeg.tar.gz