blender: dropped port

This commit is contained in:
Jose V Beneyto 2013-02-23 11:23:31 +01:00
parent 6c9b9ed2ac
commit 8926329c8c
5 changed files with 0 additions and 100 deletions

View File

@ -1,4 +0,0 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/blender
-rwxr-xr-x root/root usr/bin/blenderplayer

View File

@ -1,3 +0,0 @@
294adef0af50f0fd4fef9ae253af6eae 10_use_systemwide_ftgl
35458173db4bcfbc10f15bd12cc37cca 20_fix_ftbfs_with_latest_ftgl
6f24380ead068ef481a348bef00b3733 blender-2.49a.tar.gz

View File

@ -1,38 +0,0 @@
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -189,6 +189,8 @@ def setup_syslibs(lenv):
syslibs += Split(lenv['BF_OPENGL_LIB'])
if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross'):
syslibs += Split(lenv['BF_PTHREADS_LIB'])
+ if lenv['WITH_BF_FTGL']:
+ syslibs += Split(lenv['BF_FTGL_LIB'])
syslibs += lenv['LLIBS']
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -12,7 +12,9 @@ if env['WITH_BF_BULLET']:
SConscript(['bullet2/src/SConscript'])
if env['WITH_BF_INTERNATIONAL']:
- SConscript(['bFTGL/SConscript'])
+ # Only if the internal copy is used.
+ if env['BF_FTGL'].startswith('#extern'):
+ SConscript(['bFTGL/SConscript'])
if env['WITH_BF_VERSE']:
SConscript(['verse/dist/SConstruct'])
--- a/source/blender/ftfont/intern/FTF_TTFont.h
+++ b/source/blender/ftfont/intern/FTF_TTFont.h
@@ -34,8 +34,7 @@
#ifndef __FTF_TRUETYPE_FONT_H
#define __FTF_TRUETYPE_FONT_H
-#include "FTGLPixmapFont.h"
-#include "FTGLTextureFont.h"
+#include <FTGL/ftgl.h>
#include <stdio.h>
//#include <iconv.h>

View File

@ -1,13 +0,0 @@
--- a/source/blender/ftfont/intern/FTF_TTFont.cpp
+++ b/source/blender/ftfont/intern/FTF_TTFont.cpp
@@ -41,6 +41,8 @@
#include "BKE_utildefines.h"
#endif
+#include <GL/gl.h>
+
#define DOMAIN_NAME "blender"
#define SYSTEM_ENCODING_DEFAULT "UTF-8"

View File

@ -1,42 +0,0 @@
# Description: Fully integrated 3D graphics creation suite
# URL: http://www.blender.org/
# Maintainer: Jose V Beneyto, sepen at crux dot nu
# Packager: Jose V Beneyto, sepen at crux dot nu
# Depends on: xorg-libxi libtiff libpng ode fmod smpeg ftgl scons openexr freealut yasm
name=blender
version=2.49a
release=1
source=(http://download.blender.org/source/$name-$version.tar.gz \
10_use_systemwide_ftgl 20_fix_ftbfs_with_latest_ftgl)
build() {
cd $name-$version
patch -p1 -i $SRC/10_use_systemwide_ftgl
patch -p1 -i $SRC/20_fix_ftbfs_with_latest_ftgl
sed -e "s/-O2/${CFLAGS// /\' ,\'}/g" -i SConstruct
sed -e '/C_WARN/ s/-Wdeclaration-after-statement//' \
-i config/linux2-config.py
scons \
WITH_BF_OPENAL=yes \
WITH_BF_FMOD=yes \
WITH_BF_OPENEXR=yes \
WITH_BF_FFMPEG=yes \
WITH_BF_JPEG=yes \
WITH_BF_PNG=yes \
WITH_BF_ZLIB=yes \
WITH_BF_INTERNATIONAL=yes \
WITH_BF_GAMEENGINE=yes \
WITH_BF_ODE=yes \
WITH_BF_FTGL=yes \
BF_FTGL_INC=/usr/include/FTGL \
BF_FTGL_LIB=$(pkg-config --libs ftgl) \
WITH_BF_PLAYER=yes \
BF_DEBUG=no
install -D -m 0755 $SRC/install/linux2/$name $PKG/usr/bin/$name
install -D -m 0755 $SRC/install/linux2/${name}player $PKG/usr/bin/${name}player
}