[Bf-blender-cvs] [89c56f6] master: Install_deps: fix different 'libfreetype2' devel package name on fedora and suse... *sigh*

Bastien Montagne noreply at git.blender.org
Thu May 28 10:39:56 CEST 2015


Commit: 89c56f6e47969f799d9583eab638d2e48d8debf4
Author: Bastien Montagne
Date:   Thu May 28 10:38:48 2015 +0200
Branches: master
https://developer.blender.org/rB89c56f6e47969f799d9583eab638d2e48d8debf4

Install_deps: fix different 'libfreetype2' devel package name on fedora and suse... *sigh*

===================================================================

M	build_files/build_environment/install_deps.sh

===================================================================

diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 0873263..0d44ef9 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -2287,7 +2287,7 @@ install_RPM() {
   OGG_DEV="libogg-devel"
   THEORA_DEV="libtheora-devel"
 
-  _packages="gcc gcc-c++ make scons libtiff-devel freetype-devel libjpeg-devel\
+  _packages="gcc gcc-c++ make scons libtiff-devel libjpeg-devel\
              libpng-devel libX11-devel libXi-devel wget ncurses-devel \
              readline-devel $OPENJPEG_DEV openal-soft-devel \
              glew-devel yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV patch \
@@ -2301,7 +2301,7 @@ install_RPM() {
   if [ $RPM = "FEDORA" -o $RPM = "RHEL" ]; then
     OPENEXR_DEV="openexr-devel"
 
-    _packages="$_packages libsqlite3x-devel fftw-devel SDL-devel"
+    _packages="$_packages freetype-devel libsqlite3x-devel fftw-devel SDL-devel"
 
     if $WITH_ALL; then
       _packages="$_packages jack-audio-connection-kit-devel"
@@ -2339,7 +2339,7 @@ install_RPM() {
   elif [ $RPM = "SUSE" ]; then
     OPENEXR_DEV="libopenexr-devel"
 
-    _packages="$_packages cmake sqlite3-devel fftw3-devel libSDL-devel"
+    _packages="$_packages cmake freetype2-devel sqlite3-devel fftw3-devel libSDL-devel"
 
     PRINT ""
     install_packages_RPM $_packages




More information about the Bf-blender-cvs mailing list