CVS commit: src/external/mit/xorg/lib/libepoxy
Module Name:src Committed By: mrg Date: Wed Jul 10 21:32:22 UTC 2019 Modified Files: src/external/mit/xorg/lib/libepoxy: Makefile Log Message: handle @epoxy_has_glx@, @epoxy_has_egl@, and @epoxy_has_wgl@. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libepoxy/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libepoxy/Makefile diff -u src/external/mit/xorg/lib/libepoxy/Makefile:1.5 src/external/mit/xorg/lib/libepoxy/Makefile:1.6 --- src/external/mit/xorg/lib/libepoxy/Makefile:1.5 Tue Jul 9 22:12:40 2019 +++ src/external/mit/xorg/lib/libepoxy/Makefile Wed Jul 10 21:32:22 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/07/09 22:12:40 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2019/07/10 21:32:22 mrg Exp $ .include @@ -18,6 +18,9 @@ SRCS+= \ dispatch_egl.c \ egl_generated_dispatch.c CPPFLAGS+= -DPLATFORM_HAS_EGL=1 +EGL=1 +.else +EGL=0 .endif INCSDIR=${X11INCDIR}/epoxy @@ -33,7 +36,10 @@ CPPFLAGS+= ${X11FLAGS.CONNECTION} PKGCONFIG= epoxy PKGCONFIG_SED_FLAGS= \ --e "s,@DLOPEN_LIBS@,," +-e "s,@DLOPEN_LIBS@,," \ +-e "s,@epoxy_has_glx@,1," \ +-e "s,@epoxy_has_egl@,${EGL}," \ +-e "s,@epoxy_has_wgl@,0," .include .include
CVS commit: src/external/mit/xorg/lib/libepoxy
Module Name:src Committed By: mrg Date: Wed Jul 10 21:32:22 UTC 2019 Modified Files: src/external/mit/xorg/lib/libepoxy: Makefile Log Message: handle @epoxy_has_glx@, @epoxy_has_egl@, and @epoxy_has_wgl@. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libepoxy/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/libepoxy
Module Name:src Committed By: mrg Date: Tue Jul 9 22:12:40 UTC 2019 Modified Files: src/external/mit/xorg/lib/libepoxy: Makefile shlib_version Log Message: updates for libepoxy 1.4.3. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libepoxy/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libepoxy/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libepoxy/Makefile diff -u src/external/mit/xorg/lib/libepoxy/Makefile:1.4 src/external/mit/xorg/lib/libepoxy/Makefile:1.5 --- src/external/mit/xorg/lib/libepoxy/Makefile:1.4 Thu Apr 18 10:10:33 2019 +++ src/external/mit/xorg/lib/libepoxy/Makefile Tue Jul 9 22:12:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/04/18 10:10:33 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2019/07/09 22:12:40 mrg Exp $ .include @@ -22,11 +22,13 @@ CPPFLAGS+= -DPLATFORM_HAS_EGL=1 INCSDIR=${X11INCDIR}/epoxy INCS= \ + common.h \ gl.h gl_generated.h \ glx.h glx_generated.h \ egl.h egl_generated.h CPPFLAGS+= -I${X11SRCDIR.${LIB}}/src +CPPFLAGS+= -I${X11SRCDIR.${LIB}}/../include CPPFLAGS+= ${X11FLAGS.CONNECTION} PKGCONFIG= epoxy Index: src/external/mit/xorg/lib/libepoxy/shlib_version diff -u src/external/mit/xorg/lib/libepoxy/shlib_version:1.1 src/external/mit/xorg/lib/libepoxy/shlib_version:1.2 --- src/external/mit/xorg/lib/libepoxy/shlib_version:1.1 Thu Aug 18 07:44:32 2016 +++ src/external/mit/xorg/lib/libepoxy/shlib_version Tue Jul 9 22:12:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.1 2016/08/18 07:44:32 mrg Exp $ +# $NetBSD: shlib_version,v 1.2 2019/07/09 22:12:40 mrg Exp $ # major=0 -minor=0 +minor=1
CVS commit: src/external/mit/xorg/lib/libepoxy
Module Name:src Committed By: mrg Date: Tue Jul 9 22:12:40 UTC 2019 Modified Files: src/external/mit/xorg/lib/libepoxy: Makefile shlib_version Log Message: updates for libepoxy 1.4.3. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libepoxy/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libepoxy/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.