Skip to content

test: Use .Compat.i386 from freedesktop-sdk instead #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

test: Use .Compat.i386 from freedesktop-sdk instead #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cb9ac5
Revert "com.usebottles.bottles: Remove gamemode"
alatiera Sep 11, 2025
cf515b3
Revert "Drop unused 32-bit compilation configuration"
alatiera Sep 11, 2025
5c56e10
Update runtime to GNOME 49
alatiera Jun 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 28 additions & 20 deletions com.usebottles.bottles.pypi-deps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Generated by req2flatpak.py --requirements-file requirements.txt --yaml --target-platforms 312-x86_64 -o com.usebottles.bottles.pypi-deps.yaml
# Generated by req2flatpak.py --requirements-file requirements.txt --yaml --target-platforms 313-x86_64 -o com.usebottles.bottles.pypi-deps.yaml
name: python3-package-installation
buildsystem: simple
build-commands:
- pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
--prefix=${FLATPAK_DEST} --no-build-isolation wheel PyYAML pycurl chardet requests
Markdown icoextract patool pathvalidate FVS orjson pycairo PyGObject charset-normalizer
idna urllib3 certifi pefile
numpy pyfluidsynth idna urllib3 certifi pefile
sources:
- type: file
url: https://files.pythonhosted.org/packages/f7/2f/cc09899755f94b36e7f570b9f9ca19a5fdff536e2614fd3ac1c28bb777f6/FVS-0.3.4.tar.gz
Expand All @@ -17,19 +17,19 @@ sources:
url: https://files.pythonhosted.org/packages/2b/58/d34e67a79631177e3c08e7d02b5165147f590171f2cae6769502af5f7f7e/pygobject-3.50.0.tar.gz
sha256: 4500ad3dbf331773d8dedf7212544c999a76fc96b63a91b3dcac1e5925a1d103
- type: file
url: https://files.pythonhosted.org/packages/b9/2b/614b4752f2e127db5cc206abc23a8c19678e92b23c3db30fc86ab731d3bd/PyYAML-6.0.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256: 80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476
url: https://files.pythonhosted.org/packages/04/24/b7721e4845c2f162d26f50521b825fb061bc0a5afcf9a386840f23ea19fa/PyYAML-6.0.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256: 70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5
only-arches:
- x86_64
- type: file
url: https://files.pythonhosted.org/packages/12/90/3c9ff0512038035f59d279fddeb79f5f1eccd8859f06d6163c58798b9487/certifi-2024.8.30-py3-none-any.whl
sha256: 922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8
url: https://files.pythonhosted.org/packages/38/fc/bce832fd4fd99766c04d1ee0eead6b0ec6486fb100ae5e74c1d91292b982/certifi-2025.1.31-py3-none-any.whl
sha256: ca78db4565a652026a4db2bcdf68f2fb589ea80d0be70e03929ed730746b84fe
- type: file
url: https://files.pythonhosted.org/packages/38/6f/f5fbc992a329ee4e0f288c1fe0e2ad9485ed064cac731ed2fe47dcc38cbf/chardet-5.2.0-py3-none-any.whl
sha256: e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970
- type: file
url: https://files.pythonhosted.org/packages/ee/fb/14d30eb4956408ee3ae09ad34299131fb383c47df355ddb428a7331cfa1e/charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256: 90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b
url: https://files.pythonhosted.org/packages/52/ed/b7f4f07de100bdb95c1756d3a4d17b90c1a3c53715c1a476f8738058e0fa/charset_normalizer-3.4.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256: 955f8851919303c92343d2f66165294848d57e9bba6cf6e3625485a70a038d11
only-arches:
- x86_64
- type: file
Expand All @@ -39,33 +39,41 @@ sources:
url: https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl
sha256: 946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3
- type: file
url: https://files.pythonhosted.org/packages/a0/6b/34e6904ac99df811a06e42d8461d47b6e0c9b86e2fe7ee84934df6e35f0d/orjson-3.10.7-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256: a0c6a008e91d10a2564edbb6ee5069a9e66df3fbe11c9a005cb411f441fd2c09
url: https://files.pythonhosted.org/packages/e4/43/619c2c7a0665aafc80efca465ddb1f260287266bdbdce517396f2f145d49/numpy-2.2.3-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256: 52659ad2534427dffcc36aac76bebdd02b67e3b7a619ac67543bc9bfe6b7cdb1
only-arches:
- x86_64
- type: file
url: https://files.pythonhosted.org/packages/d3/5e/76a9d08b4b4e4583f269cb9f64de267f9aeae0dacef23307f53a14211716/pathvalidate-3.2.1-py3-none-any.whl
sha256: 9a6255eb8f63c9e2135b9be97a5ce08f10230128c4ae7b3e935378b82b22c4c9
url: https://files.pythonhosted.org/packages/22/86/65dc69bd88b6dd254535310e97bc518aa50a39ef9c5a2a5d518e7a223710/orjson-3.10.15-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sha256: e117eb299a35f2634e25ed120c37c641398826c2f5a3d3cc39f5993b96171b9e
only-arches:
- x86_64
- type: file
url: https://files.pythonhosted.org/packages/0e/44/192ede8c7f935643e4c8a56545fcac6ae1b8c50a77f54b2b1c4ab9fcae49/patool-3.0.0-py2.py3-none-any.whl
sha256: 928070d5f82a776534a290a52f4758e2c0dd9cd5a633e3f63f7270c8982833b8
url: https://files.pythonhosted.org/packages/50/14/c5a0e1a947909810fc4c043b84cac472b70e438148d34f5393be1bac663f/pathvalidate-3.2.3-py3-none-any.whl
sha256: 5eaf0562e345d4b6d0c0239d0f690c3bd84d2a9a3c4c73b99ea667401b27bee1
- type: file
url: https://files.pythonhosted.org/packages/62/fc/fb9db09ca1693e9db2e6593418fd6d085bc6293610089d29ffd02d3a64fd/patool-3.1.3-py2.py3-none-any.whl
sha256: 1f33785dbe1d9917c1bfa6ed589696cc07774f4840d17b7fab8b405bdbab90a6
- type: file
url: https://files.pythonhosted.org/packages/54/16/12b82f791c7f50ddec566873d5bdd245baa1491bac11d15ffb98aecc8f8b/pefile-2024.8.26-py3-none-any.whl
sha256: 76f8b485dcd3b1bb8166f1128d395fa3d87af26360c2358fb75b80019b957c6f
- type: file
url: https://files.pythonhosted.org/packages/07/4a/42b26390181a7517718600fa7d98b951da20be982a50cd4afb3d46c2e603/pycairo-1.27.0.tar.gz
sha256: 5cb21e7a00a2afcafea7f14390235be33497a2cce53a98a19389492a60628430
- type: file
url: https://files.pythonhosted.org/packages/65/80/8791945007e2295806bfd0e982e00fee023517b17d5b2d845ca64c81878c/pycurl-7.45.3-cp312-cp312-manylinux_2_28_x86_64.whl
sha256: 3d07c5daef2d0d85949e32ec254ee44232bb57febb0634194379dd14d1ff4f87
url: https://files.pythonhosted.org/packages/bc/ae/4d4ebf0751957209ba8b668624283053dad3f29621a6ef9fb2dc367c6546/pycurl-7.45.4-cp313-cp313-manylinux_2_28_x86_64.whl
sha256: 0470bff6cc24d8c2f63c80931aa239463800871609dafc6bcc9ca10f5a12a04e
only-arches:
- x86_64
- type: file
url: https://files.pythonhosted.org/packages/c4/91/4f6b28ac379da306dde66ba6ac170c4a6e7e1506cadc84a9359fe3f237ba/pyfluidsynth-1.3.4-py3-none-any.whl
sha256: c6990329db7cfb35f5e65d523dd4f0c971d928e70df3a6bceec8864827edf246
- type: file
url: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl
sha256: 70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
- type: file
url: https://files.pythonhosted.org/packages/ce/d9/5f4c13cecde62396b0d3fe530a50ccea91e7dfc1ccf0e09c228841bb5ba8/urllib3-2.2.3-py3-none-any.whl
sha256: ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac
url: https://files.pythonhosted.org/packages/c8/19/4ec628951a74043532ca2cf5d97b7b14863931476d117c471e8e2b1eb39f/urllib3-2.3.0-py3-none-any.whl
sha256: 1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df
- type: file
url: https://files.pythonhosted.org/packages/1b/d1/9babe2ccaecff775992753d8686970b1e2755d21c8a63be73aba7a4e7d77/wheel-0.44.0-py3-none-any.whl
sha256: 2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f
url: https://files.pythonhosted.org/packages/0b/2c/87f3254fd8ffd29e4c02732eee68a83a1d3c346ae39bc6822dcbcb697f2b/wheel-0.45.1-py3-none-any.whl
sha256: 708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248
86 changes: 67 additions & 19 deletions com.usebottles.bottles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ id: com.usebottles.bottles
sdk: org.gnome.Sdk
runtime: org.gnome.Platform
base: org.winehq.Wine
base-version: stable-24.08
runtime-version: &runtime-version '48'
base-version: stable-25.08
runtime-version: '49beta'
command: bottles

finish-args:
Expand All @@ -24,21 +24,25 @@ finish-args:

inherit-extensions:
- org.freedesktop.Platform.GL32
- org.freedesktop.Platform.ffmpeg-full
- org.freedesktop.Platform.ffmpeg_full.i386
- org.winehq.Wine.gecko
- org.winehq.Wine.mono

add-extensions:
org.gnome.Platform.Compat.i386:
org.freedesktop.Platform.Compat.i386:
directory: lib/i386-linux-gnu
version: *runtime-version
version: "25.08"

org.gnome.Platform.Compat.i386.Debug:
org.freedesktop.Platform.Compat.i386.Debug:
directory: lib/debug/lib/i386-linux-gnu
version: *runtime-version
version: "25.08"
no-autodownload: true

org.freedesktop.Platform.codecs_extra.i386:
directory: lib/i386-linux-gnu/codecs-extra
version: '25.08-extra'
autodelete: false
add-ld-path: lib

com.valvesoftware.Steam.CompatibilityTool:
subdirectories: true
directory: share/steam/compatibilitytools.d
Expand All @@ -57,6 +61,19 @@ add-extensions:
no-autodownload: true
autodelete: false

x-compat-i386-opts: &compat_i386_opts
prepend-pkg-config-path: /app/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig
ldflags: -L/app/lib32
append-path: /usr/lib/sdk/toolchain-i386/bin
env:
CC: i686-unknown-linux-gnu-gcc
CXX: i686-unknown-linux-gnu-g++
libdir: /app/lib32

sdk-extensions:
- org.freedesktop.Sdk.Compat.i386
- org.freedesktop.Sdk.Extension.toolchain-i386
Copy link
Contributor

@abderrahim abderrahim Sep 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually not needed at all, you can remove line range from 60 to here

Copy link
Contributor

@abderrahim abderrahim Sep 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#505


cleanup:
- /include
- /lib/pkgconfig
Expand All @@ -72,6 +89,7 @@ cleanup-commands:
- mkdir -p /app/utils
- mkdir -p /app/share/steam/compatibilitytools.d
- mkdir -p /app/share/vulkan/implicit_layer.d/
- mkdir -p /app/lib/i386-linux-gnu/codecs-extra

modules:
# PYPI modules
Expand Down Expand Up @@ -120,6 +138,47 @@ modules:
type: git
tag-pattern: ^sdk-([\d.]+)$

- name: gamemode
buildsystem: meson
config-opts: &gamemode_opts
- -Dwith-examples=false
- -Dwith-util=false
- -Dwith-sd-bus-provider=no-daemon
sources: &gamemode_sources
- type: git
url: https://github.com/FeralInteractive/gamemode
tag: 1.8.2
commit: c54d6d4243b0dd0afcb49f2c9836d432da171a2b
x-checker-data:
type: git
is-important: true
tag-pattern: ^([\d.]+)$

- name: gamemode-32bit
build-options:
arch:
x86_64: *compat_i386_opts
buildsystem: meson
config-opts: *gamemode_opts
sources: *gamemode_sources

- name: gamemoderun
buildsystem: simple
build-commands:
- install -Dm755 data/gamemoderun -t /app/bin
sources: *gamemode_sources

- name: xdpyinfo
buildsystem: autotools
sources:
- type: git
url: https://gitlab.freedesktop.org/xorg/app/xdpyinfo.git
tag: xdpyinfo-1.3.4
commit: ea4083ccb2a5ce4252acabeb2eb7bf49f7be25e0
x-checker-data:
type: git
tag-pattern: ^xdpyinfo-([\d.]+)$

# Libraries
# ----------------------------------------------------------------------------

Expand Down Expand Up @@ -156,17 +215,6 @@ modules:
is-important: true
tag-pattern: ^([\d.]+)$

- name: blueprint-compiler
buildsystem: meson
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/blueprint-compiler.git
tag: 0.18.0
commit: 07c9c9df9cd1b6b4454ecba21ee58211e9144a4b
x-checker-data:
type: git
tag-pattern: ^v([\d.]+)$

- name: vkbasalt-cli
buildsystem: simple
build-commands:
Expand Down