VLC recepie, sdl2 bootstaps improvements

pythonforandroid/bootstraps/pygame/__init__.py

@@ -1,4 +1,4 @@
-from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, logger, info_main, which
+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, info_main
 from os.path import join, exists
 from os import walk
 import glob
@@ -19,6 +19,9 @@ def run_distribute(self):
         #                 self.name)
         src_path = join(self.bootstrap_dir, 'build')
 
+        # AND: Hardcoding armeabi - naughty!
+        arch = ArchAndroid(self.ctx)
+
         with current_directory(self.dist_dir):
 
             info('Creating initial layout')
@@ -40,21 +43,14 @@ def run_distribute(self):
             info('Copying python distribution')
             hostpython = sh.Command(self.ctx.hostpython)
             # AND: This *doesn't* need to be in arm env?
-            shprint(hostpython, '-OO', '-m', 'compileall', self.ctx.get_python_install_dir())
+            shprint(hostpython, '-OO', '-m', 'compileall', self.ctx.get_python_install_dir(),
+                    _tail=10, _filterout="^Listing", _critical=True)
             if not exists('python-install'):
                 shprint(sh.cp, '-a', self.ctx.get_python_install_dir(), './python-install')
 
-            info('Copying libs')
-            # AND: Hardcoding armeabi - naughty!
-            shprint(sh.mkdir, '-p', join('libs', 'armeabi'))
-            for lib in glob.glob(join(self.build_dir, 'libs', 'armeabi', '*')):
-                shprint(sh.cp, '-a', lib, join('libs', 'armeabi'))
-            for lib in glob.glob(join(self.ctx.get_libs_dir('armeabi'), '*')):
-                shprint(sh.cp, '-a', lib, join('libs', 'armeabi'))
-
-            info('Copying java files')
-            for filename in glob.glob(self.ctx.javaclass_dir):
-                shprint(sh.cp, '-a', filename, 'src')
+            self.distribute_libs(arch, [join(self.build_dir, 'libs', arch.arch), self.ctx.get_libs_dir(arch.arch)]);
+            self.distribute_aars(arch)
+            self.distribute_javaclasses(self.ctx.javaclass_dir)
 
             info('Filling private directory')
             if not exists(join('private', 'lib')):
@@ -91,21 +87,7 @@ def run_distribute(self):
                 shprint(sh.rm, '-rf', 'lib-dynload/_testcapi.so')
 
 
-        info('Stripping libraries')
-        env = ArchAndroid(self.ctx).get_env()
-        strip = which('arm-linux-androideabi-strip', env['PATH'])
-        if strip is None:
-            warning('Can\'t find strip in PATH...')
-        strip = sh.Command(strip)
-        filens = shprint(sh.find, join(self.dist_dir, 'private'), join(self.dist_dir, 'libs'),
-                '-iname', '*.so', _env=env).stdout.decode('utf-8')
-        logger.info('Stripping libraries in private dir')
-        for filen in filens.split('\n'):
-            try:
-                strip(filen, _env=env)
-            except sh.ErrorReturnCode_1:
-                logger.debug('Failed to strip ' + 'filen')
-
+        self.strip_libraries(arch)
         super(PygameBootstrap, self).run_distribute()
 
 bootstrap = PygameBootstrap()

pythonforandroid/bootstraps/pygame/build/build.py

@@ -183,7 +183,7 @@ def select(fn):
     tf = tarfile.open(tfn, 'w:gz', format=tarfile.USTAR_FORMAT)
     dirs = []
     for fn, afn in files:
-        print('%s: %s' % (tfn, fn))
+#         print('%s: %s' % (tfn, fn))
         dn = dirname(afn)
         if dn not in dirs:
             # create every dirs first if not exist yet

pythonforandroid/bootstraps/pygame/build/src/org/renpy/android/AssetExtract.java

@@ -60,7 +60,7 @@ public boolean extractTar(String asset, String target) {
                 break;
             }
 
-            Log.i("python", "extracting " + entry.getName());
+            Log.v("python", "extracting " + entry.getName());
 
             if (entry.isDirectory()) {
 

pythonforandroid/bootstraps/sdl2/__init__.py

@@ -1,4 +1,4 @@
-from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, logger, info_main, which
+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, info_main
 from os.path import join, exists
 from os import walk
 import glob
@@ -20,6 +20,9 @@ def run_distribute(self):
             with open('local.properties', 'w') as fileh:
                 fileh.write('sdk.dir={}'.format(self.ctx.sdk_dir))
 
+        # AND: Hardcoding armeabi - naughty!
+        arch = ArchAndroid(self.ctx)
+
         with current_directory(self.dist_dir):
             info('Copying python distribution')
 
@@ -31,19 +34,14 @@ def run_distribute(self):
             hostpython = sh.Command(self.ctx.hostpython)
             # AND: This *doesn't* need to be in arm env?
             shprint(hostpython, '-OO', '-m', 'compileall',
-                    self.ctx.get_python_install_dir())
+                    self.ctx.get_python_install_dir(),
+                    _tail=10, _filterout="^Listing", _critical=True)
             if not exists('python-install'):
                 shprint(sh.cp, '-a', self.ctx.get_python_install_dir(), './python-install')
 
-            info('Copying libs')
-            # AND: Hardcoding armeabi - naughty!
-            shprint(sh.mkdir, '-p', join('libs', 'armeabi'))
-            for lib in glob.glob(join(self.ctx.get_libs_dir('armeabi'), '*')):
-                shprint(sh.cp, '-a', lib, join('libs', 'armeabi'))
-
-            info('Copying java files')
-            for filename in glob.glob(self.ctx.javaclass_dir):
-                shprint(sh.cp, '-a', filename, 'src')
+            self.distribute_libs(arch, [self.ctx.get_libs_dir(arch.arch)])
+            self.distribute_aars(arch)
+            self.distribute_javaclasses(self.ctx.javaclass_dir)
 
             info('Filling private directory')
             if not exists(join('private', 'lib')):
@@ -81,21 +79,7 @@ def run_distribute(self):
                 # shprint(sh.rm, '-rf', 'lib-dynload/_ctypes_test.so')
                 # shprint(sh.rm, '-rf', 'lib-dynload/_testcapi.so')
 
-
-        info('Stripping libraries')
-        env = ArchAndroid(self.ctx).get_env()
-        strip = which('arm-linux-androideabi-strip', env['PATH'])
-        if strip is None:
-            warning('Can\'t find strip in PATH...')
-        strip = sh.Command(strip)
-        filens = shprint(sh.find, join(self.dist_dir, 'private'), join(self.dist_dir, 'libs'),
-                '-iname', '*.so', _env=env).stdout.decode('utf-8')
-        logger.info('Stripping libraries in private dir')
-        for filen in filens.split('\n'):
-            try:
-                strip(filen, _env=env)
-            except sh.ErrorReturnCode_1:
-                logger.debug('Failed to strip ' + 'filen')
+        self.strip_libraries(arch)
         super(SDL2Bootstrap, self).run_distribute()
 
 bootstrap = SDL2Bootstrap()

pythonforandroid/bootstraps/sdl2/build/build.py

@@ -166,7 +166,7 @@ def select(fn):
     tf = tarfile.open(tfn, 'w:gz', format=tarfile.USTAR_FORMAT)
     dirs = []
     for fn, afn in files:
-        print('%s: %s' % (tfn, fn))
+#        print('%s: %s' % (tfn, fn))
         dn = dirname(afn)
         if dn not in dirs:
             # create every dirs first if not exist yet
@@ -249,6 +249,10 @@ def make_package(args):
     default_icon = 'templates/kivy-icon.png'
     shutil.copy(args.icon or default_icon, 'res/drawable/icon.png')
 
+    default_presplash = 'templates/kivy-presplash.jpg'
+    shutil.copy(args.presplash or default_presplash,
+                'res/drawable/presplash.jpg')
+
     versioned_name = (args.name.replace(' ', '').replace('\'', '') +
                       '-' + args.version)
 
@@ -324,6 +328,14 @@ def parse_args(args=None):
                     help='A png file to use as the icon for the application.')
     ap.add_argument('--permission', dest='permissions', action='append',
                     help='The permissions to give this app.')
+    ap.add_argument('--meta-data', dest='meta_data', action='append',
+                    help='Custom key=value to add in application metadata')
+    ap.add_argument('--presplash', dest='presplash',
+                    help=('A jpeg file to use as a screen while the '
+                          'application is loading.'))
+    ap.add_argument('--wakelock', dest='wakelock', action='store_true',
+                    help=('Indicate if the application needs the device '
+                          'to stay on'))
 
     if args is None:
         args = sys.argv[1:]
@@ -333,6 +345,9 @@ def parse_args(args=None):
     if args.permissions is None:
         args.permissions = []
 
+    if args.meta_data is None:
+        args.meta_data = []
+
     make_package(args)
 
 if __name__ == "__main__":

pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java

@@ -7,23 +7,34 @@
 import java.io.FileWriter;
 import java.io.File;
 
+import android.view.ViewGroup;
+import android.view.SurfaceView;
 import android.app.Activity;
 import android.util.Log;
 import android.widget.Toast;
 import android.os.Bundle;
+import android.os.PowerManager;
+import android.graphics.PixelFormat;
+import android.view.SurfaceHolder;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.ApplicationInfo;
 
 import org.libsdl.app.SDLActivity;
 
 import org.renpy.android.ResourceManager;
 import org.renpy.android.AssetExtract;
 
+
 public class PythonActivity extends SDLActivity {
     private static final String TAG = "PythonActivity";
 
     public static PythonActivity mActivity = null;
 
-    private ResourceManager resourceManager;
-
+    private ResourceManager resourceManager = null;
+    private Bundle mMetaData = null;
+    private PowerManager.WakeLock mWakeLock = null;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Log.v(TAG, "My oncreate running");
@@ -48,6 +59,25 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
         // nativeSetEnv("ANDROID_ARGUMENT", getFilesDir());
+
+        try {
+            Log.v(TAG, "Access to our meta-data...");
+            this.mMetaData = this.mActivity.getPackageManager().getApplicationInfo(
+                    this.mActivity.getPackageName(), PackageManager.GET_META_DATA).metaData;
+
+            PowerManager pm = (PowerManager) this.mActivity.getSystemService(Context.POWER_SERVICE);
+            if ( this.mMetaData.getInt("wakelock") == 1 ) {
+                this.mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "Screen On");
+            }
+            if ( this.mMetaData.getInt("surface.transparent") != 0 ) {
+                Log.v(TAG, "Surface will be transparent.");
+                getSurface().setZOrderOnTop(true);
+                getSurface().getHolder().setFormat(PixelFormat.TRANSPARENT);
+            } else {
+                Log.i(TAG, "Surface will NOT be transparent");
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+        }
     }
 
     // This is just overrides the normal SDLActivity, which just loads
@@ -169,6 +199,13 @@ public void unpackData(final String resource, File target) {
                 Log.w("python", e);
             }
         }
+    }
+
+    public static ViewGroup getLayout() {
+        return   mLayout;
+    }
 
+    public static SurfaceView getSurface() {
+        return   mSurface;
     }
 }

pythonforandroid/bootstraps/sdl2/build/src/org/renpy/android/AssetExtract.java

@@ -60,7 +60,7 @@ public boolean extractTar(String asset, String target) {
                 break;
             }
 
-            Log.i("python", "extracting " + entry.getName());
+            Log.v("python", "extracting " + entry.getName());
 
             if (entry.isDirectory()) {
 

pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.xml.tmpl

@@ -38,6 +38,11 @@
                  android:allowBackup="true"
                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                  android:hardwareAccelerated="true" >
+
+        {% for m in args.meta_data %}
+        <meta-data android:name="{{ m.split('=', 1)[0] }}" android:value="{{ m.split('=', 1)[-1] }}"/>{% endfor %}
+        <meta-data android:name="wakelock" android:value="{% if args.wakelock %}1{% else %}0{% endif %}"/>
+
         <activity android:name="org.kivy.android.PythonActivity"
                   android:label="@string/app_name"
                   android:configChanges="keyboardHidden|orientation"

pythonforandroid/bootstraps/sdl2python3/__init__.py

@@ -1,4 +1,4 @@
-from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, logger, info_main, which
+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, info_main
 from os.path import join, exists
 from os import walk
 import glob
@@ -22,6 +22,9 @@ def run_distribute(self):
             with open('local.properties', 'w') as fileh:
                 fileh.write('sdk.dir={}'.format(self.ctx.sdk_dir))
 
+        # AND: Hardcoding armeabi - naughty!
+        arch = ArchAndroid(self.ctx)
+
         with current_directory(self.dist_dir):
             info('Copying python distribution')
 
@@ -37,15 +40,9 @@ def run_distribute(self):
             if not exists('python-install'):
                 shprint(sh.cp, '-a', join(self.ctx.build_dir, 'python-install'), '.')
 
-            info('Copying libs')
-            # AND: Hardcoding armeabi - naughty!
-            shprint(sh.mkdir, '-p', join('libs', 'armeabi'))
-            for lib in glob.glob(join(self.ctx.libs_dir, '*')):
-                shprint(sh.cp, '-a', lib, join('libs', 'armeabi'))
-
-            info('Copying java files')
-            for filename in glob.glob(join(self.ctx.build_dir, 'java', '*')):
-                shprint(sh.cp, '-a', filename, 'src')
+            self.distribute_libs(arch, [self.ctx.libs_dir])
+            self.distribute_aars(arch)
+            self.distribute_javaclasses(join(self.ctx.build_dir, 'java'))
 
             info('Filling private directory')
             if not exists(join('private', 'lib')):
@@ -85,20 +82,7 @@ def run_distribute(self):
                 # shprint(sh.rm, '-rf', 'lib-dynload/_testcapi.so')
 
 
-        info('Stripping libraries')
-        env = ArchAndroid(self.ctx).get_env()
-        strip = which('arm-linux-androideabi-strip', env['PATH'])
-        if strip is None:
-            warning('Can\'t find strip in PATH...')
-        strip = sh.Command(strip)
-        filens = shprint(sh.find, join(self.dist_dir, 'private'), join(self.dist_dir, 'libs'),
-                '-iname', '*.so', _env=env).stdout.decode('utf-8')
-        logger.info('Stripping libraries in private dir')
-        for filen in filens.split('\n'):
-            try:
-                strip(filen, _env=env)
-            except sh.ErrorReturnCode_1:
-                logger.debug('Failed to strip ' + 'filen')
+        self.strip_libraries(arch)
         super(SDL2Bootstrap, self).run_distribute()
 
 bootstrap = SDL2Bootstrap()

pythonforandroid/bootstraps/sdl2python3/build/src/org/renpy/android/AssetExtract.java

@@ -60,7 +60,7 @@ public boolean extractTar(String asset, String target) {
                 break;
             }
 
-            Log.i("python", "extracting " + entry.getName());
+            Log.v("python", "extracting " + entry.getName());
 
             if (entry.isDirectory()) {
 

pythonforandroid/recipes/pygame/__init__.py

@@ -34,6 +34,7 @@ def prebuild_armeabi(self):
                 join(self.get_build_dir('armeabi'), 'Setup'))
         self.apply_patch(join('patches', 'fix-surface-access.patch'))
         self.apply_patch(join('patches', 'fix-array-surface.patch'))
+        self.apply_patch(join('patches', 'fix-sdl-spam-log.patch'))
         shprint(sh.touch, join(self.get_build_container_dir('armeabi'), '.patched'))
 
     def build_armeabi(self):
@@ -59,7 +60,8 @@ def build_armeabi(self):
         with current_directory(self.get_build_dir('armeabi')):
             info('hostpython is ' + self.ctx.hostpython)
             hostpython = sh.Command(self.ctx.hostpython)
-            shprint(hostpython, 'setup.py', 'install', '-O2', _env=env)
+            shprint(hostpython, 'setup.py', 'install', '-O2', _env=env,
+                    _tail=10, _critical=True)
 
             info('strip is ' + env['STRIP'])
             build_lib = glob.glob('./build/lib*')