Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e8ed9228c615c68eccd4483da078ae416527b890)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e8ed9228c615c68eccd4483da078ae416527b890)
  • Date: Sat, 25 Jan 2014 05:58:58 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

libs/asio/DETAILS | 6 +++---
libs/asio/HISTORY | 7 +++++--
libs/openscenegraph/BUILD | 1 +
libs/openscenegraph/DEPENDS | 2 ++
libs/openscenegraph/HISTORY | 4 ++++
5 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit e8ed9228c615c68eccd4483da078ae416527b890
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/openscenegraph: add deps on jasper, asio, pass location of freetype2
headers to cmake

commit 73e6d19c7c13efc8c6574063a068402665e5c38c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/asio: version 1.10.1

diff --git a/libs/asio/DETAILS b/libs/asio/DETAILS
index bfa08e8..08b9eaf 100755
--- a/libs/asio/DETAILS
+++ b/libs/asio/DETAILS
@@ -1,8 +1,8 @@
SPELL=asio
- VERSION=1.4.8
+ VERSION=1.10.1
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:74755767a90e87963352233ba0b1b865197262fc3fc2f2fa4446340d910de0f146454bf1b46736bb81aff4518bc64db1ee74f79966bcc1382774408468dd0540
+
SOURCE_URL[0]="$SOURCEFORGE_URL/$SPELL/$SPELL/${VERSION}%20%28Stable%29/${SOURCE}"
+
SOURCE_HASH=sha512:f5319aae07752af6e6ffa34a52427bbe475fbbc001154a48fc5ee5bd22d32ea07ac3be690a1466645d39cbedadafd9c97595dc14f6d2c51d4ceec097184ec0f4
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://asio.sourceforge.net/
LICENSE[0]=http://www.boost.org/LICENSE_1_0.txt
diff --git a/libs/asio/HISTORY b/libs/asio/HISTORY
index 6444d07..dcf4237 100644
--- a/libs/asio/HISTORY
+++ b/libs/asio/HISTORY
@@ -1,6 +1,9 @@
+2014-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.10.1
+
2012-04-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 1.4.8
- * PRE_BUILD, gcc-4.4.patch: removed
+ * DETAILS: version 1.4.8
+ * PRE_BUILD, gcc-4.4.patch: removed

2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
diff --git a/libs/openscenegraph/BUILD b/libs/openscenegraph/BUILD
index e013b8d..2966661 100755
--- a/libs/openscenegraph/BUILD
+++ b/libs/openscenegraph/BUILD
@@ -1 +1,2 @@
+OPTS+="-DFREETYPE_INCLUDE_DIR_freetype2=/usr/include/freetype2
-DFREETYPE_INCLUDE_DIR_ft2build=/usr/include/freetype2" &&
cmake_build
diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index c87376d..3411269 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -3,6 +3,7 @@ depends freetype2 &&
depends giflib &&
depends gdal &&
depends GLUT &&
+depends jasper &&
depends JPEG &&
depends libpng &&
depends libx11 &&
@@ -17,6 +18,7 @@ depends -sub STABLE ffmpeg &&
depends -sub CXX gcc &&
depends openexr

+optional_depends asio '' '' 'for network support' &&
optional_depends cairo '' '' 'for GTK+ plugins' &&
optional_depends gtk+2 '' '' 'for GTK+ plugins' &&
optional_depends gtkglext '' '' 'for GTK+ plugins' &&
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index 3c40e4b..7fa5e89 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,7 @@
+2014-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: pass path of freetype2 headers to cmake
+ * DEPENDS: add dep on jasper, optional dep on asio
+
2014-01-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: add dependency on gdal, optional dependency on qt4




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e8ed9228c615c68eccd4483da078ae416527b890), Florian Franzmann, 01/25/2014

Archive powered by MHonArc 2.6.24.

Top of Page