Skip to content

Commit c298a31

Browse files
authored
Update 'SDL2' package to v2.0.12-p0 (#414)
* Update 'SDL2' package to v2.0.12-p0 * rename SDL2 repo to SDL2_legacy * Package 'SDL2' change docs hunterized link
1 parent b71187d commit c298a31

File tree

5 files changed

+48
-37
lines changed

5 files changed

+48
-37
lines changed

cmake/configs/default.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ hunter_default_version(Qwt VERSION 6.1-p3)
142142
hunter_default_version(RapidJSON VERSION 1.1.0-ce81bc9-p1)
143143
hunter_default_version(RapidXML VERSION 1.13)
144144
hunter_default_version(RedisClient VERSION 0.6.1-p1)
145-
hunter_default_version(SDL2 VERSION 2.0.7-p3)
145+
hunter_default_version(SDL2 VERSION 2.0.12-p0)
146146
hunter_default_version(SDL_image VERSION 2.0.1-p1)
147147
hunter_default_version(SDL_mixer VERSION 2.0.2-p0)
148148
hunter_default_version(SDL_ttf VERSION 2.0.14-p0)

cmake/projects/SDL2/hunter.cmake

Lines changed: 39 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ hunter_add_version(
1212
VERSION
1313
"2.0.4-p8"
1414
URL
15-
"https://github.com/hunter-packages/SDL2/archive/2.0.4-p8.tar.gz"
15+
"https://github.com/cpp-pm/SDL2_legacy/archive/2.0.4-p8.tar.gz"
1616
SHA1
17-
568db770b6a137ce576f738638c42df4aa215c31
17+
d2f9aee32e956c9cafd6e2df0c5c5d5d88157047
1818
)
1919

2020
hunter_add_version(
@@ -23,9 +23,9 @@ hunter_add_version(
2323
VERSION
2424
"2.0.4-p7"
2525
URL
26-
"https://github.com/hunter-packages/SDL2/archive/2.0.4-p7.tar.gz"
26+
"https://github.com/cpp-pm/SDL2_legacy/archive/2.0.4-p7.tar.gz"
2727
SHA1
28-
3dddf9fc88868ba4aecc5c1e762f79eac0c06b70
28+
234857bd25d95a134ef6594b30f9e7d7659341ee
2929
)
3030

3131
hunter_add_version(
@@ -34,9 +34,9 @@ hunter_add_version(
3434
VERSION
3535
"2.0.4-p6"
3636
URL
37-
"https://github.com/hunter-packages/SDL2/archive/2.0.4-p6.tar.gz"
37+
"https://github.com/cpp-pm/SDL2_legacy/archive/2.0.4-p6.tar.gz"
3838
SHA1
39-
c3b1e17ec55112f0a60d32707f70dcda5ac1d2ef
39+
c9afdee8153242ee37580876bc8780872ebc0b15
4040
)
4141

4242
hunter_add_version(
@@ -45,9 +45,9 @@ hunter_add_version(
4545
VERSION
4646
"2.0.4-p5"
4747
URL
48-
"https://github.com/hunter-packages/SDL2/archive/2.0.4-p5.tar.gz"
48+
"https://github.com/cpp-pm/SDL2_legacy/archive/2.0.4-p5.tar.gz"
4949
SHA1
50-
14dcb4c439f0dbd71ad0b92184b35e3a7f29e3ca
50+
9eedf2b0fc3c145403ef634ae4ac94b59a3ec9dd
5151
)
5252

5353
hunter_add_version(
@@ -56,9 +56,9 @@ hunter_add_version(
5656
VERSION
5757
"2.0.4-p4"
5858
URL
59-
"https://github.com/hunter-packages/SDL2/archive/2.0.4-p4.tar.gz"
59+
"https://github.com/cpp-pm/SDL2_legacy/archive/2.0.4-p4.tar.gz"
6060
SHA1
61-
589fcb46963b28e9d968646af54add6f4b19890c
61+
4f46d397f5b8165c5ed228ba8108bdecc30dc17b
6262
)
6363

6464
hunter_add_version(
@@ -67,9 +67,9 @@ hunter_add_version(
6767
VERSION
6868
"2.0.4-p3"
6969
URL
70-
"https://github.com/hunter-packages/SDL2/archive/2.0.4-p3.tar.gz"
70+
"https://github.com/cpp-pm/SDL2_legacy/archive/2.0.4-p3.tar.gz"
7171
SHA1
72-
811f7577fb71fd84a391ef8c4878325effb56a8c
72+
74f949eecaad3769f23b9f1e8ab5de992fb735bf
7373
)
7474

7575
hunter_add_version(
@@ -78,9 +78,9 @@ hunter_add_version(
7878
VERSION
7979
"2.0.4-p2"
8080
URL
81-
"https://github.com/hunter-packages/SDL2/archive/2.0.4-p2.tar.gz"
81+
"https://github.com/cpp-pm/SDL2_legacy/archive/2.0.4-p2.tar.gz"
8282
SHA1
83-
dfdcff72966c1b597154f21f59bf4d30964e8795
83+
86d95409083ab0f5afbbc523bcaf06b2b23ce6ec
8484
)
8585

8686
hunter_add_version(
@@ -89,9 +89,9 @@ hunter_add_version(
8989
VERSION
9090
"2.0.4-p1"
9191
URL
92-
"https://github.com/hunter-packages/SDL2/archive/2.0.4-p1.tar.gz"
92+
"https://github.com/cpp-pm/SDL2_legacy/archive/2.0.4-p1.tar.gz"
9393
SHA1
94-
daebe20807e166f62f3671f742e81e8d2959388b
94+
6a518349dc94464692012ccf092f48b691f82320
9595
)
9696

9797
hunter_add_version(
@@ -100,9 +100,9 @@ hunter_add_version(
100100
VERSION
101101
"2.0.7-p1"
102102
URL
103-
"https://github.com/hunter-packages/SDL2/archive/v2.0.7-p1.tar.gz"
103+
"https://github.com/cpp-pm/SDL2_legacy/archive/v2.0.7-p1.tar.gz"
104104
SHA1
105-
a3550bae876c3b6ca7c160a2ee583f04cb38207a
105+
17bd450a46fac5a6de43c0a68b88be02d1497f5a
106106
)
107107

108108
hunter_add_version(
@@ -111,9 +111,9 @@ hunter_add_version(
111111
VERSION
112112
"2.0.7-p2"
113113
URL
114-
"https://github.com/hunter-packages/SDL2/archive/v2.0.7-p2.tar.gz"
114+
"https://github.com/cpp-pm/SDL2_legacy/archive/v2.0.7-p2.tar.gz"
115115
SHA1
116-
276390a8b41667f0f5c9e298825256cf7ac6a24b
116+
5ee9c4801c5ef41340aa6677eb640bbff7716884
117117
)
118118

119119
hunter_add_version(
@@ -122,9 +122,20 @@ hunter_add_version(
122122
VERSION
123123
"2.0.7-p3"
124124
URL
125-
"https://github.com/hunter-packages/SDL2/archive/v2.0.7-p3.tar.gz"
125+
"https://github.com/cpp-pm/SDL2_legacy/archive/v2.0.7-p3.tar.gz"
126126
SHA1
127-
ee6639485622d0f81163cd2c7ee5c54c89e85482
127+
3934d2cb55929f9a0ce69d22b12a06377d966720
128+
)
129+
130+
hunter_add_version(
131+
PACKAGE_NAME
132+
SDL2
133+
VERSION
134+
"2.0.12-p0"
135+
URL
136+
"https://github.com/cpp-pm/SDL/archive/v2.0.12-p0.tar.gz"
137+
SHA1
138+
3c8b785215d415b57a708f54fcb62221f98ffc18
128139
)
129140

130141
hunter_add_version(
@@ -133,9 +144,9 @@ hunter_add_version(
133144
VERSION
134145
"2.0.4-urho-p2"
135146
URL
136-
"https://github.com/hunter-packages/SDL2/archive/v2.0.4-urho-p2.tar.gz"
147+
"https://github.com/cpp-pm/SDL2_legacy/archive/v2.0.4-urho-p2.tar.gz"
137148
SHA1
138-
0d78d5fa59fb009e3ce9125cc518891889d09451
149+
1f6890d0466412fbcad4bcf938fd6b514c799e02
139150
)
140151

141152
hunter_add_version(
@@ -144,9 +155,9 @@ hunter_add_version(
144155
VERSION
145156
"2.0.4-urho-p3"
146157
URL
147-
"https://github.com/hunter-packages/SDL2/archive/v2.0.4-urho-p3.tar.gz"
158+
"https://github.com/cpp-pm/SDL2_legacy/archive/v2.0.4-urho-p3.tar.gz"
148159
SHA1
149-
4890004c9ba78d5aefe86e75b6197272d535c441
160+
86e783b9f111467fa33e8cab503b9092f720c916
150161
)
151162

152163
hunter_add_version(
@@ -155,9 +166,9 @@ hunter_add_version(
155166
VERSION
156167
"2.0.4-urho-p4"
157168
URL
158-
"https://github.com/hunter-packages/SDL2/archive/v2.0.4-urho-p4.tar.gz"
169+
"https://github.com/cpp-pm/SDL2_legacy/archive/v2.0.4-urho-p4.tar.gz"
159170
SHA1
160-
580a574f6da1634500448dddf4a73b80c54d168c
171+
5911cc0320b9418634a7e8294f0e6dbbac44e4cf
161172
)
162173

163174
hunter_pick_scheme(DEFAULT url_sha1_cmake)

docs/packages/pkg/SDL2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SDL2
1010
====
1111

1212
- `Official <https://www.libsdl.org>`__
13-
- `Hunterized <https://github.com/hunter-packages/SDL2>`__
13+
- `Hunterized <https://github.com/cpp-pm/SDL>`__
1414

1515
- `Example <https://github.com/cpp-pm/hunter/blob/master/examples/SDL2/CMakeLists.txt>`__
1616
- Available since `v0.14.29 <https://github.com/cpp-pm/hunter/releases/tag/v0.14.29>`__

examples/SDL2/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ find_package(SDL2 CONFIG REQUIRED)
1111

1212
if(ANDROID)
1313
add_library(main SHARED main.cpp)
14-
elseif(IOS)
15-
# FIXME
16-
add_library(main dummy.cpp)
1714
else()
1815
add_executable(main main.cpp)
1916
endif()
2017

18+
# Fix MinGW / MSYS build
19+
if(MINGW OR MSYS)
20+
target_link_libraries(main
21+
mingw32
22+
)
23+
endif()
24+
2125
target_link_libraries(main
2226
SDL2::SDL2main
2327
SDL2::SDL2)

examples/SDL2/dummy.cpp

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)