|
|
|
@ -56,30 +56,10 @@ 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
|
|
|
|
|
Subject: [PATCH 4/6] disable ffmpeg
|
|
|
|
|
Subject: [PATCH 3/6] disable ffmpeg
|
|
|
|
|
|
|
|
|
|
OpenSceneGraph is using removed features of ffmpeg, which have
|
|
|
|
|
been deprecated for 3+ years.
|
|
|
|
@ -88,48 +68,25 @@ 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
|
|
|
|
|
Subject: [PATCH 6/6] fix case in library ws2_32
|
|
|
|
|
Subject: [PATCH 4/6] fix case in library ws2_32
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
|
|
|
|
@ -158,3 +115,69 @@ index 1111111..2222222 100644
|
|
|
|
|
ELSE()
|
|
|
|
|
SET(TARGET_LIBRARIES_VARS
|
|
|
|
|
OPENVRML_LIBRARY)
|
|
|
|
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Boris Pek <tehnick-8@yandex.ru>
|
|
|
|
|
Date: Wed, 10 Oct 2018 00:56:37 +0300
|
|
|
|
|
Subject: [PATCH 5/6] fix build with GCC < 6.x
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/osgViewer/GraphicsWindowWin32.cpp b/src/osgViewer/GraphicsWindowWin32.cpp
|
|
|
|
|
index 91e6c8f..d11347e 100644
|
|
|
|
|
--- a/src/osgViewer/GraphicsWindowWin32.cpp
|
|
|
|
|
+++ b/src/osgViewer/GraphicsWindowWin32.cpp
|
|
|
|
|
@@ -799,7 +799,7 @@ Win32WindowingSystem::Win32WindowingSystem()
|
|
|
|
|
if (hModuleShore) {
|
|
|
|
|
setProcessDpiAwareness = (SetProcessDpiAwarenessFunc *) GetProcAddress(hModuleShore, "SetProcessDpiAwareness");
|
|
|
|
|
if (setProcessDpiAwareness) {
|
|
|
|
|
- (*setProcessDpiAwareness)(PROCESS_DPI_AWARENESS::PROCESS_PER_MONITOR_DPI_AWARE);
|
|
|
|
|
+ (*setProcessDpiAwareness)(PROCESS_PER_MONITOR_DPI_AWARE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// #endif
|
|
|
|
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Boris Pek <tehnick-8@yandex.ru>
|
|
|
|
|
Date: Wed, 10 Oct 2018 01:48:22 +0300
|
|
|
|
|
Subject: [PATCH 6/6] fix build of gta plugin when pkg-config is used
|
|
|
|
|
+ update related variable for build without pkg-config.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/CMakeModules/FindGTA.cmake b/CMakeModules/FindGTA.cmake
|
|
|
|
|
index 086069c..e483ad3 100644
|
|
|
|
|
--- a/CMakeModules/FindGTA.cmake
|
|
|
|
|
+++ b/CMakeModules/FindGTA.cmake
|
|
|
|
|
@@ -33,7 +33,7 @@ IF(NOT GTA_FOUND)
|
|
|
|
|
/usr/freeware/include
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
- FIND_LIBRARY(GTA_LIBRARY
|
|
|
|
|
+ FIND_LIBRARY(GTA_LIBRARIES
|
|
|
|
|
NAMES gta libgta
|
|
|
|
|
PATHS
|
|
|
|
|
$ENV{GTA_DIR}/lib
|
|
|
|
|
@@ -50,8 +50,8 @@ IF(NOT GTA_FOUND)
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
SET(GTA_FOUND "NO")
|
|
|
|
|
- IF(GTA_LIBRARY AND GTA_INCLUDE_DIRS)
|
|
|
|
|
+ IF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
|
|
|
|
|
SET(GTA_FOUND "YES")
|
|
|
|
|
- ENDIF(GTA_LIBRARY AND GTA_INCLUDE_DIRS)
|
|
|
|
|
+ ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
|
|
|
|
|
|
|
|
|
|
ENDIF(NOT GTA_FOUND)
|
|
|
|
|
\ No newline at end of file
|
|
|
|
|
diff --git a/src/osgPlugins/gta/CMakeLists.txt b/src/osgPlugins/gta/CMakeLists.txt
|
|
|
|
|
index 2b910a6..16466fe 100644
|
|
|
|
|
--- a/src/osgPlugins/gta/CMakeLists.txt
|
|
|
|
|
+++ b/src/osgPlugins/gta/CMakeLists.txt
|
|
|
|
|
@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES( ${GTA_INCLUDE_DIRS} )
|
|
|
|
|
|
|
|
|
|
SET(TARGET_SRC ReaderWriterGTA.cpp )
|
|
|
|
|
|
|
|
|
|
-SET(TARGET_LIBRARIES_VARS GTA_LIBRARY)
|
|
|
|
|
+SET(TARGET_LIBRARIES_VARS GTA_LIBRARIES)
|
|
|
|
|
|
|
|
|
|
#### end var setup ###
|
|
|
|
|
SETUP_PLUGIN(gta)
|
|
|
|
|