From 5333c35686eeebe9fc252ce0c97c740cbfddb6bf Mon Sep 17 00:00:00 2001 From: Mirko Galimberti Date: Sat, 16 Dec 2023 16:21:44 +0100 Subject: [PATCH] Update sdl2 deps to reflect the same targeted in kivy/kivy (#881) * 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 --- kivy_ios/recipes/sdl2/__init__.py | 2 +- kivy_ios/recipes/sdl2_image/__init__.py | 13 ++----------- .../recipes/sdl2_image/fix-ios-xcodebuild.patch | 13 ------------- kivy_ios/recipes/sdl2_mixer/__init__.py | 2 +- 4 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 kivy_ios/recipes/sdl2_image/fix-ios-xcodebuild.patch diff --git a/kivy_ios/recipes/sdl2/__init__.py b/kivy_ios/recipes/sdl2/__init__.py index 5b7983ce..2954661a 100644 --- a/kivy_ios/recipes/sdl2/__init__.py +++ b/kivy_ios/recipes/sdl2/__init__.py @@ -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" diff --git a/kivy_ios/recipes/sdl2_image/__init__.py b/kivy_ios/recipes/sdl2_image/__init__.py index 58256c11..f0f2b0dd 100644 --- a/kivy_ios/recipes/sdl2_image/__init__.py +++ b/kivy_ios/recipes/sdl2_image/__init__.py @@ -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", diff --git a/kivy_ios/recipes/sdl2_image/fix-ios-xcodebuild.patch b/kivy_ios/recipes/sdl2_image/fix-ios-xcodebuild.patch deleted file mode 100644 index 69e2d662..00000000 --- a/kivy_ios/recipes/sdl2_image/fix-ios-xcodebuild.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Xcode/SDL_image.xcodeproj/project.pbxproj b/Xcode/SDL_image.xcodeproj/project.pbxproj -index a64c8665..69565703 100644 ---- a/Xcode/SDL_image.xcodeproj/project.pbxproj -+++ b/Xcode/SDL_image.xcodeproj/project.pbxproj -@@ -7,7 +7,7 @@ - objects = { - - /* Begin PBXBuildFile section */ -- 007288A80F0DA79800C302A9 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007288A60F0DA79800C302A9 /* ApplicationServices.framework */; }; -+ 007288A80F0DA79800C302A9 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007288A60F0DA79800C302A9 /* ApplicationServices.framework */; platformFilters = (macos, ); }; - 6313BF532785566D00F268AD /* IMG_qoi.c in Sources */ = {isa = PBXBuildFile; fileRef = 6313BF522785566D00F268AD /* IMG_qoi.c */; }; - 6313BF542785566D00F268AD /* IMG_qoi.c in Sources */ = {isa = PBXBuildFile; fileRef = 6313BF522785566D00F268AD /* IMG_qoi.c */; }; - AA23FC7D20A2A1B90017DFB9 /* IMG_svg.c in Sources */ = {isa = PBXBuildFile; fileRef = AA50AA461F9C7C50003B9C0C /* IMG_svg.c */; }; diff --git a/kivy_ios/recipes/sdl2_mixer/__init__.py b/kivy_ios/recipes/sdl2_mixer/__init__.py index 76fae73c..754a8e21 100644 --- a/kivy_ios/recipes/sdl2_mixer/__init__.py +++ b/kivy_ios/recipes/sdl2_mixer/__init__.py @@ -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"