mirror of
https://github.com/RGBCube/serenity
synced 2025-07-30 17:47:34 +00:00
Ports: Update bochs's patches to use git patches
This commit is contained in:
parent
d65736e5bd
commit
3a7d5ca469
2 changed files with 21 additions and 1 deletions
48
Ports/bochs/patches/0001-Use-pkg-config-for-SDL2.patch
Normal file
48
Ports/bochs/patches/0001-Use-pkg-config-for-SDL2.patch
Normal file
|
@ -0,0 +1,48 @@
|
|||
From cdc23372934196e822175a6ecbd6b06aed2bcea5 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Ross <pross@xvid.org>
|
||||
Date: Tue, 22 Feb 2022 18:43:09 +1100
|
||||
Subject: [PATCH] Use pkg-config for SDL2
|
||||
|
||||
Modifies configure to use `pkg_config` to detect SDL2 installed on
|
||||
SerenityOS.
|
||||
|
||||
Without this patch, configure uses `sdl2_config` and will detect SDL2
|
||||
installed on the host system.
|
||||
---
|
||||
configure | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 5cc4088..d2bff12 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -24060,7 +24060,7 @@ fi
|
||||
fi
|
||||
$as_echo "#define BX_HAVE_SOUND_SDL 1" >>confdefs.h
|
||||
|
||||
- SDL2_VERSION=`sdl2-config --version`
|
||||
+ SDL2_VERSION=`pkg-config sdl2 --version`
|
||||
# SDL version >= 2.0.5 supports audio capture
|
||||
sdl2_audio_capture=0
|
||||
|
||||
@@ -24703,14 +24703,14 @@ if test "$with_sdl2" = yes; then
|
||||
SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_SDL2)"
|
||||
# GUI_*FLAGS are added to the compilation of every bochs file, not just
|
||||
# the files in gui/*.cc.
|
||||
- SDL2_CFLAGS=`sdl2-config --cflags`
|
||||
+ SDL2_CFLAGS=`pkg-config sdl2 --cflags`
|
||||
GUI_CFLAGS="$GUI_CFLAGS $SDL2_CFLAGS"
|
||||
GUI_CXXFLAGS="$GUI_CXXFLAGS $SDL2_CFLAGS"
|
||||
- GUI_LINK_OPTS_SDL2="`sdl2-config --libs`"
|
||||
+ GUI_LINK_OPTS_SDL2="`pkg-config sdl2 --libs`"
|
||||
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SDL2)"
|
||||
# The plugin version uses multi-threading support in Bochs core
|
||||
if test "$bx_plugins" = 1; then
|
||||
- NONPLUGIN_GUI_LINK_OPTS="`sdl2-config --libs`"
|
||||
+ NONPLUGIN_GUI_LINK_OPTS="`pkg-config sdl2 --libs`"
|
||||
fi
|
||||
# The enhanced X debugger depends on GTK2
|
||||
if test "$gui_debugger" = 1 -a "$DEFAULT_GUI" != win32; then
|
||||
--
|
||||
2.36.1
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue