| @@ -1,149 +1,149 @@ | | | @@ -1,149 +1,149 @@ |
1 | # $NetBSD: Makefile.common,v 1.38 2020/12/01 21:03:16 wiz Exp $ | | 1 | # $NetBSD: Makefile.common,v 1.39 2021/04/13 18:46:55 wiz Exp $ |
2 | # used by x11/modular-xorg-server/Makefile | | 2 | # used by x11/modular-xorg-server/Makefile |
3 | # used by x11/modular-xorg-xephyr/Makefile | | 3 | # used by x11/modular-xorg-xephyr/Makefile |
4 | # used by x11/modular-xorg-xwayland/Makefile | | 4 | # used by x11/modular-xorg-xwayland/Makefile |
5 | | | 5 | |
6 | XORG_VERSION= 1.20.10 | | 6 | XORG_VERSION= 1.20.11 |
7 | CATEGORIES= x11 | | 7 | CATEGORIES= x11 |
8 | MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} | | 8 | MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} |
9 | EXTRACT_SUFX= .tar.bz2 | | 9 | EXTRACT_SUFX= .tar.bz2 |
10 | | | 10 | |
11 | HOMEPAGE= https://xorg.freedesktop.org/ | | 11 | HOMEPAGE= https://xorg.freedesktop.org/ |
12 | LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause | | 12 | LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause |
13 | | | 13 | |
14 | GNU_CONFIGURE= yes | | 14 | GNU_CONFIGURE= yes |
15 | USE_LIBTOOL= yes | | 15 | USE_LIBTOOL= yes |
16 | USE_TOOLS+= gmake pkg-config | | 16 | USE_TOOLS+= gmake pkg-config |
17 | USE_LANGUAGES+= c99 | | 17 | USE_LANGUAGES+= c99 |
18 | | | 18 | |
19 | CHECK_PORTABILITY_SKIP+= hw/xquartz/bundle/mk_bundke.sh | | 19 | CHECK_PORTABILITY_SKIP+= hw/xquartz/bundle/mk_bundke.sh |
20 | | | 20 | |
21 | PKGCONFIG_OVERRIDE+= xorg-server.pc.in | | 21 | PKGCONFIG_OVERRIDE+= xorg-server.pc.in |
22 | SHLIBTOOL_OVERRIDE= # empty | | 22 | SHLIBTOOL_OVERRIDE= # empty |
23 | | | 23 | |
24 | BUILD_DEFS+= VARBASE | | 24 | BUILD_DEFS+= VARBASE |
25 | BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR | | 25 | BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR |
26 | | | 26 | |
27 | OWN_DIRS+= ${VARBASE}/log | | 27 | OWN_DIRS+= ${VARBASE}/log |
28 | OWN_DIRS+= ${XKB_OUTPUT_DIR} | | 28 | OWN_DIRS+= ${XKB_OUTPUT_DIR} |
29 | XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config | | 29 | XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config |
30 | | | 30 | |
31 | CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} | | 31 | CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} |
32 | CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} | | 32 | CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} |
33 | | | 33 | |
34 | .if !empty(USE_TOOLS:Mauto*) | | 34 | .if !empty(USE_TOOLS:Mauto*) |
35 | TOOLS_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros | | 35 | TOOLS_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros |
36 | .endif | | 36 | .endif |
37 | | | 37 | |
38 | DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp | | 38 | DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp |
39 | DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config | | 39 | DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config |
40 | | | 40 | |
41 | .include "../../mk/bsd.prefs.mk" | | 41 | .include "../../mk/bsd.prefs.mk" |
42 | | | 42 | |
43 | .if ${OPSYS} == "NetBSD" | | 43 | .if ${OPSYS} == "NetBSD" |
44 | CPPFLAGS+= -D_OPENBSD_SOURCE # for reallocarray(3) | | 44 | CPPFLAGS+= -D_OPENBSD_SOURCE # for reallocarray(3) |
45 | CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" | | 45 | CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" |
46 | CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" | | 46 | CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" |
47 | # TLS is not supported by NetBSD<6 | | 47 | # TLS is not supported by NetBSD<6 |
48 | . if !empty(OS_VERSION:M[0-5].*) | | 48 | . if !empty(OS_VERSION:M[0-5].*) |
49 | CONFIGURE_ENV+= ac_cv_tls=no | | 49 | CONFIGURE_ENV+= ac_cv_tls=no |
50 | CONFIGURE_ARGS+= --disable-glx-tls | | 50 | CONFIGURE_ARGS+= --disable-glx-tls |
51 | . endif | | 51 | . endif |
52 | .endif | | 52 | .endif |
53 | CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} | | 53 | CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} |
54 | | | 54 | |
55 | CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11 | | 55 | CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11 |
56 | | | 56 | |
57 | LEGACY_FONT_PATHS= | | 57 | LEGACY_FONT_PATHS= |
58 | DEFAULT_FONT_PATHS= | | 58 | DEFAULT_FONT_PATHS= |
59 | .for f in misc TTF OTF Type1 100dpi 75dpi cyrillic | | 59 | .for f in misc TTF OTF Type1 100dpi 75dpi cyrillic |
60 | DEFAULT_FONT_PATHS+= ${PREFIX}/share/fonts/X11/${f} | | 60 | DEFAULT_FONT_PATHS+= ${PREFIX}/share/fonts/X11/${f} |
61 | LEGACY_FONT_PATHS+= ${PREFIX}/lib/X11/fonts/${f} | | 61 | LEGACY_FONT_PATHS+= ${PREFIX}/lib/X11/fonts/${f} |
62 | .endfor | | 62 | .endfor |
63 | FONT_PATHS= ${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS} | | 63 | FONT_PATHS= ${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS} |
64 | | | 64 | |
65 | CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATHS:ts,:Q} | | 65 | CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATHS:ts,:Q} |
66 | | | 66 | |
67 | CONFIGURE_ARGS+= --disable-config-hal | | 67 | CONFIGURE_ARGS+= --disable-config-hal |
68 | CONFIGURE_ARGS+= --disable-dmx | | 68 | CONFIGURE_ARGS+= --disable-dmx |
69 | CONFIGURE_ARGS+= --disable-xwin | | 69 | CONFIGURE_ARGS+= --disable-xwin |
70 | CONFIGURE_ARGS+= --disable-xephyr | | 70 | CONFIGURE_ARGS+= --disable-xephyr |
71 | CONFIGURE_ARGS+= --disable-kdrive | | 71 | CONFIGURE_ARGS+= --disable-kdrive |
72 | #CONFIGURE_ARGS+= --disable-kdrive-vesa | | 72 | #CONFIGURE_ARGS+= --disable-kdrive-vesa |
73 | CONFIGURE_ARGS+= --enable-xtrans-send-fds | | 73 | CONFIGURE_ARGS+= --enable-xtrans-send-fds |
74 | | | 74 | |
75 | CONFIGURE_ARGS+= --with-int10=x86emu | | 75 | CONFIGURE_ARGS+= --with-int10=x86emu |
76 | | | 76 | |
77 | CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 | | 77 | CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 |
78 | CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 | | 78 | CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 |
79 | | | 79 | |
80 | PLIST_VARS+= sunos | | 80 | PLIST_VARS+= sunos |
81 | PLIST_SUBST+= SUNOS_ARCH=${SUNOS_ARCH} | | 81 | PLIST_SUBST+= SUNOS_ARCH=${SUNOS_ARCH} |
82 | | | 82 | |
83 | .if ${OPSYS} == "SunOS" | | 83 | .if ${OPSYS} == "SunOS" |
84 | PLIST.sunos= yes | | 84 | PLIST.sunos= yes |
85 | . if ${MACHINE_ARCH} == "i386" | | 85 | . if ${MACHINE_ARCH} == "i386" |
86 | SUNOS_ARCH= ia32 | | 86 | SUNOS_ARCH= ia32 |
87 | . elif ${MACHINE_ARCH} == "x86_64" | | 87 | . elif ${MACHINE_ARCH} == "x86_64" |
88 | SUNOS_ARCH= amd64 | | 88 | SUNOS_ARCH= amd64 |
89 | . elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" | | 89 | . elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" |
90 | SUNOS_ARCH= sparcv8plus | | 90 | SUNOS_ARCH= sparcv8plus |
91 | . endif | | 91 | . endif |
92 | .endif | | 92 | .endif |
93 | | | 93 | |
94 | PLIST_VARS+= sparc | | 94 | PLIST_VARS+= sparc |
95 | .if !empty(MACHINE_ARCH:Msparc*) | | 95 | .if !empty(MACHINE_ARCH:Msparc*) |
96 | PLIST.sparc= yes | | 96 | PLIST.sparc= yes |
97 | .endif | | 97 | .endif |
98 | | | 98 | |
99 | # Workaround for PR#41556. | | 99 | # Workaround for PR#41556. |
100 | # Avoid to use bsd_kqueue_apm, force to use bsd_apm instead. | | 100 | # Avoid to use bsd_kqueue_apm, force to use bsd_apm instead. |
101 | CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_event_h=no | | 101 | CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_event_h=no |
102 | | | 102 | |
103 | # Avoid picking up epoll on illumos | | 103 | # Avoid picking up epoll on illumos |
104 | CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create1=no | | 104 | CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create1=no |
105 | | | 105 | |
106 | # Only available in newer releases | | 106 | # Only available in newer releases |
107 | CONFIGURE_ENV.SunOS+= ac_cv_func_mkostemp=no | | 107 | CONFIGURE_ENV.SunOS+= ac_cv_func_mkostemp=no |
108 | | | 108 | |
109 | INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input | | 109 | INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input |
110 | | | 110 | |
111 | BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0 | | 111 | BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0 |
112 | BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2 | | 112 | BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2 |
113 | BUILDLINK_API_DEPENDS.dri+= dri>=7.8 | | 113 | BUILDLINK_API_DEPENDS.dri+= dri>=7.8 |
114 | BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2 | | 114 | BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2 |
115 | BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8 | | 115 | BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8 |
116 | | | 116 | |
117 | BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp | | 117 | BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp |
118 | CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" | | 118 | CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" |
119 | | | 119 | |
120 | .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD" | | 120 | .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD" |
121 | CONFIGURE_ARGS+= --with-sha1=libc | | 121 | CONFIGURE_ARGS+= --with-sha1=libc |
122 | .else | | 122 | .else |
123 | .include "../../security/nettle/buildlink3.mk" | | 123 | .include "../../security/nettle/buildlink3.mk" |
124 | CONFIGURE_ARGS+= --with-sha1=libnettle | | 124 | CONFIGURE_ARGS+= --with-sha1=libnettle |
125 | .endif | | 125 | .endif |
126 | | | 126 | |
127 | .include "../../devel/ncurses/buildlink3.mk" | | 127 | .include "../../devel/ncurses/buildlink3.mk" |
128 | .include "../../devel/zlib/buildlink3.mk" | | 128 | .include "../../devel/zlib/buildlink3.mk" |
129 | .include "../../fonts/libfontenc/buildlink3.mk" | | 129 | .include "../../fonts/libfontenc/buildlink3.mk" |
130 | BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0 | | 130 | BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0 |
131 | BUILDLINK_DEPMETHOD.libpciaccess= full | | 131 | BUILDLINK_DEPMETHOD.libpciaccess= full |
132 | .include "../../sysutils/libpciaccess/buildlink3.mk" | | 132 | .include "../../sysutils/libpciaccess/buildlink3.mk" |
133 | BUILDLINK_API_DEPENDS.xorgproto+= xorgproto>=2018.3 | | 133 | BUILDLINK_API_DEPENDS.xorgproto+= xorgproto>=2018.3 |
134 | .include "../../x11/xorgproto/buildlink3.mk" | | 134 | .include "../../x11/xorgproto/buildlink3.mk" |
135 | .include "../../x11/libX11/buildlink3.mk" | | 135 | .include "../../x11/libX11/buildlink3.mk" |
136 | .include "../../x11/libXau/buildlink3.mk" | | 136 | .include "../../x11/libXau/buildlink3.mk" |
137 | .include "../../x11/libXaw/buildlink3.mk" | | 137 | .include "../../x11/libXaw/buildlink3.mk" |
138 | BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1 | | 138 | BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1 |
139 | .include "../../x11/libXext/buildlink3.mk" | | 139 | .include "../../x11/libXext/buildlink3.mk" |
140 | .include "../../x11/libXfixes/buildlink3.mk" | | 140 | .include "../../x11/libXfixes/buildlink3.mk" |
141 | .include "../../x11/libXfont2/buildlink3.mk" | | 141 | .include "../../x11/libXfont2/buildlink3.mk" |
142 | .include "../../x11/libXt/buildlink3.mk" | | 142 | .include "../../x11/libXt/buildlink3.mk" |
143 | .include "../../x11/libXxf86vm/buildlink3.mk" | | 143 | .include "../../x11/libXxf86vm/buildlink3.mk" |
144 | .include "../../x11/libXinerama/buildlink3.mk" | | 144 | .include "../../x11/libXinerama/buildlink3.mk" |
145 | .include "../../x11/libxkbfile/buildlink3.mk" | | 145 | .include "../../x11/libxkbfile/buildlink3.mk" |
146 | .include "../../x11/pixman/buildlink3.mk" | | 146 | .include "../../x11/pixman/buildlink3.mk" |
147 | .include "../../x11/xcb-util-keysyms/buildlink3.mk" | | 147 | .include "../../x11/xcb-util-keysyms/buildlink3.mk" |
148 | .include "../../x11/xtrans/buildlink3.mk" | | 148 | .include "../../x11/xtrans/buildlink3.mk" |
149 | .include "../../mk/pthread.buildlink3.mk" | | 149 | .include "../../mk/pthread.buildlink3.mk" |