Commit 4cb439e7 authored by Dan Stowell's avatar Dan Stowell Committed by Felipe Sateler

Drop upstreamed patches, refresh the others

parent 717b4b47
......@@ -8,7 +8,7 @@ Bug-Debian: https://bugs.debian.org/853671
1 file changed, 1 insertion(+)
diff --git a/lang/LangPrimSource/PyrSched.cpp b/lang/LangPrimSource/PyrSched.cpp
index 5ae8766..426941a 100644
index 7d33518..2f5908e 100644
--- a/lang/LangPrimSource/PyrSched.cpp
+++ b/lang/LangPrimSource/PyrSched.cpp
@@ -37,6 +37,7 @@
......
From: Dan Stowell <danstowell@users.sourceforge.net>
Date: Wed, 16 Nov 2016 18:33:12 -0300
Subject: Fix ftbfs when using system boost
Upstreamed, patch can be removed from 3.7.1+
Forwarded: yes
---
external_libraries/CMakeLists.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/external_libraries/CMakeLists.txt b/external_libraries/CMakeLists.txt
index 5cb123d..9d2555d 100644
--- a/external_libraries/CMakeLists.txt
+++ b/external_libraries/CMakeLists.txt
@@ -60,6 +60,9 @@ if(NOT Boost_FOUND) # we compile boost ourselves
set_property(TARGET boost_thread
APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
endif()
+
+ set_property( TARGET boost_thread boost_program_options boost_system boost_filesystem PROPERTY FOLDER 3rdparty )
+
endif()
# tlsf
@@ -98,7 +101,7 @@ if(NOT YAMLCPP_FOUND)
endif()
-set_property( TARGET oscpack tlsf boost_thread boost_program_options boost_system boost_filesystem PROPERTY FOLDER 3rdparty )
+set_property( TARGET oscpack tlsf PROPERTY FOLDER 3rdparty )
##### HID_API #######
From: James Cowgill <jcowgill@debian.org>
Date: Tue, 24 May 2016 17:16:37 +0100
Subject: Fix FTBFS on various arches caused by buggy oscpack build
OscTypes.h: fix integer size detection on 64-bit arches
OscReceivedElements.cpp:
- Fix "error: 'argument_' was not declared in this scope" on big-endian
arches.
- Rename RoundUp4 to avoid multiple redefinitions on platforms where
uint32 == size_t. This bug originally happened on 64-bit arches due to the
mishandling of types in OscTypes.h.
OscOutboundPacketStream.h, OscReceivedElements.h:
- Remove extra int overloads which don't built on 32-bit arches.
The other overloads should be enough.
Bug-Debian: https://bugs.debian.org/824581
Forwarded: yes
---
.../oscpack_1_1_0/osc/OscOutboundPacketStream.h | 5 ----
.../oscpack_1_1_0/osc/OscReceivedElements.cpp | 12 ++++----
.../oscpack_1_1_0/osc/OscReceivedElements.h | 6 ----
external_libraries/oscpack_1_1_0/osc/OscTypes.h | 35 ++++------------------
4 files changed, 11 insertions(+), 47 deletions(-)
diff --git a/external_libraries/oscpack_1_1_0/osc/OscOutboundPacketStream.h b/external_libraries/oscpack_1_1_0/osc/OscOutboundPacketStream.h
index 26f3e58..333b3d9 100644
--- a/external_libraries/oscpack_1_1_0/osc/OscOutboundPacketStream.h
+++ b/external_libraries/oscpack_1_1_0/osc/OscOutboundPacketStream.h
@@ -105,11 +105,6 @@ public:
OutboundPacketStream& operator<<( const InfinitumType& rhs );
OutboundPacketStream& operator<<( int32 rhs );
-#if !(defined(__x86_64__) || defined(_M_X64))
- OutboundPacketStream& operator<<( int rhs )
- { *this << (int32)rhs; return *this; }
-#endif
-
OutboundPacketStream& operator<<( float rhs );
OutboundPacketStream& operator<<( char rhs );
OutboundPacketStream& operator<<( const RgbaColor& rhs );
diff --git a/external_libraries/oscpack_1_1_0/osc/OscReceivedElements.cpp b/external_libraries/oscpack_1_1_0/osc/OscReceivedElements.cpp
index 3b38bfc..52fd8eb 100644
--- a/external_libraries/oscpack_1_1_0/osc/OscReceivedElements.cpp
+++ b/external_libraries/oscpack_1_1_0/osc/OscReceivedElements.cpp
@@ -84,7 +84,7 @@ static inline const char* FindStr4End( const char *p, const char *end )
// round up to the next highest multiple of 4. unless x is already a multiple of 4
-static inline uint32 RoundUp4( uint32 x )
+static inline uint32 RoundUp4_UInt32( uint32 x )
{
return (x + 3) & ~((uint32)0x03);
}
@@ -249,7 +249,7 @@ int32 ReceivedMessageArgument::AsInt32Unchecked() const
return u.i;
#else
- return *(int32*)argument_;
+ return *(int32*)argumentPtr_;
#endif
}
@@ -280,7 +280,7 @@ float ReceivedMessageArgument::AsFloatUnchecked() const
return u.f;
#else
- return *(float*)argument_;
+ return *(float*)argumentPtr_;
#endif
}
@@ -400,7 +400,7 @@ double ReceivedMessageArgument::AsDoubleUnchecked() const
return u.d;
#else
- return *(double*)argument_;
+ return *(double*)argumentPtr_;
#endif
}
@@ -533,7 +533,7 @@ void ReceivedMessageArgumentIterator::Advance()
{
// treat blob size as an unsigned int for the purposes of this calculation
uint32 blobSize = ToUInt32( value_.argumentPtr_ );
- value_.argumentPtr_ = value_.argumentPtr_ + osc::OSC_SIZEOF_INT32 + RoundUp4( blobSize );
+ value_.argumentPtr_ = value_.argumentPtr_ + osc::OSC_SIZEOF_INT32 + RoundUp4_UInt32( blobSize );
}
break;
@@ -694,7 +694,7 @@ void ReceivedMessage::Init( const char *message, osc_bundle_element_size_t size
// treat blob size as an unsigned int for the purposes of this calculation
uint32 blobSize = ToUInt32( argument );
- argument = argument + osc::OSC_SIZEOF_INT32 + RoundUp4( blobSize );
+ argument = argument + osc::OSC_SIZEOF_INT32 + RoundUp4_UInt32( blobSize );
if( argument > end )
MalformedMessageException( "arguments exceed message size" );
}
diff --git a/external_libraries/oscpack_1_1_0/osc/OscReceivedElements.h b/external_libraries/oscpack_1_1_0/osc/OscReceivedElements.h
index 729938e..82daa5c 100644
--- a/external_libraries/oscpack_1_1_0/osc/OscReceivedElements.h
+++ b/external_libraries/oscpack_1_1_0/osc/OscReceivedElements.h
@@ -100,12 +100,6 @@ public:
: contents_( contents )
, size_( ValidateSize( (osc_bundle_element_size_t)size ) ) {}
-#if !(defined(__x86_64__) || defined(_M_X64))
- ReceivedPacket( const char *contents, int size )
- : contents_( contents )
- , size_( ValidateSize( (osc_bundle_element_size_t)size ) ) {}
-#endif
-
bool IsMessage() const { return !IsBundle(); }
bool IsBundle() const;
diff --git a/external_libraries/oscpack_1_1_0/osc/OscTypes.h b/external_libraries/oscpack_1_1_0/osc/OscTypes.h
index 005524f..49bb603 100644
--- a/external_libraries/oscpack_1_1_0/osc/OscTypes.h
+++ b/external_libraries/oscpack_1_1_0/osc/OscTypes.h
@@ -37,42 +37,17 @@
#ifndef INCLUDED_OSCPACK_OSCTYPES_H
#define INCLUDED_OSCPACK_OSCTYPES_H
+#include <stdint.h>
namespace osc{
// basic types
-#if defined(__BORLANDC__) || defined(_MSC_VER)
-
-typedef __int64 int64;
-typedef unsigned __int64 uint64;
-
-#elif defined(__x86_64__) || defined(_M_X64)
-
-typedef long int64;
-typedef unsigned long uint64;
-
-#else
-
-typedef long long int64;
-typedef unsigned long long uint64;
-
-#endif
-
-
-
-#if defined(__x86_64__) || defined(_M_X64)
-
-typedef signed int int32;
-typedef unsigned int uint32;
-
-#else
-
-typedef signed long int32;
-typedef unsigned long uint32;
-
-#endif
+typedef int64_t int64;
+typedef uint64_t uint64;
+typedef int32_t int32;
+typedef uint32_t uint32;
enum ValueTypeSizes{
OSC_SIZEOF_INT32 = 4,
......@@ -7,10 +7,10 @@ Subject: supernova: gcc-5 compile fix
1 file changed, 4 insertions(+)
diff --git a/server/supernova/CMakeLists.txt b/server/supernova/CMakeLists.txt
index 5ff5dd9..1ef4eda 100644
index fda7d1d..2731ce5 100644
--- a/server/supernova/CMakeLists.txt
+++ b/server/supernova/CMakeLists.txt
@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
@@ -159,6 +159,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
endif()
endif()
......
perf-counter-include.patch
supernova-i686-march-flag.patch
gcc5-compile-fix.patch
cmake-fix-systemboost.patch
tlsf-fPIC-flag.patch
fix-oscpack-ftbfs.patch
Disable-128bit-float-constants.patch
adding-functional-header-in-PyrSerialPrim.cpp.patch
DiskIO_UGens-include-functional.patch
......
......@@ -7,11 +7,11 @@ Subject: Fix supernova build on x86
1 file changed, 4 insertions(+)
diff --git a/server/supernova/CMakeLists.txt b/server/supernova/CMakeLists.txt
index 35405b1..5ff5dd9 100644
index c71a8dd..fda7d1d 100644
--- a/server/supernova/CMakeLists.txt
+++ b/server/supernova/CMakeLists.txt
@@ -157,6 +157,10 @@ else()
target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options boost_thread)
@@ -149,6 +149,10 @@ else()
target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options)
endif()
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686")
......
From: Dan Stowell <danstowell@users.sourceforge.net>
Date: Wed, 16 Nov 2016 18:33:12 -0300
Subject: Add -fPIC flag to tlfs
This patch (modified) was accepted upstream, and will be superfluous in
SC 3.7.2 and later
Forwarded: yes
---
external_libraries/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/external_libraries/CMakeLists.txt b/external_libraries/CMakeLists.txt
index 9d2555d..5dd0fe1 100644
--- a/external_libraries/CMakeLists.txt
+++ b/external_libraries/CMakeLists.txt
@@ -69,6 +69,7 @@ endif()
add_library(tlsf STATIC "TLSF-2.4.6/src/tlsf.c")
target_compile_definitions( tlsf PRIVATE TLSF_STATISTIC=1 )
target_include_directories( tlsf INTERFACE TLSF-2.4.6/src )
+target_compile_options(tlsf PRIVATE -fPIC)
if(LTO)
set_property(TARGET oscpack tlsf
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment