diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xorg-server/Makefile | 8 | ||||
| -rw-r--r-- | x11/xorg-server/distinfo | 4 | ||||
| -rw-r--r-- | x11/xorg-server/patches/patch-configure_ac | 20 | ||||
| -rw-r--r-- | x11/xorg-server/patches/patch-include_do-not-use-config_h_in | 6 | ||||
| -rw-r--r-- | x11/xorg-server/patches/patch-include_os_h | 2 |
5 files changed, 20 insertions, 20 deletions
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile index 540ccda..21b2fa1 100644 --- a/x11/xorg-server/Makefile +++ b/x11/xorg-server/Makefile @@ -1,6 +1,6 @@ COMMENT = the X.Org X server -DISTNAME = xorg-server-21.1.8 +DISTNAME = xorg-server-21.1.9 CATEGORIES = x11 HOMEPAGE = https://gitlab.freedesktop.org/xorg/xserver @@ -12,15 +12,15 @@ PERMIT_PACKAGE = Yes # uses pledge() -WANTLIB = GL X11 X11-xcb Xdmcp Xfont2 c drm expat gbm glapi kvm m pciaccess +WANTLIB = GL X11 X11-xcb Xdmcp Xfont2 c drm gbm glapi kvm m pciaccess WANTLIB += pixman-1 pthread z WANTLIB += Xau xcb xcb-dri2 xcb-dri3 xcb-xfixes xcb-glx xcb-icccm xcb-image WANTLIB += xcb-keysyms xcb-present xcb-randr xcb-render xcb-render-util WANTLIB += xcb-shape xcb-shm xcb-sync xcb-util xcb-xf86dri xcb-xkb xcb-xv WANTLIB += Xext Xfixes Xxf86vm fontenc freetype xcvt xshmfence -WANTLIB += epoxy +WANTLIB += epoxy c++abi -MASTER_SITES = ${MASTER_SITE_XORG:=xserver/} +SITES = ${SITE_XORG:=xserver/} MODULES = xenocara diff --git a/x11/xorg-server/distinfo b/x11/xorg-server/distinfo index 815d691..6f1676d 100644 --- a/x11/xorg-server/distinfo +++ b/x11/xorg-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg-server-21.1.8.tar.gz) = 2EXR/uLtszy5TzG1Fw8m2Y7TH4U84toh2sp8YMj/Oq4= -SIZE (xorg-server-21.1.8.tar.gz) = 8981767 +SHA256 (xorg-server-21.1.9.tar.gz) = RVrCLEEbPnSttNGz/Ui5A3trW6kmAkfFm2afZ6CP0m4= +SIZE (xorg-server-21.1.9.tar.gz) = 8925519 diff --git a/x11/xorg-server/patches/patch-configure_ac b/x11/xorg-server/patches/patch-configure_ac index e4bb610..ae11337 100644 --- a/x11/xorg-server/patches/patch-configure_ac +++ b/x11/xorg-server/patches/patch-configure_ac @@ -3,7 +3,7 @@ configure changes for OpenBSD Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -253,11 +253,16 @@ DEFAULT_INT10="x86emu" +@@ -261,11 +261,16 @@ DEFAULT_INT10="x86emu" dnl Override defaults as needed for specific platforms: case $host_cpu in @@ -20,7 +20,7 @@ Index: configure.ac esac GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee" ;; -@@ -284,6 +289,19 @@ case $host_cpu in +@@ -292,6 +297,19 @@ case $host_cpu in *freebsd*) DEFAULT_INT10=stub ;; esac ;; @@ -40,7 +40,7 @@ Index: configure.ac sparc*) SPARC64_VIDEO=yes BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c" -@@ -309,14 +327,25 @@ case $host_cpu in +@@ -317,14 +335,25 @@ case $host_cpu in s390*) GLX_ARCH_DEFINES="-D__GLX_ALIGN64" ;; @@ -66,7 +66,7 @@ Index: configure.ac AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" = xyes]) DRI=no -@@ -341,8 +370,11 @@ case $host_os in +@@ -349,8 +378,11 @@ case $host_os in ;; *openbsd*) AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) @@ -79,7 +79,7 @@ Index: configure.ac ;; *linux*) DRI=yes -@@ -528,6 +560,16 @@ AC_ARG_WITH(khronos-spec-dir, AS_HELP_STRING([--with-k +@@ -536,6 +568,16 @@ AC_ARG_WITH(khronos-spec-dir, AS_HELP_STRING([--with-k [KHRONOS_SPEC_DIR="${withval}"], [KHRONOS_SPEC_DIR=auto]) @@ -96,7 +96,7 @@ Index: configure.ac dnl Extensions. AC_ARG_ENABLE(composite, AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes]) AC_ARG_ENABLE(mitshm, AS_HELP_STRING([--disable-mitshm], [Build SHM extension (default: auto)]), [MITSHM=$enableval], [MITSHM=auto]) -@@ -554,6 +596,7 @@ AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--enable +@@ -562,6 +604,7 @@ AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--enable AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) AC_ARG_ENABLE(config-udev, AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto]) AC_ARG_ENABLE(config-udev-kms, AS_HELP_STRING([--enable-config-udev-kms], [Build udev kms support (default: auto)]), [CONFIG_UDEV_KMS=$enableval], [CONFIG_UDEV_KMS=auto]) @@ -104,7 +104,7 @@ Index: configure.ac AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto]) AC_ARG_ENABLE(config-wscons, AS_HELP_STRING([--enable-config-wscons], [Build wscons config support (default: auto)]), [CONFIG_WSCONS=$enableval], [CONFIG_WSCONS=auto]) AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) -@@ -830,6 +873,10 @@ if test "x$WITH_SYSTEMD_DAEMON" = "xyes" -o "x$WITH_SY +@@ -838,6 +881,10 @@ if test "x$WITH_SYSTEMD_DAEMON" = "xyes" -o "x$WITH_SY fi AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"]) @@ -115,7 +115,7 @@ Index: configure.ac if test "x$CONFIG_UDEV" = xyes && test "x$CONFIG_HAL" = xyes; then AC_MSG_ERROR([Hotplugging through both libudev and hal not allowed]) fi -@@ -1251,6 +1298,15 @@ if test "x$PRESENT" = xyes; then +@@ -1259,6 +1306,15 @@ if test "x$PRESENT" = xyes; then PRESENT_LIB='$(top_builddir)/present/libpresent.la' fi @@ -131,7 +131,7 @@ Index: configure.ac AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes]) if test "x$XINERAMA" = xyes; then AC_DEFINE(XINERAMA, 1, [Support Xinerama extension]) -@@ -1646,6 +1702,18 @@ AC_SUBST([UTILS_SYS_LIBS]) +@@ -1654,6 +1710,18 @@ AC_SUBST([UTILS_SYS_LIBS]) # Some platforms require extra flags to do this. libtool should set the # necessary flags for each platform when -export-dynamic is passed to it. LD_EXPORT_SYMBOLS_FLAG="-export-dynamic" @@ -150,7 +150,7 @@ Index: configure.ac LD_NO_UNDEFINED_FLAG= XORG_DRIVER_LIBS= case "$host_os" in -@@ -1820,7 +1888,14 @@ if test "x$XORG" = xyes; then +@@ -1828,7 +1896,14 @@ if test "x$XORG" = xyes; then esac case $host_cpu in sparc*) diff --git a/x11/xorg-server/patches/patch-include_do-not-use-config_h_in b/x11/xorg-server/patches/patch-include_do-not-use-config_h_in index fc4b524..0a01c7d 100644 --- a/x11/xorg-server/patches/patch-include_do-not-use-config_h_in +++ b/x11/xorg-server/patches/patch-include_do-not-use-config_h_in @@ -13,7 +13,7 @@ Index: include/do-not-use-config.h.in /* Use libudev for input hotplug */ #undef CONFIG_UDEV -@@ -455,7 +458,8 @@ +@@ -449,7 +452,8 @@ /* Support os-specific local connections */ #undef LOCALCONN @@ -23,7 +23,7 @@ Index: include/do-not-use-config.h.in #undef LT_OBJDIR /* Support MIT-SHM extension */ -@@ -515,7 +519,7 @@ +@@ -509,7 +513,7 @@ /* Default PCI text file ID path */ #undef PCI_TXT_IDS_PATH @@ -32,7 +32,7 @@ Index: include/do-not-use-config.h.in #undef PCVT_SUPPORT /* Support Present extension */ -@@ -845,6 +849,9 @@ +@@ -839,6 +843,9 @@ /* byte order */ #undef X_BYTE_ORDER diff --git a/x11/xorg-server/patches/patch-include_os_h b/x11/xorg-server/patches/patch-include_os_h index 8a9de64..02ed499 100644 --- a/x11/xorg-server/patches/patch-include_os_h +++ b/x11/xorg-server/patches/patch-include_os_h @@ -3,7 +3,7 @@ privsep prototypes Index: include/os.h --- include/os.h.orig +++ include/os.h -@@ -307,6 +307,15 @@ LockServer(void); +@@ -304,6 +304,15 @@ LockServer(void); extern _X_EXPORT void UnlockServer(void); |