lfs/BMLFS
1
0
Fork 0
mirror of https://github.com/dslm4515/BMLFS.git synced 2025-08-15 22:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added better no-X11 support in libepoxy

Browse Source
This commit is contained in:
dslm4515
2022-01-17 12:19:34 -06:00
parent 45b8c42d3f
commit fd23e8b835
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-scripts/libepoxy.build
View File

@ -26,6 +26,8 @@ cd build &&
# if building on a pure wayland system, add these flags:
export CFLAGS="-DEGL_NO_X11 -DMESA_EGL_NO_X11_HEADERS"
export CXXFLAGS="-DEGL_NO_X11 -DMESA_EGL_NO_X11_HEADERS"
# ... and apply patch:
patch -Np1 -i ../patches/libepoxy-mlfs/fallback-to-libOpenGL-when-GLX-is-disabled.patch
meson --prefix=/usr \
-Ddocs=false \

25
patches/libepoxy-mlfs/fallback-to-libOpenGL-when-GLX-is-disabled.patch Normal file
View File

@ -0,0 +1,25 @@
diff -uNr libepoxy-1.5.9.orig/meson.build libepoxy-1.5.9/meson.build
--- libepoxy-1.5.9.orig/meson.build 2021-08-14 08:55:37.833696000 -0500
+++ libepoxy-1.5.9/meson.build 2022-01-17 11:48:48.843360805 -0600
@@ -164,6 +164,9 @@
# Dependencies
dl_dep = cc.find_library('dl', required: false)
gl_dep = dependency('gl', required: false)
+if not gl_dep.found() and not build_glx
+ gl_dep = dependency('opengl', required: false)
+endif
egl_dep = dependency('egl', required: false)
# Optional dependencies for tests
diff -uNr libepoxy-1.5.9.orig/src/meson.build libepoxy-1.5.9/src/meson.build
--- libepoxy-1.5.9.orig/src/meson.build 2021-08-14 08:55:37.852696000 -0500
+++ libepoxy-1.5.9/src/meson.build 2022-01-17 11:49:46.553361810 -0600
@@ -93,7 +93,7 @@
# pkg-config file, for consumers of Epoxy
gl_reqs = []
if gl_dep.found() and gl_dep.type_name() == 'pkgconfig'
- gl_reqs += 'gl'
+ gl_reqs += gl_dep.name()
endif
if build_egl and egl_dep.found() and egl_dep.type_name() == 'pkgconfig'
gl_reqs += 'egl'