aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbeech <beech@FreeBSD.org>2007-10-30 05:11:28 +0800
committerbeech <beech@FreeBSD.org>2007-10-30 05:11:28 +0800
commitc1f01c45ea4b90578fb077eebc8663b43590f228 (patch)
treeb5053253df639714ae94b466e75580d2ab2e70e9
parentc89cac6e9b67b51277655d54f3faa92e2f8e8424 (diff)
downloadfreebsd-ports-gnome-c1f01c45ea4b90578fb077eebc8663b43590f228.tar.gz
freebsd-ports-gnome-c1f01c45ea4b90578fb077eebc8663b43590f228.tar.zst
freebsd-ports-gnome-c1f01c45ea4b90578fb077eebc8663b43590f228.zip
- Update to 2.45
- Fix build with amd64 PR: ports/116936 Submitted by: David Yeske <dyeske@gmail.com>, thierry (PR) Approved by: sat (mentor)
-rw-r--r--graphics/blender/Makefile30
-rw-r--r--graphics/blender/distinfo6
-rw-r--r--graphics/blender/files/patch-source_nan_definitions.mk25
-rw-r--r--graphics/blender/files/patch-user-def.mk6
4 files changed, 30 insertions, 37 deletions
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 1b6376a6c40f..a5148979f42c 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -5,10 +5,11 @@
# $FreeBSD$
PORTNAME= blender
-PORTVERSION= 2.44.1
-PORTREVISION= 1
+PORTVERSION= 2.45
CATEGORIES= graphics games
-MASTER_SITES= CENKES
+MASTER_SITES= http://download.blender.org/source/ \
+ http://mirror.cs.umn.edu/blender.org/source/ \
+ http://public.planetmirror.com/pub/blender/source/
MAINTAINER= dyeske@gmail.com
COMMENT= 3D modeling/rendering/animation/gaming package
@@ -23,7 +24,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
alut.1:${PORTSDIR}/audio/freealut \
avutil.1:${PORTSDIR}/multimedia/ffmpeg
-CONFLICTS= blender-devel-[0-9]*
PLIST_FILES= bin/blender
USE_XORG= x11 xext xmu xi
USE_GETTEXT= yes
@@ -44,16 +44,26 @@ OPTIONS= OCFLAGS "With Optimized Cflags" off \
MAKE_ENV+= NAN_CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include \
-I${LOCALBASE}/include/OpenEXR \
- -I${PYTHON_INCLUDEDIR}"
-MAKE_ENV+= NAN_FREETYPE="${LOCALBASE}"
-MAKE_ENV+= NAN_OPENEXR="${LOCALBASE}"
-MAKE_ENV+= WITH_BF_BLENDERPLAYER="false"
+ -I${PYTHON_INCLUDEDIR}/"
+MAKE_ENV+= NAN_FREETYPE="${LOCALBASE}/"
+MAKE_ENV+= NAN_OPENEXR="${LOCALBASE}/"
+MAKE_ENV+= NAN_OPENAL="${LOCALBASE}/"
.if defined(WITH_OCFLAGS)
CFLAGS+= -O3 -ffast-math
.endif
-post-patch:
+.if ${ARCH} == "amd64"
+MAKE_ENV+= NAN_NO_KETSJI="true"
+MAKE_ENV+= WITH_BF_BLENDERGAMEENGINE="false"
+MAKE_ENV+= WITH_BF_BLENDERPLAYER="false"
+.else
+MAKE_ENV+= WITH_BF_BLENDERGAMEENGINE="true"
+MAKE_ENV+= WITH_BF_OPENAL="true"
+MAKE_ENV+= WITH_BF_BLENDERPLAYER="true"
+.endif
+
+pre-configure:
@${REINPLACE_CMD} -e \
's|sdl11-config|${SDL_CONFIG}|; \
s|2.3|${PYTHON_VER}|' \
@@ -79,7 +89,7 @@ post-patch:
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/obj/freebsd/bin/blender ${PREFIX}/bin
.if !defined(WITH_NOPORTDOCS)
- @${MV} ${WRKSRC}/README ${WRKSRC}/doc/
+ @${CP} -p ${WRKSRC}/README ${WRKSRC}/doc/
@${INSTALL} -d ${DOCSDIR}/
@cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
.endif
diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo
index 23c54fc6e341..b14238cfcf93 100644
--- a/graphics/blender/distinfo
+++ b/graphics/blender/distinfo
@@ -1,3 +1,3 @@
-MD5 (blender-2.44.1.tar.gz) = 926d6ca3f0b1b4aeaa75a2b1767dc2a3
-SHA256 (blender-2.44.1.tar.gz) = 8d682ece9ce8ef15cffb5bb16e9099b11bef4c0eb3efae9b352853d58406b317
-SIZE (blender-2.44.1.tar.gz) = 14743807
+MD5 (blender-2.45.tar.gz) = 1358ca481b7f2b8eadd3327ebbd563ef
+SHA256 (blender-2.45.tar.gz) = 921f72a15d4076f62e52674337f5d3a90cd7a82675b12bb549ebe6cd5c9027ae
+SIZE (blender-2.45.tar.gz) = 14226829
diff --git a/graphics/blender/files/patch-source_nan_definitions.mk b/graphics/blender/files/patch-source_nan_definitions.mk
index 81c41c1bb688..5d8564f7092d 100644
--- a/graphics/blender/files/patch-source_nan_definitions.mk
+++ b/graphics/blender/files/patch-source_nan_definitions.mk
@@ -1,5 +1,5 @@
---- source/nan_definitions.mk.orig Wed Nov 22 11:05:35 2006
-+++ source/nan_definitions.mk Wed Mar 21 21:24:37 2007
+--- source/nan_definitions.mk.orig Tue Sep 18 06:58:49 2007
++++ source/nan_definitions.mk Thu Oct 4 22:00:38 2007
@@ -55,9 +55,9 @@
export NAN_LIBDIR ?= $(NANBLENDERHOME)/../lib
export NAN_OBJDIR ?= $(NANBLENDERHOME)/obj
@@ -10,22 +10,5 @@
- export OCGDIR = $(NAN_OBJDIR)/$(CONFIG_GUESS)
+ export OCGDIR = $(NAN_OBJDIR)/freebsd
- export NAN_MOTO ?= $(LCGDIR)/moto
- ifeq ($(FREE_WINDOWS), true)
-@@ -132,7 +132,7 @@
- export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
- else
- export NAN_OPENEXR ?= /usr/local
-- export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
-+ export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libIlmThread.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
- endif
- endif
- export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
-@@ -291,6 +291,7 @@
-
- # enable freetype2 support for text objects
- # export WITH_FREETYPE2 ?= true
-+ export NAN_NO_KETSJI=true
-
- else
- ifeq ($(OS),irix)
+ # Determines what targets are built
+ export WITH_BF_DYNAMICOPENGL ?= true
diff --git a/graphics/blender/files/patch-user-def.mk b/graphics/blender/files/patch-user-def.mk
index cb48c86b7bae..02560ba24d53 100644
--- a/graphics/blender/files/patch-user-def.mk
+++ b/graphics/blender/files/patch-user-def.mk
@@ -1,5 +1,5 @@
---- user-def.mk.orig 1969-12-31 14:00:00.000000000 -1000
-+++ user-def.mk 2007-08-07 00:38:53.000000000 -0800
+--- ./user-def.mk.orig Thu Oct 4 22:55:33 2007
++++ ./user-def.mk Thu Oct 4 22:56:26 2007
@@ -0,0 +1,74 @@
+export NAN_DEBUG=-g
+
@@ -44,7 +44,7 @@
+ export WITH_FFMPEG=false
+ export NAN_PYTHON=/usr/local
+ export NAN_PYTHON_VERSION=2.5
-+ export NAN_OPENAL=/usr
++ #export NAN_OPENAL=/usr
+ export NAN_FMOD=/usr/local
+ export NAN_JPEG=/usr/local
+ export NAN_PNG=/usr/local