Skip to content
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.

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

Update/mesa 23.0.1 #22885

Merged
merged 3 commits into from Apr 21, 2023
Merged

Update/mesa 23.0.1 #22885

merged 3 commits into from Apr 21, 2023

Conversation

csdougliss
Copy link
Contributor

@csdougliss csdougliss commented Feb 28, 2023

Description

Updates Mesa to v23.0.1

Motivation and context

Tools/depends builds would benefit from upgraded Mesa drivers.

libdrm and wayland have been updated as these are pre-requisite versions for mesa 23.

How has this been tested?

Compiled wayland, libdrm and mesa. Linked kodi. Uploaded to target arm device. Video output observed.

Links to files for upload to kodi mirrors:
https://wayland.freedesktop.org/releases/wayland-1.18.0.tar.xz
https://dri.freedesktop.org/libdrm/libdrm-2.4.115.tar.xz
https://archive.mesa3d.org/mesa-23.0.1.tar.xz
https://wayland.freedesktop.org/releases/wayland-protocols-1.24.tar.xz

What is the effect on users?

None

Types of change

  • Improvement (non-breaking change which improves existing functionality)

Checklist:

@enen92 enen92 added Type: Improvement non-breaking change which improves existing functionality Component: Depends v21 Omega labels Feb 28, 2023
@enen92 enen92 added this to the Omega 21.0 Alpha 1 milestone Feb 28, 2023
@fuzzard
Copy link
Contributor

fuzzard commented Mar 1, 2023

00:45:35 Dependency wayland-protocols found: NO found 1.20 but need: '>= 1.24'
00:45:35 Run-time dependency wayland-protocols found: NO 
00:45:35 
00:45:35 meson.build:2127:2: ERROR: Dependency lookup for wayland-protocols with method 'pkgconfig' failed: Invalid version, need 'wayland-protocols' ['>= 1.24'] found '1.20'.
00:45:35 
00:45:35 A full log can be found at /home/jenkins/workspace/LINUX-AARCH64-GLES/tools/depends/target/mesa/aarch64-linux-gnu-debug/build/meson-logs/meson-log.txt
00:45:35 WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated.
00:45:35 yes
00:45:35 make[2]: *** [Makefile:81: aarch64-linux-gnu-debug] Error 1
00:45:35 make[2]: Leaving directory '/home/jenkins/workspace/LINUX-AARCH64-GLES/tools/depends/target/mesa'
00:45:35 make[1]: *** [Makefile:173: mesa] Error 2

Guess you'll need to bump wayland-protocols as well. Fine to do in this same PR, just a separate commit is best

@csdougliss
Copy link
Contributor Author

@fuzzard Done. Weird how mine never complained!!

@fuzzard
Copy link
Contributor

fuzzard commented Mar 1, 2023

They joys of CI, haha

@csdougliss
Copy link
Contributor Author

Jenkins build this please

@csdougliss
Copy link
Contributor Author

Created an issue with mesa, had no reply yet.

https://gitlab.freedesktop.org/mesa/mesa/-/issues/8476

@csdougliss
Copy link
Contributor Author

csdougliss commented Mar 16, 2023

@fuzzard

Do we need x11 for linux 64-bit build? We may need to specify platform for this case. Otherwise it picks up x11. Can we set it to wayland? If not we will have to add -Ddri3=enabled for x11.

https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/meson.build#L300

_platforms = get_option('platforms')
if _platforms.contains('auto')
  if system_has_kms_drm
    _platforms = ['x11', 'wayland']
  elif ['darwin', 'cygwin'].contains(host_machine.system())
    _platforms = ['x11']
  elif ['haiku'].contains(host_machine.system())
    _platforms = ['haiku']
  elif host_machine.system() == 'windows'
    _platforms = ['windows']
  else
    error('Unknown OS @0@. Please pass -Dplatforms to set platforms. Patches gladly accepted to fix this.'.format(
          host_machine.system()))
  endif
endif

@fuzzard
Copy link
Contributor

fuzzard commented Mar 16, 2023

Its used for CI coverage, so yes, it's required.

Edit: lrusak knows best for Linux stuff

@lrusak
Copy link
Contributor

lrusak commented Mar 16, 2023

@fuzzard

Do we need x11 for linux 64-bit build? We may need to specify platform for this case. Otherwise it picks up x11. Can we set it to wayland? If not we will have to add -Ddri3=enabled for x11.

No, Mesa is only built for the GLES builds and only for Wayland/GBM. We don't cross compile all the other x11 libs so we can't build for x11 on arm/aarch64 currently.

@csdougliss
Copy link
Contributor Author

@lrusak Does this change see logical to you:

993b97c

Not sure why android-arm64-docker (android-arm64-docker) fails as I don't see any references to mesa.

@csdougliss csdougliss changed the title Update/mesa 23.0.0 Update/mesa 23.0.1 Mar 27, 2023
@csdougliss
Copy link
Contributor Author

@fuzzard @lrusak built successfully all targets

@fuzzard
Copy link
Contributor

fuzzard commented Apr 15, 2023

@craigcarnell tarballs are uploaded to mirrors now. Safe to drop the base_url commit. could you also squash the mesa 23.0.1 commit into the first commit. As we wont have 23.0.0 on mirrors, it would break bisect, so better to just squash.

@csdougliss
Copy link
Contributor Author

@fuzzard Done

@wsnipex
Copy link
Member

wsnipex commented Apr 19, 2023

the commit message of the last commit is misleading: Build wayland only for gles which also covers arm
how about: "[depends] mesa: build with wayland support only for GLES"?

@csdougliss
Copy link
Contributor Author

@fuzzard @wsnipex updated description of last commit

@fuzzard fuzzard merged commit 9791ae9 into xbmc:master Apr 21, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Depends Type: Improvement non-breaking change which improves existing functionality v21 Omega
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants