diff options
Diffstat (limited to 'devel/simgear/files')
5 files changed, 70 insertions, 33 deletions
diff --git a/devel/simgear/files/patch-simgear-misc-sg_path.cxx b/devel/simgear/files/patch-simgear-misc-sg_path.cxx deleted file mode 100644 index 8e8755f12a75..000000000000 --- a/devel/simgear/files/patch-simgear-misc-sg_path.cxx +++ /dev/null @@ -1,12 +0,0 @@ -Add missing include for unlink(2) call - ---- simgear/misc/sg_path.cxx.orig 2020-05-22 20:11:33 UTC -+++ simgear/misc/sg_path.cxx -@@ -31,6 +31,7 @@ - - #include <cstring> - #include <stdio.h> -+#include <unistd.h> - #include <sys/stat.h> - #include <errno.h> - #include <fstream> diff --git a/devel/simgear/files/patch-simgear-package-md5.h b/devel/simgear/files/patch-simgear-package-md5.h deleted file mode 100644 index 2489649f8e1f..000000000000 --- a/devel/simgear/files/patch-simgear-package-md5.h +++ /dev/null @@ -1,11 +0,0 @@ ---- simgear/package/md5.h.orig 2020-05-22 20:11:33 UTC -+++ simgear/package/md5.h -@@ -23,6 +23,8 @@ - typedef unsigned char u_int8_t; - typedef unsigned int u_int32_t; - typedef unsigned __int64 u_int64_t; -+#else -+#include <sys/types.h> - #endif - - #define MD5_BLOCK_LENGTH 64 diff --git a/devel/simgear/files/patch-simgear-structure-SGAtomic.cxx b/devel/simgear/files/patch-simgear-structure-SGAtomic.cxx new file mode 100644 index 000000000000..cb8ae35e2761 --- /dev/null +++ b/devel/simgear/files/patch-simgear-structure-SGAtomic.cxx @@ -0,0 +1,53 @@ +Work around: + +SGAtomic.cxx:48:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] + +to fix build on i386 as Simgear uses CMAKE_CXX_STANDARD=17 + +--- simgear/structure/SGAtomic.cxx.orig 2025-06-30 14:48:03 UTC ++++ simgear/structure/SGAtomic.cxx +@@ -29,7 +29,7 @@ + #if defined(_WIN32) + # include <windows.h> + #elif defined(GCC_ATOMIC_BUILTINS_FOUND) +-#elif defined(__GNUC__) && defined(__i386__) ++#elif (__cplusplus < 201703L) && defined(__GNUC__) && defined(__i386__) + #elif defined(SGATOMIC_USE_MUTEX) + # include <mutex> + #else +@@ -43,7 +43,7 @@ SGAtomic::operator++() + return InterlockedIncrement(reinterpret_cast<long volatile*>(&mValue)); + #elif defined(GCC_ATOMIC_BUILTINS_FOUND) + return __sync_add_and_fetch(&mValue, 1); +-#elif defined(__GNUC__) && defined(__i386__) ++#elif (__cplusplus < 201703L) && defined(__GNUC__) && defined(__i386__) + register volatile unsigned* mem = reinterpret_cast<volatile unsigned*>(&mValue); + register unsigned result; + __asm__ __volatile__("lock; xadd{l} {%0,%1|%1,%0}" +@@ -64,7 +64,7 @@ SGAtomic::operator--() + return InterlockedDecrement(reinterpret_cast<long volatile*>(&mValue)); + #elif defined(GCC_ATOMIC_BUILTINS_FOUND) + return __sync_sub_and_fetch(&mValue, 1); +-#elif defined(__GNUC__) && defined(__i386__) ++#elif (__cplusplus < 201703L) && defined(__GNUC__) && defined(__i386__) + register volatile unsigned* mem = reinterpret_cast<volatile unsigned*>(&mValue); + register unsigned result; + __asm__ __volatile__("lock; xadd{l} {%0,%1|%1,%0}" +@@ -85,7 +85,7 @@ SGAtomic::operator unsigned() const + #elif defined(GCC_ATOMIC_BUILTINS_FOUND) + __sync_synchronize(); + return mValue; +-#elif defined(__GNUC__) && defined(__i386__) ++#elif (__cplusplus < 201703L) && defined(__GNUC__) && defined(__i386__) + __asm__ __volatile__("": : : "memory"); + return mValue; + #else +@@ -102,7 +102,7 @@ SGAtomic::compareAndExchange(unsigned oldValue, unsign + return oldValue == InterlockedCompareExchange(lvPtr, newValue, oldValue); + #elif defined(GCC_ATOMIC_BUILTINS_FOUND) + return __sync_bool_compare_and_swap(&mValue, oldValue, newValue); +-#elif defined(__GNUC__) && defined(__i386__) ++#elif (__cplusplus < 201703L) && defined(__GNUC__) && defined(__i386__) + register volatile unsigned* mem = reinterpret_cast<volatile unsigned*>(&mValue); + unsigned before; + __asm__ __volatile__("lock; cmpxchg{l} {%1,%2|%1,%2}" diff --git a/devel/simgear/files/patch-simgear-structure-SGAtomic.hxx b/devel/simgear/files/patch-simgear-structure-SGAtomic.hxx new file mode 100644 index 000000000000..d8e813487dd8 --- /dev/null +++ b/devel/simgear/files/patch-simgear-structure-SGAtomic.hxx @@ -0,0 +1,17 @@ +Work around: + +SGAtomic.cxx:48:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] + +to fix build on i386 as Simgear uses CMAKE_CXX_STANDARD=17 + +--- simgear/structure/SGAtomic.hxx.orig 2025-06-30 15:01:54 UTC ++++ simgear/structure/SGAtomic.hxx +@@ -25,7 +25,7 @@ + defined(__x86_64__) + // No need to include something. Is a Compiler API ... + # define SGATOMIC_USE_GCC4_BUILTINS +-#elif defined(__GNUC__) && defined(__i386__) ++#elif (__cplusplus < 201703L) && defined(__GNUC__) && defined(__i386__) + # define SGATOMIC_USE_LIBRARY_FUNCTIONS + #elif defined(__sgi) && defined(_COMPILER_VERSION) && (_COMPILER_VERSION>=730) + // No need to include something. Is a Compiler API ... diff --git a/devel/simgear/files/patch-simgear_scene_viewer_Compositor.hxx b/devel/simgear/files/patch-simgear_scene_viewer_Compositor.hxx deleted file mode 100644 index cfbe13ebe8ce..000000000000 --- a/devel/simgear/files/patch-simgear_scene_viewer_Compositor.hxx +++ /dev/null @@ -1,10 +0,0 @@ ---- simgear/scene/viewer/Compositor.hxx.orig 2023-03-14 07:49:42 UTC -+++ simgear/scene/viewer/Compositor.hxx -@@ -17,6 +17,7 @@ - #ifndef SG_COMPOSITOR_HXX - #define SG_COMPOSITOR_HXX - -+#include <array> - #include <unordered_map> - #include <vector> - |