diff options
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/Xext/shm.c | 1 | ||||
| -rw-r--r-- | xorg-server/Xext/shmint.h | 8 | ||||
| -rw-r--r-- | xorg-server/configure.ac | 15 | ||||
| -rw-r--r-- | xorg-server/exa/Makefile.am | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/Makefile.am | 11 | ||||
| -rw-r--r-- | xorg-server/include/Makefile.am | 2 |
6 files changed, 6 insertions, 35 deletions
diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c index 46ce521af..d014b9194 100644 --- a/xorg-server/Xext/shm.c +++ b/xorg-server/Xext/shm.c @@ -55,6 +55,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xfuncproto.h> #include <sys/mman.h> #include "protocol-versions.h" +#include "busfault.h" /* Needed for Solaris cross-zone shared memory extension */ #ifdef HAVE_SHMCTL64 diff --git a/xorg-server/Xext/shmint.h b/xorg-server/Xext/shmint.h index 21d6cc4ee..9dadea756 100644 --- a/xorg-server/Xext/shmint.h +++ b/xorg-server/Xext/shmint.h @@ -56,16 +56,10 @@ typedef struct _ShmFuncs { void (*PutImage) (XSHM_PUT_IMAGE_ARGS); } ShmFuncs, *ShmFuncsPtr; -#include <protocol-versions.h> - -#if SERVER_SHM_MAJOR_VERSION == 1 && SERVER_SHM_MINOR_VERSION >= 2 +#if XTRANS_SEND_FDS #define SHM_FD_PASSING 1 #endif -#ifdef SHM_FD_PASSING -#include "busfault.h" -#endif - typedef struct _ShmDesc { struct _ShmDesc *next; int shmid; diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index eb90b1ae0..1e6f813d8 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -26,9 +26,9 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.14.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2013-10-31" -RELEASE_NAME="Bom Retiro" +AC_INIT([xorg-server], 1.14.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2013-11-14" +RELEASE_NAME="English Breakfast" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_USE_SYSTEM_EXTENSIONS @@ -1879,9 +1879,6 @@ if test "x$XORG" = xyes; then if test "${OS_MINOR}" -lt 8 ; then AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.]) fi - if test "x$SUNCC" = "xyes"; then - solaris_asm_inline="yes" - fi AC_CHECK_DECL([_LP64], [SOLARIS_64="yes"], [SOLARIS_64="no"]) case $host_cpu in @@ -1902,11 +1899,6 @@ if test "x$XORG" = xyes; then xorg@lists.freedesktop.org.]) ;; esac AC_SUBST([SOLARIS_INOUT_ARCH]) - if test x$solaris_asm_inline = xyes ; then - SOLARIS_ASM_CFLAGS='$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il' - XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)' - fi - AC_SUBST([SOLARIS_ASM_CFLAGS]) ;; gnu*) XORG_OS_SUBDIR="hurd" @@ -2012,7 +2004,6 @@ AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes]) AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes]) AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes]) AM_CONDITIONAL([LNXAPM], [test "x$linux_apm" = xyes]) -AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes]) AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes]) AM_CONDITIONAL([DGA], [test "x$DGA" = xyes]) AM_CONDITIONAL([XF86VIDMODE], [test "x$XF86VIDMODE" = xyes]) diff --git a/xorg-server/exa/Makefile.am b/xorg-server/exa/Makefile.am index c1f1e8638..6a09966f8 100644 --- a/xorg-server/exa/Makefile.am +++ b/xorg-server/exa/Makefile.am @@ -1,9 +1,5 @@ noinst_LTLIBRARIES = libexa.la -# Override these since EXA doesn't need them and the needed files aren't -# built (in hw/xfree86/os-support/solaris) until after EXA is built -SOLARIS_ASM_CFLAGS="" - if XORG sdk_HEADERS = exa.h endif diff --git a/xorg-server/hw/xfree86/Makefile.am b/xorg-server/hw/xfree86/Makefile.am index 485386fc5..15670d01d 100644 --- a/xorg-server/hw/xfree86/Makefile.am +++ b/xorg-server/hw/xfree86/Makefile.am @@ -80,17 +80,6 @@ BUILT_SOURCES = xorg.conf.example DISTCLEANFILES = xorg.conf.example EXTRA_DIST = xorgconf.cpp -if SOLARIS_ASM_INLINE -# Needs to be built before any files are compiled when using Sun compilers -# so in*/out* inline definitions are properly processed. - -BUILT_SOURCES += os-support/solaris/solaris-@SOLARIS_INOUT_ARCH@.il - -os-support/solaris/solaris-@SOLARIS_INOUT_ARCH@.il: - cd os-support/solaris ; \ - $(MAKE) $(AM_MAKEFLAGS) solaris-@SOLARIS_INOUT_ARCH@.il -endif - # Without logdir, X will post an error on the terminal and will not start install-data-local: $(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir) diff --git a/xorg-server/include/Makefile.am b/xorg-server/include/Makefile.am index 13d91e22c..93d8616f2 100644 --- a/xorg-server/include/Makefile.am +++ b/xorg-server/include/Makefile.am @@ -2,7 +2,6 @@ if XORG sdk_HEADERS = \ XIstubs.h \ Xprintf.h \ - busfault.h \ callback.h \ client.h \ closestr.h \ @@ -69,6 +68,7 @@ endif AM_CFLAGS = $(DIX_CFLAGS) EXTRA_DIST = \ + busfault.h \ dix-config-apple-verbatim.h \ dixfontstubs.h eventconvert.h eventstr.h inpututils.h \ protocol-versions.h \ |