Module Name: src
Committed By: mrg
Date: Tue Mar 19 06:19:44 UTC 2019
Modified Files:
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/lib/libXaw: Makefile
Log Message:
libvdpau depends upon libXext and libX11, so make sure they're built first.
fixes x86 and evbarm builds.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/libXaw/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/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.47 src/external/mit/xorg/lib/Makefile:1.48
--- src/external/mit/xorg/lib/Makefile:1.47 Sun Mar 10 11:18:02 2019
+++ src/external/mit/xorg/lib/Makefile Tue Mar 19 06:19:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2019/03/10 11:18:02 mrg Exp $
+# $NetBSD: Makefile,v 1.48 2019/03/19 06:19:44 mrg Exp $
# build libraries for xorg
@@ -12,7 +12,7 @@ SUBDIR= libfontenc freetype libFS libICE
SUBDIR+=libdrm_intel libdrm_amdgpu
.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
-SUBDIR+=libdrm_nouveau libvdpau
+SUBDIR+=libdrm_nouveau
.endif
SUBDIR+=libdrm_radeon pixman
.if !defined(MLIBDIR)
@@ -27,9 +27,13 @@ SUBDIR+=fontconfig libSM libX11 \
.WAIT \
libXcomposite libXdamage libXext libXfixes libXt \
libxkbfile libepoxy \
- .WAIT \
- libXi libXxf86vm \
- .WAIT \
+ .WAIT
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
+# libvdpau depends upon libX11 and libXext
+SUBDIR+=libvdpau \
+ .WAIT
+.endif
+SUBDIR+=libXi libXxf86vm \
libGL${OLD_PREFIX} libXScrnSaver libXTrap libXevie libXfont libXfont2 \
libXinerama libXmu libXmuu libXpm libXrender \
libXres libXtst libXvMC libXvMCW libXv libXxf86dga libXxf86misc \
Index: src/external/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.12 src/external/mit/xorg/lib/libXaw/Makefile:1.13
--- src/external/mit/xorg/lib/libXaw/Makefile:1.12 Mon Mar 11 06:25:55 2019
+++ src/external/mit/xorg/lib/libXaw/Makefile Tue Mar 19 06:19:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/03/11 06:25:55 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2019/03/19 06:19:44 mrg Exp $
.include <bsd.own.mk>
@@ -26,7 +26,7 @@ SRCS= Actions.c AllWidgets.c AsciiSink.c
SimpleMenu.c Sme.c SmeBSB.c SmeLine.c StripChart.c \
Text.c TextSink.c TextSrc.c TextAction.c TextPop.c \
TextTr.c Tip.c Toggle.c Tree.c Vendor.c Viewport.c \
- XawIm.c XawInit.c XawI18n.c sharedlib.c
+ XawIm.c XawInit.c XawI18n.c
.PATH: ${X11SRCDIR.Xaw}/man
MAN= Xaw.3
