Skip to content

Commit

Permalink
(#16266) sdl2: refactor access to dependencies for conan 2.0 compatib…
Browse files Browse the repository at this point in the history
…ility

* sdl: refactor access to dependencies for conan 2.0 compatibility

* sdl2: remove default dependency on nas

* sdl: newest cmake

* sdl: add package_type

* sdl2: remove old versions and sync wayland requirement

* sdl2: fix libiconv on macos

* sdl: remove logic for older versions and fix libiconv logic on macOS

---------

Co-authored-by: Chris Mc <prince.chrismc@gmail.com>
  • Loading branch information
jcar87 and prince-chrismc authored Apr 11, 2023
1 parent c99e879 commit 3c29d9d
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 200 deletions.
23 changes: 0 additions & 23 deletions recipes/sdl/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,8 @@ sources:
"2.0.20":
url: "https://www.libsdl.org/release/SDL2-2.0.20.tar.gz"
sha256: "c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06"
"2.0.18":
url: "https://www.libsdl.org/release/SDL2-2.0.18.tar.gz"
sha256: "94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c"
"2.0.16":
url: "https://www.libsdl.org/release/SDL2-2.0.16.tar.gz"
sha256: "65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b"
"2.0.14":
url: "https://www.libsdl.org/release/SDL2-2.0.14.tar.gz"
sha256: "d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc"
patches:
"2.0.20":
- patch_file: "patches/0004-2.0.20-ndk.patch"
patch_type: "conan"
patch_description: "ndk patch"
"2.0.16":
- patch_file: "patches/0003-2.0.16-wayland-scanner-buildrequires.patch"
patch_type: "conan"
patch_description: "wayland scanner buildrequires"
"2.0.14":
- patch_file: "patches/0001-fix-cmake-ios-tvos.patch"
patch_type: "conan"
patch_description: "fix cmake ios tvos"
- patch_file: "patches/0002-mingw-improvements.patch"
patch_type: "conan"
patch_description: "mingw improvements"
- patch_file: "patches/0003-2.0.14-wayland-scanner-buildrequires.patch"
patch_type: "conan"
patch_description: "wayland scanner buildrequires"
Loading

0 comments on commit 3c29d9d

Please sign in to comment.