Skip to content

Set mesa's dri-search-path to the merged extension mount point #33

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

Draft
refi64 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Set mesa's dri-search-path to the merged extension mount point #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 25 additions & 25 deletions org.freedesktop.Platform.GL.asahi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,22 @@ sdk-extensions:
build-options:
prepend-path: /usr/lib/sdk/llvm15/bin
prepend-ld-library-path: /usr/lib/sdk/llvm15/lib
arch:
x86_64:
prefix: /usr/lib/x86_64-linux-gnu/GL/asahi
prepend-pkg-config-path: /usr/lib/x86_64-linux-gnu/GL/asahi/lib/pkgconfig
libdir: /usr/lib/x86_64-linux-gnu/GL/asahi/lib
# Needs https://github.com/flatpak/flatpak-builder/issues/381 to be resolved before this can actually be used. Until then, only 64-bit builds.
i386:
prefix: /usr/lib/i386-linux-gnu/GL/asahi
prepend-pkg-config-path: /usr/lib/i386-linux-gnu/GL/asahi/lib/pkgconfig
libdir: /usr/lib/i386-linux-gnu/GL/asahi/lib


x-arch-build-options:
x86_64: &x86_64-build-options
prefix: /usr/lib/x86_64-linux-gnu/GL/asahi
prepend-pkg-config-path: /usr/lib/x86_64-linux-gnu/GL/asahi/lib/pkgconfig
libdir: /usr/lib/x86_64-linux-gnu/GL/asahi/lib
# Needs https://github.com/flatpak/flatpak-builder/issues/381 to be resolved before this can actually be used. Until then, only 64-bit builds.
i386:
prefix: /usr/lib/i386-linux-gnu/GL/asahi
prepend-pkg-config-path: /usr/lib/i386-linux-gnu/GL/asahi/lib/pkgconfig
libdir: /usr/lib/i386-linux-gnu/GL/asahi/lib

# org.freedesktop.Sdk.Compat.arm is deprecated, so only build for aarch64.
aarch64: &aarch64-build-options
prefix: /usr/lib/aarch64-linux-gnu/GL/asahi
prepend-pkg-config-path: /usr/lib/aarch64-linux-gnu/GL/asahi/lib/pkgconfig
libdir: /usr/lib/aarch64-linux-gnu/GL/asahi/lib

# org.freedesktop.Sdk.Compat.arm is deprecated, so only build for aarch64.
aarch64:
prefix: /usr/lib/aarch64-linux-gnu/GL/asahi
prepend-pkg-config-path: /usr/lib/aarch64-linux-gnu/GL/asahi/lib/pkgconfig
libdir: /usr/lib/aarch64-linux-gnu/GL/asahi/lib

cleanup:
- /include
Expand All @@ -39,10 +36,6 @@ cleanup:
- '*.a'
modules:
- name: libdrm
build-options:
arch:
x86_64: *x86_64-build-options
aarch64: *aarch64-build-options
buildsystem: meson
config-opts:
- -Dcairo-tests=disabled
Expand All @@ -53,16 +46,23 @@ modules:
url: https://gitlab.freedesktop.org/mesa/drm.git
tag: libdrm-2.4.114
commit: b9ca37b3134861048986b75896c0915cbf2e97f9
# x-checker-data:
# x-checker-data:
# type: git
# tag-pattern: ^libdrm-(\d[\d.]+\d)$


- name: mesa
build-options:
arch:
x86_64: *x86_64-build-options
aarch64: *aarch64-build-options
x86_64:
config-opts:
- -Ddri-search-path=/usr/lib/x86_64-linux-gnu/GL/lib/dri
i386:
config-opts:
- -Ddri-search-path=/usr/lib/i386-linux-gnu/GL/lib/dri
aarch64:
config-opts:
- -Ddri-search-path=/usr/lib/aarch64-linux-gnu/GL/lib/dri

# From upstream: Build only minimal debug info to reduce size
cflags: -g1
Expand Down