Mercurial > mxe-octave

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3638
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
1 diff -ur OpenSceneGraph-3.2.0.orig/src/osgPlugins/osc/CMakeLists.txt OpenSceneGraph-3.2.0/src/osgPlugins/osc/CMakeLists.txt
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
2 --- OpenSceneGraph-3.2.0.orig/src/osgPlugins/osc/CMakeLists.txt 2014-07-02 11:35:37.621624169 -0400
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
3 +++ OpenSceneGraph-3.2.0/src/osgPlugins/osc/CMakeLists.txt 2014-07-02 14:35:50.862890363 -0400
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
4 @@ -35,7 +35,7 @@
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
5 ip/win32/NetworkingUtils.cpp
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
6 ip/win32/UdpSocket.cpp
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
7 )
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
8 - SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
9 + SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
10 ELSE()
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
11 SET(TARGET_SRC
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
12 ${TARGET_SRC}
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
13 diff -ur OpenSceneGraph-3.2.0.orig/src/osgPlugins/vrml/CMakeLists.txt OpenSceneGraph-3.2.0/src/osgPlugins/vrml/CMakeLists.txt
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
14 --- OpenSceneGraph-3.2.0.orig/src/osgPlugins/vrml/CMakeLists.txt 2014-07-02 11:35:37.621624169 -0400
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
15 +++ OpenSceneGraph-3.2.0/src/osgPlugins/vrml/CMakeLists.txt 2014-07-02 14:37:13.893542090 -0400
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
16 @@ -27,7 +27,7 @@
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
17 PNG_LIBRARY
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
18 ZLIB_LIBRARY)
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
19 SET(TARGET_EXTERNAL_LIBRARIES
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
20 - Ws2_32.lib)
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
21 + ws2_32.lib)
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
22 ELSE()
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
23 SET(TARGET_LIBRARIES_VARS
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
24 OPENVRML_LIBRARY)
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
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
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
26 --- OpenSceneGraph-3.2.0.orig/src/osgPlugins/xine/video_out_rgb.c 2014-07-02 11:35:37.603623810 -0400
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
27 +++ OpenSceneGraph-3.2.0/src/osgPlugins/xine/video_out_rgb.c 2014-07-02 11:45:53.301901931 -0400
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
28 @@ -81,6 +81,19 @@
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
29 ptr = NULL;\
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
30 }
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
31
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
32 +// xine removed the xine_xmalloc_aligned function in later versions
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
33 +#if ((XINE_MAJOR_VERSION<<8)|XINE_MINOR_VERSION) >= 0x102
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
34 + static void * xine_xmalloc_aligned(size_t alignment, size_t size, void **base)
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
35 + {
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
36 + char * ptr;
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
37 +
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
38 + *base = ptr = xine_xmalloc(size+alignment);
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
39 + while((size_t)ptr % alignment)
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
40 + ptr ++;
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
41 + return *ptr;
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
42 + }
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
43 +#endif
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
44 +
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
45 #ifdef __cplusplus
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
46 extern "C" {
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
47 #endif
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
48 diff -ur OpenSceneGraph-3.2.0.orig/src/osgPlugins/ZeroConfDevice/CMakeLists.txt OpenSceneGraph-3.2.0/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
49 --- OpenSceneGraph-3.2.0.orig/src/osgPlugins/ZeroConfDevice/CMakeLists.txt 2014-07-02 11:35:37.596623671 -0400
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
50 +++ OpenSceneGraph-3.2.0/src/osgPlugins/ZeroConfDevice/CMakeLists.txt 2014-07-02 14:37:48.777236043 -0400
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
51 @@ -19,7 +19,7 @@
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
52 mdns_win/dns_sd.h
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
53 mdns_win/dns-sd.c
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
54 )
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
55 - SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
56 + SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
57 SET(TARGET_LIBRARIES_VARS ZEROCONF_LIBRARY)
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
58 ADD_DEFINITIONS(-DNOT_HAVE_GETOPT)
af91c561ff39 openscenegraph: allow cross compile to succeed
John Donoghue
parents:
diff changeset
59 ADD_DEFINITIONS(-DNOT_HAVE_SETLINEBUF)