Wed Jul 14 06:34:33 2021 UTC ()
find libgbm in libgbm.old.


(mrg)
diff -r1.1 -r1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile
cvs diff -r1.1 -r1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile 2019/04/16 21:21:51 1.1
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile 2021/07/14 06:34:33 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2019/04/16 21:21:51 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2021/07/14 06:34:33 mrg Exp $
2 2
3XMODULEDIR= ${X11USRLIBDIR}/modules 3XMODULEDIR= ${X11USRLIBDIR}/modules
4 4
5.include "../../../Makefile.serverlib" 5.include "../../../Makefile.serverlib"
6.include "../../../Makefile.servermod" 6.include "../../../Makefile.servermod"
7 7
8LIB= glamoregl 8LIB= glamoregl
9 9
10.PATH: ${X11SRCDIR.xorg-server}/glamor 10.PATH: ${X11SRCDIR.xorg-server}/glamor
11.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/glamor_egl 11.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/glamor_egl
12SRCS= glamor_egl.c \ 12SRCS= glamor_egl.c \
13 glamor_eglmodule.c \ 13 glamor_eglmodule.c \
14 glamor_xf86_xv.c 14 glamor_xf86_xv.c
@@ -20,19 +20,21 @@ CPPFLAGS+= \ @@ -20,19 +20,21 @@ CPPFLAGS+= \
20 -I${X11SRCDIR.xorg-server}/include \ 20 -I${X11SRCDIR.xorg-server}/include \
21 -I${X11SRCDIR.xorg-server}/glamor \ 21 -I${X11SRCDIR.xorg-server}/glamor \
22 -I${X11SRCDIR.xorg-server}/../include \ 22 -I${X11SRCDIR.xorg-server}/../include \
23 -I${DESTDIR}${X11INCDIR}/X11 \ 23 -I${DESTDIR}${X11INCDIR}/X11 \
24 -I${DESTDIR}${X11INCDIR}/pixman-1 \ 24 -I${DESTDIR}${X11INCDIR}/pixman-1 \
25 -I${DESTDIR}${X11INCDIR}/xorg \ 25 -I${DESTDIR}${X11INCDIR}/xorg \
26 -I${DESTDIR}${X11INCDIR}/libdrm \ 26 -I${DESTDIR}${X11INCDIR}/libdrm \
27 -I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \ 27 -I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
28 -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c 28 -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c
29 29
30CPPFLAGS+= \ 30CPPFLAGS+= \
31 -DGLAMOR_HAS_GBM 31 -DGLAMOR_HAS_GBM
32 32
 33.include "../../../../../lib/mesa-which.mk"
 34
33LIBDPLIBS= \ 35LIBDPLIBS= \
34 gbm ${.CURDIR}/../../../../../lib/libgbm 36 gbm ${.CURDIR}/../../../../../lib/libgbm${OLD_SUFFIX}
35 37
36.include <bsd.x11.mk> 38.include <bsd.x11.mk>
37LIBDIR= ${XMODULEDIR} 39LIBDIR= ${XMODULEDIR}
38.include <bsd.lib.mk> 40.include <bsd.lib.mk>