upgrade package: openscenegraph (by Martin Lambers)

4 files changed, 45 insertions, 79 deletions

diff --git a/src/openscenegraph-1-pkg-config.patch b/src/openscenegraph-1-pkg-config.patch
index 9c418e6..ed1f987 100644
--- a/src/openscenegraph-1-pkg-config.patch
+++ b/src/openscenegraph-1-pkg-config.patch
@@ -1,49 +1,48 @@
 This file is part of mingw-cross-env.
 See doc/index.html for further information.
 
-diff -uNr OpenSceneGraph-2.8.2.orig/CMakeLists.txt OpenSceneGraph-2.8.2/CMakeLists.txt
---- OpenSceneGraph-2.8.2.orig/CMakeLists.txt	2009-07-28 08:02:27.000000000 +0200
-+++ OpenSceneGraph-2.8.2/CMakeLists.txt	2010-01-17 16:58:31.000000000 +0100
-@@ -774,12 +774,34 @@
- 
- # Generate pkg-config configuration file
- 
--CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/openscenegraph.pc.in
--        ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc
-+SET(PKGCONFIG_FILES
-+  openscenegraph
-+  openscenegraph-osg
-+  openscenegraph-osgDB
-+  openscenegraph-osgFX
-+  openscenegraph-osgGA
-+  openscenegraph-osgParticle
-+  openscenegraph-osgSim
-+  openscenegraph-osgText
-+  openscenegraph-osgUtil
-+  openscenegraph-osgTerrain
-+  openscenegraph-osgManipulator
-+  openscenegraph-osgViewer
-+  openscenegraph-osgWidget
-+  openscenegraph-osgShadow
-+  openscenegraph-osgAnimation
-+  openscenegraph-osgVolume
-+  openscenegraph-osgIntrospection
-+  openscenegraph-osgPlugins
-+)
-+
-+FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES})
-+  CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc.in
-+    ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc
-     @ONLY
-     )
--
--INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)
-+  INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)
-+ENDFOREACH(PKGCONFIG_FILE)
- 
- # Run this as late as possible so users can easier spot the message
- IF (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
-Binary files OpenSceneGraph-2.8.2.orig/osgstaticviewer.exe and OpenSceneGraph-2.8.2/osgstaticviewer.exe differ
+diff -uNr OpenSceneGraph-2.8.3.orig/CMakeLists.txt OpenSceneGraph-2.8.3/CMakeLists.txt
+--- OpenSceneGraph-2.8.3.orig/CMakeLists.txt	2010-04-01 11:02:54.000000000 +0200
++++ OpenSceneGraph-2.8.3/CMakeLists.txt	2010-04-20 07:41:05.000000000 +0200
+@@ -779,12 +779,34 @@
+ 

+ # Generate pkg-config configuration file

+ 

+-CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/openscenegraph.pc.in

+-        ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc

++SET(PKGCONFIG_FILES

++  openscenegraph

++  openscenegraph-osg

++  openscenegraph-osgDB

++  openscenegraph-osgFX

++  openscenegraph-osgGA

++  openscenegraph-osgParticle

++  openscenegraph-osgSim

++  openscenegraph-osgText

++  openscenegraph-osgUtil

++  openscenegraph-osgTerrain

++  openscenegraph-osgManipulator

++  openscenegraph-osgViewer

++  openscenegraph-osgWidget

++  openscenegraph-osgShadow

++  openscenegraph-osgAnimation

++  openscenegraph-osgVolume

++  openscenegraph-osgIntrospection

++  openscenegraph-osgPlugins

++)

++

++FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES})

++  CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc.in

++    ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc

+     @ONLY

+     )

+-

+-INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)

++  INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)

++ENDFOREACH(PKGCONFIG_FILE)

+ 

+ # Run this as late as possible so users can easier spot the message

+ IF (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")

 diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in
 --- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in	1970-01-01 01:00:00.000000000 +0100
 +++ OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in	2010-01-17 16:58:31.000000000 +0100
diff --git a/src/openscenegraph-3-header.patch b/src/openscenegraph-3-header.patch
deleted file mode 100644
index 4e05a12..0000000
--- a/src/openscenegraph-3-header.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-diff -uNr OpenSceneGraph-2.8.2.orig/src/osgPlugins/txp/TXPNode.cpp OpenSceneGraph-2.8.2/src/osgPlugins/txp/TXPNode.cpp
---- OpenSceneGraph-2.8.2.orig/src/osgPlugins/txp/TXPNode.cpp	2008-06-16 15:20:51.000000000 +0200
-+++ OpenSceneGraph-2.8.2/src/osgPlugins/txp/TXPNode.cpp	2010-01-12 09:00:56.000000000 +0100
-@@ -8,6 +8,7 @@
- #include <iostream>
- #include <vector>
- #include <algorithm>
-+#include <cstdio>
- 
- #include "TileMapper.h"
- #include "TXPNode.h"
diff --git a/src/openscenegraph-4-png.patch b/src/openscenegraph-4-png.patch
deleted file mode 100644
index c6f7e9a..0000000
--- a/src/openscenegraph-4-png.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
---- OpenSceneGraph-2.8.2.orig/src/osgPlugins/png/ReaderWriterPNG.cpp
-+++ OpenSceneGraph-2.8.2/src/osgPlugins/png/ReaderWriterPNG.cpp
-@@ -179,5 +179,5 @@
- 
-                 fin.read((char*)header,8);
--                if (fin.gcount() == 8 && png_check_sig(header, 8))
-+                if (fin.gcount() == 8 && png_sig_cmp(header, 0, 8) == 0)
-                     png_set_read_fn(png,&fin,png_read_istream); //Use custom read function that will get data from istream
-                 else
-@@ -230,5 +230,5 @@
-                     png_set_palette_to_rgb(png);
-                 if (color == PNG_COLOR_TYPE_GRAY && depth < 8)
--                    png_set_gray_1_2_4_to_8(png);
-+                    png_set_expand_gray_1_2_4_to_8(png);
-                 if (png_get_valid(png, info, PNG_INFO_tRNS))
-                     png_set_tRNS_to_alpha(png);
diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk
index f0d150f..649e690 100644
--- a/src/openscenegraph.mk
+++ b/src/openscenegraph.mk
@@ -3,9 +3,9 @@
 
 # OpenSceneGraph
 PKG             := openscenegraph
-$(PKG)_IGNORE   := 2.8.2b
-$(PKG)_VERSION  := 2.8.2
-$(PKG)_CHECKSUM := f2f0a3285a022640345a81f536459f37f3f38d01
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.8.3
+$(PKG)_CHECKSUM := 90502e4cbd47aac1689cc39d25ab62bbe0bba9fc
 $(PKG)_SUBDIR   := OpenSceneGraph-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).zip
 $(PKG)_WEBSITE  := http://www.openscenegraph.org/