-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix missing window decorations on GNOME.
- Loading branch information
Showing
7 changed files
with
283 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
vcpkg_from_gitlab( | ||
GITLAB_URL https://gitlab.freedesktop.org/ | ||
OUT_SOURCE_PATH SOURCE_PATH | ||
REPO libdecor/libdecor | ||
REF ca6e6b68a3ecc4cff2da975580dbe1ae07caf18e | ||
SHA512 a4749861fff46db0b8ed1f74e0bbc1c3cba9eca0bf1c9861d4e3f49d17447c48530e06573fd796255b606aee2f7029ab7f466a2b2f822e43d8f832314d38ddc7 | ||
HEAD_REF master # branch name | ||
) | ||
|
||
if("gtk" IN_LIST FEATURES) | ||
list(APPEND OPTIONS -Dgtk=enabled) | ||
else() | ||
list(APPEND OPTIONS -Dgtk=disabled) | ||
endif() | ||
|
||
vcpkg_configure_meson( | ||
SOURCE_PATH "${SOURCE_PATH}" | ||
OPTIONS ${OPTIONS} | ||
-Ddemo=false | ||
) | ||
vcpkg_install_meson() | ||
vcpkg_copy_pdbs() | ||
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) | ||
vcpkg_fixup_pkgconfig() | ||
|
||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"name": "libdecor", | ||
"version": "0.1.0", | ||
"description": "Library to help Wayland clients draw window decorations.", | ||
"homepage": "https://gitlab.freedesktop.org/libdecor/libdecor", | ||
"license": "MIT", | ||
"supports": "linux", | ||
"dependencies": [ | ||
"dbus", | ||
"harfbuzz", | ||
"pango", | ||
{ | ||
"name": "vcpkg-tool-meson", | ||
"host": true | ||
}, | ||
"wayland-protocols" | ||
], | ||
"features": { | ||
"gtk": { | ||
"description": "Enables the use of the GTK backend", | ||
"dependencies": [ | ||
"gtk" | ||
] | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/SDL2Config.cmake.in b/SDL2Config.cmake.in | ||
index cc8bcf26d..ead829767 100644 | ||
--- a/SDL2Config.cmake.in | ||
+++ b/SDL2Config.cmake.in | ||
@@ -35,7 +35,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/sdlfind.cmake") | ||
|
||
set(SDL_ALSA @SDL_ALSA@) | ||
set(SDL_ALSA_SHARED @SDL_ALSA_SHARED@) | ||
-if(SDL_ALSA AND NOT SDL_ALSA_SHARED AND TARGET SDL2::SDL2-static) | ||
+if(SDL_ALSA) | ||
sdlFindALSA() | ||
endif() | ||
unset(SDL_ALSA) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake | ||
index 65a98efbe..2f99f28f1 100644 | ||
--- a/cmake/sdlchecks.cmake | ||
+++ b/cmake/sdlchecks.cmake | ||
@@ -352,7 +352,7 @@ endmacro() | ||
# - HAVE_SDL_LOADSO opt | ||
macro(CheckLibSampleRate) | ||
if(SDL_LIBSAMPLERATE) | ||
- find_package(SampleRate QUIET) | ||
+ find_package(SampleRate CONFIG REQUIRED) | ||
if(SampleRate_FOUND AND TARGET SampleRate::samplerate) | ||
set(HAVE_LIBSAMPLERATE TRUE) | ||
set(HAVE_LIBSAMPLERATE_H TRUE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,131 @@ | ||
vcpkg_from_github( | ||
OUT_SOURCE_PATH SOURCE_PATH | ||
REPO libsdl-org/SDL | ||
REF "release-${VERSION}" | ||
SHA512 d4ddc1abf84f09b9d2357b5bf2adc224a693767c170a6b778283c2783436d940aee4db4c9628776de28de6c499bbfb04b65f9d9210f4670525248ce5b0d31bee | ||
HEAD_REF main | ||
PATCHES | ||
deps.patch | ||
alsa-dep-fix.patch | ||
) | ||
|
||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) | ||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SDL_SHARED) | ||
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT) | ||
|
||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS | ||
FEATURES | ||
vulkan SDL_VULKAN | ||
x11 SDL_X11 | ||
wayland SDL_WAYLAND | ||
samplerate SDL_LIBSAMPLERATE | ||
ibus SDL_IBUS | ||
) | ||
|
||
if ("x11" IN_LIST FEATURES) | ||
message(WARNING "You will need to install Xorg dependencies to use feature x11:\nsudo apt install libx11-dev libxft-dev libxext-dev\n") | ||
endif() | ||
if ("wayland" IN_LIST FEATURES) | ||
message(WARNING "You will need to install Wayland dependencies to use feature wayland:\nsudo apt install libwayland-dev libxkbcommon-dev libegl1-mesa-dev\n") | ||
endif() | ||
if ("ibus" IN_LIST FEATURES) | ||
message(WARNING "You will need to install ibus dependencies to use feature ibus:\nsudo apt install libibus-1.0-dev\n") | ||
endif() | ||
|
||
if(VCPKG_TARGET_IS_UWP) | ||
set(configure_opts WINDOWS_USE_MSBUILD) | ||
endif() | ||
|
||
vcpkg_cmake_configure( | ||
SOURCE_PATH "${SOURCE_PATH}" | ||
${configure_opts} | ||
OPTIONS ${FEATURE_OPTIONS} | ||
-DSDL_STATIC=${SDL_STATIC} | ||
-DSDL_SHARED=${SDL_SHARED} | ||
-DSDL_FORCE_STATIC_VCRT=${FORCE_STATIC_VCRT} | ||
-DSDL_LIBC=ON | ||
-DSDL_TEST=OFF | ||
-DSDL_INSTALL_CMAKEDIR="cmake" | ||
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON | ||
-DSDL_LIBSAMPLERATE_SHARED=OFF | ||
MAYBE_UNUSED_VARIABLES | ||
SDL_FORCE_STATIC_VCRT | ||
) | ||
|
||
vcpkg_cmake_install() | ||
vcpkg_cmake_config_fixup(CONFIG_PATH cmake) | ||
|
||
file(REMOVE_RECURSE | ||
"${CURRENT_PACKAGES_DIR}/debug/include" | ||
"${CURRENT_PACKAGES_DIR}/debug/share" | ||
"${CURRENT_PACKAGES_DIR}/bin/sdl2-config" | ||
"${CURRENT_PACKAGES_DIR}/debug/bin/sdl2-config" | ||
"${CURRENT_PACKAGES_DIR}/SDL2.framework" | ||
"${CURRENT_PACKAGES_DIR}/debug/SDL2.framework" | ||
"${CURRENT_PACKAGES_DIR}/share/licenses" | ||
"${CURRENT_PACKAGES_DIR}/share/aclocal" | ||
) | ||
|
||
file(GLOB BINS "${CURRENT_PACKAGES_DIR}/debug/bin/*" "${CURRENT_PACKAGES_DIR}/bin/*") | ||
if(NOT BINS) | ||
file(REMOVE_RECURSE | ||
"${CURRENT_PACKAGES_DIR}/bin" | ||
"${CURRENT_PACKAGES_DIR}/debug/bin" | ||
) | ||
endif() | ||
|
||
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_IS_MINGW) | ||
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") | ||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") | ||
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/SDL2main.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/SDL2main.lib") | ||
endif() | ||
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") | ||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") | ||
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/SDL2maind.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/SDL2maind.lib") | ||
endif() | ||
|
||
file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/sdl2/*.cmake") | ||
foreach(SHARE_FILE ${SHARE_FILES}) | ||
vcpkg_replace_string("${SHARE_FILE}" "lib/SDL2main" "lib/manual-link/SDL2main") | ||
endforeach() | ||
endif() | ||
|
||
vcpkg_copy_pdbs() | ||
|
||
set(DYLIB_COMPATIBILITY_VERSION_REGEX "set\\(DYLIB_COMPATIBILITY_VERSION (.+)\\)") | ||
set(DYLIB_CURRENT_VERSION_REGEX "set\\(DYLIB_CURRENT_VERSION (.+)\\)") | ||
file(STRINGS "${SOURCE_PATH}/CMakeLists.txt" DYLIB_COMPATIBILITY_VERSION REGEX ${DYLIB_COMPATIBILITY_VERSION_REGEX}) | ||
file(STRINGS "${SOURCE_PATH}/CMakeLists.txt" DYLIB_CURRENT_VERSION REGEX ${DYLIB_CURRENT_VERSION_REGEX}) | ||
string(REGEX REPLACE ${DYLIB_COMPATIBILITY_VERSION_REGEX} "\\1" DYLIB_COMPATIBILITY_VERSION "${DYLIB_COMPATIBILITY_VERSION}") | ||
string(REGEX REPLACE ${DYLIB_CURRENT_VERSION_REGEX} "\\1" DYLIB_CURRENT_VERSION "${DYLIB_CURRENT_VERSION}") | ||
|
||
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") | ||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2main" "-lSDL2maind") | ||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2d ") | ||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2-static " "-lSDL2-staticd ") | ||
endif() | ||
|
||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) | ||
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") | ||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/sdl2.pc" "-lSDL2-static " " ") | ||
endif() | ||
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") | ||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2-staticd " " ") | ||
endif() | ||
endif() | ||
|
||
if(VCPKG_TARGET_IS_UWP) | ||
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") | ||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/sdl2.pc" "$<$<CONFIG:Debug>:d>.lib" "") | ||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/sdl2.pc" "-l-nodefaultlib:" "-nodefaultlib:") | ||
endif() | ||
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") | ||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "$<$<CONFIG:Debug>:d>.lib" "d") | ||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-l-nodefaultlib:" "-nodefaultlib:") | ||
endif() | ||
endif() | ||
|
||
vcpkg_fixup_pkgconfig() | ||
|
||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") | ||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
sdl2 provides CMake targets: | ||
|
||
find_package(SDL2 CONFIG REQUIRED) | ||
target_link_libraries(main | ||
PRIVATE | ||
$<TARGET_NAME_IF_EXISTS:SDL2::SDL2main> | ||
$<IF:$<TARGET_EXISTS:SDL2::SDL2>,SDL2::SDL2,SDL2::SDL2-static> | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
{ | ||
"name": "sdl2", | ||
"version": "2.28.2", | ||
"description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", | ||
"homepage": "https://www.libsdl.org/download-2.0.php", | ||
"license": "Zlib", | ||
"dependencies": [ | ||
{ | ||
"name": "vcpkg-cmake", | ||
"host": true | ||
}, | ||
{ | ||
"name": "vcpkg-cmake-config", | ||
"host": true | ||
} | ||
], | ||
"default-features": [ | ||
"base" | ||
], | ||
"features": { | ||
"base": { | ||
"description": "Base functionality for SDL", | ||
"dependencies": [ | ||
{ | ||
"name": "sdl2", | ||
"default-features": false, | ||
"features": [ | ||
"ibus", | ||
"wayland", | ||
"x11" | ||
], | ||
"platform": "linux" | ||
} | ||
] | ||
}, | ||
"ibus": { | ||
"description": "Build with ibus IME support", | ||
"supports": "linux" | ||
}, | ||
"samplerate": { | ||
"description": "Use libsamplerate for audio rate conversion", | ||
"dependencies": [ | ||
"libsamplerate" | ||
] | ||
}, | ||
"vulkan": { | ||
"description": "Vulkan functionality for SDL" | ||
}, | ||
"wayland": { | ||
"description": "Build with Wayland support", | ||
"dependencies":[ | ||
{ | ||
"name": "libdecor", | ||
"features": [ | ||
"gtk" | ||
] | ||
} | ||
], | ||
"supports": "linux" | ||
}, | ||
"x11": { | ||
"description": "Build with X11 support", | ||
"supports": "!windows" | ||
} | ||
} | ||
} |