Mon Jul 12 09:40:31 2021 UTC ()
look for libglapi in ${OLD_SUFFIX}.  noted by gson.


(mrg)
diff -r1.5 -r1.6 src/external/mit/xorg/lib/libEGL/Makefile
cvs diff -r1.5 -r1.6 src/external/mit/xorg/lib/libEGL/Makefile (switch to unified diff)

--- src/external/mit/xorg/lib/libEGL/Makefile 2019/09/24 19:29:42 1.5
+++ src/external/mit/xorg/lib/libEGL/Makefile 2021/07/12 09:40:31 1.6
@@ -1,127 +1,129 @@ @@ -1,127 +1,129 @@
1# $NetBSD: Makefile,v 1.5 2019/09/24 19:29:42 maya Exp $ 1# $NetBSD: Makefile,v 1.6 2021/07/12 09:40:31 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
 5.include "../mesa-which.mk"
 6
5LIB= EGL 7LIB= EGL
6LIBISCXX= yes 8LIBISCXX= yes
7 9
8SHLIB_MAJOR= 0 10SHLIB_MAJOR= 0
9SHLIB_MINOR= 0 11SHLIB_MINOR= 0
10 12
11#SUBDIR= internal 13#SUBDIR= internal
12 14
13# egl 15# egl
14.PATH: ${X11SRCDIR.Mesa}/src/egl/main 16.PATH: ${X11SRCDIR.Mesa}/src/egl/main
15SRCS.egl= \ 17SRCS.egl= \
16 eglapi.c \ 18 eglapi.c \
17 eglarray.c \ 19 eglarray.c \
18 eglconfig.c \ 20 eglconfig.c \
19 eglcontext.c \ 21 eglcontext.c \
20 eglcurrent.c \ 22 eglcurrent.c \
21 egldevice.c \ 23 egldevice.c \
22 egldisplay.c \ 24 egldisplay.c \
23 egldriver.c \ 25 egldriver.c \
24 eglfallbacks.c \ 26 eglfallbacks.c \
25 eglglobals.c \ 27 eglglobals.c \
26 eglimage.c \ 28 eglimage.c \
27 egllog.c \ 29 egllog.c \
28 eglsurface.c \ 30 eglsurface.c \
29 eglsync.c 31 eglsync.c
30 32
31.PATH: ${X11SRCDIR.Mesa}/src/egl/drivers/dri2 33.PATH: ${X11SRCDIR.Mesa}/src/egl/drivers/dri2
32SRCS.drivers/dri2= \ 34SRCS.drivers/dri2= \
33 egl_dri2.c \ 35 egl_dri2.c \
34 platform_x11.c \ 36 platform_x11.c \
35 platform_drm.c 37 platform_drm.c
36 38
37# XXX notyet 39# XXX notyet
38#SRCS.drivers/dri2+= \ 40#SRCS.drivers/dri2+= \
39# platform_x11_dri3.c 41# platform_x11_dri3.c
40 42
41.PATH: ${X11SRCDIR.Mesa}/src/util 43.PATH: ${X11SRCDIR.Mesa}/src/util
42BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c 44BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c
43SRCS.util= \ 45SRCS.util= \
44 UTILdebug.c \ 46 UTILdebug.c \
45 u_process.c 47 u_process.c
46 48
47.for file in ${SRCS.util} 49.for file in ${SRCS.util}
48CPPFLAGS.${file}+= -I${X11SRCDIR.Mesa}/src/util \ 50CPPFLAGS.${file}+= -I${X11SRCDIR.Mesa}/src/util \
49 -I${X11SRCDIR.Mesa}/src/mesa \ 51 -I${X11SRCDIR.Mesa}/src/mesa \
50 -I${X11SRCDIR.Mesa}/src \ 52 -I${X11SRCDIR.Mesa}/src \
51 -I${X11SRCDIR.Mesa}/src/gallium/include 53 -I${X11SRCDIR.Mesa}/src/gallium/include
52.endfor 54.endfor
53 55
54.PATH: ${X11SRCDIR.Mesa}/include/EGL 56.PATH: ${X11SRCDIR.Mesa}/include/EGL
55INCS= \ 57INCS= \
56 egl.h \ 58 egl.h \
57 eglext.h \ 59 eglext.h \
58 eglextchromium.h \ 60 eglextchromium.h \
59 eglmesaext.h \ 61 eglmesaext.h \
60 eglplatform.h 62 eglplatform.h
61INCSDIR=${X11INCDIR}/EGL 63INCSDIR=${X11INCDIR}/EGL
62 64
63SRCS+= ${SRCS.egl} ${SRCS.drivers/dri2} ${SRCS.util} 65SRCS+= ${SRCS.egl} ${SRCS.drivers/dri2} ${SRCS.util}
64 66
65CPPFLAGS+= \ 67CPPFLAGS+= \
66 -I${X11SRCDIR.Mesa}/include \ 68 -I${X11SRCDIR.Mesa}/include \
67 -I${X11SRCDIR.Mesa}/include/drm-uapi \ 69 -I${X11SRCDIR.Mesa}/include/drm-uapi \
68 -I${X11SRCDIR.Mesa}/src/gbm/main \ 70 -I${X11SRCDIR.Mesa}/src/gbm/main \
69 -I${X11SRCDIR.Mesa}/src/egl/main \ 71 -I${X11SRCDIR.Mesa}/src/egl/main \
70 -I${X11SRCDIR.Mesa}/src/gbm/backends/dri \ 72 -I${X11SRCDIR.Mesa}/src/gbm/backends/dri \
71 -I${X11SRCDIR.Mesa}/src/loader \ 73 -I${X11SRCDIR.Mesa}/src/loader \
72 -I${X11SRCDIR.Mesa}/src \ 74 -I${X11SRCDIR.Mesa}/src \
73 -I${DESTDIR}${X11INCDIR}/libdrm 75 -I${DESTDIR}${X11INCDIR}/libdrm
74 76
75EGL_DRIVER_INSTALL_DIR=${X11ROOTDIR}/lib 77EGL_DRIVER_INSTALL_DIR=${X11ROOTDIR}/lib
76CPPFLAGS+= \ 78CPPFLAGS+= \
77 -DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\" \ 79 -DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\" \
78 -D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11 \ 80 -D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11 \
79 -D_EGL_DRIVER_SEARCH_DIR=\"$(EGL_DRIVER_INSTALL_DIR)\" \ 81 -D_EGL_DRIVER_SEARCH_DIR=\"$(EGL_DRIVER_INSTALL_DIR)\" \
80 -D_EGL_OS_UNIX=1 82 -D_EGL_OS_UNIX=1
81 83
82CPPFLAGS+= ${X11FLAGS.THREADLIB} \ 84CPPFLAGS+= ${X11FLAGS.THREADLIB} \
83 -DHAVE_X11_PLATFORM \ 85 -DHAVE_X11_PLATFORM \
84 -DHAVE_DRM_PLATFORM \ 86 -DHAVE_DRM_PLATFORM \
85 -DHAVE_TIMESPEC_GET \ 87 -DHAVE_TIMESPEC_GET \
86 -DHAVE_PTHREAD \ 88 -DHAVE_PTHREAD \
87 -DHAVE_LIBDRM \ 89 -DHAVE_LIBDRM \
88 -DHAVE_MINCORE 90 -DHAVE_MINCORE
89 91
90.include "../libloader.mk" 92.include "../libloader.mk"
91 93
92CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp 94CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp
93CFLAGS+= -pthread 95CFLAGS+= -pthread
94 96
95# XXX missing: xcb-present 97# XXX missing: xcb-present
96LIBDPLIBS= Xext ${.CURDIR}/../libXext \ 98LIBDPLIBS= Xext ${.CURDIR}/../libXext \
97 X11 ${.CURDIR}/../libX11/dynamic \ 99 X11 ${.CURDIR}/../libX11/dynamic \
98 Xfixes ${.CURDIR}/../libXfixes \ 100 Xfixes ${.CURDIR}/../libXfixes \
99 Xdamage ${.CURDIR}/../libXdamage \ 101 Xdamage ${.CURDIR}/../libXdamage \
100 Xdmcp ${.CURDIR}/../libXdmcp \ 102 Xdmcp ${.CURDIR}/../libXdmcp \
101 glapi ${.CURDIR}/../libglapi \ 103 glapi ${.CURDIR}/../libglapi${OLD_SUFFIX} \
102 drm ${.CURDIR}/../libdrm \ 104 drm ${.CURDIR}/../libdrm \
103 gbm ${.CURDIR}/../libgbm \ 105 gbm ${.CURDIR}/../libgbm \
104 xshmfence ${.CURDIR}/../libxshmfence \ 106 xshmfence ${.CURDIR}/../libxshmfence \
105 X11-xcb ${.CURDIR}/../libX11/libX11-xcb \ 107 X11-xcb ${.CURDIR}/../libX11/libX11-xcb \
106 xcb-dri2 ${.CURDIR}/../libxcb/dri2 \ 108 xcb-dri2 ${.CURDIR}/../libxcb/dri2 \
107 xcb-glx ${.CURDIR}/../libxcb/glx \ 109 xcb-glx ${.CURDIR}/../libxcb/glx \
108 xcb-xfixes ${.CURDIR}/../libxcb/xfixes \ 110 xcb-xfixes ${.CURDIR}/../libxcb/xfixes \
109 xcb-sync ${.CURDIR}/../libxcb/sync \ 111 xcb-sync ${.CURDIR}/../libxcb/sync \
110 xcb ${.CURDIR}/../libxcb/libxcb \ 112 xcb ${.CURDIR}/../libxcb/libxcb \
111 expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \ 113 expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
112 m ${NETBSDSRCDIR}/lib/libm \ 114 m ${NETBSDSRCDIR}/lib/libm \
113 pthread ${NETBSDSRCDIR}/lib/libpthread 115 pthread ${NETBSDSRCDIR}/lib/libpthread
114 116
115MKLINT=no 117MKLINT=no
116 118
117PKGCONFIG= egl 119PKGCONFIG= egl
118PKGDIST.egl= ${X11SRCDIR.Mesa}/../src/pkgconfig 120PKGDIST.egl= ${X11SRCDIR.Mesa}/../src/pkgconfig
119.include "${.CURDIR}/../libGL/mesa-ver.mk" 121.include "${.CURDIR}/../libGL/mesa-ver.mk"
120PKGCONFIG_VERSION.egl= ${MESA_VER} 122PKGCONFIG_VERSION.egl= ${MESA_VER}
121 123
122CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format -Wno-constant-conversion 124CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format -Wno-constant-conversion
123COPTS.platform_drm.c+= -Wno-error=stack-protector 125COPTS.platform_drm.c+= -Wno-error=stack-protector
124 126
125.include <bsd.x11.mk> 127.include <bsd.x11.mk>
126.include <bsd.lib.mk> 128.include <bsd.lib.mk>
127.include <bsd.subdir.mk> 129.include <bsd.subdir.mk>