Mercurial > mxe-octave

comparison src/openscenegraph-1-fixes.patch @ 3638:af91c561ff39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
openscenegraph: allow cross compile to succeed * src/openscenegraph.mk: add -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED_EXITCODE=0, build out of source, enable static/dynamic libs * src/openscenegraph-1-fixes.patch: new file * dist-files.mk: added openscenegraph-1-fixes.patch
author John Donoghue
date Wed, 02 Jul 2014 15:27:12 -0400
parents
children
comparison
equal deleted inserted replaced
3637:4866edf6f9f3 3638:af91c561ff39
1 diff -ur OpenSceneGraph-3.2.0.orig/src/osgPlugins/osc/CMakeLists.txt OpenSceneGraph-3.2.0/src/osgPlugins/osc/CMakeLists.txt
2 --- OpenSceneGraph-3.2.0.orig/src/osgPlugins/osc/CMakeLists.txt 2014-07-02 11:35:37.621624169 -0400
3 +++ OpenSceneGraph-3.2.0/src/osgPlugins/osc/CMakeLists.txt 2014-07-02 14:35:50.862890363 -0400
4 @@ -35,7 +35,7 @@
5 ip/win32/NetworkingUtils.cpp
6 ip/win32/UdpSocket.cpp
7 )
8 - SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
9 + SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
10 ELSE()
11 SET(TARGET_SRC
12 ${TARGET_SRC}
13 diff -ur OpenSceneGraph-3.2.0.orig/src/osgPlugins/vrml/CMakeLists.txt OpenSceneGraph-3.2.0/src/osgPlugins/vrml/CMakeLists.txt
14 --- OpenSceneGraph-3.2.0.orig/src/osgPlugins/vrml/CMakeLists.txt 2014-07-02 11:35:37.621624169 -0400
15 +++ OpenSceneGraph-3.2.0/src/osgPlugins/vrml/CMakeLists.txt 2014-07-02 14:37:13.893542090 -0400
16 @@ -27,7 +27,7 @@
17 PNG_LIBRARY
18 ZLIB_LIBRARY)
19 SET(TARGET_EXTERNAL_LIBRARIES
20 - Ws2_32.lib)
21 + ws2_32.lib)
22 ELSE()
23 SET(TARGET_LIBRARIES_VARS
24 OPENVRML_LIBRARY)
25 diff -ur OpenSceneGraph-3.2.0.orig/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.2.0/src/osgPlugins/xine/video_out_rgb.c
26 --- OpenSceneGraph-3.2.0.orig/src/osgPlugins/xine/video_out_rgb.c 2014-07-02 11:35:37.603623810 -0400
27 +++ OpenSceneGraph-3.2.0/src/osgPlugins/xine/video_out_rgb.c 2014-07-02 11:45:53.301901931 -0400
28 @@ -81,6 +81,19 @@
29 ptr = NULL;\
30 }
31
32 +// xine removed the xine_xmalloc_aligned function in later versions
33 +#if ((XINE_MAJOR_VERSION<<8)|XINE_MINOR_VERSION) >= 0x102
34 + static void * xine_xmalloc_aligned(size_t alignment, size_t size, void **base)
35 + {
36 + char * ptr;
37 +
38 + *base = ptr = xine_xmalloc(size+alignment);
39 + while((size_t)ptr % alignment)
40 + ptr ++;
41 + return *ptr;
42 + }
43 +#endif
44 +
45 #ifdef __cplusplus
46 extern "C" {
47 #endif
48 diff -ur OpenSceneGraph-3.2.0.orig/src/osgPlugins/ZeroConfDevice/CMakeLists.txt OpenSceneGraph-3.2.0/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
49 --- OpenSceneGraph-3.2.0.orig/src/osgPlugins/ZeroConfDevice/CMakeLists.txt 2014-07-02 11:35:37.596623671 -0400
50 +++ OpenSceneGraph-3.2.0/src/osgPlugins/ZeroConfDevice/CMakeLists.txt 2014-07-02 14:37:48.777236043 -0400
51 @@ -19,7 +19,7 @@
52 mdns_win/dns_sd.h
53 mdns_win/dns-sd.c
54 )
55 - SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
56 + SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
57 SET(TARGET_LIBRARIES_VARS ZEROCONF_LIBRARY)
58 ADD_DEFINITIONS(-DNOT_HAVE_GETOPT)
59 ADD_DEFINITIONS(-DNOT_HAVE_SETLINEBUF)