Skip to Content.
Sympa Menu

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

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 (160f54229ac361426955b9cc7eaaaecfb52ef3da)
  • Date: Fri, 17 Jan 2014 09:30:53 -0600

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

ChangeLog | 5 ++++
libs/libnoise/0001-fix-link-error.patch | 37
++++++++++++++++++++++++++++++++
libs/libnoise/BUILD | 4 +++
libs/libnoise/DETAILS | 23 +++++++++++++++++++
libs/libnoise/HISTORY | 3 ++
libs/libnoise/INSTALL | 4 +++
libs/libnoise/PRE_BUILD | 5 ++++
libs/openscenegraph/DEPENDS | 4 ++-
libs/openscenegraph/HISTORY | 3 ++
libs/osgearth/BUILD | 2 +
libs/osgearth/DEPENDS | 11 +++++++++
libs/osgearth/DETAILS | 19 ++++++++++++++++
libs/osgearth/HISTORY | 3 ++
science/geos/DETAILS | 4 +--
science/geos/HISTORY | 3 ++
15 files changed, 127 insertions(+), 3 deletions(-)

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

libs/osgearth: new spell, a 3D mapping SDK for openscenegraph applications

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

libs/libnoise: new spell, a coherent noise generator in C++

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

science/geos: version 3.4.2

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

libs/openscenegraph: add dep on gdal and optional dep on qt4

diff --git a/ChangeLog b/ChangeLog
index 9d8021e..c26adc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * libs/libnoise: new spell, a coherent noise generator in C++
+ * libs/osgearth: new spell, a 3D mapping SDK for openscenegraph
+ applications
+
2014-01-13 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: remove obsolete functions regarding qt3/kde3

diff --git a/libs/libnoise/0001-fix-link-error.patch
b/libs/libnoise/0001-fix-link-error.patch
new file mode 100644
index 0000000..0059309
--- /dev/null
+++ b/libs/libnoise/0001-fix-link-error.patch
@@ -0,0 +1,37 @@
+From 3083c004a32b6ce6e76eb7d4d20326defa2a7e08 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Fri, 17 Jan 2014 15:45:14 +0100
+Subject: [PATCH] fix link error
+
+---
+ Makefile | 2 +-
+ src/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index cb1c7a0..390320c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+ .PHONY: all doc src include
+-all: doc src include lib
++all: src include lib
+ clean: cleandoc cleansrc cleaninclude cleanlib
+ install: installinclude installlib
+
+diff --git a/src/Makefile b/src/Makefile
+index 8df1a95..7c63b11 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -17,7 +17,7 @@ libnoise.so.0: libnoise.so.0.3
+
+ # Real build targets
+ libnoise.so.0.3: $(OBJECTS)
+- $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -shared
-Wl,-soname=libnoise.so.0 -o $@ $(OBJECTS:.o=.lo)
++ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -Xcompiler -shared
-Wl,-soname=libnoise.so.0 -o $@ $(OBJECTS:.o=.lo)
+
+ libnoise.a: $(OBJECTS)
+ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS)
+--
+1.8.5.2
+
diff --git a/libs/libnoise/BUILD b/libs/libnoise/BUILD
new file mode 100755
index 0000000..4e6515d
--- /dev/null
+++ b/libs/libnoise/BUILD
@@ -0,0 +1,4 @@
+cd $SOURCE_DIRECTORY/noise &&
+make_single &&
+default_build_make &&
+make_normal
diff --git a/libs/libnoise/DETAILS b/libs/libnoise/DETAILS
new file mode 100755
index 0000000..fe58f0e
--- /dev/null
+++ b/libs/libnoise/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=libnoise
+ VERSION=1.0.0
+ SOURCE="${SPELL}src-${VERSION}.zip"
+
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}%20sources/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:02fd600ad60d668d230ecc9d2f34020c0e3b8d1365c9ec78ae795c7031224fc2624080764824a4f899571d848587578c80a70e879b22463774435f16c3d06529
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
+ WEB_SITE="http://libnoise.sourceforge.net";
+ LICENSE[0]=GPL
+ ENTERED=20140117
+ SHORT="a portable, open-source, coherent noise-generating library
for C++"
+cat << EOF
+libnoise is a portable C++ library that is used to generate coherent noise,
+a type of smoothly-changing noise. libnoise can generate Perlin noise,
+ridged multifractal noise, and other types of coherent-noise.
+
+Coherent noise is often used by graphics programmers to generate
+natural-looking textures, planetary terrain, and other things.
+
+In libnoise, coherent-noise generators are encapsulated in classes called
noise
+modules. There are many different types of noise modules. Some noise modules
+can combine or modify the outputs of other noise modules in various ways;
+you can join these modules together to generate very complex coherent noise.
+EOF
diff --git a/libs/libnoise/HISTORY b/libs/libnoise/HISTORY
new file mode 100644
index 0000000..e9670ee
--- /dev/null
+++ b/libs/libnoise/HISTORY
@@ -0,0 +1,3 @@
+2014-01-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 0001-fix-link-error.patch, BUILD, DETAILS, INSTALL, PRE_BUILD:
spell created
+
diff --git a/libs/libnoise/INSTALL b/libs/libnoise/INSTALL
new file mode 100755
index 0000000..7b050a1
--- /dev/null
+++ b/libs/libnoise/INSTALL
@@ -0,0 +1,4 @@
+mkdir $INSTALL_ROOT/usr/include/noise &&
+cp -R $SOURCE_DIRECTORY/noise/include/* $INSTALL_ROOT/usr/include/noise/ &&
+install -m644 $SOURCE_DIRECTORY/noise/lib/libnoise* $INSTALL_ROOT/usr/lib/ &&
+ln -s /usr/lib/libnoise.so.0.3 $INSTALL_ROOT/usr/lib/libnoise.so
diff --git a/libs/libnoise/PRE_BUILD b/libs/libnoise/PRE_BUILD
new file mode 100755
index 0000000..13f2540
--- /dev/null
+++ b/libs/libnoise/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir &&
+cd $SOURCE_DIRECTORY &&
+unpack_file '' &&
+cd $SOURCE_DIRECTORY/noise &&
+patch -p1 < $SPELL_DIRECTORY/0001-fix-link-error.patch
diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index 3d48c25..c87376d 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -1,6 +1,7 @@
depends cmake &&
depends freetype2 &&
depends giflib &&
+depends gdal &&
depends GLUT &&
depends JPEG &&
depends libpng &&
@@ -20,4 +21,5 @@ optional_depends cairo '' '' 'for GTK+ plugins' &&
optional_depends gtk+2 '' '' 'for GTK+ plugins' &&
optional_depends gtkglext '' '' 'for GTK+ plugins' &&
optional_depends librsvg2 '' '' 'for GTK+ plugins' &&
-optional_depends poppler '' '' 'for GTK+ plugins'
+optional_depends poppler '' '' 'for GTK+ plugins' &&
+optional_depends qt4 '-DOSG_USE_QT=ON' '-DOSG_USE_QT=OFF' 'build qt
libraries, plugins and examples'
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index 35bf663..3c40e4b 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,6 @@
+2014-01-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on gdal, optional dependency on qt4
+
2014-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.2.0
* DEPENDS: switch dependency on ffmpeg from legacy to stable
diff --git a/libs/osgearth/BUILD b/libs/osgearth/BUILD
new file mode 100755
index 0000000..bff46e4
--- /dev/null
+++ b/libs/osgearth/BUILD
@@ -0,0 +1,2 @@
+OPTS+="-DOSGEARTH_USE_QT=OFF" &&
+cmake_build
diff --git a/libs/osgearth/DEPENDS b/libs/osgearth/DEPENDS
new file mode 100755
index 0000000..5fbac86
--- /dev/null
+++ b/libs/osgearth/DEPENDS
@@ -0,0 +1,11 @@
+depends openscenegraph &&
+depends gdal &&
+depends curl &&
+optional_depends libnoise \
+ "-DLIBNOISE_LIBRARY=/usr/lib/libnoise.so" \
+ "" \
+ "" &&
+optional_depends geos \
+ "" \
+ "" \
+ ""
diff --git a/libs/osgearth/DETAILS b/libs/osgearth/DETAILS
new file mode 100755
index 0000000..4939032
--- /dev/null
+++ b/libs/osgearth/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=osgearth
+ VERSION=2.5
+ VERSIONHASH=864c253
+ SOURCE="${SPELL}-${VERSION}"
+ SOURCE_URL[0]=https://github.com/gwaldron/${SPELL}/tarball/${SOURCE}
+
SOURCE_HASH=sha512:e1787f67b2b94b9ee5c782849df550b63cef1e9e73ac9109748c14ebb60d54810cb0f6203f39ed7993ceecf2f5d0693dc8c0400c740ab643f2205fb5da6b0977
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/gwaldron-${SPELL}-${VERSIONHASH}"
+ WEB_SITE="http://docs.osgearth.org";
+ LICENSE[0]=LGPL
+ ENTERED=20140117
+ SHORT="a 3D mapping SDK for OpenSceneGraph applications"
+cat << EOF
+osgEarth is a 3D mapping SDK for OpenSceneGraph applications. It’s different
+from traditional terrain engines in an important way: osgEarth does not
+require you to build a 3D terrain model before you display it. Instead,
+it will access the raw data sources at application run time and composite
+them into a 3D map on the fly. No terrain model is actually stored to disk,
+though it does use caching techniques to speed up the rendering of the map.
+EOF
diff --git a/libs/osgearth/HISTORY b/libs/osgearth/HISTORY
new file mode 100644
index 0000000..c6ed4a2
--- /dev/null
+++ b/libs/osgearth/HISTORY
@@ -0,0 +1,3 @@
+2014-01-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/science/geos/DETAILS b/science/geos/DETAILS
index adeb3cd..76a9811 100755
--- a/science/geos/DETAILS
+++ b/science/geos/DETAILS
@@ -1,8 +1,8 @@
SPELL=geos
- VERSION=3.3.3
+ VERSION=3.4.2
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://download.osgeo.org/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:74922f7034bf2a5627efb313410e15333f3a9d7080249869182393d3605fbd1fc9cc07660b6359d79ec15b1a631f78a5aa0f383d6b76604bb54ca5d683dffed7
+
SOURCE_HASH=sha512:c335608ff5e719ec6f3a6edc157c11fe5aaf9a813bf3c4b1e8a05de7a52584f6f64d5c42e646410c09a2e3cdfd3f8f994bedba37fc60454bbaa7c25ba1d36c9b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://trac.osgeo.org/geos/";
LICENSE[0]="LGPL"
diff --git a/science/geos/HISTORY b/science/geos/HISTORY
index fe6a03f..b2aa6cc 100644
--- a/science/geos/HISTORY
+++ b/science/geos/HISTORY
@@ -1,3 +1,6 @@
+2014-01-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.4.2
+
2012-05-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.3.3




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

Archive powered by MHonArc 2.6.24.

Top of Page