[src/trunk]: src/external/mit/xorg/lib libvdpau depends upon libXext and libX...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a8b8e758009b
branches:  trunk
changeset: 449736:a8b8e758009b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Mar 19 06:19:44 2019 +0000

description:
libvdpau depends upon libXext and libX11, so make sure they're built first.

fixes x86 and evbarm builds.

diffstat:

 external/mit/xorg/lib/Makefile        |  14 +++++++++-----
 external/mit/xorg/lib/libXaw/Makefile |   4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (53 lines):

diff -r 6296dfc30a6b -r a8b8e758009b external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile    Tue Mar 19 05:55:00 2019 +0000
+++ b/external/mit/xorg/lib/Makefile    Tue Mar 19 06:19:44 2019 +0000
@@ -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+=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 @@
        .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 \
diff -r 6296dfc30a6b -r a8b8e758009b external/mit/xorg/lib/libXaw/Makefile
--- a/external/mit/xorg/lib/libXaw/Makefile     Tue Mar 19 05:55:00 2019 +0000
+++ b/external/mit/xorg/lib/libXaw/Makefile     Tue Mar 19 06:19:44 2019 +0000
@@ -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 @@
        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