diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index d15d624f969036..d77c0903d07faa 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS x11 SDL_X11 wayland SDL_WAYLAND samplerate SDL_LIBSAMPLERATE + ibus SDL_IBUS ) if ("x11" IN_LIST FEATURES) @@ -27,6 +28,9 @@ 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) @@ -41,7 +45,6 @@ vcpkg_cmake_configure( -DSDL_FORCE_STATIC_VCRT=${FORCE_STATIC_VCRT} -DSDL_LIBC=ON -DSDL_TEST=OFF - -DSDL_IBUS=OFF -DSDL_INSTALL_CMAKEDIR="cmake" -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DSDL_LIBSAMPLERATE_SHARED=OFF diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 2f2b0422f6988e..45c4442e73b0da 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2", "version": "2.26.3", + "port-version": 1, "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", @@ -25,6 +26,7 @@ "name": "sdl2", "default-features": false, "features": [ + "ibus", "wayland", "x11" ], @@ -32,6 +34,10 @@ } ] }, + "ibus": { + "description": "Build with ibus IME support", + "supports": "linux" + }, "samplerate": { "description": "Use libsamplerate for audio rate conversion", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index beb1f0bd61bab9..04a454c838c641 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7042,7 +7042,7 @@ }, "sdl2": { "baseline": "2.26.3", - "port-version": 0 + "port-version": 1 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 21a34ced0c83a3..6ce81cbaadbbe9 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fca6245cea40954b09d7091b4a0ab02b16b3907c", + "version": "2.26.3", + "port-version": 1 + }, { "git-tree": "693dd875c592f310f23cf34ee7fbfb7e1be0dff8", "version": "2.26.3",