Skip to content

Commit 7eb3b2f

Browse files
misl6misl6
committed
MetalANGLE support
1 parent 9bb9efe commit 7eb3b2f

File tree

4 files changed

+84
-30
lines changed

4 files changed

+84
-30
lines changed

‎recipes/kivy/__init__.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class KivyRecipe(CythonRecipe):
2020
library = "libkivy.a"
2121
depends = ["sdl2", "sdl2_image", "sdl2_mixer", "sdl2_ttf", "ios",
2222
"pyobjus", "python"]
23-
pbx_frameworks = ["OpenGLES", "Accelerate", "CoreMedia", "CoreVideo"]
23+
pbx_frameworks = ["Accelerate", "CoreMedia", "CoreVideo"]
2424
pre_build_ext = True
2525

2626
def get_recipe_env(self, arch):
@@ -43,17 +43,22 @@ def _remove_line(lines, pattern):
4343
for line in lines[:]:
4444
if pattern in line:
4545
lines.remove(line)
46+
def _sub_pattern(lines, pattern_old, pattern_new):
47+
for i, line in enumerate(lines[:]):
48+
if pattern_old in line:
49+
lines[i] = lines[i].replace(pattern_old, pattern_new)
4650
with open(pyconfig) as fd:
4751
lines = fd.readlines()
4852
_remove_line(lines, "flags['libraries'] = ['GLESv2']")
53+
_sub_pattern(lines, "OpenGLES", "MetalANGLE")
4954
#_remove_line(lines, "c_options['use_sdl'] = True")
5055
with open(pyconfig, "w") as fd:
5156
fd.writelines(lines)
5257

5358
def reduce_python_package(self):
5459
dest_dir = join(self.ctx.site_packages_dir, "kivy")
55-
shutil.rmtree(join(dest_dir, "tools"))
56-
shutil.rmtree(join(dest_dir, "tests"))
60+
# shutil.rmtree(join(dest_dir, "tools"))
61+
# shutil.rmtree(join(dest_dir, "tests"))
5762

5863

5964
recipe = KivyRecipe()

‎recipes/metalangle/__init__.py‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
from toolchain import Recipe, shprint
2+
from os.path import join
3+
import sh
4+
5+
6+
class MetalAngleFramework(Recipe):
7+
version = "master"
8+
url = "https://github.com/kakashidinho/metalangle/archive/{version}.zip"
9+
frameworks = [dict(name="MetalANGLE", path="ios/xcode/build/Release-{arch.sdk}/MetalANGLE.framework")]
10+
11+
def prebuild_arch(self, arch):
12+
if self.has_marker("thirdparty_downloaded"):
13+
return
14+
shprint(sh.sh, join(self.build_dir, "ios", "xcode", "fetchDependencies.sh"))
15+
self.set_marker("thirdparty_downloaded")
16+
17+
def build_arch(self, arch):
18+
shprint(sh.xcodebuild, self.ctx.concurrent_xcodebuild,
19+
"ONLY_ACTIVE_ARCH=NO",
20+
"ARCHS={}".format(arch.arch),
21+
"-sdk", arch.sdk,
22+
"-project", "ios/xcode/OpenGLES.xcodeproj",
23+
"-target", "MetalANGLE",
24+
"-configuration", "Release")
25+
26+
27+
recipe = MetalAngleFramework()

‎recipes/sdl2/__init__.py‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,34 @@
11
from toolchain import Recipe, shprint
22
import sh
3+
from os.path import join
34

45

56
class LibSDL2Recipe(Recipe):
67
# version = "2.0.9"
78
# url = "https://www.libsdl.org/release/SDL2-{version}.tar.gz"
8-
version = "7cc4fc886d9e"
9-
url = "https://hg.libsdl.org/SDL/archive/{version}.tar.gz"
9+
version = "metalangle"
10+
url = "https://github.com/misl6/SDL-mirror/archive/{version}.zip"
1011
library = "Xcode-iOS/SDL/build/Release-{arch.sdk}/libSDL2.a"
1112
include_dir = "include"
12-
pbx_frameworks = [
13-
"OpenGLES", "AudioToolbox", "QuartzCore", "CoreGraphics",
14-
"CoreMotion", "GameController", "AVFoundation", "Metal",
15-
"UIKit"]
13+
depends = ["metalangle"]
14+
pbx_frameworks = ["AudioToolbox", "QuartzCore", "CoreGraphics", "CoreMotion",
15+
"GameController", "AVFoundation", "Metal", "UIKit", "MetalANGLE"]
1616

1717
def prebuild_arch(self, arch):
1818
if self.has_marker("patched"):
1919
return
20-
self.apply_patch("uikit-transparent.patch")
20+
# self.apply_patch("uikit-transparent.patch")
21+
22+
def _sub_pattern(lines, pattern_old, pattern_new):
23+
for i, line in enumerate(lines[:]):
24+
if pattern_old in line:
25+
lines[i] = lines[i].replace(pattern_old, pattern_new)
26+
sdl2pbxproj = join(self.build_dir, "Xcode-iOS", "SDL", "SDL.xcodeproj", "project.pbxproj")
27+
with open(sdl2pbxproj) as fd:
28+
lines = fd.readlines()
29+
_sub_pattern(lines, "--YOURFRAMEMETALANGLEWORKPATH--", join(self.ctx.dist_dir, 'frameworks'))
30+
with open(sdl2pbxproj, "w") as fd:
31+
fd.writelines(lines)
2132
self.set_marker("patched")
2233

2334
def build_arch(self, arch):

‎toolchain.py‎

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -854,8 +854,13 @@ def build_all(self):
854854
self.make_lipo(static_fn, library)
855855
logger.info("Install include files for {}".format(self.name))
856856
self.install_include()
857-
logger.info("Install frameworks for {}".format(self.name))
858-
self.install_frameworks()
857+
if self.frameworks:
858+
logger.info("Make lipo framework for {}".format(self.name))
859+
for framework in self.frameworks:
860+
framework_fn = join(self.ctx.dist_dir, "frameworks", "{}.framework".format(framework['name']))
861+
ensure_dir(dirname(framework_fn))
862+
logger.info(" - Lipo-ize {}".format(framework['name']))
863+
self.make_lipo_framework(framework_fn, framework)
859864
logger.info("Install sources for {}".format(self.name))
860865
self.install_sources()
861866
logger.info("Install {}".format(self.name))
@@ -905,20 +910,24 @@ def make_lipo(self, filename, library=None):
905910
shprint(sh.lipo, "-create", "-output", filename, *args)
906911

907912
@cache_execution
908-
def install_frameworks(self):
909-
if not self.frameworks:
913+
def make_lipo_framework(self, filename, framework=None):
914+
if framework is None:
915+
framework = self.framework
916+
if not framework:
910917
return
911-
arch = self.filtered_archs[0]
912-
build_dir = self.get_build_dir(arch.arch)
913-
for framework in self.frameworks:
914-
logger.info("Install Framework {}".format(framework))
915-
src = join(build_dir, framework)
916-
dest = join(self.ctx.dist_dir, "frameworks", framework)
917-
ensure_dir(dirname(dest))
918-
if exists(dest):
919-
shutil.rmtree(dest)
920-
logger.debug("Copy {} to {}".format(src, dest))
921-
shutil.copytree(src, dest)
918+
args = []
919+
ensure_dir(filename)
920+
for arch in self.filtered_archs:
921+
framework_p = framework['path'].format(arch=arch)
922+
args += [join(self.get_build_dir(arch.arch), framework_p, framework['name'])]
923+
logger.info("Copy the framework folder for Headers, Info.plst, etc in place")
924+
shprint(sh.cp, "-r",
925+
join(self.get_build_dir(self.filtered_archs[0].arch),
926+
framework['path'].format(arch=self.filtered_archs[0])),
927+
join(self.ctx.dist_dir, "frameworks"))
928+
shprint(sh.rm, join(filename, framework['name']))
929+
logger.info("Lipo-ize the framework")
930+
shprint(sh.lipo, "-create", "-output", join(filename, framework['name']), *args)
922931

923932
@cache_execution
924933
def install_sources(self):
@@ -1216,17 +1225,19 @@ def update_pbxproj(filename, pbx_frameworks=None):
12161225
group = project.get_or_create_group("Frameworks")
12171226
g_classes = project.get_or_create_group("Classes")
12181227
file_options = FileOptions(embed_framework=False, code_sign_on_copy=True)
1228+
file_options_embed = FileOptions(embed_framework=True, code_sign_on_copy=True)
12191229
for framework in pbx_frameworks:
1220-
framework_name = "{}.framework".format(framework)
1221-
if framework_name in frameworks:
1230+
if framework in [x['name'] for x in frameworks]:
12221231
logger.info("Ensure {} is in the project (pbx_frameworks, local)".format(framework))
1223-
f_path = join(ctx.dist_dir, "frameworks", framework_name)
1232+
f_path = join(ctx.dist_dir, "frameworks", f"{framework}.framework")
1233+
project.add_file(f_path, parent=group, tree="DEVELOPER_DIR",
1234+
force=False, file_options=file_options_embed)
12241235
else:
12251236
logger.info("Ensure {} is in the project (pbx_frameworks, system)".format(framework))
12261237
f_path = join(sysroot, "System", "Library", "Frameworks",
12271238
"{}.framework".format(framework))
1228-
project.add_file(f_path, parent=group, tree="DEVELOPER_DIR",
1229-
force=False, file_options=file_options)
1239+
project.add_file(f_path, parent=group, tree="DEVELOPER_DIR",
1240+
force=False, file_options=file_options)
12301241
for library in pbx_libraries:
12311242
logger.info("Ensure {} is in the project (pbx_libraries, dylib+tbd)".format(library))
12321243
f_path = join(sysroot, "usr", "lib",

0 commit comments

Comments
 (0)