Index: x11-servers/xephyr/Makefile =================================================================== --- x11-servers/xephyr/Makefile (revision 427130) +++ x11-servers/xephyr/Makefile (working copy) @@ -4,30 +4,28 @@ COMMENT= X server from X.Org based on kdrive +LICENSE= MIT + LIB_DEPENDS+= libxcb-image.so:x11/xcb-util-image \ libxcb-icccm.so:x11/xcb-util-wm \ libxcb-keysyms.so:x11/xcb-util-keysyms \ - libxcb-render-util.so:x11/xcb-util-renderutil + libxcb-render-util.so:x11/xcb-util-renderutil \ + libxcb-util.so:x11/xcb-util MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr -USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ - dri2proto damageproto xcmiscproto xtrans inputproto \ - xf86bigfontproto scrnsaverproto bigreqsproto \ - resourceproto fontsproto videoproto \ - compositeproto trapproto recordproto \ - xineramaproto xinerama evieproto xkbfile xfont \ - xau xdmcp xext fontenc xv pixman presentproto -CONFIGURE_ARGS= --enable-kdrive --enable-xephyr --disable-dmx --disable-xvfb \ - --without-xmlto --disable-docs --disable-devel-docs \ - --disable-xnest --localstatedir=/var --without-dtrace +SLAVE_PORT= yes +OPTIONS_EXCLUDE=DEVD HAL SUID -SLAVE_PORT= yes +USE_XORG= x11 xcb + +CONFIGURE_ARGS+=--enable-xephyr --disable-dmx --disable-xnest --disable-xvfb \ + --enable-kdrive + PLIST_FILES= bin/Xephyr man/man1/Xephyr.1.gz do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/man/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/ + cd ${WRKSRC}/hw/kdrive/ephyr; DESTDIR=${STAGEDIR} ${MAKE} install .include "${MASTERDIR}/Makefile" Index: x11-servers/xephyr/distinfo =================================================================== --- x11-servers/xephyr/distinfo (revision 427130) +++ x11-servers/xephyr/distinfo (nonexistent) @@ -1,2 +0,0 @@ -SHA256 (xorg/xserver/xorg-server-1.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5 -SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174 Property changes on: x11-servers/xephyr/distinfo ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: x11-servers/xorg-dmx/Makefile =================================================================== --- x11-servers/xorg-dmx/Makefile (revision 427130) +++ x11-servers/xorg-dmx/Makefile (working copy) @@ -5,23 +5,18 @@ COMMENT= Distributed Multihead X from X.Org +LICENSE= MIT + MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr -USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ - dri2proto damageproto xcmiscproto xextproto xf86miscproto \ - xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ - resourceproto fontsproto xf86dgaproto videoproto \ - compositeproto trapproto recordproto resourceproto \ - xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \ - xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \ - xau dmx xtst xres pixman xtrans presentproto -CONFIGURE_ARGS= --disable-xvfb --disable-xnest \ - --without-xmlto --disable-docs --disable-devel-docs \ - --enable-dmx --localstatedir=/var --without-dtrace - SLAVE_PORT= yes +OPTIONS_EXCLUDE=DEVD HAL SUID +USE_XORG= dmx dmxproto x11 xaw7 xext xfixes xi xmu xpm xrender xres xt xtst + +CONFIGURE_ARGS+=--enable-dmx --disable-xephyr --disable-xnest --disable-xvfb + do-install: cd ${WRKSRC}/hw/dmx; DESTDIR=${STAGEDIR} ${MAKE} install Index: x11-servers/xorg-dmx/distinfo =================================================================== --- x11-servers/xorg-dmx/distinfo (revision 427130) +++ x11-servers/xorg-dmx/distinfo (nonexistent) @@ -1,2 +0,0 @@ -SHA256 (xorg/xserver/xorg-server-1.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5 -SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174 Property changes on: x11-servers/xorg-dmx/distinfo ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: x11-servers/xorg-nestserver/Makefile =================================================================== --- x11-servers/xorg-nestserver/Makefile (revision 427130) +++ x11-servers/xorg-nestserver/Makefile (working copy) @@ -2,58 +2,24 @@ # $FreeBSD$ PORTNAME= xorg-nestserver -PORTVERSION= 1.18.4 -PORTEPOCH= 1 -CATEGORIES= x11-servers -MASTER_SITES= XORG/individual/xserver -DISTNAME= xorg-server-${PORTVERSION} -DIST_SUBDIR= xorg/xserver -MAINTAINER= x11@FreeBSD.org COMMENT= Nesting X server from X.Org LICENSE= MIT -LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms +MASTERDIR= ${.CURDIR}/../xorg-server +DESCR= ${.CURDIR}/pkg-descr -USES= tar:bzip2 pkgconfig ssl -INSTALL_WRKSRC= ${WRKSRC}/hw/xnest -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-dmx \ - --disable-xephyr \ - --enable-xnest \ - --disable-xfbdev \ - --disable-kdrive \ - --disable-xfake \ - --disable-screensaver \ - --disable-xwin \ - --disable-xwayland \ - --disable-xorg \ - --without-xmlto \ - --disable-docs \ - --disable-devel-docs \ - --localstatedir=/var \ - --without-dtrace \ - --without-doxygen \ - --disable-glx \ - --disable-dri \ - --disable-config-hal \ - --disable-libdrm \ - --disable-glx-tls \ - --disable-vbe \ - --disable-vgahw \ - --disable-xvfb \ - --with-fontrootdir=${PREFIX}/share/fonts +SLAVE_PORT= yes +OPTIONS_EXCLUDE=DEVD HAL SUID -USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ - damageproto xcmiscproto xextproto xf86miscproto inputproto \ - xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ - dri2proto resourceproto fontsproto xf86dgaproto videoproto \ - compositeproto trapproto recordproto resourceproto \ - xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \ - xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans presentproto +USE_XORG= x11 xext -PLIST_FILES= bin/Xnest \ - man/man1/Xnest.1.gz +CONFIGURE_ARGS+=--enable-xnest --disable-dmx --disable-xephyr --disable-xvfb -.include +PLIST_FILES= bin/Xnest man/man1/Xnest.1.gz + +do-install: + cd ${WRKSRC}/hw/xnest; DESTDIR=${STAGEDIR} ${MAKE} install + +.include "${MASTERDIR}/Makefile" Index: x11-servers/xorg-nestserver/distinfo =================================================================== --- x11-servers/xorg-nestserver/distinfo (revision 427130) +++ x11-servers/xorg-nestserver/distinfo (nonexistent) @@ -1,3 +0,0 @@ -TIMESTAMP = 1478071056 -SHA256 (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 -SIZE (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 6009508 Property changes on: x11-servers/xorg-nestserver/distinfo ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: x11-servers/xorg-server/Makefile =================================================================== --- x11-servers/xorg-server/Makefile (revision 427130) +++ x11-servers/xorg-server/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= xorg-server -PORTVERSION= 1.17.4 +PORTVERSION= 1.18.4 PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES= x11-servers @@ -14,8 +14,6 @@ LICENSE= MIT -LIB_DEPENDS+= libdrm.so:graphics/libdrm \ - libepoxy.so:graphics/libepoxy RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \ xkbcomp:x11/xkbcomp @@ -25,38 +23,42 @@ OPTIONS_SUB= yes OPTIONS_DEFINE= SUID OPTIONS_RADIO= CONF -OPTIONS_RADIO_CONF= HAL DEVD +OPTIONS_RADIO_CONF= DEVD HAL +DEVD_DESC= Use devd for autoconfiguration of input devices +HAL_DEWC= Use hald for autoconfiguration of input devices SUID_DESC= Install the Xorg server with setuid bit set -HAL_DESC= Compile with HAL config support -DEVD_DESC= Use devd for autoconfiguration of input devices -OPTIONS_DEFAULT=SUID DEVD +OPTIONS_DEFAULT=DEVD SUID OPTIONS_EXCLUDE_sparc64= HAL .include -USES= gmake libtool perl5 tar:bzip2 +USES= gmake libtool perl5 ssl tar:bzip2 USE_PERL5= build -USE_GL= gbm egl gl -USE_XORG?= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \ - xmu xt xpm xext randrproto renderproto fixesproto damageproto \ - dri2proto xcmiscproto xextproto xproto xtrans \ - xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto \ - bigreqsproto resourceproto fontsproto inputproto xf86dgaproto \ - videoproto compositeproto trapproto presentproto recordproto \ - xineramaproto xinerama evieproto xfont fontenc xkbui pixman \ - pciaccess xshmfence -USE_OPENSSL= yes -CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \ - --without-xmlto --disable-docs --disable-devel-docs \ - --localstatedir=/var --without-dtrace --disable-xephyr \ - --enable-record=yes --disable-dri3 --disable-xwayland \ - --enable-glamor +USE_GL+= gl +USE_XORG+= bigreqsproto compositeproto damageproto dri2proto \ + fixesproto fontsproto glproto inputproto kbproto pixman \ + presentproto randrproto recordproto renderproto \ + resourceproto scrnsaverproto videoproto xau \ + xcmiscproto xdmcp xextproto xf86driproto xfont \ + xineramaproto xkbfile xproto xshmfence xtrans +CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \ + --localstatedir=/var --with-shared-memory-dir=/tmp \ + --without-dtrace --disable-xwayland --disable-dri3 --enable-glamor INSTALL_TARGET= install-strip +.if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr" +LIB_DEPENDS+= libdrm.so:graphics/libdrm \ + libepoxy.so:graphics/libepoxy +.endif + .if ${SLAVE_PORT} == "no" +USE_GL+= gbm +USE_XORG+= pciaccess xf86dgaproto xf86vidmodeproto +CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb SUB_FILES= pkg-install pkg-deinstall .else +CONFIGURE_ARGS+=--disable-xorg # for slave ports we need to overwrite PLIST, so it doesn't overwrite # PLIST_FILES, with the masterport plist. PLIST= ${.CURDIR}/pkg-plist @@ -73,29 +75,16 @@ .if ${PORT_OPTIONS:MHAL} LIB_DEPENDS+= libhal.so:sysutils/hal -CONFIGURE_ARGS+= --enable-config-hal=yes +CONFIGURE_ARGS+= --enable-config-hal .else -CONFIGURE_ARGS+= --enable-config-hal=no +CONFIGURE_ARGS+= --disable-config-hal .endif # We handle Xorg setuid in the plist. This allows to build xorg-server as a user. CONFIGURE_ARGS+=--disable-install-setuid -.if ${ARCH} == i386 -EXTRA_PATCHES+= ${FILESDIR}/extra-arch-i386 -.endif - -.if ${ARCH} == ia64 -EXTRA_PATCHES+= ${FILESDIR}/extra-arch-ia64 -.endif - -.if ${ARCH} == powerpc || ${ARCH} == powerpc64 -EXTRA_PATCHES+= ${FILESDIR}/extra-arch-powerpc -.endif - .if ${ARCH} == sparc64 PLIST_SUB+= SPARC64="" -EXTRA_PATCHES+= ${FILESDIR}/extra-arch-sparc64 .else PLIST_SUB+= SPARC64="@comment " .endif Index: x11-servers/xorg-server/distinfo =================================================================== --- x11-servers/xorg-server/distinfo (revision 427130) +++ x11-servers/xorg-server/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (xorg/xserver/xorg-server-1.17.4.tar.bz2) = 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 -SIZE (xorg/xserver/xorg-server-1.17.4.tar.bz2) = 5791384 +TIMESTAMP = 1469260730 +SHA256 (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 +SIZE (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 6009508 Index: x11-servers/xorg-server/files/extra-arch-i386 =================================================================== --- x11-servers/xorg-server/files/extra-arch-i386 (revision 427130) +++ x11-servers/xorg-server/files/extra-arch-i386 (nonexistent) @@ -1,70 +0,0 @@ ---- hw/xfree86/common/compiler.h.orig 2015-06-05 17:19:40.000000000 +0200 -+++ hw/xfree86/common/compiler.h 2015-10-12 15:41:30.817470000 +0200 -@@ -968,6 +968,59 @@ inl(unsigned PORT_SIZE port) - #endif /* NDS32_MMIO_SWAP */ - - #elif defined(__i386__) || defined(__ia64__) -+#if defined(__clang__) -+ -+/* -+ * If gcc uses gas rather than the native assembler, the syntax of these -+ * inlines has to be different. DHD -+ */ -+ -+static __inline__ void -+outb(unsigned short port, unsigned char val) -+{ -+ __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port)); -+} -+ -+static __inline__ void -+outw(unsigned short port, unsigned short val) -+{ -+ __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port)); -+} -+ -+static __inline__ void -+outl(unsigned short port, unsigned int val) -+{ -+ __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port)); -+} -+ -+static __inline__ unsigned int -+inb(unsigned short port) -+{ -+ unsigned char ret; -+ __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port)); -+ -+ return ret; -+} -+ -+static __inline__ unsigned int -+inw(unsigned short port) -+{ -+ unsigned short ret; -+ __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port)); -+ -+ return ret; -+} -+ -+static __inline__ unsigned int -+inl(unsigned short port) -+{ -+ unsigned int ret; -+ __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port)); -+ -+ return ret; -+} -+ -+#else /* !__clang__, presumable GAS */ - - static __inline__ void - outb(unsigned short port, unsigned char val) -@@ -1014,6 +1067,7 @@ inl(unsigned short port) - return ret; - } - -+#endif /* !__clang__, GAS part */ - #endif /* arch madness */ - - #else /* !GNUC */ Property changes on: x11-servers/xorg-server/files/extra-arch-i386 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: x11-servers/xorg-server/files/extra-arch-ia64 =================================================================== --- x11-servers/xorg-server/files/extra-arch-ia64 (revision 427130) +++ x11-servers/xorg-server/files/extra-arch-ia64 (nonexistent) @@ -1,205 +0,0 @@ ---- configure.dist 2009-06-18 17:05:59.000000000 -0700 -+++ configure 2009-06-18 17:08:47.000000000 -0700 -@@ -1097,6 +1097,8 @@ - SPARC64_VIDEO_TRUE - PPC_VIDEO_FALSE - PPC_VIDEO_TRUE -+IA64_VIDEO_FALSE -+IA64_VIDEO_TRUE - I386_VIDEO_FALSE - I386_VIDEO_TRUE - ARM_VIDEO_FALSE -@@ -19134,6 +19136,7 @@ - GLX_ARCH_DEFINES="-D__GLX_ALIGN64" - ;; - ia64*) -+ IA64_VIDEO=yes - GLX_ARCH_DEFINES="-D__GLX_ALIGN64" - ;; - s390*) -@@ -19166,6 +19169,14 @@ - I386_VIDEO_FALSE= - fi - -+ if test "x$IA64_VIDEO" = xyes; then -+ IA64_VIDEO_TRUE= -+ IA64_VIDEO_FALSE='#' -+else -+ IA64_VIDEO_TRUE='#' -+ IA64_VIDEO_FALSE= -+fi -+ - if test "x$PPC_VIDEO" = xyes; then - PPC_VIDEO_TRUE= - PPC_VIDEO_FALSE='#' ---- hw/xfree86/os-support/bsd/Makefile.in.dist 2009-06-18 17:45:13.000000000 -0700 -+++ hw/xfree86/os-support/bsd/Makefile.in 2009-06-18 17:45:19.000000000 -0700 -@@ -63,6 +63,7 @@ - @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \ - @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@ ioperm_noop.lo - @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo -+@IA64_VIDEO_TRUE@am__objects_1 = ia64_video.lo - @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo - @ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@am__objects_1 = arm_video.lo - @ALPHA_VIDEO_TRUE@am__objects_1 = alpha_video.lo bsd_ev56.lo \ -@@ -393,6 +394,7 @@ - - @ARM_VIDEO_TRUE@ARCH_SOURCES = arm_video.c - @I386_VIDEO_TRUE@ARCH_SOURCES = i386_video.c -+@IA64_VIDEO_TRUE@ARCH_SOURCES = ia64_video.c - @PPC_VIDEO_TRUE@ARCH_SOURCES = ppc_video.c - - # Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO. ---- /dev/null 2009-06-18 18:27:23.000000000 -0700 -+++ hw/xfree86/os-support/bsd/ia64_video.c 2009-06-18 18:26:02.000000000 -0700 -@@ -0,0 +1,150 @@ -+#ifdef HAVE_XORG_CONFIG_H -+#include -+#endif -+ -+#include -+#include "xf86.h" -+#include "xf86Priv.h" -+ -+#include "xf86_OSlib.h" -+#include "xf86OSpriv.h" -+ -+#include "bus/Pci.h" -+ -+#ifndef MAP_FAILED -+#define MAP_FAILED ((caddr_t)-1) -+#endif -+ -+ -+/***************************************************************************/ -+/* Video Memory Mapping section */ -+/***************************************************************************/ -+ -+#define DEV_MEM "/dev/mem" -+ -+static pointer ia64MapVidMem(int, unsigned long, unsigned long, int flags); -+static void ia64UnmapVidMem(int, pointer, unsigned long); -+ -+Bool xf86EnableIO(void); -+void xf86DisableIO(void); -+ -+void -+xf86OSInitVidMem(VidMemInfoPtr pVidMem) -+{ -+ pVidMem->linearSupported = TRUE; -+ pVidMem->mapMem = ia64MapVidMem; -+ pVidMem->unmapMem = ia64UnmapVidMem; -+ pVidMem->initialised = TRUE; -+ xf86EnableIO(); -+} -+ -+ -+_X_EXPORT volatile unsigned char *ioBase = MAP_FAILED; -+ -+static pointer -+ia64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) -+{ -+ int fd = xf86Info.screenFd; -+ pointer base; -+#ifdef DEBUG -+ xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", -+ Base, Size, fd); -+#endif -+ -+ base = mmap(0, Size, -+ (flags & VIDMEM_READONLY) ? -+ PROT_READ : (PROT_READ | PROT_WRITE), -+ MAP_SHARED, fd, Base); -+ if (base == MAP_FAILED) -+ FatalError("%s: could not mmap screen [s=%lx,a=%lx] (%s)", -+ "xf86MapVidMem", Size, Base, strerror(errno)); -+ -+ return base; -+} -+ -+static void -+ia64UnmapVidMem(int ScreenNum, pointer Base, unsigned long Size) -+{ -+ munmap(Base, Size); -+} -+ -+_X_EXPORT int -+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, -+ int Len) -+{ -+ int rv; -+ static int kmem = -1; -+ -+ if (kmem == -1) { -+ kmem = open(DEV_MEM, 2); -+ if (kmem == -1) { -+ FatalError("xf86ReadBIOS: open %s", DEV_MEM); -+ } -+ } -+ -+#ifdef DEBUG -+ xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS() %lx %lx, %x\n", -+ Base, Offset, Len); -+#endif -+ -+ -+ lseek(kmem, Base + Offset, 0); -+ rv = read(kmem, Buf, Len); -+ -+ return rv; -+} -+ -+Bool xf86EnableIO() -+{ -+ int fd = xf86Info.screenFd; -+ -+ xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd); -+ if (ioBase == MAP_FAILED) -+ { -+ ioBase=mmap(NULL, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, fd, -+ 0); -+ xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %p\n", ioBase); -+ if (ioBase == MAP_FAILED) { -+ xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n"); -+ return FALSE; -+ } -+ } -+ return TRUE; -+} -+ -+void xf86DisableIO() -+{ -+ -+ if (ioBase != MAP_FAILED) -+ { -+ munmap((void *)(uintptr_t)(void *)ioBase, 0x10000); -+ ioBase = MAP_FAILED; -+ } -+} -+ -+void outb(unsigned long port, unsigned char val) -+{ -+} -+ -+void outw(unsigned long port, unsigned short val) -+{ -+} -+ -+void outl(unsigned long port, unsigned int val) -+{ -+} -+ -+unsigned int inb(unsigned long port) -+{ -+ return 0xff; -+} -+ -+unsigned int inw(unsigned long port) -+{ -+ return 0xffff; -+} -+ -+unsigned int inl(unsigned long port) -+{ -+ return 0xffffffff; -+} Property changes on: x11-servers/xorg-server/files/extra-arch-ia64 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: x11-servers/xorg-server/files/extra-arch-powerpc =================================================================== --- x11-servers/xorg-server/files/extra-arch-powerpc (revision 427130) +++ x11-servers/xorg-server/files/extra-arch-powerpc (nonexistent) @@ -1,14 +0,0 @@ ---- hw/xfree86/os-support/bsd/ppc_video.c.orig 2015-06-05 17:19:40.000000000 +0200 -+++ hw/xfree86/os-support/bsd/ppc_video.c 2015-10-12 15:23:47.470110000 +0200 -@@ -79,7 +79,11 @@ xf86DisableIO() - { - - if (ioBase != MAP_FAILED) { -+#if defined(__FreeBSD__) -+ munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000); -+#else - munmap(__UNVOLATILE(ioBase), 0x10000); -+#endif - ioBase = MAP_FAILED; - } - } Property changes on: x11-servers/xorg-server/files/extra-arch-powerpc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: x11-servers/xorg-server/files/extra-arch-sparc64 =================================================================== --- x11-servers/xorg-server/files/extra-arch-sparc64 (revision 427130) +++ x11-servers/xorg-server/files/extra-arch-sparc64 (nonexistent) @@ -1,12 +0,0 @@ ---- hw/xfree86/os-support/bsd/bsd_init.c.orig 2012-05-17 19:09:03.000000000 +0200 -+++ hw/xfree86/os-support/bsd/bsd_init.c 2013-09-01 20:45:36.000000000 +0200 -@@ -230,6 +230,9 @@ - * Add cases for other *BSD that behave the same. - */ - #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#if defined(__sparc64__) -+ pci_system_init_dev_mem(fd); -+#endif - uname(&uts); - i = atof(uts.release) * 100; - if (i >= 310) Property changes on: x11-servers/xorg-server/files/extra-arch-sparc64 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c =================================================================== --- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c (revision 427130) +++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c (nonexistent) @@ -1,12 +0,0 @@ -Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c -diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c ---- hw/xfree86/os-support/bsd/i386_video.c.orig Tue Oct 4 01:46:14 2005 -+++ hw/xfree86/os-support/bsd/i386_video.c Thu Jan 26 14:57:56 2006 -@@ -35,6 +35,7 @@ - #include "xf86Priv.h" - - #include -+#include - #include - - #ifdef HAS_MTRR_SUPPORT Property changes on: x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c =================================================================== --- x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c (revision 427130) +++ x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c (working copy) @@ -1,5 +1,15 @@ -Index: hw/xfree86/common/xf86Xinput.c -@@ -942,6 +942,7 @@ +--- hw/xfree86/common/xf86Xinput.c.orig 2015-10-28 19:15:36.000000000 +0100 ++++ hw/xfree86/common/xf86Xinput.c 2015-11-18 23:51:11.993397000 +0100 +@@ -841,7 +841,7 @@ xf86NewInputDevice(InputInfoPtr pInfo, D + { + InputDriverPtr drv = NULL; + DeviceIntPtr dev = NULL; +- Bool paused; ++ Bool paused = 0; + int rval; + const char *path; + +@@ -993,6 +993,7 @@ NewInputDeviceRequest(InputOption *optio if (strcmp(key, "_source") == 0 && (strcmp(value, "server/hal") == 0 || strcmp(value, "server/udev") == 0 || Index: x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c =================================================================== --- x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c (nonexistent) +++ x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c (working copy) @@ -0,0 +1,12 @@ +--- hw/xfree86/os-support/bsd/bsd_init.c.orig 2012-05-17 19:09:03.000000000 +0200 ++++ hw/xfree86/os-support/bsd/bsd_init.c 2013-09-01 20:45:36.000000000 +0200 +@@ -230,6 +230,9 @@ + * Add cases for other *BSD that behave the same. + */ + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#if defined(__sparc64__) ++ pci_system_init_dev_mem(fd); ++#endif + uname(&uts); + i = atof(uts.release) * 100; + if (i >= 310) Property changes on: x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c =================================================================== --- x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c (nonexistent) +++ x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c (working copy) @@ -0,0 +1,11 @@ +Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c +--- hw/xfree86/os-support/bsd/i386_video.c.orig 2016-01-12 21:17:27 UTC ++++ hw/xfree86/os-support/bsd/i386_video.c +@@ -32,6 +32,7 @@ + #include "xf86Priv.h" + + #include ++#include + #include + + #include "xf86_OSlib.h" Property changes on: x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c =================================================================== --- x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c (nonexistent) +++ x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c (working copy) @@ -0,0 +1,14 @@ +--- hw/xfree86/os-support/bsd/ppc_video.c.orig 2015-06-05 17:19:40.000000000 +0200 ++++ hw/xfree86/os-support/bsd/ppc_video.c 2015-10-12 15:23:47.470110000 +0200 +@@ -79,7 +79,11 @@ xf86DisableIO() + { + + if (ioBase != MAP_FAILED) { ++#if defined(__FreeBSD__) ++ munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000); ++#else + munmap(__UNVOLATILE(ioBase), 0x10000); ++#endif + ioBase = MAP_FAILED; + } + } Property changes on: x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: x11-servers/xorg-server/pkg-plist =================================================================== --- x11-servers/xorg-server/pkg-plist (revision 427130) +++ x11-servers/xorg-server/pkg-plist (working copy) @@ -22,6 +22,7 @@ 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 @@ -75,6 +76,7 @@ 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 @@ -106,14 +108,11 @@ include/xorg/shadowfb.h include/xorg/shmint.h include/xorg/site.h -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 @@ -151,7 +150,6 @@ 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 Index: x11-servers/xorg-vfbserver/Makefile =================================================================== --- x11-servers/xorg-vfbserver/Makefile (revision 427130) +++ x11-servers/xorg-vfbserver/Makefile (working copy) @@ -2,54 +2,22 @@ # $FreeBSD$ PORTNAME= xorg-vfbserver -PORTVERSION= 1.18.4 -PORTEPOCH= 1 -CATEGORIES= x11-servers -MASTER_SITES= XORG/individual/xserver -DISTNAME= xorg-server-${PORTVERSION} -DIST_SUBDIR= xorg/xserver -MAINTAINER= x11@FreeBSD.org COMMENT= X virtual framebuffer server from X.Org LICENSE= MIT -USES= tar:bzip2 pkgconfig ssl -INSTALL_WRKSRC= ${WRKSRC}/hw/vfb -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-dmx \ - --disable-xephyr \ - --disable-xnest \ - --disable-kdrive \ - --disable-xfbdev \ - --disable-xfake \ - --disable-screensaver \ - --disable-xwin \ - --disable-xwayland \ - --disable-xorg \ - --without-xmlto \ - --disable-docs \ - --disable-devel-docs \ - --localstatedir=/var \ - --without-dtrace \ - --without-doxygen \ - --disable-glx \ - --disable-dri \ - --disable-config-hal \ - --disable-libdrm \ - --disable-glx-tls \ - --disable-vbe \ - --disable-vgahw \ - --enable-xvfb \ - --with-fontrootdir=${PREFIX}/share/fonts +MASTERDIR= ${.CURDIR}/../xorg-server +DESCR= ${.CURDIR}/pkg-descr -USE_XORG= pixman x11 fixesproto damageproto xcmiscproto xtrans \ - bigreqsproto randrproto renderproto xextproto inputproto \ - videoproto compositeproto recordproto \ - fontsproto resourceproto xf86driproto glproto \ - presentproto xineramaproto xkbfile xfont +SLAVE_PORT= yes +OPTIONS_EXCLUDE=DEVD HAL SUID -PLIST_FILES= bin/Xvfb \ - man/man1/Xvfb.1.gz +CONFIGURE_ARGS+=--enable-xvfb --disable-dmx --disable-xephyr --disable-xnest -.include +PLIST_FILES= bin/Xvfb man/man1/Xvfb.1.gz + +do-install: + cd ${WRKSRC}/hw/vfb; DESTDIR=${STAGEDIR} ${MAKE} install + +.include "${MASTERDIR}/Makefile" Index: x11-servers/xorg-vfbserver/distinfo =================================================================== --- x11-servers/xorg-vfbserver/distinfo (revision 427130) +++ x11-servers/xorg-vfbserver/distinfo (nonexistent) @@ -1,3 +0,0 @@ -TIMESTAMP = 1478070717 -SHA256 (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 -SIZE (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 6009508 Property changes on: x11-servers/xorg-vfbserver/distinfo ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property