Skip to content

Commit

Permalink
Update sdl2 deps to reflect the same targeted in kivy/kivy (#881)
Browse files Browse the repository at this point in the history
* Update sdl2 deps to reflect the same targeted in kivy/kivy

* Fix include folder for sdl_image

* sdl_image 2.8.0 has been released
  • Loading branch information
misl6 committed Dec 16, 2023
1 parent b54e7b5 commit 5333c35
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 26 deletions.
2 changes: 1 addition & 1 deletion kivy_ios/recipes/sdl2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@


class LibSDL2Recipe(Recipe):
version = "2.24.1"
version = "2.28.5"
url = "https://github.com/libsdl-org/SDL/releases/download/release-{version}/SDL2-{version}.tar.gz"
library = "Xcode/SDL/build/Release-{plat.sdk}/libSDL2.a"
include_dir = "include"
Expand Down
13 changes: 2 additions & 11 deletions kivy_ios/recipes/sdl2_image/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,13 @@


class LibSDL2ImageRecipe(Recipe):
version = "2.6.2"
version = "2.8.0"
url = "https://github.com/libsdl-org/SDL_image/releases/download/release-{version}/SDL2_image-{version}.tar.gz"
library = "Xcode/build/Release-{plat.sdk}/libSDL2_image.a"
include_dir = "SDL_image.h"
include_dir = "include/SDL_image.h"
depends = ["sdl2"]
pbx_frameworks = ["CoreGraphics", "MobileCoreServices"]

def prebuild_platform(self, plat):
if self.has_marker("patched"):
return
# fix-ios-xcodebuild is a patch taken from the SDL2_image repo
# (See: https://github.com/libsdl-org/SDL_image/pull/292)
# We will need to remove it once is included into a release
self.apply_patch("fix-ios-xcodebuild.patch")
self.set_marker("patched")

def build_platform(self, plat):
shprint(sh.xcodebuild, self.ctx.concurrent_xcodebuild,
"ONLY_ACTIVE_ARCH=NO",
Expand Down
13 changes: 0 additions & 13 deletions kivy_ios/recipes/sdl2_image/fix-ios-xcodebuild.patch

This file was deleted.

2 changes: 1 addition & 1 deletion kivy_ios/recipes/sdl2_mixer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@


class LibSDL2MixerRecipe(Recipe):
version = "2.6.2"
version = "2.6.3"
url = "https://github.com/libsdl-org/SDL_mixer/releases/download/release-{version}/SDL2_mixer-{version}.tar.gz"
library = "Xcode/build/Release-{plat.sdk}/libSDL2_mixer.a"
include_dir = "include/SDL_mixer.h"
Expand Down

0 comments on commit 5333c35

Please sign in to comment.