update to 2.37a; native build
help and ok naddy@, "looks good" aanriot@
This commit is contained in:
steven
parent
ef54d03237
commit
08c6d570f1
@ -1,37 +1,54 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2002/12/29 20:08:46 fgsch Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2005/11/24 22:22:56 steven Exp $
|
||||
|
||||
COMMENT= "3D creation software"
|
||||
ONLY_FOR_ARCHS= i386
|
||||
|
||||
V= 2.23
|
||||
PKGNAME= blender-${V}
|
||||
DISTNAME= blender-creator-${V}-linux-glibc2.1.2-i386-static
|
||||
DISTNAME= blender-2.37a
|
||||
CATEGORIES= graphics
|
||||
|
||||
HOMEPAGE= http://www.blender.nl/
|
||||
HOMEPAGE= http://www.blender.org/
|
||||
|
||||
MAINTAINER= Reinhard J. Sammer <reinhard@openbsd.org>
|
||||
MAINTAINER= Steven Mestdagh <steven@openbsd.org>
|
||||
|
||||
PERMIT_PACKAGE_CDROM= "no commercial use"
|
||||
PERMIT_PACKAGE_FTP= "no commercial use"
|
||||
PERMIT_DISTFILES_CDROM= "no commercial use"
|
||||
PERMIT_DISTFILES_FTP= "no commercial use"
|
||||
# GPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= ftp://ftp.cs.umn.edu/pub/blender/pub/ \
|
||||
http://www.download.blender.pl/mirror/
|
||||
MASTER_SITES= ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
|
||||
http://download.blender.org/source/ \
|
||||
http://public.planetmirror.com/pub/blender/source/
|
||||
|
||||
RUN_DEPENDS= :redhat_base-*:emulators/redhat/base
|
||||
BUILD_DEPENDS= :scons-*:devel/scons \
|
||||
:pkgconfig-*:devel/pkgconfig
|
||||
LIB_DEPENDS= png::graphics/png \
|
||||
jpeg::graphics/jpeg \
|
||||
SDL::devel/sdl \
|
||||
python2.3.0.0:python-2.3.*:lang/python/2.3
|
||||
|
||||
INSTALL_STRIP=
|
||||
NO_BUILD= Yes
|
||||
WANTLIB= GL GLU X11 Xext c m pthread stdc++ usbhid util z
|
||||
|
||||
MODULES= devel/gettext
|
||||
USE_X11= Yes
|
||||
NO_REGRESS= Yes
|
||||
|
||||
WRKDIST= ${WRKDIR}/blender
|
||||
|
||||
pre-build:
|
||||
@perl -pi -e 's#!!LOCALBASE!!#${LOCALBASE}#g' ${WRKSRC}/SConstruct
|
||||
@perl -pi -e 's#!!X11BASE!!#${X11BASE}#g' ${WRKSRC}/SConstruct
|
||||
|
||||
do-build:
|
||||
@${SETENV} ${MAKE_ENV} CC=${CC} CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
|
||||
scons -C ${WRKBUILD}
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/blender ${PREFIX}/bin
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/blender
|
||||
${INSTALL_DATA} ${WRKSRC}/{README,copyright.txt} \
|
||||
${PREFIX}/share/examples/blender
|
||||
cd ${WRKSRC} && tar cf - plugins | \
|
||||
(cd ${PREFIX}/share/examples/blender && tar xf -)
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/blender ${PREFIX}/bin
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/blender/scripts
|
||||
${INSTALL_DATA} ${WRKSRC}/release/scripts/*.py \
|
||||
${PREFIX}/share/blender/scripts
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/blender/scripts/bpymodules
|
||||
${INSTALL_DATA} ${WRKSRC}/release/scripts/bpymodules/*.py \
|
||||
${PREFIX}/share/blender/scripts/bpymodules
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (blender-creator-2.23-linux-glibc2.1.2-i386-static.tar.gz) = 98b58b1c840160f2ed5a01344dce3b96
|
||||
RMD160 (blender-creator-2.23-linux-glibc2.1.2-i386-static.tar.gz) = a365db940b767a1cdcd69eb1cfff77e166477f39
|
||||
SHA1 (blender-creator-2.23-linux-glibc2.1.2-i386-static.tar.gz) = 751e8927bfb0e77e6b4c212ceff197fbe07332e2
|
||||
SIZE (blender-creator-2.23-linux-glibc2.1.2-i386-static.tar.gz) = 2505088
|
||||
MD5 (blender-2.37a.tar.gz) = dd0002c09ecd68b3cb3e3d8f4ce31e83
|
||||
RMD160 (blender-2.37a.tar.gz) = 77a78a9f5ead45b7d1f67837c30446afbe937889
|
||||
SHA1 (blender-2.37a.tar.gz) = 8070654abdca449658f8fb7c9ecfc4fb7e445465
|
||||
SIZE (blender-2.37a.tar.gz) = 7990789
|
||||
|
||||
85
graphics/blender/patches/patch-SConstruct
Normal file
85
graphics/blender/patches/patch-SConstruct
Normal file
@ -0,0 +1,85 @@
|
||||
$OpenBSD: patch-SConstruct,v 1.1 2005/11/24 22:22:57 steven Exp $
|
||||
--- SConstruct.orig Mon Jun 13 22:56:19 2005
|
||||
+++ SConstruct Mon Nov 21 10:27:22 2005
|
||||
@@ -607,9 +607,9 @@ elif sys.platform=='openbsd3':
|
||||
build_blender_static = 'false'
|
||||
build_blender_player = 'false'
|
||||
build_blender_plugin = 'false'
|
||||
- release_flags = ['-O2']
|
||||
- debug_flags = ['-O2', '-g']
|
||||
- extra_flags = ['-pipe', '-fPIC', '-funsigned-char']
|
||||
+ release_flags = []
|
||||
+ debug_flags = ['-g']
|
||||
+ extra_flags = ['-fPIC', '-funsigned-char']
|
||||
cxxflags = []
|
||||
defines = []
|
||||
warn_flags = ['-Wall','-W']
|
||||
@@ -623,17 +623,17 @@ elif sys.platform=='openbsd3':
|
||||
z_include = ['/usr/include']
|
||||
# png library information
|
||||
png_lib = ['png']
|
||||
- png_libpath = ['/usr/local/lib']
|
||||
- png_include = ['/usr/local/include/libpng']
|
||||
+ png_libpath = ['!!LOCALBASE!!/lib']
|
||||
+ png_include = ['!!LOCALBASE!!/include/libpng']
|
||||
# jpeg library information
|
||||
jpeg_lib = ['jpeg']
|
||||
- jpeg_libpath = ['/usr/local/lib']
|
||||
- jpeg_include = ['/usr/local/include']
|
||||
+ jpeg_libpath = ['!!LOCALBASE!!/lib']
|
||||
+ jpeg_include = ['!!LOCALBASE!!/include']
|
||||
# OpenGL library information
|
||||
opengl_lib = ['GL', 'GLU']
|
||||
- opengl_static = ['/usr/lib/libGL.a', '/usr/lib/libGLU.a']
|
||||
- opengl_libpath = ['/usr/lib', '/usr/X11R6/lib']
|
||||
- opengl_include = ['/usr/X11R6/include/']
|
||||
+ opengl_static = ['!!X11BASE!!/lib/libGL.a', '!!X11BASE!!/lib/libGLU.a']
|
||||
+ opengl_libpath = ['!!X11BASE!!/lib']
|
||||
+ opengl_include = ['!!X11BASE!!/include/']
|
||||
# SDL library information
|
||||
sdl_env.ParseConfig ('sdl-config --cflags --libs')
|
||||
sdl_cflags = sdl_env.Dictionary()['CCFLAGS']
|
||||
@@ -660,13 +660,13 @@ elif sys.platform=='openbsd3':
|
||||
ftgl_lib = []
|
||||
ftgl_libpath = []
|
||||
ftgl_include = ['#extern/bFTGL/include']
|
||||
- freetype_env.ParseConfig('pkg-config --cflags --libs freetype2')
|
||||
+ freetype_env.ParseConfig('freetype-config --cflags --libs 2>/dev/null')
|
||||
freetype_lib = freetype_env.Dictionary()['LIBS']
|
||||
freetype_libpath = freetype_env.Dictionary()['LIBPATH']
|
||||
freetype_include = freetype_env.Dictionary()['CPPPATH']
|
||||
- gettext_lib = []
|
||||
- gettext_libpath = []
|
||||
- gettext_include = []
|
||||
+ gettext_lib = ['intl', 'iconv']
|
||||
+ gettext_libpath = ['!!LOCALBASE!!/lib']
|
||||
+ gettext_include = ['!!LOCALBASE!!/include']
|
||||
# OpenAL library information
|
||||
openal_lib = ['openal']
|
||||
openal_libpath = ['/usr/lib']
|
||||
@@ -786,8 +786,8 @@ else:
|
||||
|
||||
config.write ("\n# Extra compiler flags can be defined here.\n")
|
||||
config.write ("DEFINES = %s\n"%(my_defines))
|
||||
- config.write ("CCFLAGS = %s\n"%(my_ccflags))
|
||||
- config.write ("CXXFLAGS = %s\n"%(my_cxxflags))
|
||||
+ config.write ("CCFLAGS = %s\n"%(env['ENV']['CFLAGS'].split()))
|
||||
+ config.write ("CXXFLAGS = %s\n"%(env['ENV']['CXXFLAGS'].split()))
|
||||
config.write ("LDFLAGS = %s\n"%(my_ldflags))
|
||||
|
||||
config.write ("USE_INTERNATIONAL = %r\n"%(use_international))
|
||||
@@ -800,10 +800,10 @@ else:
|
||||
config.write ("USE_FMOD = %r\n"%(use_fmod))
|
||||
config.write ("USE_QUICKTIME = %r\n"%(use_quicktime))
|
||||
config.write ("\n# Compiler information.\n")
|
||||
- config.write ("HOST_CC = %r\n"%(env_dict['CC']))
|
||||
- config.write ("HOST_CXX = %r\n"%(env_dict['CXX']))
|
||||
- config.write ("TARGET_CC = %r\n"%(env_dict['CC']))
|
||||
- config.write ("TARGET_CXX = %r\n"%(env_dict['CXX']))
|
||||
+ config.write ("HOST_CC = %r\n"%(env['ENV']['CC']))
|
||||
+ config.write ("HOST_CXX = %r\n"%(env['ENV']['CXX']))
|
||||
+ config.write ("TARGET_CC = %r\n"%(env['ENV']['CC']))
|
||||
+ config.write ("TARGET_CXX = %r\n"%(env['ENV']['CXX']))
|
||||
config.write ("TARGET_AR = %r\n"%(env_dict['AR']))
|
||||
config.write ("PATH = %r\n"%(os.environ['PATH']))
|
||||
config.write ("\n# External library information.\n")
|
||||
12
graphics/blender/patches/patch-extern_solid_SConscript
Normal file
12
graphics/blender/patches/patch-extern_solid_SConscript
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-extern_solid_SConscript,v 1.1 2005/11/24 22:22:57 steven Exp $
|
||||
--- extern/solid/SConscript.orig Sun Oct 16 17:44:24 2005
|
||||
+++ extern/solid/SConscript Sun Oct 16 17:44:37 2005
|
||||
@@ -18,7 +18,7 @@ if sys.platform=='win32':
|
||||
defines += ['WIN32','NDEBUG', '_WINDOWS', '_LIB']
|
||||
#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
|
||||
cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']
|
||||
-elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5':
|
||||
+elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5' or sys.platform=='openbsd3':
|
||||
defines += ['NDEBUG']
|
||||
cflags += ['-O2']
|
||||
elif sys.platform=='darwin' :
|
||||
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-intern_SoundSystem_intern_SND_WaveCache_cpp,v 1.1 2005/11/24 22:22:57 steven Exp $
|
||||
--- intern/SoundSystem/intern/SND_WaveCache.cpp.orig Mon Oct 17 08:43:26 2005
|
||||
+++ intern/SoundSystem/intern/SND_WaveCache.cpp Mon Oct 17 08:45:19 2005
|
||||
@@ -48,7 +48,7 @@
|
||||
#ifdef __APPLE__
|
||||
# include <sys/malloc.h>
|
||||
#else
|
||||
-# ifdef __FreeBSD__
|
||||
+# if defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
# include <stdlib.h>
|
||||
# else
|
||||
# include <malloc.h>
|
||||
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-intern_iksolver_intern_TNT_cmat_h,v 1.1 2005/11/24 22:22:57 steven Exp $
|
||||
--- intern/iksolver/intern/TNT/cmat.h.orig Mon Oct 17 09:38:08 2005
|
||||
+++ intern/iksolver/intern/TNT/cmat.h Mon Oct 17 09:42:12 2005
|
||||
@@ -39,7 +39,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
#include <iostream>
|
||||
-#include <strstream>
|
||||
+#include <sstream>
|
||||
#ifdef TNT_USE_REGIONS
|
||||
#include "region2d.h"
|
||||
#endif
|
||||
@@ -207,7 +207,7 @@ class Matrix
|
||||
Matrix(Subscript M, Subscript N, const char *s)
|
||||
{
|
||||
initialize(M,N);
|
||||
- std::istrstream ins(s);
|
||||
+ std::istringstream ins(s);
|
||||
|
||||
Subscript i, j;
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-intern_iksolver_intern_TNT_vec_h,v 1.1 2005/11/24 22:22:57 steven Exp $
|
||||
--- intern/iksolver/intern/TNT/vec.h.orig Thu Jul 22 02:15:49 2004
|
||||
+++ intern/iksolver/intern/TNT/vec.h Mon Oct 17 09:41:08 2005
|
||||
@@ -37,7 +37,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
#include <iostream>
|
||||
-#include <strstream>
|
||||
+#include <sstream>
|
||||
|
||||
namespace TNT
|
||||
{
|
||||
@@ -189,7 +189,7 @@ class Vector
|
||||
Vector(Subscript N, char *s) : v_(0), vm1_(0), n_(0)
|
||||
{
|
||||
initialize(N);
|
||||
- std::istrstream ins(s);
|
||||
+ std::istringstream ins(s);
|
||||
|
||||
Subscript i;
|
||||
|
||||
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-source_blender_blenkernel_intern_blender_c,v 1.1 2005/11/24 22:22:57 steven Exp $
|
||||
--- source/blender/blenkernel/intern/blender.c.orig Mon May 30 15:20:13 2005
|
||||
+++ source/blender/blenkernel/intern/blender.c Thu Nov 24 10:54:56 2005
|
||||
@@ -696,9 +696,10 @@ void BKE_undo_save_quit(void)
|
||||
/* no undo state to save */
|
||||
if(undobase.first==undobase.last) return;
|
||||
|
||||
+ strlcpy(U.tempdir, BLI_gethome(), sizeof(U.tempdir));
|
||||
BLI_make_file_string("/", str, U.tempdir, "quit.blend");
|
||||
|
||||
- file = open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC, 0666);
|
||||
+ file = open(str,O_WRONLY|O_CREAT|O_TRUNC, 0666);
|
||||
if(file == -1) {
|
||||
printf("Unable to save %s\n", str);
|
||||
return;
|
||||
@ -0,0 +1,39 @@
|
||||
$OpenBSD: patch-source_blender_blenkernel_intern_subsurf_ccg_c,v 1.1 2005/11/24 22:22:57 steven Exp $
|
||||
--- source/blender/blenkernel/intern/subsurf_ccg.c.orig Mon Nov 21 22:43:17 2005
|
||||
+++ source/blender/blenkernel/intern/subsurf_ccg.c Mon Nov 21 22:46:27 2005
|
||||
@@ -313,7 +313,7 @@ static DispListMesh *subSurf_createDispL
|
||||
med->flag|= ME_SEAM;
|
||||
}
|
||||
} else {
|
||||
- int edgeIdx = (int) ccgSubSurf_getEdgeEdgeHandle(ss, e);
|
||||
+ long edgeIdx = (long) ccgSubSurf_getEdgeEdgeHandle(ss, e);
|
||||
|
||||
/* Edges created by lib have handle of -1 */
|
||||
if (edgeIdx!=-1 && ssm->me->medge) {
|
||||
@@ -377,7 +377,7 @@ static DispListMesh *subSurf_createDispL
|
||||
int flag;
|
||||
|
||||
if (ssm->controlType==SUBSURF_CONTROLTYPE_MESH) {
|
||||
- int origIdx = (int) ccgSubSurf_getFaceFaceHandle(ss, f);
|
||||
+ long origIdx = (long) ccgSubSurf_getFaceFaceHandle(ss, f);
|
||||
MFace *origMFace = &((MFace*) ssm->me->mface)[origIdx];
|
||||
if (ssm->me->tface)
|
||||
origTFace = &((TFace*)ssm->me->tface)[origIdx];
|
||||
@@ -501,7 +501,7 @@ static void subSurf_sync(SubSurf *ss, in
|
||||
|
||||
if (ss->controlType==SUBSURF_CONTROLTYPE_MESH) {
|
||||
CCGVertHDL fVerts[4];
|
||||
- int i;
|
||||
+ long i;
|
||||
|
||||
for (i=0; i<ss->me->totvert; i++) {
|
||||
ccgSubSurf_syncVert(ss->subSurf, (CCGVertHDL) i, ss->me->mvert[i].co);
|
||||
@@ -981,7 +981,7 @@ void subsurf_calculate_limit_positions(M
|
||||
vi = ccgSubSurf_getVertIterator(ss->subSurf);
|
||||
for (; !ccgVertIterator_isStopped(vi); ccgVertIterator_next(vi)) {
|
||||
CCGVert *v = ccgVertIterator_getCurrent(vi);
|
||||
- int idx = (int) ccgSubSurf_getVertVertHandle(ss->subSurf, v);
|
||||
+ long idx = (long) ccgSubSurf_getVertVertHandle(ss->subSurf, v);
|
||||
int N = ccgSubSurf_getVertNumEdges(ss->subSurf, v);
|
||||
int numFaces = ccgSubSurf_getVertNumFaces(ss->subSurf, v);
|
||||
float *co;
|
||||
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-source_blender_blenlib_intern_fileops_c,v 1.1 2005/11/24 22:22:57 steven Exp $
|
||||
--- source/blender/blenlib/intern/fileops.c.orig Mon Nov 21 11:14:49 2005
|
||||
+++ source/blender/blenlib/intern/fileops.c Mon Nov 21 11:15:34 2005
|
||||
@@ -65,7 +65,7 @@ char *first_slash(char *string) {
|
||||
if (!ffslash) return fbslash;
|
||||
else if (!fbslash) return ffslash;
|
||||
|
||||
- if ((int)ffslash < (int)fbslash) return ffslash;
|
||||
+ if (ffslash < fbslash) return ffslash;
|
||||
else return fbslash;
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ char *BLI_last_slash(char *string) {
|
||||
if (!lfslash) return lbslash;
|
||||
else if (!lbslash) return lfslash;
|
||||
|
||||
- if ((int)lfslash < (int)lbslash) return lbslash;
|
||||
+ if (lfslash < lbslash) return lbslash;
|
||||
else return lfslash;
|
||||
}
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
$OpenBSD: patch-source_blender_blenlib_intern_storage_c,v 1.1 2005/11/24 22:22:57 steven Exp $
|
||||
--- source/blender/blenlib/intern/storage.c.orig Mon Oct 17 07:33:52 2005
|
||||
+++ source/blender/blenlib/intern/storage.c Mon Oct 17 08:31:26 2005
|
||||
@@ -50,7 +50,7 @@
|
||||
#include <time.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
-#if !defined(linux) && (defined(__sgi) || defined(__sun__) || defined(__sun) || defined(__sparc) || defined(__sparc__))
|
||||
+#if !defined(__OpenBSD__) && !defined(linux) && (defined(__sgi) || defined(__sun__) || defined(__sun) || defined(__sparc) || defined(__sparc__))
|
||||
#include <sys/statfs.h>
|
||||
#endif
|
||||
|
||||
@@ -89,7 +89,7 @@ struct statfs {
|
||||
#include <pwd.h>
|
||||
#endif
|
||||
|
||||
-#if !defined(__FreeBSD__) && !defined(__APPLE__)
|
||||
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
|
||||
@@ -194,7 +194,7 @@ double BLI_diskfree(char *dir)
|
||||
#ifdef __BeOS
|
||||
return -1;
|
||||
#endif
|
||||
-#if !defined(linux) && (defined (__sgi) || defined (__sun__) || defined (__sun) || defined(__sparc) || defined(__sparc__))
|
||||
+#if !defined(__OpenBSD__) && !defined(linux) && (defined (__sgi) || defined (__sun__) || defined (__sun) || defined(__sparc) || defined(__sparc__))
|
||||
|
||||
if (statfs(name, &disk, sizeof(struct statfs), 0)){
|
||||
/* printf("diskfree: Couldn't get information about %s.\n",dir); */
|
||||
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-source_blender_blenloader_intern_readfile_c,v 1.1 2005/11/24 22:22:57 steven Exp $
|
||||
--- source/blender/blenloader/intern/readfile.c.orig Mon Nov 21 22:57:09 2005
|
||||
+++ source/blender/blenloader/intern/readfile.c Mon Nov 21 22:57:25 2005
|
||||
@@ -2161,7 +2161,7 @@ static void lib_link_object(FileData *fd
|
||||
ob->type= OB_EMPTY;
|
||||
warn= 1;
|
||||
if(ob->id.lib) printf("Can't find obdata of %s lib %s\n", ob->id.name+2, ob->id.lib->name);
|
||||
- else printf("Object %s lost data. Lib:%x\n", ob->id.name+2, (unsigned int) ob->id.lib);
|
||||
+ else printf("Object %s lost data. Lib:%lx\n", ob->id.name+2, (unsigned long) ob->id.lib);
|
||||
}
|
||||
for(a=0; a<ob->totcol; a++) ob->mat[a]= newlibadr_us(fd, ob->id.lib, ob->mat[a]);
|
||||
|
||||
@ -0,0 +1,76 @@
|
||||
$OpenBSD: patch-source_blender_render_intern_source_shadbuf_c,v 1.1 2005/11/24 22:22:57 steven Exp $
|
||||
--- source/blender/render/intern/source/shadbuf.c.orig Mon Nov 21 22:36:42 2005
|
||||
+++ source/blender/render/intern/source/shadbuf.c Mon Nov 21 22:38:40 2005
|
||||
@@ -375,7 +375,7 @@ static float readshadowbuf(struct ShadBu
|
||||
{
|
||||
float temp;
|
||||
int *rz, ofs;
|
||||
- int zsamp=0;
|
||||
+ long zsamp=0;
|
||||
char *ct, *cz;
|
||||
|
||||
/* simpleclip */
|
||||
@@ -401,7 +401,7 @@ static float readshadowbuf(struct ShadBu
|
||||
else if(*ct==2) {
|
||||
ct= ((char *)rz);
|
||||
ct+= 4+2*16*(ys & 15)+2*(xs & 15);
|
||||
- zsamp= *rz;
|
||||
+ zsamp= (long) *rz;
|
||||
|
||||
cz= (char *)&zsamp;
|
||||
cz[BCOMP]= ct[0];
|
||||
@@ -410,7 +410,7 @@ static float readshadowbuf(struct ShadBu
|
||||
else if(*ct==1) {
|
||||
ct= ((char *)rz);
|
||||
ct+= 4+16*(ys & 15)+(xs & 15);
|
||||
- zsamp= *rz;
|
||||
+ zsamp= (long) *rz;
|
||||
|
||||
cz= (char *)&zsamp;
|
||||
cz[GCOMP]= ct[0];
|
||||
@@ -419,7 +419,7 @@ static float readshadowbuf(struct ShadBu
|
||||
else {
|
||||
/* got warning on this from DEC alpha (64 bits).... */
|
||||
/* but it's working code! (ton) */
|
||||
- zsamp= (int) rz;
|
||||
+ zsamp= (long) rz;
|
||||
}
|
||||
|
||||
/* if(zsamp >= 0x7FFFFE00) return 1.0; */ /* no shaduw when sampling at eternal distance */
|
||||
@@ -540,7 +540,8 @@ static float readshadowbuf_halo(struct S
|
||||
{
|
||||
float temp;
|
||||
int *rz, ofs;
|
||||
- int bias, zbias, zsamp;
|
||||
+ int bias, zbias;
|
||||
+ long zsamp;
|
||||
char *ct, *cz;
|
||||
|
||||
/* negative! The other side is more important */
|
||||
@@ -566,7 +567,7 @@ static float readshadowbuf_halo(struct S
|
||||
else if(*ct==2) {
|
||||
ct= ((char *)rz);
|
||||
ct+= 4+2*16*(ys & 15)+2*(xs & 15);
|
||||
- zsamp= *rz;
|
||||
+ zsamp= (long) *rz;
|
||||
|
||||
cz= (char *)&zsamp;
|
||||
cz[BCOMP]= ct[0];
|
||||
@@ -575,7 +576,7 @@ static float readshadowbuf_halo(struct S
|
||||
else if(*ct==1) {
|
||||
ct= ((char *)rz);
|
||||
ct+= 4+16*(ys & 15)+(xs & 15);
|
||||
- zsamp= *rz;
|
||||
+ zsamp= (long) *rz;
|
||||
|
||||
cz= (char *)&zsamp;
|
||||
cz[GCOMP]= ct[0];
|
||||
@@ -584,7 +585,7 @@ static float readshadowbuf_halo(struct S
|
||||
else {
|
||||
/* same as before */
|
||||
/* still working code! (ton) */
|
||||
- zsamp= (int) rz;
|
||||
+ zsamp= (long) rz;
|
||||
}
|
||||
|
||||
/* NO schadow when sampled at 'eternal' distance */
|
||||
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-source_blender_src_transform_conversions_c,v 1.1 2005/11/24 22:22:57 steven Exp $
|
||||
--- source/blender/src/transform_conversions.c.orig Mon Nov 21 22:32:14 2005
|
||||
+++ source/blender/src/transform_conversions.c Mon Nov 21 22:32:33 2005
|
||||
@@ -892,8 +892,8 @@ static void createTransLatticeVerts(Tran
|
||||
/* ********************* mesh ****************** */
|
||||
|
||||
/* proportional distance based on connectivity */
|
||||
-#define E_VEC(a) (vectors + (3 * (int)(a)->vn))
|
||||
-#define E_NEAR(a) (nears[((int)(a)->vn)])
|
||||
+#define E_VEC(a) (vectors + (3 * (long)(a)->vn))
|
||||
+#define E_NEAR(a) (nears[((long)(a)->vn)])
|
||||
static void editmesh_set_connectivity_distance(int total, float *vectors, EditVert **nears)
|
||||
{
|
||||
EditMesh *em = G.editMesh;
|
||||
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-source_blender_src_usiblender_c,v 1.1 2005/11/24 22:22:57 steven Exp $
|
||||
--- source/blender/src/usiblender.c.orig Wed Nov 23 00:24:07 2005
|
||||
+++ source/blender/src/usiblender.c Wed Nov 23 00:22:38 2005
|
||||
@@ -153,9 +153,7 @@ static void init_userdef_file(void)
|
||||
}
|
||||
if(U.mixbufsize==0) U.mixbufsize= 2048;
|
||||
if (BLI_streq(U.tempdir, "/")) {
|
||||
- char *tmp= getenv("TEMP");
|
||||
-
|
||||
- strcpy(U.tempdir, tmp?tmp:"/tmp/");
|
||||
+ strlcpy(U.tempdir, BLI_gethome(), sizeof(U.tempdir));
|
||||
}
|
||||
if (U.savetime <= 0) {
|
||||
U.savetime = 1;
|
||||
@ -1,9 +1,10 @@
|
||||
Developed as the in-house software of a high quality animation
|
||||
studio, Blender has proven to be an extremely fast and versatile
|
||||
design instrument. The software has a personal touch, offering a
|
||||
unique approach to the world of Three Dimensions. Use Blender to
|
||||
create TV commercials, to make technical visualizations, business
|
||||
graphics, to do some morphing, or design user interfaces. You can
|
||||
easy build and manage complex environments. The renderer is versatile
|
||||
and extremely fast. All basic animation principles (curves & keys)
|
||||
are well implemented.
|
||||
Blender is an integrated suite of tools enabling the creation of a
|
||||
broad range of 3D content. It offers full functionality for modelling,
|
||||
rendering, animation, post-production, creation and playback of
|
||||
interactive 3D content with the singular benefits of cross-platform
|
||||
operability and a download file size of less than 2.5MB.
|
||||
Aimed at media professionals and artists, Blender can be used to create
|
||||
3D visualizations, stills as well as broadcast quality video.
|
||||
|
||||
Documentation for blender is available on the homepage:
|
||||
http://www.blender.org/cms/Documentation.628.0.html
|
||||
|
||||
@ -1 +0,0 @@
|
||||
The beginners page is at http://www.blender.nl/support/beginners.php
|
||||
@ -1,27 +1,84 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:50:08 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2005/11/24 22:22:57 steven Exp $
|
||||
bin/blender
|
||||
share/examples/blender/
|
||||
share/examples/blender/README
|
||||
share/examples/blender/copyright.txt
|
||||
share/examples/blender/plugins/
|
||||
share/examples/blender/plugins/Makefile
|
||||
share/examples/blender/plugins/bmake
|
||||
share/examples/blender/plugins/include/
|
||||
share/examples/blender/plugins/include/floatpatch.h
|
||||
share/examples/blender/plugins/include/iff.h
|
||||
share/examples/blender/plugins/include/plugin.h
|
||||
share/examples/blender/plugins/include/util.h
|
||||
share/examples/blender/plugins/sequence/
|
||||
share/examples/blender/plugins/sequence/Makefile
|
||||
share/examples/blender/plugins/sequence/blur.c
|
||||
share/examples/blender/plugins/sequence/blur.so
|
||||
share/examples/blender/plugins/sequence/scatter.c
|
||||
share/examples/blender/plugins/sequence/scatter.so
|
||||
share/examples/blender/plugins/sequence/showzbuf.c
|
||||
share/examples/blender/plugins/sequence/showzbuf.so
|
||||
share/examples/blender/plugins/texture/
|
||||
share/examples/blender/plugins/texture/Makefile
|
||||
share/examples/blender/plugins/texture/clouds2.c
|
||||
share/examples/blender/plugins/texture/clouds2.so
|
||||
share/examples/blender/plugins/texture/tiles.c
|
||||
share/examples/blender/plugins/texture/tiles.so
|
||||
share/blender/
|
||||
share/blender/scripts/
|
||||
share/blender/scripts/Apply_def.py
|
||||
share/blender/scripts/Axiscopy.py
|
||||
share/blender/scripts/DirectX8Exporter.py
|
||||
share/blender/scripts/DirectXExporter.py
|
||||
share/blender/scripts/UVpaint05.py
|
||||
share/blender/scripts/ac3d_export.py
|
||||
share/blender/scripts/ac3d_import.py
|
||||
share/blender/scripts/armature_symetry.py
|
||||
share/blender/scripts/batch_name_edit.py
|
||||
share/blender/scripts/bevel_center.py
|
||||
share/blender/scripts/blender2cal3d.py
|
||||
share/blender/scripts/bpymodules/
|
||||
share/blender/scripts/bpymodules/BPyBlender.py
|
||||
share/blender/scripts/bpymodules/BPyMathutils.py
|
||||
share/blender/scripts/bpymodules/BPyNMesh.py
|
||||
share/blender/scripts/bpymodules/BPyRegistry.py
|
||||
share/blender/scripts/bpymodules/ai2obj.py
|
||||
share/blender/scripts/bpymodules/defaultdoodads.py
|
||||
share/blender/scripts/bpymodules/eps2obj.py
|
||||
share/blender/scripts/bpymodules/gimp2obj.py
|
||||
share/blender/scripts/bpymodules/meshtools.py
|
||||
share/blender/scripts/bpymodules/svg2obj.py
|
||||
share/blender/scripts/bvh2arm.py
|
||||
share/blender/scripts/bvh_export.py
|
||||
share/blender/scripts/bvh_import.py
|
||||
share/blender/scripts/camera_changer.py
|
||||
share/blender/scripts/clean_mesh.py
|
||||
share/blender/scripts/config.py
|
||||
share/blender/scripts/console.py
|
||||
share/blender/scripts/discombobulator.py
|
||||
share/blender/scripts/disp_paint.py
|
||||
share/blender/scripts/doc_browser.py
|
||||
share/blender/scripts/envelope_assignment.py
|
||||
share/blender/scripts/envelope_symmetry.py
|
||||
share/blender/scripts/fixfromarmature.py
|
||||
share/blender/scripts/help_browser.py
|
||||
share/blender/scripts/help_getting_started.py
|
||||
share/blender/scripts/help_manual.py
|
||||
share/blender/scripts/help_py_reference.py
|
||||
share/blender/scripts/help_release_notes.py
|
||||
share/blender/scripts/help_tutorials.py
|
||||
share/blender/scripts/help_web_blender.py
|
||||
share/blender/scripts/help_web_devcomm.py
|
||||
share/blender/scripts/help_web_eshop.py
|
||||
share/blender/scripts/help_web_usercomm.py
|
||||
share/blender/scripts/hotkeys.py
|
||||
share/blender/scripts/kloputils.py
|
||||
share/blender/scripts/knife.py
|
||||
share/blender/scripts/lightwave_export.py
|
||||
share/blender/scripts/lightwave_import.py
|
||||
share/blender/scripts/nendo_export.py
|
||||
share/blender/scripts/nendo_import.py
|
||||
share/blender/scripts/obdatacopier.py
|
||||
share/blender/scripts/obj_export.py
|
||||
share/blender/scripts/obj_import.py
|
||||
share/blender/scripts/off_export.py
|
||||
share/blender/scripts/off_import.py
|
||||
share/blender/scripts/paths_import.py
|
||||
share/blender/scripts/radiosity_export.py
|
||||
share/blender/scripts/radiosity_import.py
|
||||
share/blender/scripts/raw_export.py
|
||||
share/blender/scripts/raw_import.py
|
||||
share/blender/scripts/renameobjectbyblock.py
|
||||
share/blender/scripts/rvk1_torvk2.py
|
||||
share/blender/scripts/save_theme.py
|
||||
share/blender/scripts/sel_same.py
|
||||
share/blender/scripts/skin.py
|
||||
share/blender/scripts/slp_import.py
|
||||
share/blender/scripts/sysinfo.py
|
||||
share/blender/scripts/tex2uvbaker.py
|
||||
share/blender/scripts/truespace_export.py
|
||||
share/blender/scripts/truespace_import.py
|
||||
share/blender/scripts/unweld.py
|
||||
share/blender/scripts/uv_export.py
|
||||
share/blender/scripts/videoscape_export.py
|
||||
share/blender/scripts/vrml97_export.py
|
||||
share/blender/scripts/wings_export.py
|
||||
share/blender/scripts/wings_import.py
|
||||
share/blender/scripts/wrl2export.py
|
||||
share/blender/scripts/x3d_export.py
|
||||
|
||||
Loading…
Reference in New Issue
Block a user