1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
|
This file is part of MXE.
See index.html for further information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Fri, 9 Oct 2015 11:13:12 +0200
Subject: [PATCH] fix case in headers windows.h, winsock2.h
diff --git a/examples/osghangglide/hat.cpp b/examples/osghangglide/hat.cpp
index 1111111..2222222 100644
--- a/examples/osghangglide/hat.cpp
+++ b/examples/osghangglide/hat.cpp
@@ -17,7 +17,7 @@
*/
#ifdef _MSC_VER
-#include <Windows.h>
+#include <windows.h>
#pragma warning( disable : 4244 )
#endif
diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp
index 1111111..2222222 100644
--- a/src/osg/DisplaySettings.cpp
+++ b/src/osg/DisplaySettings.cpp
@@ -24,7 +24,7 @@ using namespace osg;
using namespace std;
#if defined(WIN32) && !defined(__CYGWIN__)
-#include<Windows.h>
+#include<windows.h>
extern "C" { OSG_EXPORT DWORD NvOptimusEnablement=0x00000001; }
#else
extern "C" { int NvOptimusEnablement=0x00000001; }
diff --git a/src/osgPlugins/ply/typedefs.h b/src/osgPlugins/ply/typedefs.h
index 1111111..2222222 100644
--- a/src/osgPlugins/ply/typedefs.h
+++ b/src/osgPlugins/ply/typedefs.h
@@ -13,8 +13,8 @@
#define MESH_TYPEDEFS_H
# if defined(_MSC_VER)
-# include <Winsock2.h>
-# include <Windows.h>
+# include <winsock2.h>
+# include <windows.h>
# endif
# include <osg/Notify>
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Fri, 9 Oct 2015 12:54:07 +0200
Subject: [PATCH] fix case in library ws2_32
diff --git a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
index 1111111..2222222 100644
--- a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
+++ b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
@@ -19,7 +19,7 @@ IF(WIN32)
mdns_win/dns_sd.h
mdns_win/dns-sd.c
)
- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
+ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
SET(TARGET_LIBRARIES_VARS ZEROCONF_LIBRARY)
ADD_DEFINITIONS(-DNOT_HAVE_GETOPT)
ADD_DEFINITIONS(-DNOT_HAVE_SETLINEBUF)
diff --git a/src/osgPlugins/osc/CMakeLists.txt b/src/osgPlugins/osc/CMakeLists.txt
index 1111111..2222222 100644
--- a/src/osgPlugins/osc/CMakeLists.txt
+++ b/src/osgPlugins/osc/CMakeLists.txt
@@ -35,7 +35,7 @@ if(WIN32 AND NOT ANDROID)
ip/win32/NetworkingUtils.cpp
ip/win32/UdpSocket.cpp
)
- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
+ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
ELSE()
SET(TARGET_SRC
${TARGET_SRC}
diff --git a/src/osgPlugins/vrml/CMakeLists.txt b/src/osgPlugins/vrml/CMakeLists.txt
index 1111111..2222222 100644
--- a/src/osgPlugins/vrml/CMakeLists.txt
+++ b/src/osgPlugins/vrml/CMakeLists.txt
@@ -27,7 +27,7 @@ IF (WIN32)
PNG_LIBRARY
ZLIB_LIBRARY)
SET(TARGET_EXTERNAL_LIBRARIES
- Ws2_32.lib)
+ ws2_32.lib)
ELSE()
SET(TARGET_LIBRARIES_VARS
OPENVRML_LIBRARY)
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Fri, 9 Oct 2015 14:00:54 +0200
Subject: [PATCH] fix pointer to int conversion on 64bit
diff --git a/src/osgPlugins/osgjs/WriteVisitor.cpp b/src/osgPlugins/osgjs/WriteVisitor.cpp
index 1111111..2222222 100644
--- a/src/osgPlugins/osgjs/WriteVisitor.cpp
+++ b/src/osgPlugins/osgjs/WriteVisitor.cpp
@@ -225,7 +225,7 @@ JSONObject* createImage(osg::Image* image, bool inlineImages, int maxTextureDime
// no image file so use this inline name image and create a file
std::stringstream ss;
ss << osgDB::getFilePath(baseName) << osgDB::getNativePathSeparator();
- ss << (long int)image << ".inline_conv_generated.png"; // write the pointer location
+ ss << (uintptr_t)image << ".inline_conv_generated.png"; // write the pointer location
std::string filename = ss.str();
if (osgDB::writeImageFile(*image, filename)) {
image->setFileName(filename);
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Sun, 10 Jan 2016 14:04:18 +1100
Subject: [PATCH] openscenegraph: use previously built openthreads
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1111111..2222222 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,6 @@ ENDIF()
#the old construct SUBDIRS( was substituded by ADD_SUBDIRECTORY that is to be preferred according on CMake docs.
FOREACH( mylibfolder
- OpenThreads
osg
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] 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] disable ffmpeg
OpenSceneGraph is using removed features of ffmpeg, which have
been deprecated for 3+ years.
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
--- a/src/osgPlugins/CMakeLists.txt
+++ b/src/osgPlugins/CMakeLists.txt
@@ -199,10 +199,6 @@ IF(XINE_FOUND)
ADD_SUBDIRECTORY(xine)
ENDIF()
-IF(FFMPEG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
- ADD_SUBDIRECTORY(ffmpeg)
-ENDIF()
-
IF(GSTREAMER_FOUND AND GLIB_FOUND)
ADD_SUBDIRECTORY(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] 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
@@ -712,9 +712,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()
|
