On Sun, 01 Apr 2012 18:57:46 -0400, Brian Callahan wrote:
> On 4/1/2012 5:32 PM, Pascal Stumpf wrote:
> > Enable ffmpeg support, requested and tested by peters at schwertfisch
> > dot de.  Also, add a commented entry for blender.beforesubst to appease
> > update-plist.
> >
> > ok?
> >
> 
> This will break blender for mips64el (the newer ffmpeg is broken because 
> ld fails on it - another binutils problem).
> Can you give us a way to turn off ffmpeg?
> 
> Thanks.

Sure, I can make it a FLAVOR.


Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/blender/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile    30 Mar 2012 14:51:55 -0000      1.39
+++ Makefile    1 Apr 2012 23:26:38 -0000
@@ -3,7 +3,7 @@
 COMMENT =      3D creation software
 
 DISTNAME =     blender-2.62
-REVISION =     0
+REVISION =     1
 
 CATEGORIES =   graphics
 
@@ -51,6 +51,16 @@ WANTLIB += GL GLEW GLU Half Iex IlmImf I
 WANTLIB += Xi Xxf86vm boost_filesystem-mt boost_regex-mt boost_system-mt
 WANTLIB += boost_thread-mt c freetype jpeg m openal openjpeg png
 WANTLIB += pthread ${MODPY_WANTLIB} stdc++ tiff util z
+
+# until ffmpeg works on mips64el, make it a FLAVOR
+FLAVORS =      ffmpeg
+FLAVOR ?=
+
+.if ${FLAVOR:L:Mffmpeg}
+CONFIGURE_ARGS += -DWITH_CODEC_FFMPEG=ON
+LIB_DEPENDS += graphics/ffmpeg>=20111126
+WANTLIB += avcodec avdevice avformat avutil
+.endif
 
 NO_REGRESS =   Yes
 
Index: patches/patch-source_gameengine_VideoTexture_VideoFFmpeg_h
===================================================================
RCS file: patches/patch-source_gameengine_VideoTexture_VideoFFmpeg_h
diff -N patches/patch-source_gameengine_VideoTexture_VideoFFmpeg_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-source_gameengine_VideoTexture_VideoFFmpeg_h  1 Apr 2012 
23:26:38 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- source/gameengine/VideoTexture/VideoFFmpeg.h.orig  Sat Mar 31 16:36:14 2012
++++ source/gameengine/VideoTexture/VideoFFmpeg.h       Sat Mar 31 16:36:19 2012
+@@ -29,7 +29,6 @@ http://www.gnu.org/copyleft/lesser.txt.
+ 
+ #ifdef WITH_FFMPEG
+ extern "C" {
+-#undef __cplusplus
+ #include <pthread.h>
+ 
+ #include "ffmpeg_compat.h"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/blender/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST   26 Feb 2012 20:37:26 -0000      1.10
+++ pkg/PLIST   1 Apr 2012 23:26:38 -0000
@@ -2,6 +2,7 @@
 bin/blender
 @bin bin/blender-bin
 bin/blender-thumbnailer
+@comment bin/blender.beforesubst
 @man man/man1/blender.1
 share/applications/blender.desktop
 share/blender/

Reply via email to