Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/server/xorg-server/hw/sun fix build:



details:   https://anonhg.NetBSD.org/src/rev/7b389e8a03d0
branches:  trunk
changeset: 1012128:7b389e8a03d0
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jul 23 09:59:36 2020 +0000

description:
fix build:
- add .../xorg subdir to the path
- add dbe and present extensions, both wanted via linkage

.. but maybe these shouldn't be built?  they're not in sets.

diffstat:

 external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r 64e56c14611e -r 7b389e8a03d0 external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
--- a/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Thu Jul 23 09:46:49 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Thu Jul 23 09:59:36 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.Xsun,v 1.1 2020/07/22 20:54:08 tsutsui Exp $
+#      $NetBSD: Makefile.Xsun,v 1.2 2020/07/23 09:59:36 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -73,6 +73,7 @@
 SRCS+= fbcmap_mi.c
 
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/hw/sun \
+               -I${DESTDIR}${X11INCDIR}/xorg \
                ${X11INCS.DIX}
 
 CPPFLAGS+=     -UHAVE_XORG_CONFIG_H
@@ -89,6 +90,7 @@
        ${LDADD.xkbstubs} \
        ${LDADD.randr} \
        ${LDADD.Xext} \
+       ${LDADD.dbe} \
        ${LDADD.composite} \
        ${LDADD.record} \
        ${LDADD.render} \
@@ -98,9 +100,9 @@
        ${LDADD.miext/damage} \
        ${LDADD.miext/sync} \
        ${LDADD.Xi} \
+       ${LDADD.present} \
        -lXfont2 \
        -lpixman-1 \
-       -lXext \
        -lX11 \
        -lz \
        -lm
@@ -111,6 +113,7 @@
        ${DPADD.xkb} \
        ${DPADD.randr} \
        ${DPADD.Xext} \
+       ${DPADD.dbe} \
        ${DPADD.composite} \
        ${DPADD.record} \
        ${DPADD.render} \
@@ -120,6 +123,7 @@
        ${DPADD.miext/damage} \
        ${DPADD.miext/sync} \
        ${DPADD.Xi} \
+       ${DPADD.present} \
        ${LIBXFONT2} \
        ${LIBPIXMAN-1} \
        ${LIBXEXT} \



Home | Main Index | Thread Index | Old Index