aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2021-02-25 05:49:53 +0800
committerGitHub <noreply@github.com>2021-02-24 13:49:53 -0800
commit6a46f50134494b92f0c0cf8142bfdbfaf865f007 (patch)
tree23bf242e796807f72d0d60e7eb771f4ed71d6153
parentc3de6c271eb87205e8d92755f22699bde4e4eb53 (diff)
downloadvcpkg-6a46f50134494b92f0c0cf8142bfdbfaf865f007.tar.gz
vcpkg-6a46f50134494b92f0c0cf8142bfdbfaf865f007.zip
[sdl2] Update patch (#16370)
* [SDl2] Update patch * update versions
-rw-r--r--ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch8
-rw-r--r--ports/sdl2/vcpkg.json2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/s-/sdl2.json5
4 files changed, 12 insertions, 5 deletions
diff --git a/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch b/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch
index 5dd4ad83c..bef831556 100644
--- a/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch
+++ b/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch
@@ -1,6 +1,8 @@
---- CMakeLists.orig.txt 2020-10-28 09:08:51.925900284 +0100
-+++ CMakeLists.txt 2020-10-28 09:09:10.034165780 +0100
-@@ -1240,12 +1240,6 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 06aa026..81d7645 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1240,12 +1240,6 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID AND NOT RISCOS)
set(HAVE_FCITX TRUE)
endif()
diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json
index 0babf17fb..691875670 100644
--- a/ports/sdl2/vcpkg.json
+++ b/ports/sdl2/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "sdl2",
"version-string": "2.0.14",
- "port-version": 2,
+ "port-version": 3,
"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",
"features": {
diff --git a/versions/baseline.json b/versions/baseline.json
index 3fedc7bc9..3372234e1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5282,7 +5282,7 @@
},
"sdl2": {
"baseline": "2.0.14",
- "port-version": 2
+ "port-version": 3
},
"sdl2-gfx": {
"baseline": "1.0.4",
diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json
index b1b45b6ec..fba093c63 100644
--- a/versions/s-/sdl2.json
+++ b/versions/s-/sdl2.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "07b3a3a427d35ed4ba0a154d7ff3e34be2f0ddfb",
+ "version-string": "2.0.14",
+ "port-version": 3
+ },
+ {
"git-tree": "df27b00967d099fabd3b9315a02105bd3e1be3d1",
"version-string": "2.0.14",
"port-version": 2