From: Emil Velikov <[email protected]>

As pointed out in the ABI tracker[1], epoxy has gone through a few
non-backwards compatible ABI changes, yet preserved the DSO name.

Most noticeable of which, from xserver POV, in epoxy_has_egl_extension()
- s/EGLDisplay */EGLDisplay/.

To avoid unwanted/unexpected 'fun' behaviour, just bump the requirement.
Version 1.2 has been released more than 2 years ago, in May 2014.

[1] https://abi-laboratory.pro/tracker/timeline/libepoxy/
Cc: Eric Anholt <[email protected]>
Cc: Dave Airlie <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
---
We might want this in the stable branch(es)?

Eric, iirc Dave had some ideas about moving libepoxy to fd.o [+ making
it the canonical/upstream source] and was looking for your blessing.

How is that going ? The state of the github repo looks tragic.
---
 configure.ac | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2e35abf..2aa8c85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -828,6 +828,7 @@ LIBDMX="dmx >= 1.0.99.1"
 LIBDRI="dri >= 7.8.0"
 LIBDRM="libdrm >= 2.3.1"
 LIBEGL="egl"
+LIBEPOXY="epoxy >= 1.2"
 LIBGBM="gbm >= 10.2.0"
 LIBGL="gl >= 7.1.0"
 LIBXEXT="xext >= 1.0.99.4"
@@ -2150,7 +2151,7 @@ AM_CONDITIONAL([GLAMOR], [test "x$GLAMOR" = xyes])
 
 if test "x$GLAMOR" = xyes; then
        AC_DEFINE(GLAMOR, 1, [Build glamor])
-       PKG_CHECK_MODULES([GLAMOR], [epoxy])
+       PKG_CHECK_MODULES([GLAMOR], [$LIBEPOXY])
 
        PKG_CHECK_MODULES(GBM, "$LIBGBM", [GBM=yes], [GBM=no])
        if test "x$GBM" = xyes; then
@@ -2503,7 +2504,7 @@ AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && 
test "x$XFAKE" = xyes])
 
 dnl Xwayland DDX
 
-XWAYLANDMODULES="wayland-client >= 1.3.0 $LIBDRM epoxy"
+XWAYLANDMODULES="wayland-client >= 1.3.0 $LIBDRM $LIBEPOXY"
 if test "x$XF86VIDMODE" = xyes; then
        XWAYLANDMODULES="$XWAYLANDMODULES $VIDMODEPROTO"
 fi
-- 
2.10.0

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to