Attachment 69953 Details for Bug 102200 – blender_2_42a_current-patch

blender_2_42a_current-patch

blender_2_42a_current-patch (text/plain), 12.64 KB, created by Armin Pirkovitsch on 2006-09-09 16:01:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Armin Pirkovitsch

Created: 2006-09-09 16:01:23 UTC

Size: 12.64 KB

patch

obsolete

>diff -urN blender-devel.orig/Makefile blender-devel/Makefile
>--- blender-devel.orig/Makefile	Tue Sep  5 22:46:21 2006
>+++ blender-devel/Makefile	Sat Sep  9 15:26:01 2006
>@@ -2,10 +2,10 @@
> # Date created:				27 Feb 2003
> # Whom:					David Yeske <dyeske@yahoo.com>
> #
>-# $FreeBSD: ports/graphics/blender-devel/Makefile,v 1.22 2006/07/22 19:54:58 ahze Exp $
>+# $FreeBSD: ports/graphics/blender-devel/Makefile,v 1.21 2006/05/07 23:45:51 edwin Exp $
> 
> PORTNAME=	blender
>-PORTVERSION=	2.40
>+PORTVERSION=	2.42a
> CATEGORIES=	graphics games
> MASTER_SITES=	http://download.blender.org/source/ \
> 		ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
>@@ -15,15 +15,21 @@
> MAINTAINER=	dyeske@yahoo.com
> COMMENT=	3D modeling/rendering/animation/gaming package
> 
>-BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons
>+BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons \
>+		${X11BASE}/lib/libftgl.a:${PORTSDIR}/graphics/ftgl
>+		
> LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
> 		freetype.9:${PORTSDIR}/print/freetype2 \
> 		png.5:${PORTSDIR}/graphics/png \
>-		tiff.4:${PORTSDIR}/graphics/tiff
>+		tiff.4:${PORTSDIR}/graphics/tiff \
>+		SDL-1.1.7:${PORTSDIR}/devel/sdl12 \
>+		Half.2:${PORTSDIR}/graphics/OpenEXR \
>+		gettextpo.1:${PORTSDIR}/devel/gettext \
>+		avutil.1:${PORTSDIR}/multimedia/ffmpeg-devel
> 
> PLIST_FILES=	bin/blender
> USE_X_PREFIX=	yes
>-USE_PYTHON=	yes
>+USE_PYTHON=	2.3
> USE_SDL=	sdl
> USE_GL=		yes
> 
>@@ -39,10 +45,15 @@
> 	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
> .endif
> 
>+post-patch::
>+.if ${OSVERSION} > 700003
>+	@${REINPLACE_CMD} -e 's|c_r||g' ${WRKSRC}/user-config.py
>+.endif
>+
> do-build:
> 	@cd ${WRKSRC} && scons
> 
> do-install:
>-	@${INSTALL_PROGRAM} ${WRKSRC}/blender ${PREFIX}/bin
>+	@${INSTALL_PROGRAM} ${WRKSRC}/../install/freebsd/blender ${PREFIX}/bin
> 
> .include <bsd.port.post.mk>
>diff -urN blender-devel.orig/distinfo blender-devel/distinfo
>--- blender-devel.orig/distinfo	Tue Sep  5 22:46:21 2006
>+++ blender-devel/distinfo	Thu Sep  7 17:21:20 2006
>@@ -1,3 +1,3 @@
>-MD5 (blender-2.40.tar.gz) = 3b58026ca9d0b26292ef39d7e2353f31
>-SHA256 (blender-2.40.tar.gz) = 931a7b997f08ef6d7e917ba2f1ac203dd886fa8b7d598939fd0e405b7743317c
>-SIZE (blender-2.40.tar.gz) = 9298365
>+MD5 (blender-2.42a.tar.gz) = 3d60b7ebe0dea47da12744fe2462d96c
>+SHA256 (blender-2.42a.tar.gz) = f046a66abe2e9a93a17ef1538f43642d2b6a6e48b55b804899fea59279dacd52
>+SIZE (blender-2.42a.tar.gz) = 12295244
>diff -urN blender-devel.orig/files/patch-SConstruct blender-devel/files/patch-SConstruct
>--- blender-devel.orig/files/patch-SConstruct	Tue Sep  5 22:46:21 2006
>+++ blender-devel/files/patch-SConstruct	Thu Jan  1 01:00:00 1970
>@@ -1,22 +0,0 @@
>---- SConstruct.orig	Tue Dec 20 10:56:12 2005
>-+++ SConstruct	Fri Dec 30 16:43:44 2005
>-@@ -735,7 +735,7 @@
>- 	openal_libpath = ['/usr/lib']
>- 	openal_include = ['/usr/include']
>- 	
>--elif sys.platform=='freebsd4' or sys.platform=='freebsd5':
>-+elif sys.platform=='freebsd4' or sys.platform=='freebsd5' or sys.platform=='freebsd6' or sys.platform=='freebsd7':
>- 	print "Building for FreeBSD"
>- 	use_international = 'false'
>- 	use_gameengine = 'false'
>-@@ -773,6 +773,10 @@
>- 	jpeg_lib = ['jpeg']
>- 	jpeg_libpath = ['/usr/local/lib']
>- 	jpeg_include = ['/usr/local/include']
>-+	# Tiff Library information
>-+	tiff_lib = ['libtiff']
>-+	tiff_libpath = ['#../lib/windows/tiff/lib']
>-+	tiff_include = ['#../lib/windows/tiff/include']
>- 	# OpenGL library information
>- 	opengl_lib = ['GL', 'GLU']
>- 	opengl_static = ['/usr/lib/libGL.a', '/usr/lib/libGLU.a']
>diff -urN blender-devel.orig/files/patch-intern_ghost-SConscript blender-devel/files/patch-intern_ghost-SConscript
>--- blender-devel.orig/files/patch-intern_ghost-SConscript	Thu Jan  1 01:00:00 1970
>+++ blender-devel/files/patch-intern_ghost-SConscript	Thu Sep  7 17:21:20 2006
>@@ -0,0 +1,27 @@
>+--- intern/ghost/SConscript.orig	Mon Jun  5 17:52:26 2006
>++++ intern/ghost/SConscript	Mon Aug 21 00:20:20 2006
>+@@ -26,6 +26,24 @@
>+     for f in pf:
>+         sources.remove('intern' + os.sep + f + 'Win32.cpp')
>+         sources.remove('intern' + os.sep + f + 'Carbon.cpp')
>++elif window_system == 'freebsd4':
>++    for f in pf:
>++        sources.remove('intern' + os.sep + f + 'Win32.cpp')
>++        sources.remove('intern' + os.sep + f + 'Carbon.cpp')
>++elif window_system == 'freebsd5':
>++    for f in pf:
>++        sources.remove('intern' + os.sep + f + 'Win32.cpp')
>++        sources.remove('intern' + os.sep + f + 'Carbon.cpp')
>++elif window_system == 'freebsd6':
>++    for f in pf:
>++        sources.remove('intern' + os.sep + f + 'Win32.cpp')
>++        sources.remove('intern' + os.sep + f + 'Carbon.cpp')
>++elif window_system == 'freebsd7':
>++    for f in pf:
>++        sources.remove('intern' + os.sep + f + 'Win32.cpp')
>++        sources.remove('intern' + os.sep + f + 'Carbon.cpp')
>++
>++
>+ else:
>+     print "Unknown window system specified."
>+     Exit()
>diff -urN blender-devel.orig/files/patch-source_blender_blenlib_intern-storage.c blender-devel/files/patch-source_blender_blenlib_intern-storage.c
>--- blender-devel.orig/files/patch-source_blender_blenlib_intern-storage.c	Thu Jan  1 01:00:00 1970
>+++ blender-devel/files/patch-source_blender_blenlib_intern-storage.c	Thu Sep  7 17:21:20 2006
>@@ -0,0 +1,20 @@
>+--- source/blender/blenlib/intern/storage.c.orig	Sun Mar 19 14:28:01 2006
>++++ source/blender/blenlib/intern/storage.c	Mon Aug 21 23:50:20 2006
>+@@ -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(__FreeBSD__) && !defined(linux) && (defined(__sgi) || defined(__sun__) || defined(__sun) || defined(__sparc) || defined(__sparc__))
>+ #include <sys/statfs.h>
>+ #endif
>+ 
>+@@ -196,7 +196,7 @@
>+ #ifdef __BeOS
>+ 	return -1;
>+ #endif
>+-#if !defined(linux) && (defined (__sgi) || defined (__sun__) || defined (__sun) || defined(__sparc) || defined(__sparc__))
>++#if !defined(__FreeBSD__) && !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); */
>diff -urN blender-devel.orig/files/patch-source_blender_blenlib_intern_storage.c blender-devel/files/patch-source_blender_blenlib_intern_storage.c
>--- blender-devel.orig/files/patch-source_blender_blenlib_intern_storage.c	Tue Sep  5 22:46:21 2006
>+++ blender-devel/files/patch-source_blender_blenlib_intern_storage.c	Thu Jan  1 01:00:00 1970
>@@ -1,20 +0,0 @@
>---- source/blender/blenlib/intern/storage.c.orig	Fri Jul  7 14:15:04 2006
>-+++ source/blender/blenlib/intern/storage.c	Fri Jul  7 14:17:47 2006
>-@@ -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(__FreeBSD__) && !defined(linux) && (defined(__sgi) || defined(__sun__) || defined(__sun) || defined(__sparc) || defined(__sparc__))
>- #include <sys/statfs.h>
>- #endif
>- 
>-@@ -194,7 +194,7 @@
>- #ifdef __BeOS
>- 	return -1;
>- #endif
>--#if !defined(linux) && (defined (__sgi) || defined (__sun__) || defined (__sun) || defined(__sparc) || defined(__sparc__))
>-+#if !defined(__FreeBSD__) && !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); */
>diff -urN blender-devel.orig/files/patch-user-config_py blender-devel/files/patch-user-config_py
>--- blender-devel.orig/files/patch-user-config_py	Thu Jan  1 01:00:00 1970
>+++ blender-devel/files/patch-user-config_py	Thu Sep  7 17:21:20 2006
>@@ -0,0 +1,166 @@
>+--- user-config.py.orig	Mon Aug 21 01:28:00 2006
>++++ user-config.py	Mon Aug 21 01:28:13 2006
>+@@ -0,0 +1,163 @@
>++LCGDIR = '../lib/freebsd'
>++BF_PYTHON = '/usr/local'
>++BF_PYTHON_VERSION = '2.3'
>++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_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config'
>++
>++WITH_BF_OPENAL = 'false'
>++BF_OPENAL = '/usr/local'
>++BF_OPENAL_INC = '${BF_OPENAL}/include/AL'
>++BF_OPENAL_LIB = 'openal'
>++
>++WITH_BF_SDL = 'true'
>++BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
>++BF_SDL_INC = '${BF_SDL}/include/SDL11' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
>++BF_SDL_LIB = 'SDL-1.1' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
>++BF_SDL_LIBPATH = '${BF_SDL}/lib'
>++
>++WITH_BF_FMOD = 'false'
>++BF_FMOD = LCGDIR + '/fmod'
>++
>++WITH_BF_OPENEXR = 'true'
>++BF_OPENEXR = '/usr/local'
>++BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
>++BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
>++
>++WITH_BF_JPEG = 'true'
>++BF_JPEG = '/usr/local'
>++BF_JPEG_INC = '${BF_JPEG}/include'
>++BF_JPEG_LIB = 'jpeg'
>++BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
>++
>++WITH_BF_PNG = 'true'
>++BF_PNG = '/usr/local'
>++BF_PNG_INC = '${BF_PNG}/include/libpng'
>++BF_PNG_LIB = 'png'
>++BF_PNG_LIBPATH = '${BF_PNG}/lib'
>++
>++BF_TIFF = '/usr/local'
>++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/local'
>++BF_GETTEXT_INC = '${BF_GETTEXT}/include'
>++BF_GETTEXT_LIB = 'intl iconv'
>++BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
>++
>++WITH_BF_FTGL = 'true'
>++BF_FTGL = '/usr/X11R6'
>++BF_FTGL_INC = '${BF_FTGL}/include/FTGL'
>++BF_FTGL_LIB = 'extern_ftgl'
>++#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/local'
>++BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
>++BF_FREETYPE_LIB = 'freetype'
>++BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
>++
>++WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
>++BF_QUICKTIME = '/usr/local'
>++BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
>++
>++# enable ffmpeg  support
>++WITH_BF_FFMPEG = 'true'  # -DWITH_FFMPEG
>++BF_FFMPEG = '/usr/local'
>++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 = 'true'
>++BF_OPENGL = '/usr/X11R6'
>++BF_OPENGL_INC = '${BF_OPENGL}/include'
>++BF_OPENGL_LIB = 'OSMesa'
>++BF_OPENGL_LIBPATH = '${BF_OPENGL}/lib'
>++BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.so ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/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','-I/usr/local/include','-I/usr/X11R6/include']
>++CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-I/usr/local/include','-I/usr/X11R6/include']
>++REL_CFLAGS = ['-O2']
>++REL_CCFLAGS = ['-O2']
>++##BF_DEPEND = 'true'
>++##
>++##AR = ar
>++##ARFLAGS = ruv
>++##ARFLAGSQUIET = ru
>++##
>++CC = 'gcc'
>++CXX = 'g++'
>++C_WARN = '-Wall'
>++
>++CC_WARN = '-Wall'
>++
>++##FIX_STUBS_WARNINGS = -Wno-unused
>++
>++LLIBS = 'util c_r m pthread stdc++'
>++##LOPTS = --dynamic
>++##DYNLDFLAGS = -shared $(LDFLAGS)
>++
>++BF_PROFILE_FLAGS = ['-pg','-g']
>++BF_PROFILE = 'false'
>++
>++BF_DEBUG = 'false'
>++BF_DEBUG_FLAGS = ''
>++
>++BF_BUILDDIR = '../build/freebsd'
>++BF_INSTALLDIR='../install/freebsd'
>++
>++
>++#Link against pthread
>++PLATFORM_LINKFLAGS = ['-pthread','-L/usr/local/lib','-L/usr/X11R6/lib']

Actions: View

Attachments on bug 102200: 69950 | 69951 | 69952 | 69953