RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 21:57:43 +00:00
Code Issues Activity Actions

Ports: Return SDL2 to upstream

Browse source
This commit is contained in:
Tim Schumacher 2022-05-21 20:42:08 +02:00 • committed by Linus Groh
parent 81a2f09a80
commit cb6a406190
5 changed files with 1752 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ports/AvailablePorts.md
View file

@ -195,7 +195,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
| [`sam`](sam/) | Software Automatic Mouth (SAM) | c86ea39 | https://github.com/vidarh/SAM |
| [`scummvm`](scummvm/) | ScummVM | 2.5.1 | https://www.scummvm.org/ |
| [`SDL_sound`](SDL_sound/) | SDL_sound (Abstract soundfile decoder) | | https://github.com/icculus/SDL_sound |
| [`SDL2`](SDL2/) | Simple DirectMedia Layer (SDL2) | | https://github.com/SerenityOS/SDL |
| [`SDL2`](SDL2/) | Simple DirectMedia Layer (SDL2) | 9f1e1a0 | 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/ |

7
Ports/SDL2/package.sh
View file

@ -1,9 +1,10 @@
#!/usr/bin/env -S bash ../.port_include.sh
port=SDL2
version=git
workdir=SDL-main-serenity
version=c63a62ae49cd20e46786a4437edac09ff5c24c16
workdir=SDL-${version}
useconfigure=true
files="https://github.com/SerenityPorts/SDL/archive/main-serenity.tar.gz SDL2-git.tar.gz"
auth_type=sha256
files="https://github.com/libsdl-org/SDL/archive/${version}.tar.gz SDL2-${version}.tar.gz 9f1e1a00cf2f840839f0a3158e3acc046526e4418378625929cb583eae3acc10"
configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-DPULSEAUDIO=OFF" "-DJACK=OFF" "-DEXTRA_LDFLAGS=-laudio;-liconv;-ldl")
depends=("libiconv")

1699
Ports/SDL2/patches/0001-Add-SerenityOS-platform-support.patch Normal file
View file

File diff suppressed because it is too large Load diff

31
Ports/SDL2/patches/0002-Replace-usages-of-FULL-paths-with-their-relative-cou.patch Normal file
View file

@ -0,0 +1,31 @@
From 602fc626d157e66d0436f99f8d8df30f2022182b Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Fri, 29 Oct 2021 20:17:42 +0200
Subject: [PATCH 2/2] Replace usages of FULL paths with their relative
counterparts
GNUInstallDirs currently doesn't support the seperate STAGING directory,
and will always prepend the final installation prefix to its paths.
Work around that by just using the path that is relative to the
installation directory and let CMake figure out the rest.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e744d17..b574e6f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2630,7 +2630,7 @@ if(NOT (WINDOWS OR CYGWIN))
endif()
install(PROGRAMS ${SDL2_BINARY_DIR}/sdl2-config DESTINATION bin)
# TODO: what about the .spec file? Is it only needed for RPM creation?
- install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/aclocal")
+ install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/aclocal")
endif()
##### Uninstall target #####
--
2.36.1

17
Ports/SDL2/patches/ReadMe.md Normal file
View file

@ -0,0 +1,17 @@
# Patches for SDL2 on SerenityOS
## `0001-Add-SerenityOS-platform-support.patch`
Add SerenityOS platform support
## `0002-Replace-usages-of-FULL-paths-with-their-relative-cou.patch`
Replace usages of FULL paths with their relative counterparts
GNUInstallDirs currently doesn't support the seperate STAGING directory,
and will always prepend the final installation prefix to its paths.
Work around that by just using the path that is relative to the
installation directory and let CMake figure out the rest.