Mercurial > mxe-octave

changeset 3637:4866edf6f9f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
openscenegraph: update from mxe_devel * src/openscenegraph.mk: update version 3.2.0
author John Donoghue
date Tue, 01 Jul 2014 08:39:54 -0400
parents 7f8d5eecf152
children af91c561ff39
files src/openscenegraph.mk
diffstat 1 files changed, 14 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/openscenegraph.mk	Tue Jul 01 19:01:15 2014 -0400
+++ b/src/openscenegraph.mk	Tue Jul 01 08:39:54 2014 -0400
@@ -3,20 +3,19 @@
 
 PKG             := openscenegraph
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.0.1
-$(PKG)_CHECKSUM := 13c7e39f6d62047ad944d8d28a0f0eb60384ce33
+$(PKG)_VERSION  := 3.2.0
+$(PKG)_CHECKSUM := c20891862b5876983d180fc4a3d3cfb2b4a3375c
 $(PKG)_SUBDIR   := OpenSceneGraph-$($(PKG)_VERSION)
 $(PKG)_FILE     := OpenSceneGraph-$($(PKG)_VERSION).zip
-$(PKG)_URL      := http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$($(PKG)_VERSION)/source/$($(PKG)_FILE)
-$(PKG)_URL_2    := http://distfiles.macports.org/OpenSceneGraph/$($(PKG)_FILE)
-$(PKG)_DEPS     := curl ffmpeg freetype gdal giflib jasper jpeg libpng openexr tiff xine-lib zlib dcmtk qt
+$(PKG)_URL      := http://www.openscenegraph.org/downloads/developer_releases/$($(PKG)_FILE)
+$(PKG)_DEPS     := boost curl dcmtk ffmpeg freetype gdal giflib gta jasper jpeg libpng openal openexr poppler qt tiff xine-lib zlib
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://www.openscenegraph.org/projects/osg/browser/OpenSceneGraph/tags?order=date&desc=1' | \
-    grep '<a ' | \
-    $(SED) -n 's,.*>OpenSceneGraph-\([0-9][^<]*\)<.*,\1,p' | \
-    grep -v '^2\.9\.' | \
-    head -1
+    $(WGET) -q -O- 'http://www.openscenegraph.org/downloads/developer_releases/?C=M;O=D' | \
+    $(SED) -n 's,.*OpenSceneGraph-\([0-9]*\.[0-9]*[02468]\.[^<]*\)\.zip.*,\1,p' | \
+    grep -v rc | \
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
@@ -24,9 +23,13 @@
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS \
         -DCMAKE_HAVE_PTHREAD_H=OFF \
+        -DPKG_CONFIG_EXECUTABLE='$(MXE_PKG_CONFIG)' \
         -DDYNAMIC_OPENTHREADS=OFF \
         -DDYNAMIC_OPENSCENEGRAPH=OFF \
         -DBUILD_OSG_APPLICATIONS=OFF \
+        -DPOPPLER_HAS_CAIRO_EXITCODE=0 \
         -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1
+    $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1
+    $(MAKE) -C '$(1)' -j 1 install
 endef
+