diff options
| -rw-r--r-- | Ports/AvailablePorts.md | 2 | ||||
| -rwxr-xr-x | Ports/SDL2/package.sh | 10 | ||||
| -rw-r--r-- | Ports/SDL2/patches/0001-Add-SerenityOS-platform-support.patch | 217 | ||||
| -rw-r--r-- | Ports/SDL2/patches/0002-Make-sdl2-config-prefixes-configurable-again.patch | 28 | ||||
| -rw-r--r-- | Ports/SDL2/patches/ReadMe.md | 7 |
5 files changed, 50 insertions, 214 deletions
diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index ca4c11b9c4..3ee6ab969d 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -212,7 +212,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`sam`](sam/) | Software Automatic Mouth (SAM) | c86ea39 | https://github.com/vidarh/SAM | | [`scummvm`](scummvm/) | ScummVM | 2.6.0 | https://www.scummvm.org/ | | [`sdl12-compat`](sdl12-compat/) | SDL2 compatibility layer for SDL 1.2 games | 1.2.52 | https://github.com/libsdl-org/sdl12-compat/ | -| [`SDL2`](SDL2/) | Simple DirectMedia Layer (SDL2) | 2.0.22 | https://github.com/libsdl-org/SDL | +| [`SDL2`](SDL2/) | Simple DirectMedia Layer (SDL2) | 2.24.0 | https://github.com/libsdl-org/SDL | | [`SDL2-GNUBoy`](SDL2-GNUBoy/) | SDL2 GNUBoy | 1.2.1 | https://github.com/AlexOberhofer/SDL2-GNUBoy | | [`SDL2_gfx`](SDL2_gfx/) | SDL2\_gfx (Graphics primitives add-on for SDL2) | 1.0.4 | https://sourceforge.net/projects/sdl2gfx/ | | [`SDL2_image`](SDL2_image/) | SDL2\_image (Image loading add-on for SDL2) | 2.0.5 | https://www.libsdl.org/projects/SDL_image/ | diff --git a/Ports/SDL2/package.sh b/Ports/SDL2/package.sh index d6b07c725f..487aa7f081 100755 --- a/Ports/SDL2/package.sh +++ b/Ports/SDL2/package.sh @@ -1,9 +1,9 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=SDL2 -version=2.0.22 -useconfigure=true -auth_type=sha256 -files="https://github.com/libsdl-org/SDL/releases/download/release-${version}/SDL2-${version}.tar.gz SDL2-${version}.tar.gz fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e" +port='SDL2' +version='2.24.0' +useconfigure='true' +auth_type='sha256' +files="https://github.com/libsdl-org/SDL/releases/download/release-${version}/SDL2-${version}.tar.gz SDL2-${version}.tar.gz 91e4c34b1768f92d399b078e171448c6af18cafda743987ed2064a28954d6d97" configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-DPULSEAUDIO=OFF" "-DJACK=OFF" "-DEXTRA_LDFLAGS=-laudio;-liconv;-ldl") depends=("libiconv") diff --git a/Ports/SDL2/patches/0001-Add-SerenityOS-platform-support.patch b/Ports/SDL2/patches/0001-Add-SerenityOS-platform-support.patch index cbac3d4951..c1a60b84ba 100644 --- a/Ports/SDL2/patches/0001-Add-SerenityOS-platform-support.patch +++ b/Ports/SDL2/patches/0001-Add-SerenityOS-platform-support.patch @@ -20,23 +20,23 @@ Co-Authored-By: circl <circl.lastname@gmail.com> build-scripts/config.sub | 3 + cmake/sdlchecks.cmake | 20 + include/SDL_config.h.cmake | 2 + - src/SDL_error.c | 9 +- + src/SDL_error.c | 7 +- src/audio/SDL_audio.c | 3 + src/audio/SDL_sysaudio.h | 1 + - src/audio/serenity/SDL_serenityaudio.cpp | 160 ++++ - src/audio/serenity/SDL_serenityaudio.h | 38 + + src/audio/serenity/SDL_serenityaudio.cpp | 160 +++++ + src/audio/serenity/SDL_serenityaudio.h | 38 ++ src/stdlib/SDL_stdlib.c | 2 +- src/video/SDL_sysvideo.h | 1 + src/video/SDL_video.c | 13 + src/video/serenity/SDL_serenityevents.cpp | 52 ++ src/video/serenity/SDL_serenityevents_c.h | 33 + - src/video/serenity/SDL_serenitymessagebox.cpp | 40 + - src/video/serenity/SDL_serenitymessagebox.h | 38 + - src/video/serenity/SDL_serenitymouse.cpp | 142 ++++ - src/video/serenity/SDL_serenitymouse.h | 39 + - src/video/serenity/SDL_serenityvideo.cpp | 720 ++++++++++++++++++ + src/video/serenity/SDL_serenitymessagebox.cpp | 40 ++ + src/video/serenity/SDL_serenitymessagebox.h | 38 ++ + src/video/serenity/SDL_serenitymouse.cpp | 142 +++++ + src/video/serenity/SDL_serenitymouse.h | 39 ++ + src/video/serenity/SDL_serenityvideo.cpp | 600 ++++++++++++++++++ src/video/serenity/SDL_serenityvideo.h | 98 +++ - 20 files changed, 1414 insertions(+), 25 deletions(-) + 20 files changed, 1292 insertions(+), 25 deletions(-) create mode 100644 src/audio/serenity/SDL_serenityaudio.cpp create mode 100644 src/audio/serenity/SDL_serenityaudio.h create mode 100644 src/video/serenity/SDL_serenityevents.cpp @@ -49,10 +49,10 @@ Co-Authored-By: circl <circl.lastname@gmail.com> create mode 100644 src/video/serenity/SDL_serenityvideo.h diff --git a/CMakeLists.txt b/CMakeLists.txt -index 644715a..4cd432d 100644 +index 6b53699..e910dc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -17,6 +17,9 @@ endif() +@@ -26,6 +26,9 @@ set(EXTRA_LDFLAGS) # etc. See https://github.com/libsdl-org/SDL/issues/4150 add_library(sdl-build-options INTERFACE) @@ -62,7 +62,7 @@ index 644715a..4cd432d 100644 if(WINDOWS_STORE) cmake_minimum_required(VERSION 3.11.0) target_compile_definitions(sdl-build-options INTERFACE "-DSDL_BUILDING_WINRT=1") -@@ -397,7 +396,7 @@ set_option(SDL_DUMMYVIDEO "Use dummy video driver" ON) +@@ -448,7 +451,7 @@ set_option(SDL_DUMMYVIDEO "Use dummy video driver" ON) set_option(SDL_OPENGL "Include OpenGL support" ON) set_option(SDL_OPENGLES "Include OpenGL ES support" ON) set_option(SDL_PTHREADS "Use POSIX threads for multi-threading" ${SDL_PTHREADS_ENABLED_BY_DEFAULT}) @@ -71,8 +71,8 @@ index 644715a..4cd432d 100644 dep_option(SDL_OSS "Support the OSS audio API" ON "UNIX_SYS OR RISCOS" OFF) set_option(SDL_ALSA "Support the ALSA audio API" ${UNIX_SYS}) dep_option(SDL_ALSA_SHARED "Dynamically load ALSA audio support" ON "SDL_ALSA" OFF) -@@ -1268,25 +1267,7 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID AND NOT RISCOS AND NOT HAIKU) - CheckLibSampleRate() +@@ -1345,25 +1348,7 @@ elseif(UNIX AND NOT APPLE AND NOT RISCOS AND NOT HAIKU) + CheckFusionSound() endif() - if(SDL_VIDEO) @@ -113,10 +113,10 @@ index dba16e8..39c9ecb 100755 os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake -index 8dcb392..a34c781 100644 +index 7e25075..1d09487 100644 --- a/cmake/sdlchecks.cmake +++ b/cmake/sdlchecks.cmake -@@ -771,6 +771,26 @@ macro(CheckDirectFB) +@@ -785,6 +785,26 @@ macro(CheckDirectFB) endif() endmacro() @@ -144,10 +144,10 @@ index 8dcb392..a34c781 100644 # - n/a macro(CheckVivante) diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake -index fcd18e5..d7b9cfc 100644 +index 2d21b37..370ffcf 100644 --- a/include/SDL_config.h.cmake +++ b/include/SDL_config.h.cmake -@@ -312,6 +312,7 @@ +@@ -318,6 +318,7 @@ #cmakedefine SDL_AUDIO_DRIVER_PULSEAUDIO @SDL_AUDIO_DRIVER_PULSEAUDIO@ #cmakedefine SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC @SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC@ #cmakedefine SDL_AUDIO_DRIVER_QSA @SDL_AUDIO_DRIVER_QSA@ @@ -155,7 +155,7 @@ index fcd18e5..d7b9cfc 100644 #cmakedefine SDL_AUDIO_DRIVER_SNDIO @SDL_AUDIO_DRIVER_SNDIO@ #cmakedefine SDL_AUDIO_DRIVER_SNDIO_DYNAMIC @SDL_AUDIO_DRIVER_SNDIO_DYNAMIC@ #cmakedefine SDL_AUDIO_DRIVER_SUNAUDIO @SDL_AUDIO_DRIVER_SUNAUDIO@ -@@ -394,6 +395,7 @@ +@@ -404,6 +405,7 @@ #cmakedefine SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC @SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC@ #cmakedefine SDL_VIDEO_DRIVER_DUMMY @SDL_VIDEO_DRIVER_DUMMY@ #cmakedefine SDL_VIDEO_DRIVER_OFFSCREEN @SDL_VIDEO_DRIVER_OFFSCREEN@ @@ -164,37 +164,28 @@ index fcd18e5..d7b9cfc 100644 #cmakedefine SDL_VIDEO_DRIVER_WINRT @SDL_VIDEO_DRIVER_WINRT@ #cmakedefine SDL_VIDEO_DRIVER_WAYLAND @SDL_VIDEO_DRIVER_WAYLAND@ diff --git a/src/SDL_error.c b/src/SDL_error.c -index 4d25999..24491ee 100644 +index 1ca460a..b08d742 100644 --- a/src/SDL_error.c +++ b/src/SDL_error.c -@@ -33,6 +33,7 @@ SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) - /* Ignore call if invalid format pointer was passed */ - if (fmt != NULL) { - va_list ap; -+ char errmsg[SDL_ERRBUFIZE]; - SDL_error *error = SDL_GetErrBuf(); +@@ -53,10 +53,9 @@ SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) + } - error->error = 1; /* mark error as valid */ -@@ -41,10 +42,10 @@ SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) - SDL_vsnprintf(error->str, ERR_MAX_STRLEN, fmt, ap); - va_end(ap); - if (SDL_LogGetPriority(SDL_LOG_CATEGORY_ERROR) <= SDL_LOG_PRIORITY_DEBUG) { - /* If we are in debug mode, print out the error message */ - SDL_LogDebug(SDL_LOG_CATEGORY_ERROR, "%s", error->str); - } + // # HACK(SerenityOS): show everything that's going on -+ SDL_GetErrorMsg(errmsg, sizeof(errmsg)); -+ dbgputstr(errmsg, strlen(errmsg)); ++ dbgputstr(error->str, strlen(error->str)); + dbgputstr("\n", 1); } return -1; diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c -index fb363f7..59c36e5 100644 +index e2f7412..7181100 100644 --- a/src/audio/SDL_audio.c +++ b/src/audio/SDL_audio.c -@@ -121,6 +121,9 @@ static const AudioBootStrap *const bootstrap[] = { +@@ -125,6 +125,9 @@ static const AudioBootStrap *const bootstrap[] = { #endif #if SDL_AUDIO_DRIVER_DUMMY &DUMMYAUDIO_bootstrap, @@ -205,10 +196,10 @@ index fb363f7..59c36e5 100644 NULL }; diff --git a/src/audio/SDL_sysaudio.h b/src/audio/SDL_sysaudio.h -index 8aa7298..c16af45 100644 +index 6afaae1..6c7009a 100644 --- a/src/audio/SDL_sysaudio.h +++ b/src/audio/SDL_sysaudio.h -@@ -208,6 +208,7 @@ extern AudioBootStrap PSPAUDIO_bootstrap; +@@ -211,6 +211,7 @@ extern AudioBootStrap PSPAUDIO_bootstrap; extern AudioBootStrap VITAAUD_bootstrap; extern AudioBootStrap EMSCRIPTENAUDIO_bootstrap; extern AudioBootStrap OS2AUDIO_bootstrap; @@ -427,12 +418,12 @@ index 0000000..8d152ca + size_t mixlen { 0 }; +}; diff --git a/src/stdlib/SDL_stdlib.c b/src/stdlib/SDL_stdlib.c -index 9d785aa..6c31981 100644 +index 2af18b1..fbef9e7 100644 --- a/src/stdlib/SDL_stdlib.c +++ b/src/stdlib/SDL_stdlib.c -@@ -533,7 +533,7 @@ int SDL_toupper(int x) { return ((x) >= 'a') && ((x) <= 'z') ? ('A'+((x)-'a')) : - int SDL_tolower(int x) { return ((x) >= 'A') && ((x) <= 'Z') ? ('a'+((x)-'A')) : (x); } - #endif +@@ -637,7 +637,7 @@ SDL_memset(SDL_OUT_BYTECAP(len) void *dst, int c, size_t len) + #endif /* HAVE_MEMSET */ + } -#if defined(HAVE_CTYPE_H) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#if defined(HAVE_CTYPE_H) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && !defined(__serenity__) @@ -440,22 +431,22 @@ index 9d785aa..6c31981 100644 #else int SDL_isblank(int x) { return ((x) == ' ') || ((x) == '\t'); } diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h -index 2384a64..5090f3e 100644 +index 4ea7705..83b9bba 100644 --- a/src/video/SDL_sysvideo.h +++ b/src/video/SDL_sysvideo.h -@@ -458,6 +458,7 @@ extern VideoBootStrap QNX_bootstrap; - extern VideoBootStrap OFFSCREEN_bootstrap; +@@ -470,6 +470,7 @@ extern VideoBootStrap OFFSCREEN_bootstrap; + extern VideoBootStrap NGAGE_bootstrap; extern VideoBootStrap OS2DIVE_bootstrap; extern VideoBootStrap OS2VMAN_bootstrap; +extern VideoBootStrap SERENITYVIDEO_bootstrap; - extern SDL_VideoDevice *SDL_GetVideoDevice(void); - extern int SDL_AddBasicVideoDisplay(const SDL_DisplayMode * desktop_mode); + /* Use SDL_OnVideoThread() sparingly, to avoid regressions in use cases that currently happen to work */ + extern SDL_bool SDL_OnVideoThread(void); diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c -index 93c803e..36960a1 100644 +index 21c5162..2e765de 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c -@@ -122,6 +122,9 @@ static VideoBootStrap *bootstrap[] = { +@@ -128,6 +128,9 @@ static VideoBootStrap *bootstrap[] = { &OS2DIVE_bootstrap, &OS2VMAN_bootstrap, #endif @@ -464,8 +455,8 @@ index 93c803e..36960a1 100644 +#endif #if SDL_VIDEO_DRIVER_DUMMY &DUMMY_bootstrap, - #endif -@@ -4146,6 +4149,10 @@ SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask) + #if SDL_INPUT_LINUXEV +@@ -4258,6 +4261,10 @@ SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask) } } #endif @@ -476,7 +467,7 @@ index 93c803e..36960a1 100644 SDL_bool SDL_GetWindowWMInfo(SDL_Window * window, struct SDL_SysWMinfo *info) -@@ -4425,6 +4432,12 @@ SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid) +@@ -4543,6 +4550,12 @@ SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid) VITA_ShowMessageBox(messageboxdata, buttonid) == 0) { retval = 0; } @@ -871,10 +862,10 @@ index 0000000..039f036 +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/serenity/SDL_serenityvideo.cpp b/src/video/serenity/SDL_serenityvideo.cpp new file mode 100644 -index 0000000..494766f +index 0000000..85e69ef --- /dev/null +++ b/src/video/serenity/SDL_serenityvideo.cpp -@@ -0,0 +1,720 @@ +@@ -0,0 +1,600 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org> @@ -907,7 +898,6 @@ index 0000000..494766f +# include "../SDL_sysvideo.h" +# include "SDL_mouse.h" +# include "SDL_video.h" -+# include "../../../include/SDL_scancode.h" +} + +# include "SDL_serenityevents_c.h" @@ -923,115 +913,6 @@ index 0000000..494766f +# include <LibGUI/Widget.h> +# include <LibGUI/Window.h> + -+static int conversion_map[] = { -+ SDLK_UNKNOWN, -+ SDLK_ESCAPE, -+ SDLK_TAB, -+ SDLK_BACKSPACE, -+ SDLK_RETURN, -+ SDLK_INSERT, -+ SDLK_DELETE, -+ SDLK_PRINTSCREEN, -+ SDLK_SYSREQ, -+ SDLK_HOME, -+ SDLK_END, -+ SDLK_LEFT, -+ SDLK_UP, -+ SDLK_RIGHT, -+ SDLK_DOWN, -+ SDLK_PAGEUP, -+ SDLK_PAGEDOWN, -+ SDLK_LSHIFT, -+ SDLK_RSHIFT, -+ SDLK_LCTRL, -+ SDLK_LALT, -+ SDLK_CAPSLOCK, -+ SDLK_NUMLOCKCLEAR, -+ SDLK_SCROLLLOCK, -+ SDLK_F1, -+ SDLK_F2, -+ SDLK_F3, -+ SDLK_F4, -+ SDLK_F5, -+ SDLK_F6, -+ SDLK_F7, -+ SDLK_F8, -+ SDLK_F9, -+ SDLK_F10, -+ SDLK_F11, -+ SDLK_F12, -+ SDLK_SPACE, -+ SDLK_EXCLAIM, -+ SDLK_QUOTE, -+ SDLK_3, -+ SDLK_4, -+ SDLK_5, -+ SDLK_7, -+ SDLK_QUOTE, -+ SDLK_9, -+ SDLK_0, -+ SDLK_8, -+ SDLK_PLUS, -+ SDLK_COMMA, -+ SDLK_MINUS, -+ SDLK_PERIOD, -+ SDLK_SLASH, -+ SDLK_0, -+ SDLK_1, -+ SDLK_2, -+ SDLK_3, -+ SDLK_4, -+ SDLK_5, -+ SDLK_6, -+ SDLK_7, -+ SDLK_8, -+ SDLK_9, -+ SDLK_SEMICOLON, -+ SDLK_SEMICOLON, -+ SDLK_COMMA, -+ SDLK_EQUALS, -+ SDLK_PERIOD, -+ SDLK_SLASH, -+ SDLK_2, -+ SDLK_a, -+ SDLK_b, -+ SDLK_c, -+ SDLK_d, -+ SDLK_e, -+ SDLK_f, -+ SDLK_g, -+ SDLK_h, -+ SDLK_i, -+ SDLK_j, -+ SDLK_k, -+ SDLK_l, -+ SDLK_m, -+ SDLK_n, -+ SDLK_o, -+ SDLK_p, -+ SDLK_q, -+ SDLK_r, -+ SDLK_s, -+ SDLK_t, -+ SDLK_u, -+ SDLK_v, -+ SDLK_w, -+ SDLK_x, -+ SDLK_y, -+ SDLK_z, -+ SDLK_LEFTBRACKET, -+ SDLK_RIGHTBRACKET, -+ SDLK_BACKSLASH, -+ SDLK_6, -+ SDLK_MINUS, -+ SDLK_LEFTBRACKET, -+ SDLK_RIGHTBRACKET, -+ SDLK_BACKSLASH, -+ SDLK_BACKQUOTE, -+ SDLK_BACKQUOTE, -+ SDLK_UNKNOWN, -+}; -+ +static SDL_Scancode scancode_map[] = { + SDL_SCANCODE_UNKNOWN, + SDL_SCANCODE_ESCAPE, @@ -1181,11 +1062,10 @@ index 0000000..494766f +extern int Serenity_GL_MakeCurrent(_THIS, SDL_Window* window, SDL_GLContext context); +extern int Serenity_GL_SwapWindow(_THIS, SDL_Window* window); + -+static SDL_VideoDevice* SERENITY_CreateDevice(int devindex) ++static SDL_VideoDevice* SERENITY_CreateDevice(void) +{ + SDL_VideoDevice* device; + -+ dbgln("SERENITY_CreateDevice {}", devindex); + /* Initialize all variables that we clean on shutdown */ + device = (SDL_VideoDevice*)SDL_calloc(1, sizeof(SDL_VideoDevice)); + if (!device) { @@ -1278,15 +1158,6 @@ index 0000000..494766f +SerenitySDLWidget::SerenitySDLWidget(SDL_Window* window) + : m_sdl_window(window) +{ -+ SDL_Keycode keymap[SDL_NUM_SCANCODES]; -+ SDL_GetDefaultKeymap(keymap); -+ -+ for (int i = 0; i < (sizeof(scancode_map) / sizeof(SDL_Keycode)); ++i) { -+ if (scancode_map[i] != SDL_SCANCODE_UNKNOWN) -+ keymap[scancode_map[i]] = conversion_map[i]; -+ } -+ SDL_SetKeymap(0, keymap, SDL_NUM_SCANCODES); -+ + update(); +} + diff --git a/Ports/SDL2/patches/0002-Make-sdl2-config-prefixes-configurable-again.patch b/Ports/SDL2/patches/0002-Make-sdl2-config-prefixes-configurable-again.patch deleted file mode 100644 index d7811d7da2..0000000000 --- a/Ports/SDL2/patches/0002-Make-sdl2-config-prefixes-configurable-again.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tim Schumacher <timschumi@gmx.de> -Date: Sat, 21 May 2022 23:33:31 +0200 -Subject: [PATCH] Make sdl2-config prefixes configurable again - -These were accidentally removed in -6956f4aa1982b66b234026b46f7bb2dd44c67894. ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2400d53..7a55d25 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2656,9 +2656,9 @@ if(NOT WINDOWS OR CYGWIN OR MINGW) - set(prefix ${CMAKE_INSTALL_PREFIX}) - - set(exec_prefix "\${prefix}") -- set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") -- set(bindir "${CMAKE_INSTALL_FULL_BINDIR}") -- set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") -+ set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") -+ set(bindir "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}") -+ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") - if(SDL_STATIC) - set(ENABLE_STATIC_TRUE "") - set(ENABLE_STATIC_FALSE "#") diff --git a/Ports/SDL2/patches/ReadMe.md b/Ports/SDL2/patches/ReadMe.md index 4e6b850be4..28ab27facc 100644 --- a/Ports/SDL2/patches/ReadMe.md +++ b/Ports/SDL2/patches/ReadMe.md @@ -5,10 +5,3 @@ Add SerenityOS platform support -## `0002-Make-sdl2-config-prefixes-configurable-again.patch` - -Make sdl2-config prefixes configurable again - -These were accidentally removed in -6956f4aa1982b66b234026b46f7bb2dd44c67894. - |