mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 14:17:34 +00:00
Ports: Format patches without numbering, commit hash or version number
This commit is contained in:
Tim Schumacher
Linus Groh
parent
d69a79b03b
commit
d426c5a4b2
371 changed files with 806 additions and 1884 deletions
|
|
@ -1,14 +1,14 @@
|
|||
From 7658f60b1a064ca08da8e71c4f44c4505df6f571 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jesse Buhagiar <jooster669@gmail.com>
|
||||
Date: Fri, 25 Mar 2022 09:39:21 +1100
|
||||
Subject: [PATCH 1/8] Meta: Refactor Makefile to support Serenity
|
||||
Subject: [PATCH] Meta: Refactor Makefile to support Serenity
|
||||
|
||||
---
|
||||
Makefile | 36 ++++++++++++++++--------------------
|
||||
1 file changed, 16 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 9e535559..b26ceb7f 100644
|
||||
index 9e53555..b26ceb7 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -3,8 +3,8 @@
|
||||
|
|
@ -120,6 +120,3 @@ index 9e535559..b26ceb7f 100644
|
|||
#############################################################################
|
||||
# SETUP AND BUILD -- GENERIC
|
||||
#############################################################################
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
From a5f5bd1db818a315cf7da0211a20718f7879791e Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jesse Buhagiar <jooster669@gmail.com>
|
||||
Date: Fri, 25 Mar 2022 09:39:42 +1100
|
||||
Subject: [PATCH 2/8] Engine: Add Serenity so `q_platform.h`
|
||||
Subject: [PATCH] Engine: Add Serenity so `q_platform.h`
|
||||
|
||||
---
|
||||
code/qcommon/q_platform.h | 29 +++++++++++++++++++++++++++++
|
||||
1 file changed, 29 insertions(+)
|
||||
|
||||
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
|
||||
index 72dbfe1d..3bd829d4 100644
|
||||
index 72dbfe1..3bd829d 100644
|
||||
--- a/code/qcommon/q_platform.h
|
||||
+++ b/code/qcommon/q_platform.h
|
||||
@@ -290,6 +290,35 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
|
@ -47,6 +47,3 @@ index 72dbfe1d..3bd829d4 100644
|
|||
//================================================================== Q3VM ===
|
||||
|
||||
#ifdef Q3_VM
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c7106223c30a896a576c44ce735d4772c283afac Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jesse Buhagiar <jooster669@gmail.com>
|
||||
Date: Fri, 25 Mar 2022 09:40:41 +1100
|
||||
Subject: [PATCH 3/8] Engine: Add `<sys/select.h>` include for Serenity
|
||||
Subject: [PATCH] Engine: Add `<sys/select.h>` include for Serenity
|
||||
|
||||
QuakeIII makes extensive use of the `select()` syscall for its' netcode.
|
||||
It seems that Linux has this in a header that isn't `<sys/select.h>`
|
||||
|
|
@ -13,7 +13,7 @@ like us, which results in an implicit declaration error.
|
|||
3 files changed, 15 insertions(+)
|
||||
|
||||
diff --git a/code/qcommon/net_ip.c b/code/qcommon/net_ip.c
|
||||
index bcccda20..ea940f59 100644
|
||||
index bcccda2..ea940f5 100644
|
||||
--- a/code/qcommon/net_ip.c
|
||||
+++ b/code/qcommon/net_ip.c
|
||||
@@ -81,6 +81,10 @@ static qboolean winsockInitialized = qfalse;
|
||||
|
|
@ -45,7 +45,7 @@ index bcccda20..ea940f59 100644
|
|||
====================
|
||||
NET_OpenSocks
|
||||
diff --git a/code/sys/con_tty.c b/code/sys/con_tty.c
|
||||
index 58f178ad..74e1c60d 100644
|
||||
index 58f178a..74e1c60 100644
|
||||
--- a/code/sys/con_tty.c
|
||||
+++ b/code/sys/con_tty.c
|
||||
@@ -34,6 +34,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
|
@ -60,7 +60,7 @@ index 58f178ad..74e1c60d 100644
|
|||
=============================================================
|
||||
tty console routines
|
||||
diff --git a/code/sys/sys_unix.c b/code/sys/sys_unix.c
|
||||
index e0c63238..05f311bb 100644
|
||||
index e0c6323..05f311b 100644
|
||||
--- a/code/sys/sys_unix.c
|
||||
+++ b/code/sys/sys_unix.c
|
||||
@@ -39,6 +39,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
|
@ -74,6 +74,3 @@ index e0c63238..05f311bb 100644
|
|||
qboolean stdinIsATTY;
|
||||
|
||||
// Used to determine where to store user-specific files
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
From 5efef55d7dc570bcef21533a952267e6b107d495 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jesse Buhagiar <jooster669@gmail.com>
|
||||
Date: Fri, 25 Mar 2022 09:45:12 +1100
|
||||
Subject: [PATCH 4/8] Meta: Add `-ldl` library for Serenity target
|
||||
Subject: [PATCH] Meta: Add `-ldl` library for Serenity target
|
||||
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index b26ceb7f..035fea77 100644
|
||||
index b26ceb7..035fea7 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -868,7 +868,7 @@ ifeq ($(PLATFORM),serenity)
|
||||
|
|
@ -20,6 +20,3 @@ index b26ceb7f..035fea77 100644
|
|||
|
||||
CLIENT_LIBS =
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 1d85a563613d3ea2f6cb03c01a4f4bbda2051e79 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jesse Buhagiar <jooster669@gmail.com>
|
||||
Date: Fri, 25 Mar 2022 09:45:32 +1100
|
||||
Subject: [PATCH 5/8] Engine: Move `#ifdef` to more sensible location
|
||||
Subject: [PATCH] Engine: Move `#ifdef` to more sensible location
|
||||
|
||||
No linker errors in this dojo!
|
||||
---
|
||||
|
|
@ -9,7 +9,7 @@ No linker errors in this dojo!
|
|||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/code/qcommon/net_ip.c b/code/qcommon/net_ip.c
|
||||
index ea940f59..aaba8321 100644
|
||||
index ea940f5..aaba832 100644
|
||||
--- a/code/qcommon/net_ip.c
|
||||
+++ b/code/qcommon/net_ip.c
|
||||
@@ -1000,9 +1000,9 @@ NET_JoinMulticast
|
||||
|
|
@ -47,6 +47,3 @@ index ea940f59..aaba8321 100644
|
|||
|
||||
/*
|
||||
====================
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
From 4c52876ae0217438e97ee9092533bbb29ee1739e Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jesse Buhagiar <jooster669@gmail.com>
|
||||
Date: Fri, 25 Mar 2022 21:46:14 +1100
|
||||
Subject: [PATCH 6/8] Meta: Add ARCH to TOOLS_CFLAGS
|
||||
Subject: [PATCH] Meta: Add ARCH to TOOLS_CFLAGS
|
||||
|
||||
---
|
||||
Makefile | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 035fea77..c5a27abe 100644
|
||||
index 035fea7..c5a27ab 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -821,6 +821,8 @@ ifeq ($(PLATFORM),serenity)
|
||||
|
|
@ -20,6 +20,3 @@ index 035fea77..c5a27abe 100644
|
|||
OPTIMIZEVM = -O3
|
||||
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
From 4d5d4cd86c7e94b3f4b2d8cdaf3909a5016aec23 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jesse Buhagiar <jooster669@gmail.com>
|
||||
Date: Fri, 25 Mar 2022 22:04:17 +1100
|
||||
Subject: [PATCH 7/8] Meta: Remove extension from main game exe
|
||||
Subject: [PATCH] Meta: Remove extension from main game exe
|
||||
|
||||
---
|
||||
Makefile | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index c5a27abe..c0e62001 100644
|
||||
index c5a27ab..c0e6200 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1046,12 +1046,12 @@ endif
|
||||
|
|
@ -53,6 +53,3 @@ index c5a27abe..c0e62001 100644
|
|||
ifneq ($(USE_RENDERER_DLOPEN),0)
|
||||
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_opengl1_$(SHLIBNAME) $(COPYBINDIR)/renderer_opengl1_$(SHLIBNAME)
|
||||
ifneq ($(BUILD_RENDERER_OPENGL2),0)
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 488dfbc449db59057afabb92d2843a2ae63741ac Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jesse Buhagiar <jooster669@gmail.com>
|
||||
Date: Sat, 26 Mar 2022 00:08:46 +1100
|
||||
Subject: [PATCH 8/8] Engine: Use Serenity style PROT_EXEC mmap
|
||||
Subject: [PATCH] Engine: Use Serenity style PROT_EXEC mmap
|
||||
|
||||
The code for this was really old and crusty, so let's `ifdef` it out and
|
||||
use some more friendly Serenity style memory code.
|
||||
|
|
@ -10,7 +10,7 @@ use some more friendly Serenity style memory code.
|
|||
1 file changed, 27 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/code/qcommon/vm_x86.c b/code/qcommon/vm_x86.c
|
||||
index 8d6321a6..d155efc2 100644
|
||||
index 8d6321a..d155efc 100644
|
||||
--- a/code/qcommon/vm_x86.c
|
||||
+++ b/code/qcommon/vm_x86.c
|
||||
@@ -42,6 +42,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
|
@ -67,6 +67,3 @@ index 8d6321a6..d155efc2 100644
|
|||
#elif _WIN32
|
||||
{
|
||||
DWORD oldProtect = 0;
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue