Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/xorg/lib remove dead mesa7 support.
details: https://anonhg.NetBSD.org/src/rev/f6ed803fdc51
branches: trunk
changeset: 984533:f6ed803fdc51
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Jul 11 01:13:26 2021 +0000
description:
remove dead mesa7 support.
diffstat:
external/mit/xorg/lib/Makefile | 4 +-
external/mit/xorg/lib/dri7/Makefile | 9 -
external/mit/xorg/lib/dri7/dri.mk | 49 ---
external/mit/xorg/lib/dri7/libglsl7.mk | 103 --------
external/mit/xorg/lib/dri7/libmesa/Makefile | 40 ---
external/mit/xorg/lib/dri7/libmesa7.mk | 351 ----------------------------
external/mit/xorg/lib/dri7/r300/Makefile | 111 --------
external/mit/xorg/lib/mesa-which.mk | 3 +-
8 files changed, 3 insertions(+), 667 deletions(-)
diffs (truncated from 717 to 300 lines):
diff -r 65caea74306b -r f6ed803fdc51 external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile Sun Jul 11 00:43:40 2021 +0000
+++ b/external/mit/xorg/lib/Makefile Sun Jul 11 01:13:26 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2020/10/28 08:10:10 nia Exp $
+# $NetBSD: Makefile,v 1.55 2021/07/11 01:13:26 mrg Exp $
# build libraries for xorg
@@ -23,7 +23,7 @@
libX11 \
.WAIT
.if !defined(MLIBDIR)
-SUBDIR+=${EXTRA_DRI_DIRS} dri${OLD_PREFIX} gallium${OLD_PREFIX}
+SUBDIR+=dri${OLD_PREFIX} gallium${OLD_PREFIX}
.endif
SUBDIR+=fontconfig libSM \
.WAIT \
diff -r 65caea74306b -r f6ed803fdc51 external/mit/xorg/lib/dri7/Makefile
--- a/external/mit/xorg/lib/dri7/Makefile Sun Jul 11 00:43:40 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/01/05 03:45:31 mrg Exp $
-
-# Build MesaLib 7.x r300 driver, which requires LLVM in Mesa 10.x
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SUBDIR= libmesa .WAIT r300
-.endif
-
-.include <bsd.subdir.mk>
diff -r 65caea74306b -r f6ed803fdc51 external/mit/xorg/lib/dri7/dri.mk
--- a/external/mit/xorg/lib/dri7/dri.mk Sun Jul 11 00:43:40 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-# $NetBSD: dri.mk,v 1.1 2015/01/05 03:45:31 mrg Exp $
-
-# XXX DRI_LIB_DEPS
-
-LIBISMODULE= yes
-
-.include <bsd.own.mk>
-
-SHLIB_MAJOR= 0
-
-CPPFLAGS+= \
- -I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/common \
- -I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/${MODULE}/server \
- -I${X11SRCDIR.MesaLib7}/include \
- -I${X11SRCDIR.MesaLib7}/src/mapi \
- -I${X11SRCDIR.MesaLib7}/src/mesa \
- -I${DESTDIR}${X11INCDIR}/libdrm
-
-CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 \
- -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING \
- -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
-
-CPPFLAGS+= -Wno-stack-protector
-
-.PATH: ${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/${MODULE} ${DRI_EXTRA_PATHS}
-
-# Common sources
-.PATH: ${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/common \
- ${X11SRCDIR.MesaLib7}/src/mesa/drivers/common
-.if (${MODULE} == "swrast")
-SRCS+= drisw_util.c driverfuncs.c utils.c
-.else
-SRCS+= dri_util.c drirenderbuffer.c driverfuncs.c texmem.c
-SRCS+= utils.c vblank.c xmlconfig.c
-.endif
-
-.include <bsd.x11.mk>
-
-LIB= ${MODULE}_dri
-LIBDIR= ${X11USRLIBDIR}/modules/dri
-
-LIBDPLIBS+= drm ${.CURDIR}/../../libdrm
-LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
-LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
-LIBDPLIBS+= mesa_dri ${.CURDIR}/../libmesa
-# to find mesa_dri.so
-LDFLAGS+= -Wl,-rpath,${LIBDIR}
-
-.include <bsd.lib.mk>
diff -r 65caea74306b -r f6ed803fdc51 external/mit/xorg/lib/dri7/libglsl7.mk
--- a/external/mit/xorg/lib/dri7/libglsl7.mk Sun Jul 11 00:43:40 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-# $NetBSD: libglsl7.mk,v 1.2 2018/08/03 02:19:12 kamil Exp $
-
-# This copy for MesaLib7 old drivers.
-
-# Derived loosely from src/glsl/Makefile.
-
-# XXX Now that we don't need glsl-compile as a tool, this should just
-# be made into a library instead.
-
-.PATH: ${X11SRCDIR.MesaLib7}/src/glsl
-.PATH: ${X11SRCDIR.MesaLib7}/src/glsl/glcpp
-
-CPPFLAGS+= -I${X11SRCDIR.MesaLib7}/include
-CPPFLAGS+= -I${X11SRCDIR.MesaLib7}/src/glsl
-CPPFLAGS+= -I${X11SRCDIR.MesaLib7}/src/mapi
-CPPFLAGS+= -I${X11SRCDIR.MesaLib7}/src/mesa
-COPTS.glsl_lexer.cpp+= -Wno-deprecated-register
-
-SRCS.glsl.libglcpp= \
- glcpp-lex.c \
- glcpp-parse.c \
- pp.c
-
-SRCS.glsl.glcpp= \
- ${SRCS.glsl.libglcpp} \
- strtod.c \
- glcpp.c
-
-SRCS.glsl.c= \
- strtod.c \
- ralloc.c \
- ${SRCS.glsl.libglcpp}
-
-SRCS.glsl.cxx= \
- ast_expr.cpp \
- ast_function.cpp \
- ast_to_hir.cpp \
- ast_type.cpp \
- glsl_lexer.cpp \
- glsl_parser.cpp \
- glsl_parser_extras.cpp \
- glsl_types.cpp \
- glsl_symbol_table.cpp \
- hir_field_selection.cpp \
- ir_basic_block.cpp \
- ir_clone.cpp \
- ir_constant_expression.cpp \
- ir.cpp \
- ir_expression_flattening.cpp \
- ir_function_can_inline.cpp \
- ir_function_detect_recursion.cpp \
- ir_function.cpp \
- ir_hierarchical_visitor.cpp \
- ir_hv_accept.cpp \
- ir_import_prototypes.cpp \
- ir_print_visitor.cpp \
- ir_reader.cpp \
- ir_rvalue_visitor.cpp \
- ir_set_program_inouts.cpp \
- ir_validate.cpp \
- ir_variable.cpp \
- ir_variable_refcount.cpp \
- linker.cpp \
- link_functions.cpp \
- loop_analysis.cpp \
- loop_controls.cpp \
- loop_unroll.cpp \
- lower_discard.cpp \
- lower_if_to_cond_assign.cpp \
- lower_instructions.cpp \
- lower_jumps.cpp \
- lower_mat_op_to_vec.cpp \
- lower_noise.cpp \
- lower_texture_projection.cpp \
- lower_variable_index_to_cond_assign.cpp \
- lower_vec_index_to_cond_assign.cpp \
- lower_vec_index_to_swizzle.cpp \
- lower_vector.cpp \
- opt_algebraic.cpp \
- opt_constant_folding.cpp \
- opt_constant_propagation.cpp \
- opt_constant_variable.cpp \
- opt_copy_propagation.cpp \
- opt_copy_propagation_elements.cpp \
- opt_dead_code.cpp \
- opt_dead_code_local.cpp \
- opt_dead_functions.cpp \
- opt_discard_simplification.cpp \
- opt_function_inlining.cpp \
- opt_if_simplification.cpp \
- opt_noop_swizzle.cpp \
- opt_redundant_jumps.cpp \
- opt_structure_splitting.cpp \
- opt_swizzle_swizzle.cpp \
- opt_tree_grafting.cpp \
- s_expression.cpp
-
-SRCS.glsl= \
- ${SRCS.glsl.c} \
- ${SRCS.glsl.cxx}
-
-SRCS.glsl+= \
- builtin_function.cpp
diff -r 65caea74306b -r f6ed803fdc51 external/mit/xorg/lib/dri7/libmesa/Makefile
--- a/external/mit/xorg/lib/dri7/libmesa/Makefile Sun Jul 11 00:43:40 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/01/05 03:45:31 mrg Exp $
-
-.include <bsd.own.mk>
-
-_LIB_PREFIX= lib
-LIB= mesa_dri
-LIBISMODULE= yes
-LIBISCXX= yes
-
-SHLIB_MAJOR= 0
-
-MESA_SRC_MODULES= main math vbo tnl program swrast ss common
-
-CPPFLAGS+= \
- -I${X11SRCDIR.MesaLib7}/include \
- -I${X11SRCDIR.MesaLib7}/src/glsl \
- -I${X11SRCDIR.MesaLib7}/src/mesa \
- -I${X11SRCDIR.MesaLib7}/src/mapi
-
-CPPFLAGS+= ${X11FLAGS.THREADLIB} \
- -DPTHREADS -D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 \
- -DHAVE_ALIAS -DIN_DRI_DRIVER
-#CPPFLAGS+= -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_POSIX_MEMALIGN
-CFLAGS+= -pthread
-
-.include "../libmesa7.mk"
-.include "../libglsl7.mk"
-
-SRCS+= ${SRCS.glsl}
-
-.include <bsd.x11.mk>
-
-LIBDIR= ${X11USRLIBDIR}/modules/dri
-
-#LIBDPLIBS+= GL ${.CURDIR}/../../libGL
-
-CWARNFLAGS.clang+= -Wno-format -Wno-constant-conversion \
- -Wno-tautological-compare
-
-.include <bsd.lib.mk>
diff -r 65caea74306b -r f6ed803fdc51 external/mit/xorg/lib/dri7/libmesa7.mk
--- a/external/mit/xorg/lib/dri7/libmesa7.mk Sun Jul 11 00:43:40 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,351 +0,0 @@
-# $NetBSD: libmesa7.mk,v 1.1 2015/01/05 03:45:31 mrg Exp $
-
-# This copy for old MesaLib 7.x drivers only.
-
-#
-# Consumer of this Makefile should set MESA_SRC_MODULES.
-
-INCLUDES.all= mapi mesa mesa/main
-
-# The source file lists derived from src/mesa/sources.mak and
-# src/mapi/glapi/sources.mak. Please keep the organization in line
-# with those files.
-
-# Main sources
-PATHS.main= mesa/main
-INCLUDES.main= glsl
-SRCS.main= \
- api_exec_es1.c \
- api_exec_es2.c
-
-SRCS.main+= \
- api_arrayelt.c \
- api_exec.c \
- api_loopback.c \
- api_noop.c \
- api_validate.c \
- accum.c \
- arbprogram.c \
- atifragshader.c \
- attrib.c \
- arrayobj.c \
- blend.c \
- bufferobj.c \
- buffers.c \
- clear.c \
- clip.c \
- colortab.c \
- condrender.c \
- context.c \
- convolve.c \
- cpuinfo.c \
- debug.c \
- depth.c \
- depthstencil.c \
- dlist.c \
- dlopen.c \
- drawpix.c \
- drawtex.c \
- enable.c \
- enums.c \
- MESAeval.c \
- execmem.c \
- extensions.c \
- fbobject.c \
- feedback.c \
- ffvertex_prog.c \
- fog.c \
- formats.c \
- framebuffer.c \
- get.c \
- getstring.c \
Home |
Main Index |
Thread Index |
Old Index