Update renpy shared runtime and renpy 8 to 8.4.1

flatpaker/data/com.github.dcbaker.flatpaker.RenPy.7.py2.Sdk.yml

@@ -11,17 +11,6 @@ modules:
   - "modules/renpy-shared.yml"
   - "modules/python-2.7.json"
   - "modules/python2-requirements.json"
-  - name: "python2-cython0"
-    buildsystem: "simple"
-    build-commands:
-      - pip2 install --prefix=${FLATPAK_DEST} --no-deps . --verbose
-      - ln -s ${FLATPAK_DEST}/lib/python2.7/site-packages/cython0.py ${FLATPAK_DEST}/lib/python2.7/site-packages/cython.py
-    sources:
-      - type: "git"
-        url: "https://github.com/dcbaker/cython.git"
-        branch: "cython0"
-    cleanup-platform:
-      - ${FLATPAK_DEST}/bin
   - name: PyGame_SDL2
     buildsystem: simple
     build-commands:
@@ -32,14 +21,12 @@ modules:
         sha256: 8103b73e32604456db3950d4729982cd3243413a651014d06fc8196365ede37a
       - type: patch
         path: patches/pygame-sdl2-7-remove-pathlib.patch
-      - type: patch
-        path: patches/pygame-sdl2-7-use-correct-cython.patch
       - type: patch
         path: patches/pygame-sdl2-7-install-headers.patch
   - name: RenPy
     buildsystem: simple
     build-commands:
-      - RENPY_CYTHON=cython0 RENPY_DEPS_INSTALL="${FLATPAK_DEST}" python2 module/setup.py install --prefix=${FLATPAK_DEST} || exit 1
+      - RENPY_DEPS_INSTALL="${FLATPAK_DEST}" python2 module/setup.py install --prefix=${FLATPAK_DEST} || exit 1
 
       # If this is initialized it tries to write files into a readonly location
       # and causes a crash. It's also not useful since there is no steam in the

flatpaker/data/com.github.dcbaker.flatpaker.RenPy.7.py3.Sdk.yml

@@ -14,7 +14,7 @@ modules:
   - name: PyGame_SDL2
     buildsystem: simple
     build-commands:
-      - pip3 install --prefix=${FLATPAK_DEST} --no-deps .
+      - pip3 install --prefix=${FLATPAK_DEST} --no-deps . --exists-action=i --no-index --no-build-isolation
     sources:
       - type: archive
         url: https://www.renpy.org/dl/7.8.7/pygame_sdl2-2.1.0+renpy7.8.7.tar.gz
@@ -28,7 +28,7 @@ modules:
   - name: RenPy
     buildsystem: simple
     build-commands:
-      - RENPY_CYTHON=cython0 RENPY_DEPS_INSTALL="${FLATPAK_DEST}" pip3 install --prefix=${FLATPAK_DEST} --no-deps ./module || exit 1
+      - RENPY_CYTHON=cython0 RENPY_DEPS_INSTALL="${FLATPAK_DEST}" pip3 install --prefix=${FLATPAK_DEST} --no-deps ./module --exists-action=i --no-index --no-build-isolation || exit 1
 
       # If this is initialized it tries to write files into a readonly location
       # and causes a crash It's also not useful since there is no steam in the

flatpaker/data/com.github.dcbaker.flatpaker.RenPy.8.Sdk.yml

@@ -10,21 +10,67 @@ inherit-extensions:
 modules:
   - "modules/renpy-shared.yml"
   - "modules/python3-requirements.json"
-  - "modules/python3-cython0.yml"
+  - name: assimp
+    buildsystem: cmake-ninja
+    config-opts:
+      - "-DASSIMP_BUILD_SAMPLES=OFF"
+      - "-DASSIMP_WARNINGS_AS_ERRORS=OFF"
+      - "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF"
+      - "-DASSIMP_BUILD_ZLIB=OFF"
+    cleanup:
+      - "/include"
+      - "/lib/*/cmake"
+      - "/lib/*/pkgconfig"
+    sources:
+      - type: "archive"
+        url: "https://github.com/assimp/assimp/archive/refs/tags/v6.0.5.tar.gz"
+        sha256: "edf3749559c2b7d1f758ffb66fc5bec62186221e623b7f2e8969f17ee46ecb6f"
+  - name: glu
+    buildsystem: meson
+    sources:
+      - type: archive
+        url: https://archive.mesa3d.org/glu/glu-9.0.3.tar.xz
+        sha256: bd43fe12f374b1192eb15fe20e45ff456b9bc26ab57f0eee919f96ca0f8a330f
+    cleanup:
+      - "/include"
+      - "/lib/*/*.a"
+      - "/lib/*/*.la"
+      - "/lib/*/pkgconfig"
+  - name: "ftgl"
+    buildsystem: "autotools"
+    config-opts:
+      - "--with-pic"
+      - "--disable-static"
+    cleanup:
+      - "/share"
+      - "/lib/*.la"
+    cleanup-platform:
+      - "/include"
+      - "/lib/cmake"
+      - "/lib/pkgconfig"
+      - "/lib/*.a"
+    sources:
+      - type: "git"
+        url: "https://github.com/frankheckenbach/ftgl"
+        commit: "483639219095ad080538e07ceb5996de901d4e74"
+      - type: "patch"
+        path: "patches/ftgl-disable-docs-demos.patch"
+      - type: "patch"
+        path: "patches/ftgl-fix-illegal-cast.patch"
   - name: PyGame_SDL2
     buildsystem: simple
     build-commands:
-      - pip3 install --prefix=${FLATPAK_DEST} --no-deps .
+      - pip3 install --prefix=${FLATPAK_DEST} --no-deps . --exists-action=i --no-index --no-build-isolation
     sources:
       - type: archive
-        url: https://www.renpy.org/dl/8.3.7/pygame_sdl2-2.1.0+renpy8.3.7.tar.gz
-        sha256: 4630b82d7e9ff3e5a864cd3693b4ef093a8ae9e87c3c7cb9ff5ca7e69299febf
+        url: "https://www.renpy.org/dl/8.4.1/pygame_sdl2-2.1.0+renpy8.4.1.tar.gz"
+        sha256: "ac05762de19f2799784f23f474170b2dab0b63018b8b151291d6dc8afb8b93f8"
       - type: patch
         path: patches/pygame-sdl2-fix-header-install-path.patch
   - name: RenPy
     buildsystem: simple
     build-commands:
-      - RENPY_CYTHON=cython0 RENPY_DEPS_INSTALL="${FLATPAK_DEST}" pip3 install --prefix=${FLATPAK_DEST} --no-deps ./module || exit 1
+      - RENPY_DEPS_INSTALL="${FLATPAK_DEST}" CFLAGS="$CFLAGS $(pkg-config --cflags sdl2 ftgl)" pip3 install --prefix=${FLATPAK_DEST} --no-deps . --exists-action=i --no-index --no-build-isolation || exit 1
 
       # If this is initialized it tries to write files into a readonly location
       # and causes a crash It's also not useful since there is no steam in the
@@ -51,12 +97,12 @@ modules:
         rm -r /app/lib/game || exit 1
     sources:
       - type: archive
-        url: https://www.renpy.org/dl/8.3.7/renpy-8.3.7-source.tar.bz2
-        sha256: fd33248d5eea506ff9017c535b5b77e17edf7a77ddaf1bcf542b9cd261ff3fe5
-      - type: patch
-        path: patches/renpy-setuplib-fix-paths.patch
-      - type: patch
-        path: patches/renpy-ffmpeg-7.patch
+        url: "https://www.renpy.org/dl/8.4.1/renpy-8.4.1-source.tar.bz2"
+        sha256: "29e185b090a59a2415beeaf29e4067471dfc5d4ff296eb53b63d3954e171f2a1"
+      # - type: patch
+      #   path: patches/renpy-setuplib-fix-paths.patch
+      # - type: patch
+      #   path: patches/renpy-ffmpeg-7.patch
       - type: file
         path: files/renpy.py
         dest-filename: renpy-bin

flatpaker/data/modules/python-2.7.json

@@ -7,6 +7,9 @@
             "sha256": "b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43"
         }
     ],
+    "build-options": {
+        "cflags": "-std=c11"
+    },
     "config-opts": [
         "--enable-shared",
         "--with-ensurepip=yes",

flatpaker/data/modules/python2-requirements.json

@@ -4,22 +4,39 @@
     "build-commands": [],
     "modules": [
         {
-            "name": "python2-ecdsa",
+            "name": "python2-six",
             "buildsystem": "simple",
             "build-commands": [
-                "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"ecdsa\" --no-build-isolation"
+                "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"six\" --no-build-isolation"
             ],
             "sources": [
-                {
-                    "type": "file",
-                    "url": "https://files.pythonhosted.org/packages/00/e7/ed3243b30d1bec41675b6394a1daae46349dc2b855cb83be846a5a918238/ecdsa-0.19.0-py2.py3-none-any.whl",
-                    "sha256": "2cea9b88407fdac7bbeca0833b189e4c9c53f2ef1e1eaa29f6224dbc809b707a"
-                },
                 {
                     "type": "file",
                     "url": "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl",
                     "sha256": "4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274"
                 }
+            ],
+            "cleanup": [
+                "/bin",
+                "/share/man/man1"
+            ]
+        },
+        {
+            "name": "python2-ecdsa",
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"ecdsa\" --no-build-isolation"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "url": "https://files.pythonhosted.org/packages/51/79/119091c98e2bf49e24ed9f3ae69f816d715d2904aefa6a2baa039a2ba0b0/ecdsa-0.19.2-py2.py3-none-any.whl",
+                    "sha256": "840f5dc5e375c68f36c1a7a5b9caad28f95daa65185c9253c0c08dd952bb7399"
+                }
+            ],
+            "cleanup": [
+                "/bin",
+                "/share/man/man1"
             ]
         },
         {
@@ -34,6 +51,10 @@
                     "url": "https://files.pythonhosted.org/packages/a7/b2/4140c69c6a66432916b26158687e821ba631a4c9273c474343badf84d3ba/future-1.0.0.tar.gz",
                     "sha256": "bd2968309307861edae1458a4f8a4f3598c03be43b97521076aebf5d94c07b05"
                 }
+            ],
+            "cleanup": [
+                "/bin",
+                "/share/man/man1"
             ]
         },
         {
@@ -53,6 +74,10 @@
                     "url": "https://files.pythonhosted.org/packages/36/58/acf7f35859d541985f0a6ea3c34baaefbfaee23642cf11e85fe36453ae77/pefile-2019.4.18.tar.gz",
                     "sha256": "a5d6e8305c6b210849b47a6174ddf9c452b2888340b8177874b862ba6c207645"
                 }
+            ],
+            "cleanup": [
+                "/bin",
+                "/share/man/man1"
             ]
         },
         {
@@ -87,13 +112,17 @@
                     "url": "https://files.pythonhosted.org/packages/33/cf/8435d5a7159e2a9c83a95896ed596f68cf798005fe107cc655b5c5c14704/urllib3-1.26.20-py2.py3-none-any.whl",
                     "sha256": "0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e"
                 }
+            ],
+            "cleanup": [
+                "/bin",
+                "/share/man/man1"
             ]
         },
         {
             "name": "python2-rsa",
             "buildsystem": "simple",
             "build-commands": [
-                "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"rsa<4.1\" --no-build-isolation"
+                "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"rsa==4.0\" --no-build-isolation"
             ],
             "sources": [
                 {
@@ -106,35 +135,46 @@
                     "url": "https://files.pythonhosted.org/packages/02/e5/38518af393f7c214357079ce67a317307936896e961e35450b70fad2a9cf/rsa-4.0-py2.py3-none-any.whl",
                     "sha256": "14ba45700ff1ec9eeb206a2ce76b32814958a98e372006c8fb76ba820211be66"
                 }
+            ],
+            "cleanup": [
+                "/bin",
+                "/share/man/man1"
             ]
         },
         {
-            "name": "python2-six",
+            "name": "python2-typing",
             "buildsystem": "simple",
             "build-commands": [
-                "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"six\" --no-build-isolation"
+                "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"typing\" --no-build-isolation"
             ],
             "sources": [
                 {
                     "type": "file",
-                    "url": "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl",
-                    "sha256": "4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274"
+                    "url": "https://files.pythonhosted.org/packages/0b/cb/da856e81731833b94da70a08712f658416266a5fb2a9d9e426c8061becef/typing-3.10.0.0-py2-none-any.whl",
+                    "sha256": "c7219ef20c5fbf413b4567092adfc46fa6203cb8454eda33c3fc1afe1398a308"
                 }
+            ],
+            "cleanup": [
+                "/bin",
+                "/share/man/man1"
             ]
         },
         {
-            "name": "python2-typing",
+            "name": "python2-cython",
             "buildsystem": "simple",
             "build-commands": [
-                "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"typing\" --no-build-isolation"
+                "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"cython==0.29.37\" --no-build-isolation"
             ],
             "sources": [
                 {
                     "type": "file",
-                    "url": "https://files.pythonhosted.org/packages/0b/cb/da856e81731833b94da70a08712f658416266a5fb2a9d9e426c8061becef/typing-3.10.0.0-py2-none-any.whl",
-                    "sha256": "c7219ef20c5fbf413b4567092adfc46fa6203cb8454eda33c3fc1afe1398a308"
+                    "url": "https://files.pythonhosted.org/packages/7e/26/9d8de10005fedb1eceabe713348d43bae1dbab1786042ca0751a2e2b0f8c/Cython-0.29.37-py2.py3-none-any.whl",
+                    "sha256": "95f1d6a83ef2729e67b3fa7318c829ce5b07ac64c084cd6af11c228e0364662c"
                 }
+            ],
+            "cleanup": [
+                "*"
             ]
         }
     ]
-}
+}

flatpaker/data/modules/python3-cython0.yml

@@ -1,7 +1,7 @@
 name: "python3-cython0"
 buildsystem: "simple"
 build-commands:
-  - pip3 install --prefix=${FLATPAK_DEST} --no-deps . --verbose
+  - pip3 install --prefix=${FLATPAK_DEST} --no-deps . --verbose --exists-action=i --no-index --no-build-isolation
 sources:
   - type: "git"
     url: "https://github.com/dcbaker/cython.git"