MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-22 12:54:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove patches for linking pthreads

Browse Source
This commit is contained in:
Jeremy Soller 2019-01-07 17:36:36 -07:00
parent fc6c997e4b
commit 917dcda07f
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
13 changed files with 48 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/x86_64-unknown-redox-llvm-config
View File

@ -111,7 +111,7 @@ elif args == ["--ldflags"]:
elif args == ["--libdir"]:
print(prefix + "/lib")
elif args == ["--system-libs"]:
print("-Wl,--whole-archive -lpthread -Wl,--no-whole-archive -lm")
print("-lpthread -lm")
elif args == ["--targets-built"]:
print("X86")
elif args[0] == "--libs":

2
recipes/cairodemo/recipe.sh
View File

@ -21,7 +21,7 @@ function recipe_build {
export LDFLAGS="-L$sysroot/lib"
export CPPFLAGS="-I$sysroot/include"
set -x
"${CXX}" -I "$sysroot/include" -L "$sysroot/lib" cairodemo.c -o cairodemo -lorbital -lcairo -lpixman-1 -lfreetype -lpng -lz -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -lm
"${CXX}" -I "$sysroot/include" -L "$sysroot/lib" cairodemo.c -o cairodemo -lorbital -lcairo -lpixman-1 -lfreetype -lpng -lz -lm
set +x
skip=1
}

1
recipes/freeciv/recipe.sh
View File

@ -17,7 +17,6 @@ function recipe_build {
sysroot="$(realpath ../sysroot)"
export CFLAGS="-I$sysroot/include"
export LDFLAGS="-L$sysroot/lib"
export LIBS="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
./configure \
--host="$HOST" \
--prefix='' \

1
recipes/gcc/recipe.sh
View File

@ -26,7 +26,6 @@ function recipe_build {
ln -sf "$sysroot/include" "$sysroot/usr/include"
ln -sf "$sysroot/lib" "$sysroot/usr/lib"
export LIBS='-Wl,--whole-archive -lpthread -Wl,--no-whole-archive'
./configure \
--host=${HOST} \
--target=${HOST} \

2
recipes/git/recipe.sh
View File

@ -17,7 +17,7 @@ function recipe_update {
function recipe_build {
sysroot="$(realpath ../sysroot)"
export LDFLAGS="-L$sysroot/lib -Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
export LDFLAGS="-L$sysroot/lib"
export CPPFLAGS="-I$sysroot/include"
./configure --host=${HOST} --prefix=/ ac_cv_fread_reads_directories=yes ac_cv_snprintf_returns_bogus=yes ac_cv_lib_curl_curl_global_init=yes CURL_CONFIG=no
make ${MAKEFLAGS} -j"$(nproc)"

14
recipes/libc-bench/redox.patch
View File

@ -2,13 +2,13 @@ diff -ruw source/Makefile source-new/Makefile
--- source/Makefile 2011-01-31 00:13:00.000000000 -0700
+++ source-new/Makefile 2018-12-25 09:07:37.564520567 -0700
@@ -4,7 +4,7 @@
CFLAGS = -Os
LDFLAGS = -static
-LIBS = -lpthread -lrt -lpthread
+LIBS = -Wl,--whole-archive -lpthread -Wl,--no-whole-archive
+LIBS = -lpthread
all: libc-bench
diff -ruw source/utf8.c source-new/utf8.c
--- source/utf8.c 2011-01-24 20:08:38.000000000 -0700
@ -19,7 +19,7 @@ diff -ruw source/utf8.c source-new/utf8.c
#include <locale.h>
-#include <langinfo.h>
+//#include <langinfo.h>
size_t b_utf8_bigbuf(void *dummy)
{
@@ -18,7 +18,7 @@
@ -28,7 +28,7 @@ diff -ruw source/utf8.c source-new/utf8.c
|| setlocale(LC_CTYPE, "fr_FR-8");
- if (strcmp(nl_langinfo(CODESET), "UTF-8")) return -1;
+ //if (strcmp(nl_langinfo(CODESET), "UTF-8")) return -1;
buf = malloc(500000);
wbuf = malloc(500000*sizeof(wchar_t));
@@ -56,7 +56,7 @@
@ -37,6 +37,6 @@ diff -ruw source/utf8.c source-new/utf8.c
|| setlocale(LC_CTYPE, "fr_FR-8");
- if (strcmp(nl_langinfo(CODESET), "UTF-8")) return -1;
+ //if (strcmp(nl_langinfo(CODESET), "UTF-8")) return -1;
buf = malloc(500000);
l = 0;

2
recipes/llvm/recipe.sh
View File

@ -25,7 +25,7 @@ function recipe_build {
-DCMAKE_AR="$(which "${AR}")"
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_CROSSCOMPILING=True
-DCMAKE_CXX_FLAGS="--std=gnu++11 -Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
-DCMAKE_CXX_FLAGS="--std=gnu++11"
-DCMAKE_RANLIB="$(which "${RANLIB}")"
-DCMAKE_INSTALL_PREFIX="/"
-DCMAKE_SYSTEM_NAME=Generic

1
recipes/mesa/recipe.sh
View File

@ -18,7 +18,6 @@ function recipe_build {
export CFLAGS="-I$sysroot/include -DHAVE_PTHREAD=1"
export CPPFLAGS="-I$sysroot/include -DHAVE_PTHREAD=1"
export LDFLAGS="-L$sysroot/lib"
export LIBS="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
#export LLVM_CONFIG="x86_64-unknown-redox-llvm-config"
NOCONFIGURE=1 ./autogen.sh
./configure \

2
recipes/openjazz/recipe.sh
View File

@ -22,7 +22,7 @@ function recipe_build {
autoconf
wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
./configure --host=${HOST} --prefix=''
make -j"$(nproc)"
make -j"$(nproc)" V=1
skip=1
}

29
recipes/openttd/01_redox.patch
View File

@ -1,7 +1,7 @@
diff -rupwN source/config.lib source-new/config.lib
diff -ruwN source/config.lib source-new/config.lib
--- source/config.lib 2018-12-29 07:28:58.975290421 -0700
+++ source-new/config.lib 2018-12-29 10:11:42.310241717 -0700
@@ -1486,7 +1486,7 @@ make_cflags_and_ldflags() {
+++ source-new/config.lib 2019-01-06 17:30:43.830146522 -0700
@@ -1486,7 +1486,7 @@
# Special CXXFlags for HOST
CXXFLAGS="$CXXFLAGS"
# Libs to compile. In fact this is just LDFLAGS
@ -10,19 +10,10 @@ diff -rupwN source/config.lib source-new/config.lib
# LDFLAGS used for HOST
LDFLAGS="$LDFLAGS"
# FEATURES for HOST (lto)
@@ -1594,7 +1594,7 @@ make_cflags_and_ldflags() {
fi
if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
- LIBS="$LIBS -lpthread"
+ LIBS="$LIBS -Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
fi
if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "MINGW" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ]; then
diff -rupwN source/src/music/extmidi.cpp source-new/src/music/extmidi.cpp
diff -ruwN source/src/music/extmidi.cpp source-new/src/music/extmidi.cpp
--- source/src/music/extmidi.cpp 2018-12-29 07:28:59.143295501 -0700
+++ source-new/src/music/extmidi.cpp 2018-12-29 10:14:06.637357598 -0700
@@ -115,7 +115,11 @@ void MusicDriver_ExtMidi::DoPlay()
@@ -115,7 +115,11 @@
switch (this->pid) {
case 0: {
close(0);
@ -34,10 +25,10 @@ diff -rupwN source/src/music/extmidi.cpp source-new/src/music/extmidi.cpp
if (d != -1 && dup2(d, 1) != -1 && dup2(d, 2) != -1) {
execvp(this->params[0], this->params);
}
diff -rupwN source/src/rev.cpp.in source-new/src/rev.cpp.in
diff -ruwN source/src/rev.cpp.in source-new/src/rev.cpp.in
--- source/src/rev.cpp.in 2018-12-29 07:28:59.167296226 -0700
+++ source-new/src/rev.cpp.in 2018-12-29 10:11:42.314241804 -0700
@@ -57,7 +57,7 @@ const char _openttd_build_date[] = __DAT
@@ -57,7 +57,7 @@
* (compiling from sources without any version control software)
* and 2 is for modified revision.
*/
@ -46,7 +37,7 @@ diff -rupwN source/src/rev.cpp.in source-new/src/rev.cpp.in
/**
* The NewGRF revision of OTTD:
diff -rupwN source/src/stdafx.h source-new/src/stdafx.h
diff -ruwN source/src/stdafx.h source-new/src/stdafx.h
--- source/src/stdafx.h 2018-12-29 07:28:59.203297314 -0700
+++ source-new/src/stdafx.h 2018-12-29 10:11:42.314241804 -0700
@@ -12,6 +12,9 @@
@ -59,10 +50,10 @@ diff -rupwN source/src/stdafx.h source-new/src/stdafx.h
#if defined(__APPLE__)
#include "os/macosx/osx_stdafx.h"
#endif /* __APPLE__ */
diff -rupwN source/src/string.cpp source-new/src/string.cpp
diff -ruwN source/src/string.cpp source-new/src/string.cpp
--- source/src/string.cpp 2018-12-29 07:28:59.207297436 -0700
+++ source-new/src/string.cpp 2018-12-29 10:11:42.314241804 -0700
@@ -528,7 +528,7 @@ size_t Utf8TrimString(char *s, size_t ma
@@ -528,7 +528,7 @@
return length;
}

1
recipes/pcre/recipe.sh
View File

@ -16,7 +16,6 @@ function recipe_build {
sysroot="$(realpath ../sysroot)"
export CFLAGS="-I$sysroot/include"
export LDFLAGS="-L$sysroot/lib"
export LIBS="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
./configure \
--host=${HOST} \
--prefix=/ \

13
recipes/sdl/redox.patch
View File

@ -12,7 +12,7 @@ diff -ruwN source/build-scripts/config.sub source-new/build-scripts/config.sub
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
diff -ruwN source/configure.in source-new/configure.in
--- source/configure.in 2012-01-18 23:30:05.000000000 -0700
+++ source-new/configure.in 2018-12-30 08:48:46.611954605 -0700
+++ source-new/configure.in 2019-01-06 17:08:43.147342277 -0700
@@ -685,6 +685,18 @@
fi
}
@ -45,7 +45,7 @@ diff -ruwN source/configure.in source-new/configure.in
+ if test x$enable_video_orbital = xyes; then
+ AC_DEFINE(SDL_VIDEO_DRIVER_ORBITAL)
+ SOURCES="$SOURCES $srcdir/src/video/orbital/*.c"
+ SDL_LIBS="$SDL_LIBS -Wl,--gc-sections -lorbital"
+ SDL_LIBS="$SDL_LIBS -lorbital"
+ have_video=yes
+ fi
+}
@ -53,19 +53,18 @@ diff -ruwN source/configure.in source-new/configure.in
dnl Check to see if OpenGL support is desired
AC_ARG_ENABLE(video-opengl,
AC_HELP_STRING([--enable-video-opengl], [include OpenGL context creation [[default=yes]]]),
@@ -1859,6 +1885,11 @@
@@ -1859,6 +1885,10 @@
AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]]),
, enable_pthread_sem=yes)
case "$host" in
+ *-*-redox*)
+ pthread_cflags="-D_REENTRANT"
+ pthread_lib="-lpthread"
+ SDL_LIBS="$SDL_LIBS -Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
+ ;;
*-*-linux*|*-*-uclinux*)
pthread_cflags="-D_REENTRANT"
pthread_lib="-lpthread"
@@ -2325,10 +2356,11 @@
@@ -2325,10 +2355,11 @@
have_timers=yes
fi
;;
@ -78,7 +77,7 @@ diff -ruwN source/configure.in source-new/configure.in
*-*-kfreebsd*-gnu) ARCH=kfreebsd-gnu ;;
*-*-knetbsd*-gnu) ARCH=knetbsd-gnu ;;
*-*-kopenbsd*-gnu) ARCH=kopenbsd-gnu ;;
@@ -2347,8 +2379,10 @@
@@ -2347,8 +2378,10 @@
esac
CheckVisibilityHidden
CheckDummyVideo
@ -89,7 +88,7 @@ diff -ruwN source/configure.in source-new/configure.in
CheckDLOPEN
CheckNASM
CheckAltivec
@@ -2445,6 +2479,11 @@
@@ -2445,6 +2478,11 @@
SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c"
have_cdrom=yes
;;

41
recipes/sdl2/redox.patch
View File

@ -1,6 +1,6 @@
diff -ruwN source/configure.in source-new/configure.in
--- source/configure.in 2018-10-31 09:07:22.000000000 -0600
+++ source-new/configure.in 2018-12-30 20:01:02.572341419 -0700
+++ source-new/configure.in 2019-01-06 17:29:39.198302773 -0700
@@ -1222,6 +1222,18 @@
fi
}
@ -41,19 +41,18 @@ diff -ruwN source/configure.in source-new/configure.in
dnl Set up the QNX video driver if enabled
CheckQNXVideo()
{
@@ -2789,6 +2815,11 @@
@@ -2789,6 +2815,10 @@
AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]]),
, enable_pthread_sem=yes)
case "$host" in
+ *-*-redox*)
+ pthread_cflags="-D_REENTRANT"
+ pthread_lib="-lpthread"
+ SDL_LIBS="$SDL_LIBS -Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
+ ;;
*-*-android*)
pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
pthread_lib=""
@@ -3362,7 +3393,7 @@
@@ -3362,7 +3392,7 @@
dnl Set up the configuration based on the host platform!
case "$host" in
@ -62,7 +61,7 @@ diff -ruwN source/configure.in source-new/configure.in
case "$host" in
*-*-android*)
# Android
@@ -3383,6 +3414,7 @@
@@ -3383,6 +3413,7 @@
;;
*-*-linux*) ARCH=linux ;;
*-*-uclinux*) ARCH=linux ;;
@ -70,7 +69,7 @@ diff -ruwN source/configure.in source-new/configure.in
*-*-kfreebsd*-gnu) ARCH=kfreebsd-gnu ;;
*-*-knetbsd*-gnu) ARCH=knetbsd-gnu ;;
*-*-kopenbsd*-gnu) ARCH=kopenbsd-gnu ;;
@@ -3404,6 +3436,8 @@
@@ -3404,6 +3435,8 @@
CheckVisibilityHidden
CheckDeclarationAfterStatement
CheckDummyVideo
@ -81,7 +80,7 @@ diff -ruwN source/configure.in source-new/configure.in
CheckDLOPEN
diff -ruwN source/include/SDL_config.h.in source-new/include/SDL_config.h.in
--- source/include/SDL_config.h.in 2018-10-31 09:07:22.000000000 -0600
+++ source-new/include/SDL_config.h.in 2018-12-30 19:54:01.263870482 -0700
+++ source-new/include/SDL_config.h.in 2018-12-31 14:01:08.736950947 -0700
@@ -263,6 +263,7 @@
#undef SDL_AUDIO_DRIVER_PULSEAUDIO
#undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC
@ -100,7 +99,7 @@ diff -ruwN source/include/SDL_config.h.in source-new/include/SDL_config.h.in
#undef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
diff -ruwN source/src/audio/redox/SDL_redoxaudio.c source-new/src/audio/redox/SDL_redoxaudio.c
--- source/src/audio/redox/SDL_redoxaudio.c 1969-12-31 17:00:00.000000000 -0700
+++ source-new/src/audio/redox/SDL_redoxaudio.c 2018-12-30 19:53:02.919797606 -0700
+++ source-new/src/audio/redox/SDL_redoxaudio.c 2018-12-31 14:01:08.736950947 -0700
@@ -0,0 +1,169 @@
+/*
+ SDL - Simple DirectMedia Layer
@ -273,7 +272,7 @@ diff -ruwN source/src/audio/redox/SDL_redoxaudio.c source-new/src/audio/redox/SD
+}
diff -ruwN source/src/audio/redox/SDL_redoxaudio.h source-new/src/audio/redox/SDL_redoxaudio.h
--- source/src/audio/redox/SDL_redoxaudio.h 1969-12-31 17:00:00.000000000 -0700
+++ source-new/src/audio/redox/SDL_redoxaudio.h 2018-12-30 19:53:02.919797606 -0700
+++ source-new/src/audio/redox/SDL_redoxaudio.h 2018-12-31 14:01:08.736950947 -0700
@@ -0,0 +1,40 @@
+/*
+ SDL - Simple DirectMedia Layer
@ -317,7 +316,7 @@ diff -ruwN source/src/audio/redox/SDL_redoxaudio.h source-new/src/audio/redox/SD
+#endif /* _SDL_redoxaudio_h */
diff -ruwN source/src/audio/SDL_audio.c source-new/src/audio/SDL_audio.c
--- source/src/audio/SDL_audio.c 2018-10-31 09:07:22.000000000 -0600
+++ source-new/src/audio/SDL_audio.c 2018-12-30 19:54:43.931922299 -0700
+++ source-new/src/audio/SDL_audio.c 2018-12-31 14:01:08.736950947 -0700
@@ -35,6 +35,9 @@
/* Available audio drivers */
@ -330,7 +329,7 @@ diff -ruwN source/src/audio/SDL_audio.c source-new/src/audio/SDL_audio.c
#endif
diff -ruwN source/src/audio/SDL_sysaudio.h source-new/src/audio/SDL_sysaudio.h
--- source/src/audio/SDL_sysaudio.h 2018-10-31 09:07:22.000000000 -0600
+++ source-new/src/audio/SDL_sysaudio.h 2018-12-30 19:55:51.280001807 -0700
+++ source-new/src/audio/SDL_sysaudio.h 2018-12-31 14:01:08.736950947 -0700
@@ -183,6 +183,7 @@
} AudioBootStrap;
@ -341,7 +340,7 @@ diff -ruwN source/src/audio/SDL_sysaudio.h source-new/src/audio/SDL_sysaudio.h
extern AudioBootStrap JACK_bootstrap;
diff -ruwN source/src/dynapi/SDL_dynapi.h source-new/src/dynapi/SDL_dynapi.h
--- source/src/dynapi/SDL_dynapi.h 2018-10-31 09:07:22.000000000 -0600
+++ source-new/src/dynapi/SDL_dynapi.h 2018-12-30 19:51:10.263649275 -0700
+++ source-new/src/dynapi/SDL_dynapi.h 2018-12-31 14:01:08.736950947 -0700
@@ -55,6 +55,8 @@
#define SDL_DYNAMIC_API 0
#elif defined(__clang_analyzer__)
@ -353,7 +352,7 @@ diff -ruwN source/src/dynapi/SDL_dynapi.h source-new/src/dynapi/SDL_dynapi.h
/* everyone else. This is where we turn on the API if nothing forced it off. */
diff -ruwN source/src/thread/pthread/SDL_systhread.c source-new/src/thread/pthread/SDL_systhread.c
--- source/src/thread/pthread/SDL_systhread.c 2018-10-31 09:07:22.000000000 -0600
+++ source-new/src/thread/pthread/SDL_systhread.c 2018-12-30 19:57:03.592084415 -0700
+++ source-new/src/thread/pthread/SDL_systhread.c 2018-12-31 14:01:08.740951021 -0700
@@ -165,7 +165,11 @@
for (i = 0; sig_list[i]; ++i) {
sigaddset(&mask, sig_list[i]);
@ -368,7 +367,7 @@ diff -ruwN source/src/thread/pthread/SDL_systhread.c source-new/src/thread/pthre
diff -ruwN source/src/video/orbital/SDL_orbitalevents.c source-new/src/video/orbital/SDL_orbitalevents.c
--- source/src/video/orbital/SDL_orbitalevents.c 1969-12-31 17:00:00.000000000 -0700
+++ source-new/src/video/orbital/SDL_orbitalevents.c 2018-12-30 20:37:39.185277773 -0700
+++ source-new/src/video/orbital/SDL_orbitalevents.c 2018-12-31 14:01:08.740951021 -0700
@@ -0,0 +1,192 @@
+/*
+ SDL - Simple DirectMedia Layer
@ -564,7 +563,7 @@ diff -ruwN source/src/video/orbital/SDL_orbitalevents.c source-new/src/video/orb
+/* end of SDL_orbitalevents.c ... */
diff -ruwN source/src/video/orbital/SDL_orbitalevents_c.h source-new/src/video/orbital/SDL_orbitalevents_c.h
--- source/src/video/orbital/SDL_orbitalevents_c.h 1969-12-31 17:00:00.000000000 -0700
+++ source-new/src/video/orbital/SDL_orbitalevents_c.h 2018-12-30 19:51:10.263649275 -0700
+++ source-new/src/video/orbital/SDL_orbitalevents_c.h 2018-12-31 14:01:08.740951021 -0700
@@ -0,0 +1,32 @@
+/*
+ SDL - Simple DirectMedia Layer
@ -600,7 +599,7 @@ diff -ruwN source/src/video/orbital/SDL_orbitalevents_c.h source-new/src/video/o
+/* end of SDL_orbitalevents_c.h ... */
diff -ruwN source/src/video/orbital/SDL_orbitalmouse.c source-new/src/video/orbital/SDL_orbitalmouse.c
--- source/src/video/orbital/SDL_orbitalmouse.c 1969-12-31 17:00:00.000000000 -0700
+++ source-new/src/video/orbital/SDL_orbitalmouse.c 2018-12-30 19:51:10.263649275 -0700
+++ source-new/src/video/orbital/SDL_orbitalmouse.c 2018-12-31 14:01:08.740951021 -0700
@@ -0,0 +1,33 @@
+/*
+ SDL - Simple DirectMedia Layer
@ -637,7 +636,7 @@ diff -ruwN source/src/video/orbital/SDL_orbitalmouse.c source-new/src/video/orbi
+};
diff -ruwN source/src/video/orbital/SDL_orbitalmouse_c.h source-new/src/video/orbital/SDL_orbitalmouse_c.h
--- source/src/video/orbital/SDL_orbitalmouse_c.h 1969-12-31 17:00:00.000000000 -0700
+++ source-new/src/video/orbital/SDL_orbitalmouse_c.h 2018-12-30 19:51:10.267649280 -0700
+++ source-new/src/video/orbital/SDL_orbitalmouse_c.h 2018-12-31 14:01:08.740951021 -0700
@@ -0,0 +1,26 @@
+/*
+ SDL - Simple DirectMedia Layer
@ -667,7 +666,7 @@ diff -ruwN source/src/video/orbital/SDL_orbitalmouse_c.h source-new/src/video/or
+/* Functions to be exported */
diff -ruwN source/src/video/orbital/SDL_orbitalvideo.c source-new/src/video/orbital/SDL_orbitalvideo.c
--- source/src/video/orbital/SDL_orbitalvideo.c 1969-12-31 17:00:00.000000000 -0700
+++ source-new/src/video/orbital/SDL_orbitalvideo.c 2018-12-30 20:26:21.622297793 -0700
+++ source-new/src/video/orbital/SDL_orbitalvideo.c 2018-12-31 14:01:08.740951021 -0700
@@ -0,0 +1,182 @@
+/*
+ SDL - Simple DirectMedia Layer
@ -853,7 +852,7 @@ diff -ruwN source/src/video/orbital/SDL_orbitalvideo.c source-new/src/video/orbi
+#endif
diff -ruwN source/src/video/orbital/SDL_orbitalvideo.h source-new/src/video/orbital/SDL_orbitalvideo.h
--- source/src/video/orbital/SDL_orbitalvideo.h 1969-12-31 17:00:00.000000000 -0700
+++ source-new/src/video/orbital/SDL_orbitalvideo.h 2018-12-30 19:51:10.267649280 -0700
+++ source-new/src/video/orbital/SDL_orbitalvideo.h 2018-12-31 14:01:08.740951021 -0700
@@ -0,0 +1,39 @@
+/*
+ SDL - Simple DirectMedia Layer
@ -896,7 +895,7 @@ diff -ruwN source/src/video/orbital/SDL_orbitalvideo.h source-new/src/video/orbi
+#endif /* _SDL_orbitalvideo_h */
diff -ruwN source/src/video/SDL_sysvideo.h source-new/src/video/SDL_sysvideo.h
--- source/src/video/SDL_sysvideo.h 2018-10-31 09:07:22.000000000 -0600
+++ source-new/src/video/SDL_sysvideo.h 2018-12-30 19:58:01.920149215 -0700
+++ source-new/src/video/SDL_sysvideo.h 2018-12-31 14:01:08.740951021 -0700
@@ -416,6 +416,7 @@
extern VideoBootStrap PSP_bootstrap;
extern VideoBootStrap RPI_bootstrap;
@ -907,7 +906,7 @@ diff -ruwN source/src/video/SDL_sysvideo.h source-new/src/video/SDL_sysvideo.h
extern VideoBootStrap NACL_bootstrap;
diff -ruwN source/src/video/SDL_video.c source-new/src/video/SDL_video.c
--- source/src/video/SDL_video.c 2018-10-31 09:07:22.000000000 -0600
+++ source-new/src/video/SDL_video.c 2018-12-30 19:58:27.472177138 -0700
+++ source-new/src/video/SDL_video.c 2018-12-31 14:01:08.740951021 -0700
@@ -112,6 +112,9 @@
#if SDL_VIDEO_DRIVER_QNX
&QNX_bootstrap,