From 5b75c1b4131a5fba27520c87eafb605f3ad06466 Mon Sep 17 00:00:00 2001
From: "lb@lb520" <lb@lb520>
Date: Mon, 12 Aug 2019 09:50:38 +0200
Subject: [PATCH] Further corrections to python3 / android. Card images format
 has been changed to png. And a bugfix.

---
 MANIFEST.in                    |  1 +
 README.android                 | 21 ++++++++++++++++++---
 android/mkcards                |  6 +++---
 android/mkp4a.debug            |  2 +-
 android/mkp4a.init             |  4 ++++
 pysollib/kivy/LApp.py          |  6 ++++++
 pysollib/kivy/selectcardset.py | 12 ++++--------
 7 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 9cb0df19..7d6358c6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -30,6 +30,7 @@ include tests/unit-generated/PLACEHOLDER
 include .tidyallrc
 include android/*.py
 include android/mk*
+include android/initsdk
 include android/debian/*
 #graft data/plugins
 ##
diff --git a/README.android b/README.android
index 756a3b51..ff083227 100644
--- a/README.android
+++ b/README.android
@@ -45,6 +45,11 @@ Prerequisites (needs root):
 
 Build with 'python-for-android' (as user):
 
+  Use the repo or an unpacked distribution tarball.
+
+  $ python setup.py install
+  $ make dist  (if using the repo)
+
   go to the android directory, then
 
   $ ./mkp4a.init [<sdkdir>] [<ndkdir>]        # prepare sdk and p4a installation
@@ -52,7 +57,6 @@ Build with 'python-for-android' (as user):
 
   $ ./mkp4a.debug                             # build debug apk
   $ ./mkp4a.release  <passwd1>  [<passwd2>]   # build release apk
-  $ ./mkp4a.unsigned                          # build an unsigned release apk
 
   The build system will download all required additional
   packages (such as the android sdk and more). Do the first build will
@@ -68,11 +72,22 @@ Build with 'python-for-android' (as user):
 
 Cardsets:
 
-Cardsets should be installed in ${HOME}/.PySolFC/cardsets/. On an
-android device this is equivalent to /sdcard/.PySolFC/cardsets/.
+The Apk includes a minimal set of cards for playing.
+
+Additional cardsets can be installed in ${HOME}/.PySolFC/cardsets/.
+On an android device this is equivalent to /sdcard/.PySolFC/cardsets/.
 Cardsets must use the bmp image format. Use scripts/cardconv
 (on a linux system) to convert them, before copying to the device.
 
+Important Notice on python3/kivy 1.11.x (pysol verson 2.6.4 ff):
+In kivy, using python3, the support for bmp images depends on OpenGL.
+On fairly up to date Android OpenGL ES 3.x is available. ES (Embedded
+System) release is a subset of the full OpenGL. Due to this, bmp image
+support will be broken on android, but not on up to date workstations.
+
+As gif images are still slow and error prone, the best we can do is to
+use png images instead of bmp (as noted above).
+
 Possible known build issues:
 
 2) for android ndk: needs a Version <=13 (because needs ant support).
diff --git a/android/mkcards b/android/mkcards
index c1a31cdd..d28df654 100755
--- a/android/mkcards
+++ b/android/mkcards
@@ -18,9 +18,9 @@ fi
 echo '### processing cardsets'
 (
   cd ${cardsets_dir}
-  ../../scripts/cardconv
-  for i in cardset-*-bmp; do
-    rm -rf `basename $i -bmp`
+  ../../scripts/cardconv gif png
+  for i in cardset-*-png; do
+    rm -rf `basename $i -png`
   done
 )
 
diff --git a/android/mkp4a.debug b/android/mkp4a.debug
index 4256c6d5..25cff219 100755
--- a/android/mkp4a.debug
+++ b/android/mkp4a.debug
@@ -5,7 +5,7 @@ set -eux
 
 new_options=${p4a_options}
 new_options=${new_options/PySolFC/PySolFCdbg}
-new_options=${new_options/org.lubefe16.pysolfc/org.lubefe16.pysolfc.dbg}
+new_options=${new_options/org.lufebe16.pysolfc/org.lufebe16.pysolfc.dbg}
 
 python3 -m pythonforandroid.toolchain apk \
   ${new_options}
diff --git a/android/mkp4a.init b/android/mkp4a.init
index 0aae5b0b..2574ffd6 100755
--- a/android/mkp4a.init
+++ b/android/mkp4a.init
@@ -35,6 +35,10 @@ rm -rf ${tmpdir}/.appveyor.yml
 rm -rf ${tmpdir}/.perltidyrc
 rm -rf ${tmpdir}/.travis.yml
 
+rm -rf ${tmpdir}/setup.py
+rm -rf ${tmpdir}/setup_osx.py
+rm -rf ${tmpdir}/setup.cfg
+
 cp -a main.py ${tmpdir}
 mkdir -p ${tmpdir}/data/images/cards/bottoms/trumps-only
 echo "" > ${tmpdir}/data/images/cards/bottoms/trumps-only/.keep
diff --git a/pysollib/kivy/LApp.py b/pysollib/kivy/LApp.py
index 2355f321..5d4eacab 100644
--- a/pysollib/kivy/LApp.py
+++ b/pysollib/kivy/LApp.py
@@ -1541,6 +1541,12 @@ class LMainWindow(BoxLayout, LTkBase):
         self.workStack = LStack()
         self.app = None
 
+        '''
+        from kivy.graphics import opengl_utils
+        print('OPENGL support:')
+        print(opengl_utils.gl_get_extensions())
+        '''
+
         # self.touches = []
 
         # beispiel zu canvas (hintergrund)
diff --git a/pysollib/kivy/selectcardset.py b/pysollib/kivy/selectcardset.py
index 69b51d12..28b753b7 100644
--- a/pysollib/kivy/selectcardset.py
+++ b/pysollib/kivy/selectcardset.py
@@ -35,17 +35,13 @@ class SelectCardsetDialogWithPreview(MfxDialog):
     _cardset_store = None
 
     def __init__(self, parent, title, app, manager, key=None, **kw):
-        kw = self.initKw(kw)
-        MfxDialog.__init__(self, parent, title, **kw)
-        #
         if key is None:
-            key = manager.getSelected()
+            key = 1
+        self.status = -1
+        self.key = key
         self.app = app
         self.manager = manager
-        self.key = key
-        self.preview_key = -1
-        self.all_keys = []
-        self.status = -1
+        return
 
     def getSelected(self):
         return None