Module Name: src
Committed By: msaitoh
Date: Thu Dec 25 05:05:02 UTC 2014
Modified Files:
src/external/mit/xorg/include/xcb-proto [netbsd-6]: Makefile
src/external/mit/xorg/lib/fontconfig/src [netbsd-6]: Makefile
src/external/mit/xorg/server/xorg-server [netbsd-6]: Makefile
Log Message:
Pullup additional patches requested by mrg in ticket #1178:
external/mit/xorg/include/xcb-proto/Makefile patch
external/mit/xorg/lib/fontconfig/src/Makefile patch
external/mit/xorg/server/xorg-server/Makefile patch
xsrc/external/mit/fontconfig/include/config.h patch
- Fix compile error on non x86 archs.
- Fix unexpanded @@ in .pc files.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.8.1 src/external/mit/xorg/include/xcb-proto/Makefile
cvs rdiff -u -r1.7.4.2 -r1.7.4.3 \
src/external/mit/xorg/lib/fontconfig/src/Makefile
cvs rdiff -u -r1.19 -r1.19.8.1 \
src/external/mit/xorg/server/xorg-server/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/include/xcb-proto/Makefile
diff -u src/external/mit/xorg/include/xcb-proto/Makefile:1.1 src/external/mit/xorg/include/xcb-proto/Makefile:1.1.8.1
--- src/external/mit/xorg/include/xcb-proto/Makefile:1.1 Sat Jul 17 23:44:29 2010
+++ src/external/mit/xorg/include/xcb-proto/Makefile Thu Dec 25 05:05:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/07/17 23:44:29 mrg Exp $
+# $NetBSD: Makefile,v 1.1.8.1 2014/12/25 05:05:02 msaitoh Exp $
.include <bsd.own.mk>
@@ -13,6 +13,8 @@ FILES= bigreq.xml composite.xml damage.x
FILESDIR=${X11SHAREDIR}/xcb
PKGCONFIG= xcb-proto
+PKGCONFIG_SED_FLAGS= \
+ -e "s,@pythondir@,,"
NOPROG= # defined
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.7.4.2 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.7.4.3
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.7.4.2 Sun Dec 21 19:12:10 2014
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Thu Dec 25 05:05:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7.4.2 2014/12/21 19:12:10 msaitoh Exp $
+# $NetBSD: Makefile,v 1.7.4.3 2014/12/25 05:05:02 msaitoh Exp $
.include <bsd.own.mk>
@@ -119,13 +119,28 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free
.include "Makefile.fcarch"
+.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+CPPFLAGS+= -DHAVE_INTEL_ATOMIC_PRIMITIVES=1
+.endif
+
+.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+CPPFLAGS+= -DHAVE_INTEL_ATOMIC_PRIMITIVES=1
+.endif
+
CLEANFILES+= fcarch.h
PKGCONFIG= fontconfig
PKGCONFIG_SED_FLAGS= \
-e "s,@sysconfdir@,${X11ETCDIR},; \
s,@localstatedir@,/var,; \
+ s,@PACKAGE@,${PKGDIST},; \
s,@BASECONFIGDIR@,/etc/fonts,; \
+ s,@PKGCONFIG_REQUIRES@,${PKGCONFIG_REQUIRES},; \
+ s,@PKGCONFIG_REQUIRES_PRIVATELY@,${PKGCONFIG_REQUIRES_PRIVATELY},; \
+ s,@EXPAT_CFLAGS@,,; \
+ s,@FREETYPE_CFLAGS@,-I${X11ROOTDIR}/include/freetype2 -I${X11ROOTDIR}/include,; \
+ s,@ICONV_CFLAGS@,,; \
+ s,@LIBXML2_CFLAGS@,,; \
s,@fc_cachedir@,${FONTCONFIG_PATH},"
# XXX
Index: src/external/mit/xorg/server/xorg-server/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.19 src/external/mit/xorg/server/xorg-server/Makefile:1.19.8.1
--- src/external/mit/xorg/server/xorg-server/Makefile:1.19 Thu Jun 11 05:43:15 2009
+++ src/external/mit/xorg/server/xorg-server/Makefile Thu Dec 25 05:05:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/06/11 05:43:15 mrg Exp $
+# $NetBSD: Makefile,v 1.19.8.1 2014/12/25 05:05:02 msaitoh Exp $
.include <bsd.own.mk>
@@ -32,6 +32,10 @@ SUBDIR+= hw
.PATH: ${X11SRCDIR.xorg-server}
PKGCONFIG= xorg-server
+# Use -fvisibility=hidden for symbol_visibility?
+PKGCONFIG_SED_FLAGS= \
+ -e "s,@sysconfigdir@,${X11ETCDIR},; \
+ s,@symbol_visibility@,,"
.include <bsd.x11.mk>
.include <bsd.man.mk>
