diff options
| author | Ali Mohammad Pur <ali.mpfard@gmail.com> | 2022-05-16 19:21:28 +0430 |
|---|---|---|
| committer | Ali Mohammad Pur <Ali.mpfard@gmail.com> | 2022-05-19 20:17:10 +0430 |
| commit | 6eb071cd0d1e5c454b188dca6ba60260966779fe (patch) | |
| tree | e5a5d2dce51928297695c87f8bb338fa825fc03e | |
| parent | e24b55db8c4cc17f591301c3b20a8733fad2ea2d (diff) | |
| download | serenity-6eb071cd0d1e5c454b188dca6ba60260966779fe.zip | |
Ports: Update SDL_sound's patches to use git patches
| -rw-r--r-- | Ports/SDL_sound/patches/0001-Use-pkgconfig-to-find-SDL2.patch | 28 | ||||
| -rw-r--r-- | Ports/SDL_sound/patches/ReadMe.md | 7 | ||||
| -rw-r--r-- | Ports/SDL_sound/patches/fix_cmakelists.patch | 14 |
3 files changed, 32 insertions, 17 deletions
diff --git a/Ports/SDL_sound/patches/0001-Use-pkgconfig-to-find-SDL2.patch b/Ports/SDL_sound/patches/0001-Use-pkgconfig-to-find-SDL2.patch new file mode 100644 index 0000000000..bd35729e6f --- /dev/null +++ b/Ports/SDL_sound/patches/0001-Use-pkgconfig-to-find-SDL2.patch @@ -0,0 +1,28 @@ +From 1a5d08869b8084f5fdc3442c4b4ed237b7c7cf29 Mon Sep 17 00:00:00 2001 +From: xSlendiX <gamingxslendix@gmail.com> +Date: Sun, 19 Sep 2021 22:46:10 +0300 +Subject: [PATCH] Use pkgconfig to find SDL2 + +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c1b9241..a659246 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,10 @@ if(CMAKE_C_COMPILER_ID STREQUAL "SunPro") + add_definitions(-xldscope=hidden) + endif() + +-find_package(SDL2 REQUIRED) ++INCLUDE(FindPkgConfig) ++ ++PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) ++ + include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_INCLUDE_DIR}) + if(WIN32) + # -lmingw32: gcc adds it automatically. +-- +2.36.1 + diff --git a/Ports/SDL_sound/patches/ReadMe.md b/Ports/SDL_sound/patches/ReadMe.md index c2ac5bfbd1..12316726f9 100644 --- a/Ports/SDL_sound/patches/ReadMe.md +++ b/Ports/SDL_sound/patches/ReadMe.md @@ -1,6 +1,7 @@ -# Patches for SDL_sound +# Patches for SDL_sound on SerenityOS -## `fix_cmakelists.patch` +## `0001-Use-pkgconfig-to-find-SDL2.patch` + +Use pkgconfig to find SDL2 -Use `FindPkgConfig` to find SDL2 instead of `find_package`. diff --git a/Ports/SDL_sound/patches/fix_cmakelists.patch b/Ports/SDL_sound/patches/fix_cmakelists.patch deleted file mode 100644 index 7cb860c3a0..0000000000 --- a/Ports/SDL_sound/patches/fix_cmakelists.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- SDL_sound-main/CMakeLists.txt 2021-08-21 03:28:50.000000000 +0300 -+++ SDL_sound-main.serenity/CMakeLists.txt 2021-09-18 15:59:24.321216126 +0300 -@@ -29,7 +29,10 @@ - add_definitions(-xldscope=hidden) - endif() - --find_package(SDL2 REQUIRED) -+INCLUDE(FindPkgConfig) -+ -+PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) -+ - include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_INCLUDE_DIR}) - if(WIN32) - # -lmingw32: gcc adds it automatically. |