Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src Pull up following revision(s) (requested by mrg in ticket...
details: https://anonhg.NetBSD.org/src/rev/3e0f0da29d24
branches: netbsd-7
changeset: 799042:3e0f0da29d24
user: snj <snj%NetBSD.org@localhost>
date: Tue Mar 03 08:28:12 2015 +0000
description:
Pull up following revision(s) (requested by mrg in ticket #559):
distrib/sets/lists/xdebug/md.amd64: revision 1.10
distrib/sets/lists/xdebug/md.i386: revision 1.11
distrib/sets/lists/xdebug/shl.mi: revision 1.18 via patch
distrib/sets/lists/xserver/md.amd64: revision 1.75
distrib/sets/lists/xserver/md.i386: revision 1.94
distrib/sets/lists/xserver/mi: revision 1.35
distrib/sets/sets.subr: revision 1.162
external/mit/xorg/lib/Makefile: revision 1.31
external/mit/xorg/lib/dri7/Makefile: revision 1.1
external/mit/xorg/lib/dri7/dri.mk: revision 1.1
external/mit/xorg/lib/dri7/libglsl7.mk: revision 1.1
external/mit/xorg/lib/dri7/libmesa/Makefile: revision 1.1
external/mit/xorg/lib/dri7/libmesa7.mk: revision 1.1
external/mit/xorg/lib/dri7/r300/Makefile: revision 1.1
share/mk/bsd.own.mk: revision 1.841
sets.subr: support machine=<xxx>, machine_arch=<xxx>, machine_cpu=<xxx> tags.
dri7: build Mesa 7 r300_dri.so for x86 platforms.
diffstat:
distrib/sets/lists/xdebug/md.amd64 | 4 +-
distrib/sets/lists/xdebug/md.i386 | 4 +-
distrib/sets/lists/xdebug/shl.mi | 6 +-
distrib/sets/lists/xserver/md.amd64 | 6 +-
distrib/sets/lists/xserver/md.i386 | 6 +-
distrib/sets/lists/xserver/mi | 10 +-
distrib/sets/sets.subr | 10 +-
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 | 102 ++++++++
external/mit/xorg/lib/dri7/libmesa/Makefile | 40 +++
external/mit/xorg/lib/dri7/libmesa7.mk | 351 ++++++++++++++++++++++++++++
external/mit/xorg/lib/dri7/r300/Makefile | 111 ++++++++
share/mk/bsd.own.mk | 4 +-
15 files changed, 695 insertions(+), 21 deletions(-)
diffs (truncated from 872 to 300 lines):
diff -r a023ed66e9fd -r 3e0f0da29d24 distrib/sets/lists/xdebug/md.amd64
--- a/distrib/sets/lists/xdebug/md.amd64 Tue Mar 03 07:14:03 2015 +0000
+++ b/distrib/sets/lists/xdebug/md.amd64 Tue Mar 03 08:28:12 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.6.4.1 2015/01/05 21:23:50 martin Exp $
+# $NetBSD: md.amd64,v 1.6.4.2 2015/03/03 08:28:12 snj Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg
@@ -71,7 +71,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- xorg,debug
diff -r a023ed66e9fd -r 3e0f0da29d24 distrib/sets/lists/xdebug/md.i386
--- a/distrib/sets/lists/xdebug/md.i386 Tue Mar 03 07:14:03 2015 +0000
+++ b/distrib/sets/lists/xdebug/md.i386 Tue Mar 03 08:28:12 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.6.4.2 2015/01/07 10:05:01 martin Exp $
+# $NetBSD: md.i386,v 1.6.4.3 2015/03/03 08:28:12 snj Exp $
./usr/X11R6/lib/modules/extensions/libGLcore_g.a -unknown- debuglib,x11
./usr/X11R6/lib/modules/extensions/libdbe_g.a -unknown- debuglib,x11
./usr/X11R6/lib/modules/extensions/libextmod_g.a -unknown- debuglib,x11
@@ -115,7 +115,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug -unknown- xorg,debug
diff -r a023ed66e9fd -r 3e0f0da29d24 distrib/sets/lists/xdebug/shl.mi
--- a/distrib/sets/lists/xdebug/shl.mi Tue Mar 03 07:14:03 2015 +0000
+++ b/distrib/sets/lists/xdebug/shl.mi Tue Mar 03 08:28:12 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.14.4.2 2015/01/05 21:23:50 martin Exp $
+# $NetBSD: shl.mi,v 1.14.4.3 2015/03/03 08:28:12 snj Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -144,6 +144,8 @@
./usr/libdata/debug/usr/X11R7/lib/libxcb.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- xorg,debug,machine=i386
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- xorg,debug,machine=amd64
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug obsolete obsolete,xorg,debug,!machine=i386,!machine=amd64
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/swrast_dri.so.0.debug -unknown- xorg,debug
diff -r a023ed66e9fd -r 3e0f0da29d24 distrib/sets/lists/xserver/md.amd64
--- a/distrib/sets/lists/xserver/md.amd64 Tue Mar 03 07:14:03 2015 +0000
+++ b/distrib/sets/lists/xserver/md.amd64 Tue Mar 03 08:28:12 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.73.4.1 2015/01/05 21:23:50 martin Exp $
+# $NetBSD: md.amd64,v 1.73.4.2 2015/03/03 08:28:12 snj Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -371,8 +371,8 @@
./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- obsolete
-./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
diff -r a023ed66e9fd -r 3e0f0da29d24 distrib/sets/lists/xserver/md.i386
--- a/distrib/sets/lists/xserver/md.i386 Tue Mar 03 07:14:03 2015 +0000
+++ b/distrib/sets/lists/xserver/md.i386 Tue Mar 03 08:28:12 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.92.4.1 2015/01/05 21:23:50 martin Exp $
+# $NetBSD: md.i386,v 1.92.4.2 2015/03/03 08:28:12 snj Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -405,8 +405,8 @@
./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- obsolete
-./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
diff -r a023ed66e9fd -r 3e0f0da29d24 distrib/sets/lists/xserver/mi
--- a/distrib/sets/lists/xserver/mi Tue Mar 03 07:14:03 2015 +0000
+++ b/distrib/sets/lists/xserver/mi Tue Mar 03 08:28:12 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.33.10.1 2015/01/05 21:23:50 martin Exp $
+# $NetBSD: mi,v 1.33.10.2 2015/03/03 08:28:12 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -54,8 +54,12 @@
./usr/X11R6/man/man1/xvidtune.1 -unknown- .man,x11
./usr/X11R7/bin/Xnest -unknown- xorg
./usr/X11R7/bin/Xvfb -unknown- xorg
-./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- obsolete
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- xorg,machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- xorg,machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- xorg,machine=amd64
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- xorg,machine=amd64
+./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- obsolete,xorg,!machine=amd64,!machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- obsolete,xorg,!machine=amd64,!machine=i386
./usr/X11R7/lib/modules/dri/swrast_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/swrast_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/gallium_dri.so -unknown- xorg
diff -r a023ed66e9fd -r 3e0f0da29d24 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr Tue Mar 03 07:14:03 2015 +0000
+++ b/distrib/sets/sets.subr Tue Mar 03 08:28:12 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.160 2014/01/29 22:35:52 joerg Exp $
+# $NetBSD: sets.subr,v 1.160.4.1 2015/03/03 08:28:12 snj Exp $
#
#
@@ -179,7 +179,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.160 2014/01/29 22:35:52 joerg Exp $
+# # $NetBSD: sets.subr,v 1.160.4.1 2015/03/03 08:28:12 snj Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -318,6 +318,12 @@
wanted[".man"] = 1
if ("endian" in wanted)
wanted["endian=" "'"${TARGET_ENDIANNESS}"'"] = 1
+ if ("machine" in wanted)
+ wanted["machine=" "'"${MACHINE}"'"] = 1
+ if ("machine_arch" in wanted)
+ wanted["machine_arch=" "'"${MACHINE_ARCH}"'"] = 1
+ if ("machine_cpu" in wanted)
+ wanted["machine_cpu=" "'"${MACHINE_CPU}"'"] = 1
}
/^#/ {
diff -r a023ed66e9fd -r 3e0f0da29d24 external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile Tue Mar 03 07:14:03 2015 +0000
+++ b/external/mit/xorg/lib/Makefile Tue Mar 03 08:28:12 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29.2.1 2015/01/05 21:23:50 martin Exp $
+# $NetBSD: Makefile,v 1.29.2.2 2015/03/03 08:28:12 snj Exp $
# build libraries for xorg
@@ -9,7 +9,7 @@
.endif
SUBDIR+=libdrm_radeon pixman xkeyboard-config libxcb \
.WAIT
-SUBDIR+=dri gallium fontconfig libSM libX11 \
+SUBDIR+=dri7 dri gallium fontconfig libSM libX11 \
.WAIT \
libXcomposite libXdamage libXext libXfixes libXt \
libxkbfile \
diff -r a023ed66e9fd -r 3e0f0da29d24 external/mit/xorg/lib/dri7/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/dri7/Makefile Tue Mar 03 08:28:12 2015 +0000
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1.2.2 2015/03/03 08:28:12 snj 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 a023ed66e9fd -r 3e0f0da29d24 external/mit/xorg/lib/dri7/dri.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/dri7/dri.mk Tue Mar 03 08:28:12 2015 +0000
@@ -0,0 +1,49 @@
+# $NetBSD: dri.mk,v 1.1.2.2 2015/03/03 08:28:12 snj 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 a023ed66e9fd -r 3e0f0da29d24 external/mit/xorg/lib/dri7/libglsl7.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/dri7/libglsl7.mk Tue Mar 03 08:28:12 2015 +0000
@@ -0,0 +1,102 @@
+# $NetBSD: libglsl7.mk,v 1.1.2.2 2015/03/03 08:28:12 snj 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
+
+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 \
Home |
Main Index |
Thread Index |
Old Index