Fixed patching and added pygame prebuild

Author: inclement

recipes/pygame/__init__.py

@@ -1,11 +1,22 @@
 
 from toolchain import PythonRecipe, shprint
+from os.path import exists, join
+import sh
 
 class PygameRecipe(PythonRecipe):
     name = 'pygame'
     version = '1.9.1'
     url = 'http://pygame.org/ftp/pygame-{version}release.tar.gz'
     depends = ['python2', 'sdl']
 
+    def prebuild_armeabi(self):
+        if exists(join(self.get_build_dir('armeabi'), '.patched')):
+            print('Pygame already patched, skipping.')
+            return
+        self.apply_patch(join('patches', 'fix-surface-access.patch'))
+        self.apply_patch(join('patches', 'fix-array-surface.patch'))
+        shprint(sh.touch, join(self.get_build_dir('armeabi'), '.patched'))
+        
+
 
 recipe = PygameRecipe()

toolchain.py

@@ -597,7 +597,8 @@ def apply_patch(self, filename):
         """
         print("Apply patch {}".format(filename))
         filename = join(self.recipe_dir, filename)
-        sh.patch("-t", "-d", self.build_dir, "-p1", "-i", filename)
+        # AND: get_build_dir shouldn't need to hardcode armeabi
+        sh.patch("-t", "-d", join(self.get_build_dir('armeabi'), get_directory(self.versioned_url)), "-p1", "-i", filename)
 
     def copy_file(self, filename, dest):
         print("Copy {} to {}".format(filename, dest))