Fixes and updates for Ubuntu Touch port (#2510)

Updated to UT 20.04 and Clickable 7

.github/workflows/ubuntu-touch.yml

@@ -67,7 +67,7 @@ jobs:
           ARCH: ${{ matrix.arch }}
         run: |
           ~/.local/bin/clickable build --verbose ${BUILD_TYPE} --arch ${ARCH}  \
-                                      --config mk/clickable/build-with-glew.json
+                                      --config mk/clickable/clickable-glew.yaml
 
       - name: Build (OpenGL with GLbinding)
         if: ${{ matrix.opengl == 'glbinding' }}
@@ -76,7 +76,7 @@ jobs:
           ARCH: ${{ matrix.arch }}
         run: |
           ~/.local/bin/clickable build --verbose ${BUILD_TYPE} --arch ${ARCH}  \
-                                 --config mk/clickable/build-with-glbinding.json
+                                 --config mk/clickable/clickable-glbinding.yaml
 
       - name: Build (no OpenGL)
         if: ${{ matrix.opengl == 'sdl' }}
@@ -92,12 +92,12 @@ jobs:
           path: build.clickable/*.click
           if-no-files-found: ignore
 
-      - name: Publish to Open Store
-        if: ${{ github.ref == 'refs/heads/master' && matrix.build_type == 'Release' && matrix.opengl == 'sdl' }}
-        env:
-          ARCH: ${{ matrix.arch }}
-          OPENSTORE_KEY: ${{ secrets.OPENSTORE_KEY }}
-        run: |
-          ~/.local/bin/clickable publish "* $(git log -1 --pretty=%B |         \
-                                         head -1)" --apikey ${OPENSTORE_KEY}   \
-                                         --arch ${ARCH}
+      #- name: Publish to Open Store
+      #  if: ${{ github.ref == 'refs/heads/master' && matrix.build_type == 'Release' && matrix.opengl == 'sdl' }}
+      #  env:
+      #    ARCH: ${{ matrix.arch }}
+      #    OPENSTORE_KEY: ${{ secrets.OPENSTORE_KEY }}
+      #  run: |
+      #    ~/.local/bin/clickable publish "* $(git log -1 --pretty=%B |         \
+      #                                   head -1)" --apikey ${OPENSTORE_KEY}   \
+      #                                   --arch ${ARCH}

clickable.yaml

@@ -0,0 +1,39 @@
+clickable_minimum_required: 7
+framework: "ubuntu-sdk-20.04"
+builder: "cmake"
+build_dir: "build.clickable"
+dependencies_target:
+  - "libogg-dev"
+  - "libvorbis-dev"
+  - "libopenal-dev"
+  - "libsdl2-dev"
+  - "libsdl2-image-dev"
+  - "libfreetype6-dev"
+  - "libcurl4-openssl-dev"
+  - "libharfbuzz-dev"
+  - "libfribidi-dev"
+  - "libglm-dev"
+  - "zlib1g-dev"
+install_lib:
+  - "/usr/lib/${ARCH_TRIPLET}/libogg.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libvorbis.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libvorbisfile.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libopenal.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2-2.0.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2_image.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2_image-2.0.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libfreetype.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libcurl.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libharfbuzz.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libfribidi.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libasound.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libsndio.so*"
+  - "/lib/${ARCH_TRIPLET}/libz.so.1.2.11"
+build_args:
+  - "-DUBUNTU_TOUCH=ON"
+  - "-DENABLE_OPENGL=OFF"
+  - "-DWARNINGS=ON"
+  - "-DWERROR=ON"
+  - "-DCLICK_ARCH=${ARCH}"
+  - "-DCLICK_FRAMEWORK=ubuntu-sdk-20.04"

mk/clickable/clickable-glbinding.yaml

@@ -0,0 +1,41 @@
+clickable_minimum_required: 7
+framework: "ubuntu-sdk-20.04"
+builder: "cmake"
+build_dir: "build.clickable"
+dependencies_target:
+  - "libogg-dev"
+  - "libvorbis-dev"
+  - "libopenal-dev"
+  - "libsdl2-dev"
+  - "libsdl2-image-dev"
+  - "libfreetype6-dev"
+  - "libcurl4-openssl-dev"
+  - "libglbinding-dev"
+  - "libharfbuzz-dev"
+  - "libfribidi-dev"
+  - "libglm-dev"
+  - "zlib1g-dev"
+install_lib:
+  - "/usr/lib/${ARCH_TRIPLET}/libogg.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libvorbis.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libvorbisfile.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libopenal.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2-2.0.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2_image.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2_image-2.0.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libfreetype.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libcurl.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libglbinding.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libharfbuzz.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libfribidi.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libasound.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libsndio.so*"
+  - "/lib/${ARCH_TRIPLET}/libz.so.1.2.11"
+build_args:
+  - "-DUBUNTU_TOUCH=ON"
+  - "-DGLBINDING_ENABLED=ON"
+  - "-DWARNINGS=ON"
+  - "-DWERROR=ON"
+  - "-DCLICK_ARCH=${ARCH}"
+  - "-DCLICK_FRAMEWORK=ubuntu-sdk-20.04"

mk/clickable/clickable-glew.yaml

@@ -0,0 +1,40 @@
+clickable_minimum_required: 7
+framework: "ubuntu-sdk-20.04"
+builder: "cmake"
+build_dir: "build.clickable"
+dependencies_target:
+  - "libogg-dev"
+  - "libvorbis-dev"
+  - "libopenal-dev"
+  - "libsdl2-dev"
+  - "libsdl2-image-dev"
+  - "libfreetype6-dev"
+  - "libcurl4-openssl-dev"
+  - "libglew-dev"
+  - "libharfbuzz-dev"
+  - "libfribidi-dev"
+  - "libglm-dev"
+  - "zlib1g-dev"
+install_lib:
+  - "/usr/lib/${ARCH_TRIPLET}/libogg.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libvorbis.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libvorbisfile.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libopenal.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2-2.0.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2_image.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2_image-2.0.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libfreetype.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libcurl.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libGLEW.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libharfbuzz.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libfribidi.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libasound.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libsndio.so*"
+  - "/lib/${ARCH_TRIPLET}/libz.so.1.2.11"
+build_args:
+  - "-DUBUNTU_TOUCH=ON"
+  - "-DWARNINGS=ON"
+  - "-DWERROR=ON"
+  - "-DCLICK_ARCH=${ARCH}"
+  - "-DCLICK_FRAMEWORK=ubuntu-sdk-20.04"

mk/clickable/supertux2.apparmor

@@ -3,5 +3,5 @@
         "audio",
         "networking"
     ],
-    "policy_version": 16.04
+    "policy_version": 20.04
 }