Index: branches/2020Q3/x11/libX11/Makefile =================================================================== --- branches/2020Q3/x11/libX11/Makefile (revision 543912) +++ branches/2020Q3/x11/libX11/Makefile (revision 543913) @@ -1,32 +1,39 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME= libX11 PORTVERSION= 1.6.9 -PORTREVISION= 1 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X11 library + +PATCH_SITES= https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/ +PATCHFILES= 0e6561efcfaa0ae7b5c74eac7e064b76d687544e.diff:-p1 +PATCHFILES+= 388b303c62aa35a245f1704211a023440ad2c488.diff:-p1 +PATCHFILES+= 2fcfcc49f3b1be854bb9085993a01d17c62acf60.diff:-p1 +PATCHFILES+= 1a566c9e00e5f35c1f9e7f3d741a02e5170852b2.diff:-p1 +PATCHFILES+= 1703b9f3435079d3c6021e1ee2ec34fd4978103d.diff:-p1 LICENSE= MIT USES= cpe perl5 xorg xorg-cat:lib USE_XORG= xau xcb xdmcp xtrans xorgproto USE_PERL5= build CPE_VENDOR= x CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \ --without-xmlto \ --disable-specs CONFIGURE_ENV+= ac_cv_path_PS2PDF="" INSTALL_TARGET= install-strip post-patch: @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ ${WRKSRC}/configure @${REINPLACE_CMD} '/^install-data-am:/,/^$$/ \ s/install-specDATA//' ${WRKSRC}/nls/Makefile.in .include Index: branches/2020Q3/x11/libX11/distinfo =================================================================== --- branches/2020Q3/x11/libX11/distinfo (revision 543912) +++ branches/2020Q3/x11/libX11/distinfo (revision 543913) @@ -1,3 +1,13 @@ -TIMESTAMP = 1571332179 +TIMESTAMP = 1596290430 SHA256 (xorg/lib/libX11-1.6.9.tar.bz2) = 9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1 SIZE (xorg/lib/libX11-1.6.9.tar.bz2) = 2283814 +SHA256 (xorg/lib/0e6561efcfaa0ae7b5c74eac7e064b76d687544e.diff) = 9ad45b12018b914a03db18773d6a98bada3b0bcdae652b32a6015d85ed2abb1f +SIZE (xorg/lib/0e6561efcfaa0ae7b5c74eac7e064b76d687544e.diff) = 1638 +SHA256 (xorg/lib/388b303c62aa35a245f1704211a023440ad2c488.diff) = 94132d3b1b3fa43c6e8a6c1ae465b4565eef6e3f0b50e94351b8f40d17bbc1c7 +SIZE (xorg/lib/388b303c62aa35a245f1704211a023440ad2c488.diff) = 1917 +SHA256 (xorg/lib/2fcfcc49f3b1be854bb9085993a01d17c62acf60.diff) = 71ac3ec3e27a48a2d08ad11a3f3654dd0452e51c2ee3f21a16a7ddeb041f85bb +SIZE (xorg/lib/2fcfcc49f3b1be854bb9085993a01d17c62acf60.diff) = 854 +SHA256 (xorg/lib/1a566c9e00e5f35c1f9e7f3d741a02e5170852b2.diff) = 1a85e3b4bd56248be5a5a373dda6f3985af60de8b8d784db1406a583d1a24091 +SIZE (xorg/lib/1a566c9e00e5f35c1f9e7f3d741a02e5170852b2.diff) = 4297 +SHA256 (xorg/lib/1703b9f3435079d3c6021e1ee2ec34fd4978103d.diff) = 8b002aa51e1eb0ac7d435e078c9104ce47f1327bffa29e5bece93af8b4cdd27f +SIZE (xorg/lib/1703b9f3435079d3c6021e1ee2ec34fd4978103d.diff) = 443 Index: branches/2020Q3/x11-servers/xorg-server/Makefile =================================================================== --- branches/2020Q3/x11-servers/xorg-server/Makefile (revision 543912) +++ branches/2020Q3/x11-servers/xorg-server/Makefile (revision 543913) @@ -1,130 +1,131 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME?= xorg-server PORTVERSION?= 1.20.8 -PORTREVISION?= 2 +PORTREVISION?= 3 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver 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 +PATCHFILES+= aac28e162e5108510065ad4c323affd6deffd816.diff:-p1 LICENSE= MIT RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \ xkbcomp:x11/xkbcomp SLAVE_PORT?= no OPTIONS_SUB= yes OPTIONS_DEFINE+= SUID OPTIONS_RADIO= CONF OPTIONS_RADIO_CONF= DEVD UDEV OPTIONS_DEFAULT= SUID OPTIONS_DEFAULT_FreeBSD_11= DEVD OPTIONS_DEFAULT_FreeBSD_12= UDEV OPTIONS_DEFAULT_FreeBSD_13= UDEV OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} SUID_DESC= Install setuid wrapper to allow startx as non-root CONF_DESC= Backend to use for input device configuration DEVD_DESC= Use devd for autoconfiguration of input devices UDEV_DESC= Use udev via libudev-devd for autoconfiguration of input devices DEVD_CONFIGURE_ENABLE= config-devd SUID_CONFIGURE_ENABLE= suid-wrapper SUID_CONFIGURE_ON= --libexecdir=${PREFIX}/bin # set SUID_WRAPPER_DIR UDEV_CONFIGURE_ENABLE= config-udev UDEV_CONFIGURE_ON= --disable-config-udev-kms UDEV_LIB_DEPENDS= libudev.so:devel/libudev-devd .include FONTPATH_ROOT?= ${LOCALBASE}/share/fonts FONTPATHD?= ${PREFIX}/etc/X11/fontpath.d DEFAULT_FONTPATH_LIST= \ ${FONTPATH_ROOT}/misc/ \ ${FONTPATH_ROOT}/TTF/ \ ${FONTPATH_ROOT}/OTF/ \ ${FONTPATH_ROOT}/Type1/ \ ${FONTPATH_ROOT}/100dpi/ \ ${FONTPATH_ROOT}/75dpi/ \ catalogue:${FONTPATHD} DEFAULT_FONTPATH_CMD=${ECHO_CMD} ${DEFAULT_FONTPATH_LIST} | ${TR} ' ' , PLIST_SUB+= FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}" 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 --disable-config-hal \ --disable-install-setuid --disable-unit-tests \ --with-fallback-input-driver=libinput INSTALL_TARGET= install-strip CPE_VENDOR= x.org .if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr" || ${PORTNAME} == "xwayland" 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 CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ --disable-xwayland --enable-xcsecurity SUB_FILES= pkg-install pkg-deinstall .else CONFIGURE_ARGS+= --disable-xorg OPTIONS_EXCLUDE= DEVD UDEV SUID # Set PLIST for slave ports so they only need to set PLIST_FILES PLIST= ${.CURDIR}/pkg-plist .endif .include .if ${SSL_DEFAULT} == base # The reason why I use this is cause openssl from base doesn't install a .pc file # and configure will fail trying to find it. Setting both of those variables to # a *non-empty* value by-passes the pkg-config check. CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .endif .if ${ARCH} == "i386" || ${ARCH} == "amd64" LIB_DEPENDS+= libunwind.so:devel/libunwind .endif .if ${ARCH} == "sparc64" PLIST_SUB+= SPARC64="" .else PLIST_SUB+= SPARC64="@comment " .endif post-patch: @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ ${WRKSRC}/configure .if ${SLAVE_PORT} == "no" post-install: # Avoid conflict with nvidia-driver, move libglx.so into .xorg directory @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg ${MV} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libglx.so \ ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d @${MKDIR} ${STAGEDIR}${FONTPATHD} @${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d @${INSTALL_DATA} ${FILESDIR}/20-evdev-kbd.conf \ ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d .endif # ! SLAVE_PORT .include Index: branches/2020Q3/x11-servers/xorg-server/distinfo =================================================================== --- branches/2020Q3/x11-servers/xorg-server/distinfo (revision 543912) +++ branches/2020Q3/x11-servers/xorg-server/distinfo (revision 543913) @@ -1,5 +1,7 @@ -TIMESTAMP = 1588512348 +TIMESTAMP = 1596289918 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 +SHA256 (xorg/xserver/aac28e162e5108510065ad4c323affd6deffd816.diff) = c1713942583adc12f77a381ed2ee8907ca0d189e08f6a1730948b51744d2f764 +SIZE (xorg/xserver/aac28e162e5108510065ad4c323affd6deffd816.diff) = 520 Index: branches/2020Q3 =================================================================== --- branches/2020Q3 (revision 543912) +++ branches/2020Q3 (revision 543913) Property changes on: branches/2020Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r543911-543912