diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2020-05-04 16:08:16 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2020-05-04 16:08:16 +0000 |
| commit | 2c19f2b990231eaed8b75fee4a2c5dc8739551fd (patch) | |
| tree | 6f701df717e7d8b7983348e4861c4a5f9ec0acf3 /x11-servers | |
| parent | MFH: r533909 (diff) | |
MFH: r533807
xorg-server: Do not send spurious focus events
Apply an upstream patch to avoid sending focus evens when grab actually does
not change. This fixes certain full screen applications. [1]
Ensure that we actually don't try to find and link against HAL even if it's
around on the system we're compiling on [2]
Add CPE information [3]
PR: 245854 [1] (with changes), 245604 [2], 197712 [3]
Submitted by: naddy@ [1], mi@ [2], arrowd [3]
Reported by: shun [3]
Approved by: ports-secteam (joenum)
Notes
Notes:
svn path=/branches/2020Q2/; revision=533929
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 9 | ||||
| -rw-r--r-- | x11-servers/xorg-server/distinfo | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index b1d21c2b368c..0e48f0d5db6b 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -3,6 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.20.8 +PORTREVISION?= 1 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -11,6 +12,9 @@ DISTNAME= xorg-server-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT?= X.Org X server and related programs +PATCH_SITES= https://gitlab.freedesktop.org/xorg/xserver/commit/ +PATCHFILES= 271934db9f3b1297754b29855646e0a4ee01db59.diff:-p1 + LICENSE= MIT RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \ @@ -55,15 +59,16 @@ DEFAULT_FONTPATH_LIST= \ DEFAULT_FONTPATH_CMD=${ECHO_CMD} ${DEFAULT_FONTPATH_LIST} | ${TR} ' ' , PLIST_SUB+= FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}" -USES= compiler:c11 gl gmake perl5 ssl xorg xorg-cat:xserver +USES= compiler:c11 cpe gl gmake perl5 ssl xorg xorg-cat:xserver USE_PERL5= build USE_GL+= gl USE_XORG+= pixman xau xdmcp xfont2 xkbfile xorgproto xshmfence xtrans CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \ --with-default-font-path="$$(${DEFAULT_FONTPATH_CMD})" \ - --without-dtrace --with-shared-memory-dir=/tmp \ + --without-dtrace --disable-config-hal \ --disable-install-setuid --disable-unit-tests INSTALL_TARGET= install-strip +CPE_VENDOR= x.org .if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr" || ${PORTNAME} == "xwayland" LIB_DEPENDS+= libdrm.so:graphics/libdrm \ diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index dce49ea58c6e..f0d858b04ac2 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1585642684 +TIMESTAMP = 1588512348 SHA256 (xorg/xserver/xorg-server-1.20.8.tar.bz2) = d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146 SIZE (xorg/xserver/xorg-server-1.20.8.tar.bz2) = 6309640 +SHA256 (xorg/xserver/271934db9f3b1297754b29855646e0a4ee01db59.diff) = b29a3af8f6d93a5b6e1d4652fca0a76e438884dee8caf03f89148fbc47c98f71 +SIZE (xorg/xserver/271934db9f3b1297754b29855646e0a4ee01db59.diff) = 1262 |