mirror of
https://github.com/SerenityOS/serenity
synced 2024-07-01 11:39:22 +00:00
Ports/qemu: Update to 8.1.3
This commit is contained in:
Tim Schumacher
parent
592c3a8cb4
commit
afea177d41
|
|
@ -262,7 +262,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
|
|||
| [`pt2-clone`](pt2-clone/) | ProTracker 2 clone | 1.63 | https://github.com/8bitbubsy/pt2-clone |
|
||||
| [`pv`](pv/) | Pipe Viewer | 1.6.20 | http://www.ivarch.com/programs/pv.shtml |
|
||||
| [`python3`](python3/) | Python | 3.12.1 | https://www.python.org/ |
|
||||
| [`qemu`](qemu/) | QEMU | 8.1.0 | https://qemu.org |
|
||||
| [`qemu`](qemu/) | QEMU | 8.1.3 | https://qemu.org |
|
||||
| [`qoi`](qoi/) | Quite OK Image Format for fast, lossless image compression | 351450e | https://github.com/phoboslab/qoi |
|
||||
| [`qt6-qt5compat`](qt6-qt5compat/) | Qt6 Qt5Compat | 6.4.0 | https://doc.qt.io/qt-6/qtcore5-index.html |
|
||||
| [`qt6-qtbase`](qt6-qtbase/) | Qt6 QtBase | 6.4.0 | https://qt.io |
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ Subject: [PATCH] Add build system support for SerenityOS
|
|||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 7c08c18358becf49779c876b0f3d17329df053c6..3177605054876b387cd2b93463025ee3203991e7 100755
|
||||
index 133f4e3235125222083bf77368ea714b7cc0b703..004e2d5893a4834d4cc209ce4c0f91978b89422f 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -496,6 +496,8 @@ elif check_define __NetBSD__; then
|
||||
@@ -365,6 +365,8 @@ elif check_define __NetBSD__; then
|
||||
targetos=netbsd
|
||||
elif check_define __APPLE__; then
|
||||
targetos=darwin
|
||||
|
|
@ -20,7 +20,7 @@ index 7c08c18358becf49779c876b0f3d17329df053c6..3177605054876b387cd2b93463025ee3
|
|||
else
|
||||
# This is a fatal error, but don't report it yet, because we
|
||||
# might be going to just print the --help text, or it might
|
||||
@@ -509,6 +511,7 @@ mingw32="no"
|
||||
@@ -378,6 +380,7 @@ mingw32="no"
|
||||
bsd="no"
|
||||
linux="no"
|
||||
solaris="no"
|
||||
|
|
@ -28,9 +28,9 @@ index 7c08c18358becf49779c876b0f3d17329df053c6..3177605054876b387cd2b93463025ee3
|
|||
case $targetos in
|
||||
windows)
|
||||
mingw32="yes"
|
||||
@@ -565,6 +568,9 @@ linux)
|
||||
@@ -413,6 +416,9 @@ haiku)
|
||||
linux)
|
||||
linux="yes"
|
||||
vhost_user=${default_feature:-yes}
|
||||
;;
|
||||
+serenity)
|
||||
+ serenity="yes"
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@ sets, so extend them into a full list manually.
|
|||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/chardev/char.c b/chardev/char.c
|
||||
index 0169d8dde4b533c9cf851831b03c8adcac24cff5..03ce487a23c92b70981643bd213930f5d074afdb 100644
|
||||
index 661ad8176a982c641531cdab8e05c3815504cc2f..c9f701ffc59837a0480bb56c63d5f8ef7ee022e6 100644
|
||||
--- a/chardev/char.c
|
||||
+++ b/chardev/char.c
|
||||
@@ -382,11 +382,11 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename,
|
||||
@@ -383,11 +383,11 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename,
|
||||
if (strstart(filename, "vc", &p)) {
|
||||
qemu_opt_set(opts, "backend", "vc", &error_abort);
|
||||
if (*p == ':') {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ HPET timer read for each tick.
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/qemu/timer.h b/include/qemu/timer.h
|
||||
index ee071e07d131641131ed9705e7407f153bbf6c67..97fb9b9ac28bd36cd7200e92c3c0c1e30858aa0d 100644
|
||||
index 9a91cb1248a29d884cd3ddc8806e8c7eb922bd21..fec731a3811f57d2a5d9b56bc1f5fee2d2e7365e 100644
|
||||
--- a/include/qemu/timer.h
|
||||
+++ b/include/qemu/timer.h
|
||||
@@ -833,7 +833,7 @@ static inline int64_t get_clock(void)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tim Schumacher <timschumi@gmx.de>
|
||||
Date: Thu, 30 Nov 2023 15:45:32 +0100
|
||||
Subject: [PATCH] file-posix: Include the correct file for ioctl on SerenityOS
|
||||
|
||||
---
|
||||
block/file-posix.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/block/file-posix.c b/block/file-posix.c
|
||||
index 7f540b03ed4f3e3ea87288cda485fee8c809c34c..b034080300923f4a1acfbfc7ac1595ca93c3ece4 100644
|
||||
--- a/block/file-posix.c
|
||||
+++ b/block/file-posix.c
|
||||
@@ -110,6 +110,10 @@
|
||||
#include <sys/diskslice.h>
|
||||
#endif
|
||||
|
||||
+#ifdef __serenity__
|
||||
+#include <sys/ioctl.h>
|
||||
+#endif
|
||||
+
|
||||
/* OS X does not have O_DSYNC */
|
||||
#ifndef O_DSYNC
|
||||
#ifdef O_SYNC
|
||||
|
|
@ -22,3 +22,8 @@ overhead of the `clock_gettime` syscall (as `CLOCK_MONOTONIC_COARSE`
|
|||
is forwarded using the mapped time page) and we don't have to do a
|
||||
HPET timer read for each tick.
|
||||
|
||||
## `0004-file-posix-Include-the-correct-file-for-ioctl-on-Ser.patch`
|
||||
|
||||
file-posix: Include the correct file for ioctl on SerenityOS
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
QEMU_VERSION="8.1.0"
|
||||
QEMU_VERSION="8.1.3"
|
||||
QEMU_ARCHIVE="qemu-${QEMU_VERSION}.tar.xz"
|
||||
QEMU_ARCHIVE_URL="https://download.qemu.org/${QEMU_ARCHIVE}"
|
||||
QEMU_ARCHIVE_SHA256SUM="710c101198e334d4762eef65f649bc43fa8a5dd75303554b8acfec3eb25f0e55"
|
||||
QEMU_ARCHIVE_SHA256SUM="43cc176804105586f74f90398f34e9f85787dff400d3b640d81f7779fbe265bb"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user