parent
1b68370975
commit
17e89ed109
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.57 2022/07/14 07:41:49 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.58 2023/07/15 21:24:46 rjs Exp $
|
||||
|
||||
# build libraries for xorg
|
||||
|
||||
|
@ -58,7 +58,7 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw libXcursor \
|
|||
SUBDIR+=libgbm${OLD_SUFFIX}
|
||||
.if ${HAVE_XORG_GLAMOR} != "no"
|
||||
# libEGL depends upon libgbm
|
||||
SUBDIR+=.WAIT libEGL
|
||||
SUBDIR+=.WAIT libEGL${OLD_SUFFIX}
|
||||
.endif
|
||||
|
||||
.include <bsd.buildinstall.mk>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.6 2023/07/02 23:56:12 rillig Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2023/07/15 21:24:46 rjs Exp $
|
||||
|
||||
# Link the mesa_dri_drivers mega driver.
|
||||
|
||||
|
@ -449,8 +449,8 @@ LIBDPLIBS+= drm_intel ${.CURDIR}/../libdrm_intel
|
|||
LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
|
||||
|
||||
MESA_SRC_MODULES= main math math_xform vbo tnl swrast ss common asm_c program asm_s
|
||||
.include "../libmesa.old.mk"
|
||||
.include "../libglsl.old.mk"
|
||||
.include "../libmesa${OLD_SUFFIX}.mk"
|
||||
.include "../libglsl${OLD_SUFFIX}.mk"
|
||||
|
||||
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
|
||||
SRCS+= streaming-load-memcpy.c
|
||||
|
@ -460,7 +460,7 @@ CPPFLAGS.isl_tiled_memcpy_sse41.c+= -msse4.1
|
|||
|
||||
CFLAGS+= ${${ACTIVE_CC} == "clang":? -Wno-error=atomic-alignment :}
|
||||
|
||||
.include "../driver.mk"
|
||||
.include "../driver${OLD_SUFFIX}.mk"
|
||||
|
||||
.for _d in ${DRIVERS}
|
||||
SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
|
||||
|
@ -474,7 +474,7 @@ SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR}.debug ${DRIDEBUGDIR}/${_d}_dri.so.
|
|||
|
||||
PKGCONFIG= dri
|
||||
PKGDIST.dri= ${X11SRCDIR.Mesa}/../src/pkgconfig
|
||||
.include "${.CURDIR}/../libGL/mesa-ver.mk"
|
||||
.include "${.CURDIR}/../libGL${OLD_SUFFIX}/mesa-ver.mk"
|
||||
PKGCONFIG_VERSION.dri= ${MESA_VER}
|
||||
|
||||
# XXX remove these from bsd.x11.mk
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.5 2023/02/07 06:19:03 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2023/07/15 21:24:46 rjs Exp $
|
||||
|
||||
# Transparent struct/union broken
|
||||
NOLINT=yes
|
||||
|
@ -1133,7 +1133,7 @@ CPPFLAGS+= ${CPPFLAGS.${XORG_MACHINE_ARCH:U${MACHINE_ARCH}}}
|
|||
CPPFLAGS.r600_pipe_common.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
|
||||
CPPFLAGS.si_get.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
|
||||
|
||||
.include "../driver.mk"
|
||||
.include "../driver${OLD_SUFFIX}.mk"
|
||||
|
||||
|
||||
.PATH: ${X11SRCDIR.Mesa}/src/gallium/targets/dri
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.4 2023/06/03 21:33:02 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2023/07/15 21:24:46 rjs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
@ -216,7 +216,7 @@ MKLINT=no
|
|||
|
||||
PKGCONFIG= gl
|
||||
PKGDIST.gl= ${X11SRCDIR.Mesa}/../src/pkgconfig
|
||||
.include "${.CURDIR}/../libGL/mesa-ver.mk"
|
||||
.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
|
||||
PKGCONFIG_VERSION.gl= ${MESA_VER}
|
||||
|
||||
# XXX remove these from bsd.x11.mk
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.3 2022/09/29 18:58:04 rjs Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2023/07/15 21:24:47 rjs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
@ -53,7 +53,7 @@ LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
|
|||
|
||||
PKGCONFIG= gbm
|
||||
PKGDIST.gbm= ${X11SRCDIR.Mesa}/../src/pkgconfig
|
||||
.include "${.CURDIR}/../libGL/mesa-ver.mk"
|
||||
.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
|
||||
PKGCONFIG_VERSION.gbm= ${MESA_VER}
|
||||
|
||||
.include "../libdrm/Makefile.defines"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.2 2021/07/11 20:53:35 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2023/07/15 21:24:47 rjs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
@ -37,7 +37,7 @@ CPPFLAGS+= \
|
|||
|
||||
CPPFLAGS+= ${X11FLAGS.THREADLIB}
|
||||
|
||||
.include "${.CURDIR}/../libGL/mesa-ver.mk"
|
||||
.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
|
||||
|
||||
CFLAGS+= -fno-strict-aliasing -fvisibility=hidden -pthread -fno-builtin-memcmp
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: libmesa.old.mk,v 1.2 2021/07/11 20:53:35 mrg Exp $
|
||||
# $NetBSD: libmesa.old.mk,v 1.3 2023/07/15 21:24:46 rjs Exp $
|
||||
#
|
||||
# Consumer of this Makefile should set MESA_SRC_MODULES.
|
||||
|
||||
|
@ -550,4 +550,4 @@ CPPFLAGS+= \
|
|||
|
||||
CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp -fcommon
|
||||
|
||||
.include "libGL/mesa-ver.mk"
|
||||
.include "libGL.old/mesa-ver.mk"
|
||||
|
|
Loading…
Reference in New Issue