diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-02-13 14:17:29 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-02-13 14:17:29 (GMT) |
| commit | 1a18c31c6ad58ec44c3667da6a333ab94166f10d (patch) | |
| tree | 07a337cd7db2320684103bf544ff9dbcaa53fc15 /src | |
| parent | 121c0ab47081b50d99e7f0b6f676618517b05597 (diff) | |
| download | mxe-1a18c31c6ad58ec44c3667da6a333ab94166f10d.zip mxe-1a18c31c6ad58ec44c3667da6a333ab94166f10d.tar.gz mxe-1a18c31c6ad58ec44c3667da6a333ab94166f10d.tar.bz2 | |
package openscenegraph: update to track svn instead of releases
Diffstat (limited to 'src')
| -rw-r--r-- | src/openscenegraph-1-disable-broken-plugins.patch | 9 | ||||
| -rw-r--r-- | src/openscenegraph.mk | 18 |
2 files changed, 9 insertions, 18 deletions
diff --git a/src/openscenegraph-1-disable-broken-plugins.patch b/src/openscenegraph-1-disable-broken-plugins.patch index 76dd6a9..4810e12 100644 --- a/src/openscenegraph-1-disable-broken-plugins.patch +++ b/src/openscenegraph-1-disable-broken-plugins.patch @@ -8,15 +8,6 @@ http://lists.nongnu.org/archive/html/mingw-cross-env-list/2012-11/msg00009.html diff -uNr a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt 2011-07-31 09:50:34.000000000 +0200 +++ b/CMakeLists.txt 2012-11-26 09:41:12.199384455 +0100 -@@ -466,7 +466,7 @@ - FIND_PACKAGE(LibVNCServer) - FIND_PACKAGE(OurDCMTK) - FIND_PACKAGE(OpenAL) -- FIND_PACKAGE(FFmpeg) -+ #FIND_PACKAGE(FFmpeg) - FIND_PACKAGE(DirectShow) - FIND_PACKAGE(SDL) - FIND_PACKAGE(Poppler-glib) @@ -530,7 +530,7 @@ # can use Quicktime. IF(NOT ANDROID) diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index 03fca3d..3342666 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -3,17 +3,16 @@ PKG := openscenegraph $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 13c7e39f6d62047ad944d8d28a0f0eb60384ce33 -$(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://www.openscenegraph.org/downloads/developer_releases/$($(PKG)_FILE) -$(PKG)_DEPS := gcc curl ffmpeg freetype gdal giflib jasper jpeg libpng openexr tiff xine-lib zlib dcmtk qt +$(PKG)_CHECKSUM := 3e1b13d17cea0c729389ce440e73ff9d8962e0ae +$(PKG)_SUBDIR := tonytheodore-$(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/tonytheodore/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc curl ffmpeg freetype gdal giflib jasper jpeg libpng openexr tiff xine-lib zlib dcmtk qt openal boost 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]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \ + echo 'info: sync latest with git svn rebase; git push origin master' >&2; + $(WGET) -q -O- 'https://github.com/tonytheodore/$(PKG)/commits/master' | \ + $(SED) -n 's#.*<span class="sha">\([^<]\{7\}\)[^<]\{3\}<.*#\1#p' | \ head -1 endef @@ -22,6 +21,7 @@ define $(PKG)_BUILD -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS \ -DCMAKE_HAVE_PTHREAD_H=OFF \ + -DPKG_CONFIG_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-pkg-config' \ -DDYNAMIC_OPENTHREADS=OFF \ -DDYNAMIC_OPENSCENEGRAPH=OFF \ -DBUILD_OSG_APPLICATIONS=OFF \ |