Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk move mesa10 build into .old scheme:
details: https://anonhg.NetBSD.org/src/rev/aee14c39ba4a
branches: trunk
changeset: 997488:aee14c39ba4a
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Mar 10 02:29:52 2019 +0000
description:
move mesa10 build into .old scheme:
- add ${X11SRCDIR.MesaLib.old} and introduce ${X11SRCDIR.Mesa} as an
alias for either the former or the non old. this allows many of
the makefiles to simply use ${X11SRCDIR.Mesa} (but does not really
enable much sharing of makefiles, but reduces their diffs.)
- use mesa-which.mk to define ${OLD_PREFIX} to either "" or ".old",
and to know if to build 'dri7' (.old only.) ${OLD_PREFIX} is used
by other code (eg, LIBDPLIBS) to pick the right subdir.
diffstat:
external/mit/xorg/lib/Makefile | 12 +-
external/mit/xorg/lib/dri.old/Makefile | 421 ++++++
external/mit/xorg/lib/dri/Makefile | 38 +-
external/mit/xorg/lib/driver.mk | 16 +-
external/mit/xorg/lib/driver.old.mk | 24 +
external/mit/xorg/lib/gallium.old/Makefile | 646 ++++++++++
external/mit/xorg/lib/gallium/Makefile | 50 +-
external/mit/xorg/lib/libGL.old/Makefile | 184 ++
external/mit/xorg/lib/libGL.old/internal/Makefile | 13 +
external/mit/xorg/lib/libGL.old/mesa-ver.mk | 3 +
external/mit/xorg/lib/libGL.old/shlib_version | 5 +
external/mit/xorg/lib/libGL/Makefile | 46 +-
external/mit/xorg/lib/libGL/internal/Makefile | 4 +-
external/mit/xorg/lib/libGLU/Makefile | 8 +-
external/mit/xorg/lib/libGLw/Makefile | 8 +-
external/mit/xorg/lib/libgbm.old/Makefile | 48 +
external/mit/xorg/lib/libgbm.old/shlib_version | 4 +
external/mit/xorg/lib/libgbm/Makefile | 18 +-
external/mit/xorg/lib/libglapi.old/Makefile | 101 +
external/mit/xorg/lib/libglapi/Makefile | 26 +-
external/mit/xorg/lib/libglsl.mk | 6 +-
external/mit/xorg/lib/libglsl.old.mk | 113 +
external/mit/xorg/lib/libglut/Makefile | 8 +-
external/mit/xorg/lib/libloader.mk | 10 +-
external/mit/xorg/lib/libloader.old.mk | 18 +
external/mit/xorg/lib/libmesa.mk | 44 +-
external/mit/xorg/lib/libmesa.old.mk | 443 ++++++
external/mit/xorg/lib/mesa-which.mk | 7 +
external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile | 6 +-
external/mit/xorg/server/xorg-server.old/glx/Makefile.glx | 16 +-
external/mit/xorg/server/xorg-server.old/hw/xfree86/dri/Makefile | 4 +-
external/mit/xorg/server/xorg-server.old/hw/xfree86/dri2/Makefile | 4 +-
external/mit/xorg/server/xorg-server/glx/Makefile.glx | 16 +-
external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile | 4 +-
external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile | 4 +-
share/mk/bsd.own.mk | 10 +-
36 files changed, 2217 insertions(+), 171 deletions(-)
diffs (truncated from 3084 to 300 lines):
diff -r 58383214458a -r aee14c39ba4a external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile Sat Mar 09 23:46:34 2019 +0000
+++ b/external/mit/xorg/lib/Makefile Sun Mar 10 02:29:52 2019 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.45 2019/03/08 11:14:49 mrg Exp $
+# $NetBSD: Makefile,v 1.46 2019/03/10 02:29:52 mrg Exp $
# build libraries for xorg
.include <bsd.own.mk>
-SUBDIR= libfontenc freetype libFS libICE libglapi \
+.include "mesa-which.mk"
+
+SUBDIR= libfontenc freetype libFS libICE libglapi${OLD_PREFIX} \
libXau libXdmcp libdrm libpciaccess libpthread-stubs libxshmfence .WAIT
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+=libdrm_intel libdrm_amdgpu
@@ -19,7 +21,7 @@
SUBDIR+=libxcb \
.WAIT
.if !defined(MLIBDIR)
-SUBDIR+=dri7 dri gallium
+SUBDIR+=${EXTRA_DRI_DIRS} dri${OLD_PREFIX} gallium${OLD_PREFIX}
.endif
SUBDIR+=fontconfig libSM libX11 \
.WAIT \
@@ -28,7 +30,7 @@
.WAIT \
libXi libXxf86vm \
.WAIT \
- libGL libXScrnSaver libXTrap libXevie libXfont libXfont2 \
+ libGL${OLD_PREFIX} libXScrnSaver libXTrap libXevie libXfont libXfont2 \
libXinerama libXmu libXmuu libXpm libXrender \
libXres libXtst libXvMC libXvMCW libXv libXxf86dga libXxf86misc \
libxkbui \
@@ -46,7 +48,7 @@
.WAIT \
libXdmGreet \
xcb-util
-SUBDIR+=libgbm
+SUBDIR+=libgbm${OLD_PREFIX}
.include <bsd.buildinstall.mk>
.include <bsd.subdir.mk>
diff -r 58383214458a -r aee14c39ba4a external/mit/xorg/lib/dri.old/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/dri.old/Makefile Sun Mar 10 02:29:52 2019 +0000
@@ -0,0 +1,421 @@
+# $NetBSD: Makefile,v 1.1 2019/03/10 02:29:52 mrg Exp $
+
+# Link the mesa_dri_drivers mega driver.
+
+.include <bsd.own.mk>
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+
+LIBISMODULE= yes
+LIBISCXX= yes
+
+SHLIB_MAJOR= 0
+
+LIB= mesa_dri_drivers
+DRIDIR= ${X11USRLIBDIR}/modules/dri
+DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/modules/dri
+
+# -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/${MODULE}/server \
+
+CPPFLAGS+= \
+ -I${X11SRCDIR.Mesa}/src/egl/main \
+ -I${X11SRCDIR.Mesa}/src/egl/drivers/dri \
+ -I${X11SRCDIR.Mesa}/../src/mesa/drivers/dri/common \
+ -I${DESTDIR}${X11INCDIR}/libdrm
+
+#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
+
+# We don't actually build this on non-x86 at all, currently.
+# The following if statements are not effective since we only
+# get here for x86
+.if ${MACHINE_ARCH} == "alpha"
+DRIVERS= r200 radeon
+.elif ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
+DRIVERS= r200 radeon
+.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
+DRIVERS= r200 radeon
+.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+DRIVERS= i915 i965 r200 radeon
+.elif ${MACHINE} == "prep" || ${MACHINE} == "bebox"
+DRIVERS= r200 radeon
+.endif
+
+DRI_SUBDIRS= ${DRIVERS}
+
+DRI_SOURCES.i915 = \
+ i830_context.c \
+ i830_state.c \
+ i830_texblend.c \
+ i830_texstate.c \
+ i830_vtbl.c \
+ i915_tex_layout.c \
+ i915_texstate.c \
+ i915_context.c \
+ i915_debug_fp.c \
+ i915_fragprog.c \
+ i915_program.c \
+ i915_state.c \
+ i915_vtbl.c
+
+I915_INTEL_FILES = \
+ intel_render.c \
+ intel_regions.c \
+ intel_buffer_objects.c \
+ intel_batchbuffer.c \
+ intel_clear.c \
+ intel_extensions.c \
+ intel_mipmap_tree.c \
+ intel_tex_layout.c \
+ intel_tex_image.c \
+ intel_tex_subimage.c \
+ intel_tex_copy.c \
+ intel_tex_validate.c \
+ intel_tex.c \
+ intel_pixel.c \
+ intel_pixel_bitmap.c \
+ intel_pixel_copy.c \
+ intel_pixel_draw.c \
+ intel_pixel_read.c \
+ intel_buffers.c \
+ intel_blit.c \
+ intel_context.c \
+ intel_screen.c \
+ intel_state.c \
+ intel_syncobj.c \
+ intel_tris.c \
+ intel_fbo.c
+
+.for _f in ${I915_INTEL_FILES}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i915/${_f} i915_${_f}
+DRI_SOURCES.i915+= i915_${_f}
+CPPFLAGS.i915_${_f}+= -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i915
+.endfor
+
+DRI_SOURCES.i965 = \
+ brw_binding_tables.c \
+ brw_blorp.cpp \
+ brw_blorp_blit.cpp \
+ brw_blorp_blit_eu.cpp \
+ brw_cc.c \
+ brw_cfg.cpp \
+ brw_clear.c \
+ brw_clip.c \
+ brw_clip_line.c \
+ brw_clip_point.c \
+ brw_clip_state.c \
+ brw_clip_tri.c \
+ brw_clip_unfilled.c \
+ brw_clip_util.c \
+ brw_context.c \
+ brw_cubemap_normalize.cpp \
+ brw_curbe.c \
+ brw_dead_control_flow.cpp \
+ brw_device_info.c \
+ brw_disasm.c \
+ brw_draw.c \
+ brw_draw_upload.c \
+ brw_eu.c \
+ brw_eu_compact.c \
+ brw_eu_emit.c \
+ brw_eu_util.c \
+ brw_fs.cpp \
+ brw_fs_channel_expressions.cpp \
+ brw_fs_copy_propagation.cpp \
+ brw_fs_cse.cpp \
+ brw_fs_dead_code_eliminate.cpp \
+ brw_fs_fp.cpp \
+ brw_fs_generator.cpp \
+ brw_fs_live_variables.cpp \
+ brw_fs_peephole_predicated_break.cpp \
+ brw_fs_reg_allocate.cpp \
+ brw_fs_register_coalesce.cpp \
+ brw_fs_saturate_propagation.cpp \
+ brw_fs_sel_peephole.cpp \
+ brw_fs_vector_splitting.cpp \
+ brw_fs_visitor.cpp \
+ brw_gs.c \
+ brw_gs_emit.c \
+ brw_gs_state.c \
+ brw_gs_surface_state.c \
+ brw_gs.c \
+ brw_gs_emit.c \
+ brw_gs_state.c \
+ brw_gs_surface_state.c \
+ brw_interpolation_map.c \
+ brw_lower_texture_gradients.cpp \
+ brw_lower_unnormalized_offset.cpp \
+ brw_meta_updownsample.c \
+ brw_meta_stencil_blit.c \
+ brw_meta_util.c \
+ brw_meta_fast_clear.c \
+ brw_misc_state.c \
+ brw_object_purgeable.c \
+ brw_performance_monitor.c \
+ brw_program.c \
+ brw_primitive_restart.c \
+ brw_queryobj.c \
+ brw_reset.c \
+ brw_sampler_state.c \
+ brw_schedule_instructions.cpp \
+ brw_sf.c \
+ brw_sf_emit.c \
+ brw_sf_state.c \
+ brw_shader.cpp \
+ brw_state_batch.c \
+ brw_state_cache.c \
+ brw_state_dump.c \
+ brw_state_upload.c \
+ brw_surface_formats.c \
+ brw_tex.c \
+ brw_tex_layout.c \
+ brw_urb.c \
+ brw_util.c \
+ brw_vec4.cpp \
+ brw_vec4_copy_propagation.cpp \
+ brw_vec4_cse.cpp \
+ brw_vec4_generator.cpp \
+ brw_vec4_gs.c \
+ brw_vec4_gs_visitor.cpp \
+ brw_vec4_live_variables.cpp \
+ brw_vec4_reg_allocate.cpp \
+ brw_vec4_visitor.cpp \
+ brw_vec4_vp.cpp \
+ brw_vec4_vs_visitor.cpp \
+ brw_vs.c \
+ brw_vs_state.c \
+ brw_vs_surface_state.c \
+ brw_wm.c \
+ brw_wm_iz.cpp \
+ brw_wm_state.c \
+ brw_wm_surface_state.c \
+ gen6_blorp.cpp \
+ gen6_cc.c \
+ gen6_clip_state.c \
+ gen6_depth_state.c \
+ gen6_depthstencil.c \
+ gen6_gs_state.c \
+ gen6_multisample_state.c \
+ gen6_queryobj.c \
+ gen6_sampler_state.c \
+ gen6_scissor_state.c \
+ gen6_sf_state.c \
+ gen6_sol.c \
+ gen6_surface_state.c \
+ gen6_urb.c \
+ gen6_viewport_state.c \
+ gen6_vs_state.c \
+ gen6_wm_state.c \
+ gen7_blorp.cpp \
+ gen7_disable.c \
+ gen7_gs_state.c \
+ gen7_misc_state.c \
+ gen7_sf_state.c \
+ gen7_sol_state.c \
+ gen7_urb.c \
+ gen7_viewport_state.c \
+ gen7_vs_state.c \
+ gen7_wm_state.c \
+ gen7_wm_surface_state.c \
+ gen8_blend_state.c \
+ gen8_depth_state.c \
+ gen8_disable.c \
+ gen8_draw_upload.c \
+ gen8_gs_state.c \
+ gen8_misc_state.c \
+ gen8_multisample_state.c \
+ gen8_sf_state.c \
+ gen8_sol_state.c \
+ gen8_surface_state.c \
+ gen8_viewport_state.c \
+ gen8_vs_state.c \
+ gen8_wm_depth_stencil.c \
+ gen8_ps_state.c
+
+I965_INTEL_FILES = \
+ intel_asm_annotation.c \
+ intel_batchbuffer.c \
+ intel_blit.c \
+ intel_buffer_objects.c \
+ intel_buffers.c \
+ intel_copy_image.c \
+ intel_debug.c \
+ intel_extensions.c \
+ intel_fbo.c \
+ intel_mipmap_tree.c \
+ intel_resolve_map.c \
+ intel_screen.c \
+ intel_pixel.c \
+ intel_pixel_bitmap.c \
+ intel_pixel_copy.c \
+ intel_pixel_draw.c \
+ intel_pixel_read.c \
Home |
Main Index |
Thread Index |
Old Index