diff options
author | Matthew Rezny <rezny@FreeBSD.org> | 2017-02-11 14:17:58 +0000 |
---|---|---|
committer | Matthew Rezny <rezny@FreeBSD.org> | 2017-02-11 14:17:58 +0000 |
commit | 3f87b5cb51a9164076426ff318d5d77c12b0ced3 (patch) | |
tree | f850017ca906c1f973d599485b77a7dceb60e2fc /x11-servers/xorg-server | |
parent | ce75c0657853608ceeaeda9f2d28dc0d2c634129 (diff) | |
download | ports-3f87b5cb51a9164076426ff318d5d77c12b0ced3.tar.gz ports-3f87b5cb51a9164076426ff318d5d77c12b0ced3.zip |
Notes
Diffstat (limited to 'x11-servers/xorg-server')
19 files changed, 198 insertions, 375 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 26946dcc6213..2d1908986be8 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -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 @@ COMMENT?= X.Org X server and related programs 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,44 @@ SLAVE_PORT?= no OPTIONS_SUB= yes OPTIONS_DEFINE= SUID OPTIONS_RADIO= CONF -OPTIONS_RADIO_CONF= HAL DEVD -SUID_DESC= Install the Xorg server with setuid bit set -HAL_DESC= Compile with HAL config support +OPTIONS_RADIO_CONF= DEVD HAL DEVD_DESC= Use devd for autoconfiguration of input devices -OPTIONS_DEFAULT=SUID DEVD +HAL_DESC= Use hald for autoconfiguration of input devices +SUID_DESC= Install the Xorg server with setuid bit set +OPTIONS_DEFAULT=DEVD SUID OPTIONS_EXCLUDE_sparc64= HAL .include <bsd.port.options.mk> -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 dri3proto \ + 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 --enable-glamor INSTALL_TARGET= install-strip +.if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr" +LIB_DEPENDS+= libdrm.so:graphics/libdrm \ + libepoxy.so:graphics/libepoxy +.else +BUILD_DEPENDS+= libepoxy>0:graphics/libepoxy # only for configure +.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 +77,20 @@ CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .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 +.if ${ARCH} == "i386" || ${ARCH} == "amd64" +LIB_DEPENDS+= libunwind.so:devel/libunwind .endif -.if ${ARCH} == sparc64 +.if ${ARCH} == "sparc64" PLIST_SUB+= SPARC64="" -EXTRA_PATCHES+= ${FILESDIR}/extra-arch-sparc64 .else PLIST_SUB+= SPARC64="@comment " .endif diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index 83c587efd8c7..9a0938b3bccc 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -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 = 1484803304 +SHA256 (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 +SIZE (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 6009508 diff --git a/x11-servers/xorg-server/files/extra-arch-i386 b/x11-servers/xorg-server/files/extra-arch-i386 deleted file mode 100644 index 9bebe285797c..000000000000 --- a/x11-servers/xorg-server/files/extra-arch-i386 +++ /dev/null @@ -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 */ diff --git a/x11-servers/xorg-server/files/extra-arch-ia64 b/x11-servers/xorg-server/files/extra-arch-ia64 deleted file mode 100644 index 77a84db752fb..000000000000 --- a/x11-servers/xorg-server/files/extra-arch-ia64 +++ /dev/null @@ -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 <xorg-config.h> -+#endif -+ -+#include <X11/X.h> -+#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; -+} diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c deleted file mode 100644 index 933742b00170..000000000000 --- a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c +++ /dev/null @@ -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 <errno.h> -+#include <sys/types.h> - #include <sys/mman.h> - - #ifdef HAS_MTRR_SUPPORT diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in deleted file mode 100644 index 8a05ae6b33cb..000000000000 --- a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- hw/xfree86/os-support/misc/Makefile.in.orig 2015-09-23 10:21:18.470900000 +0200 -+++ hw/xfree86/os-support/misc/Makefile.in 2015-09-23 10:22:34.979974000 +0200 -@@ -530,7 +530,8 @@ - - #AM_LDFLAGS = -r - AM_CPPFLAGS = $(XORG_INCS) --AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) -+@I386_VIDEO_TRUE@I386_VIDEO_CFLAGS = -mno-sse -+AM_CFLAGS = $(I386_VIDEO_CFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS) - EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS) - all: all-am - diff --git a/x11-servers/xorg-server/files/patch-config_config-backends.h b/x11-servers/xorg-server/files/patch-config_config-backends.h index 9b696c7e8dda..ff0f03899399 100644 --- a/x11-servers/xorg-server/files/patch-config_config-backends.h +++ b/x11-servers/xorg-server/files/patch-config_config-backends.h @@ -1,6 +1,6 @@ ---- config/config-backends.h.orig 2014-12-09 22:02:34.000000000 +0100 -+++ config/config-backends.h 2014-12-21 23:08:34.268311262 +0100 -@@ -44,3 +44,8 @@ +--- config/config-backends.h.orig 2016-07-15 16:17:45 UTC ++++ config/config-backends.h +@@ -44,3 +44,8 @@ void config_hal_fini(void); int config_wscons_init(void); void config_wscons_fini(void); #endif diff --git a/x11-servers/xorg-server/files/patch-config_config.c b/x11-servers/xorg-server/files/patch-config_config.c index 570d0de16ee4..e9dd5c667168 100644 --- a/x11-servers/xorg-server/files/patch-config_config.c +++ b/x11-servers/xorg-server/files/patch-config_config.c @@ -1,21 +1,21 @@ ---- config/config.c.orig 2014-04-12 15:29:14 UTC +--- config/config.c.orig 2016-07-19 17:07:29 UTC +++ config/config.c -@@ -64,6 +64,9 @@ config_init(void) +@@ -55,6 +55,9 @@ config_init(void) #elif defined(CONFIG_WSCONS) if (!config_wscons_init()) ErrorF("[config] failed to initialise wscons\n"); +#elif defined(CONFIG_DEVD) -+ if (!config_devd_init()) -+ ErrorF("[config] failed to initialise devd\n"); ++ if (!config_devd_init()) ++ ErrorF("[config] failed to initialise devd\n"); #endif } -@@ -82,6 +85,8 @@ config_fini(void) - config_dbus_core_fini(); +@@ -67,6 +70,8 @@ config_fini(void) + config_hal_fini(); #elif defined(CONFIG_WSCONS) config_wscons_fini(); +#elif defined(CONFIG_DEVD) -+ config_devd_fini(); ++ config_devd_fini(); #endif } diff --git a/x11-servers/xorg-server/files/patch-config_devd.c b/x11-servers/xorg-server/files/patch-config_devd.c index f2178fbc166d..fba07a77373f 100644 --- a/x11-servers/xorg-server/files/patch-config_devd.c +++ b/x11-servers/xorg-server/files/patch-config_devd.c @@ -1,6 +1,6 @@ ---- config/devd.c.orig 2015-05-19 19:41:49 UTC +--- config/devd.c.orig 2017-01-19 15:20:42 UTC +++ config/devd.c -@@ -0,0 +1,531 @@ +@@ -0,0 +1,532 @@ +/* + * Copyright (c) 2012 Baptiste Daroussin + * Copyright (c) 2013, 2014 Alex Kozlov @@ -64,7 +64,7 @@ +static int sock_devd; +static bool is_console_kbd = false; +static bool is_kbdmux = false; -+OsTimerPtr rtimer; ++static OsTimerPtr rtimer = NULL; + +struct hw_type { + const char *driver; @@ -417,6 +417,7 @@ + disconnect_devd(sock_devd); + rtimer = TimerSet(NULL, 0, 1, reconnect_handler, NULL); + LogMessage(X_WARNING, "config/devd: devd socket is lost\n"); ++ free(buf); + return -1; + } + if (c == '\n') diff --git a/x11-servers/xorg-server/files/patch-configure b/x11-servers/xorg-server/files/patch-configure index 15d750b71b01..9ced61b3e131 100644 --- a/x11-servers/xorg-server/files/patch-configure +++ b/x11-servers/xorg-server/files/patch-configure @@ -1,6 +1,87 @@ ---- configure.orig 2015-10-28 16:31:48.000000000 +0000 -+++ configure 2016-11-04 17:02:00.798706000 +0000 -@@ -22637,9 +22637,14 @@ +--- configure.orig 2016-07-19 17:27:31 UTC ++++ configure +@@ -18019,7 +18019,7 @@ $as_echo_n "checking whether the $compil + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no +- link_all_deplibs=unknown ++ link_all_deplibs=no + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= +@@ -18318,7 +18318,7 @@ _LT_EOF + wlarc= + else + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' + fi + ;; + +@@ -18337,7 +18337,7 @@ _LT_EOF + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' + else + ld_shlibs=no + fi +@@ -18366,7 +18366,7 @@ _LT_EOF + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' + else + ld_shlibs=no + fi +@@ -18384,7 +18384,7 @@ _LT_EOF + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' + else + ld_shlibs=no + fi +@@ -19032,7 +19032,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' + else +@@ -19881,7 +19881,7 @@ freebsd* | dragonfly*) + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' + soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no +@@ -21016,7 +21016,7 @@ striplib= + old_striplib= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 + $as_echo_n "checking whether stripping libraries is possible... " >&6; } +-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +@@ -21738,7 +21738,7 @@ if test `${RAWCPP} < conftest.$ac_ext | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + else +- if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then ++ if true; then + TRADITIONALCPPFLAGS="-traditional" + RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +@@ -23168,9 +23168,14 @@ $as_echo "#define USE_ALPHA_PIO 1" >>con esac GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee" ;; @@ -16,12 +97,12 @@ ;; i*86) I386_VIDEO=yes -@@ -25559,7 +25564,7 @@ +@@ -26057,7 +26062,7 @@ fi case "x$XTRANS_SEND_FDS" in xauto) case "$host_os" in - linux*|solaris*) -+ linux*|solaris*|freebsd*|dragonfly*) ++ linux*|solaris*|freebsd*|dragonfly*|openbsd*) XTRANS_SEND_FDS=yes ;; *) diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86AutoConfig.c b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86AutoConfig.c new file mode 100644 index 000000000000..071e77e8fa09 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86AutoConfig.c @@ -0,0 +1,23 @@ +--- hw/xfree86/common/xf86AutoConfig.c.orig 2017-01-11 20:00:58 UTC ++++ hw/xfree86/common/xf86AutoConfig.c +@@ -276,7 +276,7 @@ listPossibleVideoDrivers(char *matches[] + i += xf86PciMatchDriver(&matches[i], nmatches - i); + #endif + +-#if defined(__linux__) ++#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) + matches[i++] = xnfstrdup("modesetting"); + #endif + +@@ -285,8 +285,10 @@ listPossibleVideoDrivers(char *matches[] + if (i < (nmatches - 1)) { + #if !defined(__linux__) && defined(__sparc__) + matches[i++] = xnfstrdup("wsfb"); +-#else ++#elif defined(__linux__) + matches[i++] = xnfstrdup("fbdev"); ++#elif defined(__FreeBSD__) ++ matches[i++] = xnfstrdup("scfb"); + #endif + } + #endif /* !__sun */ diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c index 7d9edf6a0e21..8553ace79086 100644 --- a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c +++ b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c @@ -1,6 +1,6 @@ ---- hw/xfree86/common/xf86Config.c.orig 2014-04-15 01:01:57 UTC +--- hw/xfree86/common/xf86Config.c.orig 2016-07-19 17:14:30 UTC +++ hw/xfree86/common/xf86Config.c -@@ -1376,13 +1376,16 @@ checkCoreInputDevices(serverLayoutPtr se +@@ -1410,13 +1410,16 @@ checkCoreInputDevices(serverLayoutPtr se } if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) { diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c index bae0675d962a..ed134ade6c53 100644 --- a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c +++ b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c @@ -1,7 +1,7 @@ ---- hw/xfree86/common/xf86Globals.c.orig 2014-04-12 15:29:14 UTC +--- hw/xfree86/common/xf86Globals.c.orig 2016-07-19 17:07:29 UTC +++ hw/xfree86/common/xf86Globals.c -@@ -123,7 +123,8 @@ xf86InfoRec xf86Info = { - .log = LogNone, +@@ -122,7 +122,8 @@ xf86InfoRec xf86Info = { + .pmFlag = TRUE, .disableRandR = FALSE, .randRFrom = X_DEFAULT, -#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS) diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c index 0260fb86b780..23d08282d4a2 100644 --- a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c +++ b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c @@ -1,5 +1,15 @@ -Index: hw/xfree86/common/xf86Xinput.c -@@ -942,6 +942,7 @@ +--- hw/xfree86/common/xf86Xinput.c.orig 2016-07-19 17:07:29 UTC ++++ hw/xfree86/common/xf86Xinput.c +@@ -841,7 +841,7 @@ xf86NewInputDevice(InputInfoPtr pInfo, D + { + InputDriverPtr drv = NULL; + DeviceIntPtr dev = NULL; +- Bool paused; ++ Bool paused = 0; + int rval; + char *path = NULL; + +@@ -996,6 +996,7 @@ NewInputDeviceRequest(InputOption *optio if (strcmp(key, "_source") == 0 && (strcmp(value, "server/hal") == 0 || strcmp(value, "server/udev") == 0 || diff --git a/x11-servers/xorg-server/files/extra-arch-sparc64 b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c index 45d40053ece6..4f4a60ee749a 100644 --- a/x11-servers/xorg-server/files/extra-arch-sparc64 +++ b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c @@ -1,6 +1,6 @@ ---- 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 @@ +--- hw/xfree86/os-support/bsd/bsd_init.c.orig 2016-07-19 17:07:29 UTC ++++ hw/xfree86/os-support/bsd/bsd_init.c +@@ -230,6 +230,9 @@ xf86OpenConsole() * Add cases for other *BSD that behave the same. */ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c new file mode 100644 index 000000000000..57cf332c70f1 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c @@ -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-07-15 16:18:11 UTC ++++ hw/xfree86/os-support/bsd/i386_video.c +@@ -32,6 +32,7 @@ + #include "xf86Priv.h" + + #include <errno.h> ++#include <sys/types.h> + #include <sys/mman.h> + + #include "xf86_OSlib.h" diff --git a/x11-servers/xorg-server/files/extra-arch-powerpc b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c index 1feec004d65a..fbdd9ef10735 100644 --- a/x11-servers/xorg-server/files/extra-arch-powerpc +++ b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c @@ -1,5 +1,5 @@ ---- 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 +--- hw/xfree86/os-support/bsd/ppc_video.c.orig 2016-07-15 16:18:11 UTC ++++ hw/xfree86/os-support/bsd/ppc_video.c @@ -79,7 +79,11 @@ xf86DisableIO() { diff --git a/x11-servers/xorg-server/files/patch-xkb_Makefile.in b/x11-servers/xorg-server/files/patch-xkb_Makefile.in index 934bef0af445..c3dd6aae35f7 100644 --- a/x11-servers/xorg-server/files/patch-xkb_Makefile.in +++ b/x11-servers/xorg-server/files/patch-xkb_Makefile.in @@ -1,6 +1,6 @@ ---- xkb/Makefile.in.orig 2013-06-16 11:16:48.000000000 +0000 -+++ xkb/Makefile.in 2013-06-16 11:17:08.000000000 +0000 -@@ -816,7 +816,7 @@ +--- xkb/Makefile.in.orig 2017-01-19 15:20:42 UTC ++++ xkb/Makefile.in +@@ -878,7 +878,7 @@ info: info-am info-am: diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index 3b99a43fc437..91e808374f62 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -22,6 +22,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 @@ -31,6 +32,7 @@ include/xorg/dixgrabs.h include/xorg/dixstruct.h include/xorg/dri.h include/xorg/dri2.h +include/xorg/dri3.h include/xorg/dristruct.h include/xorg/edid.h include/xorg/events.h @@ -75,6 +77,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 @@ -106,14 +109,11 @@ include/xorg/shadow.h 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 +151,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 @@ -160,6 +159,7 @@ include/xorg/xkbstr.h include/xorg/xorg-server.h include/xorg/xorgVersion.h include/xorg/xserver-properties.h +@comment include/xorg/xserver_poll.h include/xorg/xvdix.h include/xorg/xvmcext.h lib/xorg/modules/drivers/modesetting_drv.so |