Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
x11/modular-xorg-server/Makefile
View File

@@ -1,14 +1,15 @@
# $NetBSD: Makefile,v 1.102 2015/09/13 04:59:35 tnn Exp $
# $NetBSD: Makefile,v 1.109 2016/03/12 08:50:50 wiz Exp $
DISTNAME= xorg-server-${XORG_VERSION}
PKGNAME= modular-${DISTNAME}
PKGREVISION= 5
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Modular X11 server from modular X.org
SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
NOT_FOR_PLATFORM= Darwin-*-*
.include "Makefile.common"
CONFIGURE_ARGS+= --enable-xorg

17
x11/modular-xorg-server/Makefile.common
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile.common,v 1.1 2015/07/07 21:51:22 khorben Exp $
# $NetBSD: Makefile.common,v 1.11 2016/07/19 20:04:04 wiz Exp $
# used by x11/modular-xorg-server/Makefile
# used by x11/modular-xorg-xephyr/Makefile
XORG_VERSION= 1.17.2
XORG_VERSION= 1.18.4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
EXTRACT_SUFX= .tar.bz2
@@ -38,6 +38,7 @@ DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
CPPFLAGS+= -D_OPENBSD_SOURCE # for reallocarray(3)
CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org"
CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation"
# TLS is not supported by NetBSD<6
@@ -68,6 +69,7 @@ CONFIGURE_ARGS+= --disable-kdrive
#CONFIGURE_ARGS+= --disable-kdrive-vesa
CONFIGURE_ARGS+= --disable-xfake
CONFIGURE_ARGS+= --disable-xfbdev
CONFIGURE_ARGS+= --enable-xtrans-send-fds
CONFIGURE_ARGS+= --with-int10=x86emu
@@ -81,7 +83,7 @@ PLIST_SUBST+= SUNOS_ARCH=${SUNOS_ARCH}
PLIST.sunos= yes
. if ${MACHINE_ARCH} == "i386"
SUNOS_ARCH= ia32
. elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "x86_64"
. elif ${MACHINE_ARCH} == "x86_64"
SUNOS_ARCH= amd64
. elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
SUNOS_ARCH= sparcv8plus
@@ -95,9 +97,7 @@ PLIST.sparc= yes
# Workaround for PR#41556.
# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
.if ${OPSYS} == "NetBSD"
CONFIGURE_ENV+= ac_cv_header_sys_event_h=no
.endif
CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_event_h=no
INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
@@ -108,7 +108,7 @@ BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1
BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0
BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2
BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0
BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.22
BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.28
BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99
BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1
BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1
@@ -119,7 +119,7 @@ BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.16
BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.1.99.6
BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3
BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8
BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4.0
BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0
BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11
BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.1.0
@@ -161,7 +161,6 @@ BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1
.include "../../x11/libxkbfile/buildlink3.mk"
.include "../../x11/libxkbui/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
.include "../../x11/presentproto/buildlink3.mk"
.include "../../x11/randrproto/buildlink3.mk"
.include "../../x11/recordproto/buildlink3.mk"
.include "../../x11/renderproto/buildlink3.mk"

18
x11/modular-xorg-server/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.22 2015/09/13 04:59:35 tnn Exp $
@comment $NetBSD: PLIST,v 1.26 2016/03/14 02:13:33 tnn Exp $
bin/X
bin/Xnest
bin/Xorg
@@ -24,6 +24,7 @@ include/xorg/damage.h
include/xorg/damagestr.h
include/xorg/dbestruct.h
include/xorg/dgaproc.h
include/xorg/displaymode.h
include/xorg/dix.h
include/xorg/dixaccess.h
include/xorg/dixevents.h
@@ -33,7 +34,7 @@ include/xorg/dixgrabs.h
include/xorg/dixstruct.h
${PLIST.dri}include/xorg/dri.h
${PLIST.dri}include/xorg/dri2.h
${PLIST.dri3}include/xorg/dri3.h
${PLIST.dri}include/xorg/dri3.h
${PLIST.dri}include/xorg/dristruct.h
include/xorg/edid.h
include/xorg/events.h
@@ -52,7 +53,7 @@ include/xorg/gc.h
include/xorg/gcstruct.h
include/xorg/geext.h
include/xorg/geint.h
${PLIST.glamor}include/xorg/glamor.h
${PLIST.dri}include/xorg/glamor.h
include/xorg/globals.h
include/xorg/glx_extinit.h
include/xorg/glyphstr.h
@@ -78,6 +79,7 @@ include/xorg/misyncfd.h
include/xorg/misyncshm.h
include/xorg/misyncstr.h
include/xorg/mizerarc.h
include/xorg/nonsdk_extinit.h
include/xorg/opaque.h
include/xorg/optionstr.h
include/xorg/os.h
@@ -87,8 +89,8 @@ include/xorg/picture.h
include/xorg/picturestr.h
include/xorg/pixmap.h
include/xorg/pixmapstr.h
include/xorg/present.h
include/xorg/presentext.h
${PLIST.dri}include/xorg/present.h
${PLIST.dri}include/xorg/presentext.h
include/xorg/privates.h
include/xorg/property.h
include/xorg/propertyst.h
@@ -110,14 +112,11 @@ include/xorg/shadowfb.h
include/xorg/shmint.h
include/xorg/site.h
${PLIST.sunos}include/xorg/solaris-${SUNOS_ARCH}.il
include/xorg/swaprep.h
include/xorg/swapreq.h
include/xorg/syncsdk.h
include/xorg/validate.h
include/xorg/vbe.h
include/xorg/vbeModes.h
include/xorg/vgaHW.h
include/xorg/vidmodeproc.h
include/xorg/wfbrename.h
include/xorg/window.h
include/xorg/windowstr.h
@@ -155,7 +154,6 @@ include/xorg/xf86str.h
include/xorg/xf86xv.h
include/xorg/xf86xvmc.h
include/xorg/xf86xvpriv.h
include/xorg/xfixes.h
include/xorg/xisb.h
include/xorg/xkbfile.h
include/xorg/xkbrules.h
@@ -172,7 +170,7 @@ ${PLIST.dri}lib/xorg/modules/extensions/libglx.la
lib/xorg/modules/libexa.la
lib/xorg/modules/libfb.la
lib/xorg/modules/libfbdevhw.la
${PLIST.glamor}lib/xorg/modules/libglamoregl.la
${PLIST.dri}lib/xorg/modules/libglamoregl.la
lib/xorg/modules/libint10.la
lib/xorg/modules/libshadow.la
lib/xorg/modules/libshadowfb.la

12
x11/modular-xorg-server/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.15 2015/04/25 11:47:03 tnn Exp $
# $NetBSD: buildlink3.mk,v 1.18 2016/03/14 02:13:33 tnn Exp $
BUILDLINK_TREE+= modular-xorg-server
@@ -13,7 +13,7 @@ USE_OLD_MODULAR_XORG_SERVER?= no
BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.12.4nb12<1.17
BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server112
.else
BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.17
BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.18
BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server
.endif
@@ -23,19 +23,25 @@ BUILDLINK_DEPMETHOD.libpciaccess= full
.include "../../x11/compositeproto/buildlink3.mk"
.include "../../x11/dri2proto/buildlink3.mk"
.include "../../x11/dri3proto/buildlink3.mk"
.include "../../x11/fontsproto/buildlink3.mk"
.if empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS])
.if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS])
.include "../../graphics/MesaLib7/buildlink3.mk" # XXX should not be needed for non-dri build
.else
.include "../../graphics/MesaLib/buildlink3.mk" # XXX should not be needed for non-dri build
.include "../../x11/resourceproto/buildlink3.mk"
.include "../../x11/scrnsaverproto/buildlink3.mk"
.include "../../x11/presentproto/buildlink3.mk"
.endif
.include "../../x11/inputproto/buildlink3.mk"
.include "../../x11/libXfont/buildlink3.mk"
BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0
.include "../../x11/randrproto/buildlink3.mk"
.include "../../x11/renderproto/buildlink3.mk"
.include "../../x11/videoproto/buildlink3.mk"
.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/xf86driproto/buildlink3.mk"
BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.28
.include "../../x11/xproto/buildlink3.mk"
.include "../../x11/xineramaproto/buildlink3.mk"
.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK

24
x11/modular-xorg-server/distinfo
View File

@@ -1,17 +1,21 @@
$NetBSD: distinfo,v 1.63 2015/09/20 15:32:38 tnn Exp $
$NetBSD: distinfo,v 1.76 2016/07/19 20:04:04 wiz Exp $
SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262
RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2
Size (xorg-server-1.17.2.tar.bz2) = 5767983 bytes
SHA1 (xorg-server-1.18.4.tar.bz2) = ff088ee29dee46a2d68925c8df3f0515ef15ec52
RMD160 (xorg-server-1.18.4.tar.bz2) = 6f58d84d3bbc59a773e6a2e1eafc208827a5923f
SHA512 (xorg-server-1.18.4.tar.bz2) = 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
Size (xorg-server-1.18.4.tar.bz2) = 6009508 bytes
SHA1 (patch-configure) = b3c5ae8cd7aca96dbb5a237dda061e8c2569b2f2
SHA1 (patch-exa_exa__render.c) = 4e144b977797d9cdc7e08c286aaedb303f1a1aa8
SHA1 (patch-hw_xfree86_common_compiler.h) = c6f2a1ec352e3577dcd46acc8c9c45d81a0c3964
SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
SHA1 (patch-hw_xfree86_os-support_bsd_sparc64__video.c) = eddf15142e26f10f9028088f8e4e910bb6b5df59
SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 74ddd0ce09b8d4426accca5a1a1d25bc6cea6524
SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
SHA1 (patch-os_WaitFor.c) = 6060455bd8d145116b4177c5b0f482cf39c741ea
SHA1 (patch-os_connection.c) = 19189656fbcabb0a48b68a7606660bda33e5d605
SHA1 (patch-os_io.c) = 42c41abee29d241e3d7e10d59764c573a2165d55
SHA1 (patch-hw_xfree86_sdksyms.sh) = c403149ad35ffb70ee44f70de94b4497b751c118
SHA1 (patch-os_WaitFor.c) = a76c5ef4e3725f5299fa3f0860183e89c6004a71
SHA1 (patch-os_connection.c) = d6b9bbc1ab34cec6457aa68546105ea5deb6ded6
SHA1 (patch-os_io.c) = 6216e35e780706a8d5aaa60652c9ae7b4ec8e6e6
SHA1 (patch-os_xdmcp.c) = 3d0f3a1d8c7078f3c8752e5ca12929e41d76f899
SHA1 (patch-os_xstrans.c) = 489a4f4b226ecd361b922895204fb9041b065d4e

37
x11/modular-xorg-server/options.mk
View File

@@ -1,48 +1,49 @@
# $NetBSD: options.mk,v 1.12 2015/09/13 04:59:35 tnn Exp $
# $NetBSD: options.mk,v 1.15 2016/03/14 02:13:33 tnn Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server
PKG_SUPPORTED_OPTIONS= dri inet6 debug dtrace
PKG_SUGGESTED_OPTIONS= dri inet6
PKG_SUPPORTED_OPTIONS= inet6 debug dtrace
PKG_SUGGESTED_OPTIONS= inet6
.if ${X11_TYPE} == "modular"
PKG_SUPPORTED_OPTIONS+= dri
PKG_SUGGESTED_OPTIONS+= dri
.endif
.include "../../mk/bsd.options.mk"
PLIST_VARS+= dri dri3 dtrace glamor
PLIST_VARS+= dri dtrace
.if !empty(PKG_OPTIONS:Mdri)
.include "../../graphics/libepoxy/buildlink3.mk"
BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=10
BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../x11/glproto/buildlink3.mk"
.include "../../x11/dri2proto/buildlink3.mk"
.include "../../x11/dri3proto/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
.include "../../x11/libxshmfence/buildlink3.mk"
.include "../../x11/presentproto/buildlink3.mk"
.include "../../x11/xf86driproto/buildlink3.mk"
PLIST.dri= yes
CONFIGURE_ARGS+= --enable-dri
CONFIGURE_ARGS+= --enable-dri2
CONFIGURE_ARGS+= --enable-dri3
CONFIGURE_ARGS+= --enable-glx
CONFIGURE_ARGS+= --enable-aiglx
. if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
PLIST.glamor= yes
CONFIGURE_ARGS+= --enable-glamor
.include "../../x11/libxshmfence/buildlink3.mk"
. endif
# Linux supports dri3
. if ${OPSYS} == "Linux"
PLIST.dri3= yes
.include "../../x11/dri3proto/buildlink3.mk"
CONFIGURE_ARGS+= --enable-dri3
. else
CONFIGURE_ARGS+= --disable-dri3
. endif
CONFIGURE_ARGS+= --enable-present
.else
###
### XXX Perhaps we should allow for a built-in glx without dri enabled?
###
CONFIGURE_ARGS+= --disable-dri
CONFIGURE_ARGS+= --disable-dri2
CONFIGURE_ARGS+= --disable-dri3
CONFIGURE_ARGS+= --disable-glx
CONFIGURE_ARGS+= --disable-present
pre-build: disable-modesetting
.PHONY: disable-modesetting
disable-modesetting:
(echo "all:"; echo "install:") > ${WRKSRC}/hw/xfree86/drivers/modesetting/Makefile
(${ECHO} "all:"; ${ECHO} "install:") > ${WRKSRC}/hw/xfree86/drivers/modesetting/Makefile
.endif
.if !empty(PKG_OPTIONS:Minet6)

20
x11/modular-xorg-server/patches/patch-exa_exa__render.c
View File

@@ -1,20 +0,0 @@
$NetBSD: patch-exa_exa__render.c,v 1.2 2015/04/25 11:47:03 tnn Exp $
Fix CVE-2013-6424 using
http://lists.x.org/archives/xorg-devel/2013-October/037996.html
XXX why does upstream not have this patch?
XXX was it fixed differently or is it still unpatched?
--- exa/exa_render.c.orig 2015-01-17 23:42:52.000000000 +0000
+++ exa/exa_render.c
@@ -1141,7 +1141,8 @@ exaTrapezoids(CARD8 op, PicturePtr pSrc,
exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
for (; ntrap; ntrap--, traps++)
- (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1);
+ if (xTrapezoidValid(traps))
+ (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1);
exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
xRel = bounds.x1 + xSrc - xDst;

53
x11/modular-xorg-server/patches/patch-hw_xfree86_common_compiler.h
View File

@@ -1,53 +0,0 @@
$NetBSD: patch-hw_xfree86_common_compiler.h,v 1.2 2015/04/25 11:47:03 tnn Exp $
--- hw/xfree86/common/compiler.h.orig 2015-01-17 23:42:52.000000000 +0000
+++ hw/xfree86/common/compiler.h
@@ -972,26 +972,26 @@ inl(unsigned PORT_SIZE port)
static __inline__ void
outb(unsigned short port, unsigned char val)
{
- __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port));
+ __asm__ __volatile__("outb %0, %1"::"a"(val), "d"(port));
}
static __inline__ void
outw(unsigned short port, unsigned short val)
{
- __asm__ __volatile__("out%W0 (%1)"::"a"(val), "d"(port));
+ __asm__ __volatile__("outw %0, %1"::"a"(val), "d"(port));
}
static __inline__ void
outl(unsigned short port, unsigned int val)
{
- __asm__ __volatile__("out%L0 (%1)"::"a"(val), "d"(port));
+ __asm__ __volatile__("outl %0, %1"::"a"(val), "d"(port));
}
static __inline__ unsigned int
inb(unsigned short port)
{
unsigned char ret;
- __asm__ __volatile__("in%B0 (%1)":"=a"(ret):"d"(port));
+ __asm__ __volatile__("inb %1, %0":"=a"(ret):"d"(port));
return ret;
}
@@ -1000,7 +1000,7 @@ static __inline__ unsigned int
inw(unsigned short port)
{
unsigned short ret;
- __asm__ __volatile__("in%W0 (%1)":"=a"(ret):"d"(port));
+ __asm__ __volatile__("inw %1, %0":"=a"(ret):"d"(port));
return ret;
}
@@ -1009,7 +1009,7 @@ static __inline__ unsigned int
inl(unsigned short port)
{
unsigned int ret;
- __asm__ __volatile__("in%L0 (%1)":"=a"(ret):"d"(port));
+ __asm__ __volatile__("inl %1, %0":"=a"(ret):"d"(port));
return ret;
}

24
x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_arm__video.c Normal file
View File

@@ -0,0 +1,24 @@
$NetBSD: patch-hw_xfree86_os-support_bsd_arm__video.c,v 1.1 2016/02/23 22:32:45 tnn Exp $
XXX stubs for now, sufficient for wsfb. Need to sync this file with xsrc.
--- hw/xfree86/os-support/bsd/arm_video.c.orig 2016-01-06 17:23:08.000000000 +0000
+++ hw/xfree86/os-support/bsd/arm_video.c
@@ -66,6 +66,12 @@
#include "xf86_OSlib.h"
#include "xf86OSpriv.h"
+#if defined(__NetBSD__)
+Bool xf86EnableIO(void) { return TRUE; }
+void xf86DisableIO(void) { return; }
+void xf86OSInitVidMem(VidMemInfoPtr pVidMem) { pVidMem->initialised = TRUE; }
+#else /* DISABLED */
+
#if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED
#else
@@ -203,3 +209,4 @@ xf86DisableIO()
}
#endif /* USE_ARC_MMAP */
+#endif /* DISABLED */

26
x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_bsd__VTsw.c Normal file
View File

@@ -0,0 +1,26 @@
$NetBSD: patch-hw_xfree86_os-support_bsd_bsd__VTsw.c,v 1.1 2015/10/11 18:28:53 tnn Exp $
VT switching support. From xsrc.
--- hw/xfree86/os-support/bsd/bsd_VTsw.c.orig 2015-05-21 14:21:39.000000000 +0000
+++ hw/xfree86/os-support/bsd/bsd_VTsw.c
@@ -68,6 +68,9 @@ xf86VTSwitchAway()
{
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
+#ifdef WSCONS_SUPPORT
+ ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
+#endif
xf86Info.vtRequestsPending = FALSE;
if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
return FALSE;
@@ -83,6 +86,9 @@ xf86VTSwitchTo()
{
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
+#ifdef WSCONS_SUPPORT
+ ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS);
+#endif
xf86Info.vtRequestsPending = FALSE;
if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)
return FALSE;

23
x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_sparc64__video.c
View File

@@ -1,23 +0,0 @@
$NetBSD: patch-hw_xfree86_os-support_bsd_sparc64__video.c,v 1.1 2015/04/25 11:47:03 tnn Exp $
For some reason we need these symbls to link.
--- hw/xfree86/os-support/bsd/sparc64_video.c.orig 2015-01-17 23:42:52.000000000 +0000
+++ hw/xfree86/os-support/bsd/sparc64_video.c
@@ -43,3 +43,16 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
{
pVidMem->initialised = TRUE;
}
+
+void
+xf86SetTVOut(int mode)
+{
+ return;
+}
+
+void
+xf86SetRGBOut()
+{
+ return;
+}
+

15
x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSproc.h Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-hw_xfree86_os-support_xf86_OSproc.h,v 1.1 2016/02/23 22:32:45 tnn Exp $
These are in i386_video.c only. XXX what are they used for?
--- hw/xfree86/os-support/xf86_OSproc.h.orig 2016-01-06 17:23:08.000000000 +0000
+++ hw/xfree86/os-support/xf86_OSproc.h
@@ -115,7 +115,7 @@ _XFUNCPROTOBEGIN
extern _X_EXPORT Bool xf86EnableIO(void);
extern _X_EXPORT void xf86DisableIO(void);
-#ifdef __NetBSD__
+#if defined(__NetBSD__) && (defined(__i386__) || defined(__x86_64__))
extern _X_EXPORT void xf86SetTVOut(int);
extern _X_EXPORT void xf86SetRGBOut(void);
#endif

27
x11/modular-xorg-server/patches/patch-hw_xfree86_sdksyms.sh Normal file
View File

@@ -0,0 +1,27 @@
$NetBSD: patch-hw_xfree86_sdksyms.sh,v 1.1 2016/04/10 07:35:20 tnn Exp $
Kludge sdksyms.c generator to not fail on GetClientPid.
It returns pid_t which on NetBSD is #define pid_t __pid_t
This slightly alters the GCC preprocessor output which this fragile
code could not deal with when using GCC 5+
--- hw/xfree86/sdksyms.sh.orig 2016-03-08 20:22:17.000000000 +0000
+++ hw/xfree86/sdksyms.sh
@@ -357,6 +357,17 @@ BEGIN {
n = 1;
}
}
+ # hack: pid_t becomes __pid_t on NetBSD.
+ # GCC 5 inserts additional lines around this.
+ if ($1 == "__pid_t" && NF == 1) {
+ getline;
+ n++;
+ # skip line numbers GCC 5 adds (after typedef return type?)
+ while ($n == "" || $0 ~ /^# [0-9]+ "/) {
+ getline;
+ n = 1;
+ }
+ }
# type specifier may not be set, as in
# extern _X_EXPORT unsigned name(...)

16
x11/modular-xorg-server/patches/patch-os_WaitFor.c
View File

@@ -1,24 +1,18 @@
$NetBSD: patch-os_WaitFor.c,v 1.1 2015/07/25 04:10:53 markd Exp $
$NetBSD: patch-os_WaitFor.c,v 1.2 2015/10/11 17:40:24 tnn Exp $
move X11/Xpoll.h include earlier than sys/select.h to avoid missing
out on setting FD_SETSIZE early enough.
--- os/WaitFor.c.orig 2015-07-21 21:58:16.000000000 +0000
--- os/WaitFor.c.orig 2015-05-21 14:23:54.000000000 +0000
+++ os/WaitFor.c
@@ -52,6 +52,8 @@ SOFTWARE.
@@ -52,6 +52,10 @@ SOFTWARE.
*
*****************************************************************/
+#ifdef __NetBSD__
+#include <X11/Xpoll.h>
+#endif
+
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
@@ -66,7 +68,6 @@ SOFTWARE.
#include "misc.h"
#include "osdep.h"
-#include <X11/Xpoll.h>
#include "dixstruct.h"
#include "opaque.h"
#ifdef DPMSExtension

16
x11/modular-xorg-server/patches/patch-os_connection.c
View File

@@ -1,24 +1,18 @@
$NetBSD: patch-os_connection.c,v 1.1 2015/07/25 04:10:53 markd Exp $
$NetBSD: patch-os_connection.c,v 1.2 2015/10/11 17:40:24 tnn Exp $
move X11/Xpoll.h include earlier than sys/select.h to avoid missing
out on setting FD_SETSIZE early enough.
--- os/connection.c.orig 2015-07-21 21:58:52.000000000 +0000
--- os/connection.c.orig 2015-06-16 15:21:07.000000000 +0000
+++ os/connection.c
@@ -60,6 +60,8 @@ SOFTWARE.
@@ -60,6 +60,10 @@ SOFTWARE.
*
*****************************************************************/
+#ifdef __NetBSD__
+#include <X11/Xpoll.h>
+#endif
+
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
@@ -103,7 +105,6 @@ SOFTWARE.
#endif /* WIN32 */
#include "misc.h" /* for typedef of pointer */
#include "osdep.h"
-#include <X11/Xpoll.h>
#include "opaque.h"
#include "dixstruct.h"
#include "xace.h"

16
x11/modular-xorg-server/patches/patch-os_io.c
View File

@@ -1,24 +1,18 @@
$NetBSD: patch-os_io.c,v 1.1 2015/07/25 04:10:53 markd Exp $
$NetBSD: patch-os_io.c,v 1.2 2015/10/11 17:40:24 tnn Exp $
move X11/Xpoll.h include earlier than sys/select.h to avoid missing
out on setting FD_SETSIZE early enough.
--- os/io.c.orig 2015-07-21 21:58:59.000000000 +0000
--- os/io.c.orig 2015-05-21 14:23:54.000000000 +0000
+++ os/io.c
@@ -51,6 +51,8 @@ SOFTWARE.
@@ -51,6 +51,10 @@ SOFTWARE.
*
*****************************************************************/
+#ifdef __NetBSD__
+#include <X11/Xpoll.h>
+#endif
+
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
@@ -74,7 +76,6 @@ SOFTWARE.
#include <X11/Xproto.h>
#include "os.h"
#include "osdep.h"
-#include <X11/Xpoll.h>
#include "opaque.h"
#include "dixstruct.h"
#include "misc.h"

18
x11/modular-xorg-server/patches/patch-os_xdmcp.c Normal file
View File

@@ -0,0 +1,18 @@
$NetBSD: patch-os_xdmcp.c,v 1.1 2015/10/12 21:48:33 tnn Exp $
move X11/Xpoll.h include earlier than sys/select.h to avoid missing
out on setting FD_SETSIZE early enough.
--- os/xdmcp.c.orig 2015-06-16 15:21:07.000000000 +0000
+++ os/xdmcp.c
@@ -13,6 +13,10 @@
*
*/
+#ifdef __NetBSD__
+#include <X11/Xpoll.h>
+#endif
+
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif

21
x11/modular-xorg-server/patches/patch-os_xstrans.c Normal file
View File

@@ -0,0 +1,21 @@
$NetBSD: patch-os_xstrans.c,v 1.1 2015/09/26 18:35:41 tnn Exp $
CMSG_SPACE must evaluate to a constant, but doesn't on netbsd-5.
See sys/socket.h r1.104.
--- os/xstrans.c.orig 2015-05-21 14:23:54.000000000 +0000
+++ os/xstrans.c
@@ -14,4 +14,13 @@ _X_ATTRIBUTE_PRINTF(1, 2);
#define TRANS_REOPEN
#define TRANS_SERVER
#define XSERV_t
+#if defined(__NetBSD__)
+#include <sys/param.h>
+#if (__NetBSD_Version__ < 600000000)
+#include <sys/socket.h>
+#define __MY_CMSG_ALIGN(n) (((n) + 7) & ~7)
+#undef CMSG_SPACE
+#define CMSG_SPACE(l) (__MY_CMSG_ALIGN(sizeof(struct msghdr)) + __MY_CMSG_ALIGN(l))
+#endif
+#endif
#include <X11/Xtrans/transport.c>