Accepting request 681521 from home:Andreas_Schwab:Factory

- Don't enable gallium_loader on ppc and s390x
- Fix configuration on non-gallium archs
- u_dep_xcb.patch: fix missing xcb dependencies

OBS-URL: https://build.opensuse.org/request/show/681521
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=815
This commit is contained in:
2019-03-04 20:05:54 +00:00
committed by Git OBS Bridge
parent 62ce36500a
commit b4a9f5bd73
6 changed files with 75 additions and 38 deletions

29
u_dep_xcb.patch Normal file
View File

@@ -0,0 +1,29 @@
Index: mesa-18.3.4/meson.build
===================================================================
--- mesa-18.3.4.orig/meson.build
+++ mesa-18.3.4/meson.build
@@ -1379,10 +1379,12 @@ if with_platform_x11
dep_x11_xcb = dependency('x11-xcb')
endif
if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')
+ dep_x11_xcb = dependency('x11-xcb')
dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
if with_dri3
pre_args += '-DHAVE_DRI3'
+ dep_xcb = dependency('xcb')
dep_xcb_dri3 = dependency('xcb-dri3')
dep_xcb_present = dependency('xcb-present')
# until xcb-dri3 has been around long enough to make a hard-dependency:
Index: mesa-18.3.4/src/loader/meson.build
===================================================================
--- mesa-18.3.4.orig/src/loader/meson.build
+++ mesa-18.3.4/src/loader/meson.build
@@ -28,6 +28,7 @@ if with_platform_x11 and with_dri3
include_directories : [inc_include, inc_src, inc_drm_uapi],
dependencies : [
dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence,
+ dep_xcb,
],
build_by_default : false,
)