update openscenegraph

src/openscenegraph-1-fixes.patch

@@ -56,26 +56,6 @@ index 1111111..2222222 100644
          osgDB
          osgUtil
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Sun, 10 Jan 2016 14:19:57 +1100
-Subject: [PATCH 3/6] use pkg-config for gstreamer detection in mingw
-
-
-diff --git a/CMakeModules/FindGStreamer.cmake b/CMakeModules/FindGStreamer.cmake
-index 1111111..2222222 100644
---- a/CMakeModules/FindGStreamer.cmake
-+++ b/CMakeModules/FindGStreamer.cmake
-@@ -65,7 +65,7 @@
- #    )
- #endmacro()
- 
--if (WIN32)
-+if (WIN32 AND NOT MINGW)
-     macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
-         find_path(${_component_prefix}_INCLUDE_DIRS
-             NAMES ${_header}
-
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Boris Nagaev <bnagaev@gmail.com>
 Date: Mon, 22 Feb 2016 03:35:28 +0300
@@ -88,44 +68,21 @@ See https://github.com/mxe/mxe/issues/1230#issuecomment-186936198
 Source of patch: http://forum.openscenegraph.org/viewtopic.php?t=10485
 
 diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt
-index 1111111..2222222 100644
+index 77d66f8..1c8398e 100644
 --- a/src/osgPlugins/CMakeLists.txt
 +++ b/src/osgPlugins/CMakeLists.txt
-@@ -199,10 +199,6 @@ IF(XINE_FOUND)
-     ADD_SUBDIRECTORY(xine)
+@@ -213,10 +213,6 @@ IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
+     ADD_PLUGIN_DIRECTORY(txp)
  ENDIF()
  
 -IF(FFMPEG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
--    ADD_SUBDIRECTORY(ffmpeg)
+-    ADD_PLUGIN_DIRECTORY(ffmpeg)
 -ENDIF()
 -
  IF(GSTREAMER_FOUND AND GLIB_FOUND)
-     ADD_SUBDIRECTORY(gstreamer)
+     ADD_PLUGIN_DIRECTORY(gstreamer)
  ENDIF()
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Saikrishna Arcot <saiarcot895@gmail.com>
-Date: Mon, 6 Jun 2016 19:06:00 -0500
-Subject: [PATCH 5/6] Require the presence of either qt5 or qt4.
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1111111..2222222 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -708,9 +708,9 @@ IF(OSG_USE_QT AND NOT ANDROID)
- 
-     IF  (DESIRED_QT_VERSION)
-         IF  (DESIRED_QT_VERSION MATCHES 5)
--            FIND_PACKAGE(Qt5Widgets)
-+            FIND_PACKAGE(Qt5Widgets REQUIRED)
-         ELSEIF (DESIRED_QT_VERSION MATCHES 4)
--            FIND_PACKAGE(Qt4)
-+            FIND_PACKAGE(Qt4 REQUIRED)
-         ELSE()
-             FIND_PACKAGE(Qt3)
-         ENDIF()
-
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Boris Pek <tehnick-8@yandex.ru>
 Date: Thu, 14 Dec 2017 15:29:38 +0300

src/openscenegraph.mk

@@ -4,12 +4,9 @@ PKG             := openscenegraph
 $(PKG)_WEBSITE  := http://www.openscenegraph.org/
 $(PKG)_DESCR    := OpenSceneGraph
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.4.1
-$(PKG)_CHECKSUM := 930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
-#$(PKG)_GH_CONF  := openscenegraph/OpenSceneGraph/tags, OpenSceneGraph-
-$(PKG)_SUBDIR   := OpenSceneGraph-OpenSceneGraph-$($(PKG)_VERSION)
-$(PKG)_FILE     := OpenSceneGraph-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/openscenegraph/OpenSceneGraph/archive/$($(PKG)_FILE)
+$(PKG)_VERSION  := 3.6.3
+$(PKG)_CHECKSUM := 51bbc79aa73ca602cd1518e4e25bd71d41a10abd296e18093a8acfebd3c62696
+$(PKG)_GH_CONF  := openscenegraph/OpenSceneGraph/tags, OpenSceneGraph-
 $(PKG)_DEPS     := cc boost curl dcmtk freetype gdal giflib gstreamer \
                    gta jasper jpeg libpng openal openexr openthreads poppler \
                    qtbase tiff zlib
@@ -25,16 +22,15 @@ define $(PKG)_BUILD
     cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \
         -DCMAKE_CXX_FLAGS='-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS' \
         -DCMAKE_HAVE_PTHREAD_H=OFF \
+        -DOSG_DETERMINE_WIN_VERSION=OFF \
         -DPKG_CONFIG_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-pkg-config' \
         -DDYNAMIC_OPENTHREADS=$(CMAKE_SHARED_BOOL) \
         -DDYNAMIC_OPENSCENEGRAPH=$(CMAKE_SHARED_BOOL) \
         -DBUILD_OSG_APPLICATIONS=OFF \
         -DPOPPLER_HAS_CAIRO_EXITCODE=0 \
         -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \
-        -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \
-        $(if $(filter qtbase,$($(PKG)_DEPS)), \
-          -DDESIRED_QT_VERSION=5, \
-          -DDESIRED_QT_VERSION=4)
+        -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1
+
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1
 endef

src/openthreads.mk

@@ -12,19 +12,19 @@ $(PKG)_URL       = $(openscenegraph_URL)
 $(PKG)_DEPS     := cc
 
 define $(PKG)_UPDATE
-    echo $openscenegraph_VERSION)
+    echo $(openscenegraph_VERSION)
 endef
 
 define $(PKG)_BUILD
-    mkdir '$(1).build'
-    cd '$(1).build' && '$(TARGET)-cmake' \
+    cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \
         -DDYNAMIC_OPENTHREADS=$(CMAKE_SHARED_BOOL) \
+        -DOSG_DETERMINE_WIN_VERSION=OFF \
         -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-        -DOSG_USE_QT=FALSE \
         -DPOPPLER_HAS_CAIRO_EXITCODE=0 \
         -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \
         -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \
         '$(1)'
 
-    $(MAKE) -C '$(1).build/src/OpenThreads' -j '$(JOBS)' install VERBOSE=1
+    $(MAKE) -C '$(BUILD_DIR)/src/OpenThreads' -j '$(JOBS)' VERBOSE=1
+    $(MAKE) -C '$(BUILD_DIR)/src/OpenThreads' -j 1 install VERBOSE=1
 endef