Merge branch '3.6' into 3.7

5 files changed, 93 insertions, 16 deletions

diff --git a/libdrm/.signature b/libdrm/.signature
index f640cf6e..6fbff763 100644
--- a/libdrm/.signature
+++ b/libdrm/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndGrnospvw0V1DSskhxSLf7csu/Cof/hQfRl3ZsamqI9vob+lm+E3KFXL0jJwdSd/5A/o6374VtlPRlea0hJKbg4=
-SHA256 (Pkgfile) = f63723ebe753bfeab2218e642ae828eba4b0e3361e57c143486cc7097760b2b8
+RWTSGWF5Q7TndBmNa5ltrUpafSuYsM7A5IuIjVpxN6yAZIfJGrK2WNjVE+cFCWgr8y2NFw1jHWsHIBJigW+j9WqLp2wKrjQDhgY=
+SHA256 (Pkgfile) = 62e5ff135bc6079181e455224aee15b9f8b8810ac1553c3884d13038e9b6e077
 SHA256 (.footprint) = 9c34397a9d89ba2cce5de09a4c7e00c8729b84120058b3a84b5b00e329ed8833
-SHA256 (libdrm-2.4.112.tar.xz) = 00b07710bd09b35cd8d80eaf4f4497fe27f4becf467a9830f1f5e8324f8420ff
+SHA256 (libdrm-2.4.113.tar.xz) = 7fd7eb2967f63beb4606f22d50e277d993480d05ef75dd88a9bd8e677323e5e1
diff --git a/libdrm/Pkgfile b/libdrm/Pkgfile
index 93cdf480..6b9c72e2 100644
--- a/libdrm/Pkgfile
+++ b/libdrm/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: xorg-libpciaccess
 
 name=libdrm
-version=2.4.112
+version=2.4.113
 release=1
 source=(https://dri.freedesktop.org/libdrm/libdrm-$version.tar.xz)
 
@@ -15,9 +15,9 @@ build() {
 		--wrap-mode nodownload \
 		-D b_lto=true \
 		-D b_pie=true \
-		-D man-pages=false \
-		-D valgrind=false \
-		-D cairo-tests=false
+		-D man-pages=disabled \
+		-D valgrind=disabled \
+		-D cairo-tests=disabled
 
 	meson compile -C build -j ${JOBS:-1}
 	DESTDIR=$PKG meson install -C build
diff --git a/xorg-libxft/.footprint b/xorg-libxft/.footprint
index 92be991b..1c1672a0 100644
--- a/xorg-libxft/.footprint
+++ b/xorg-libxft/.footprint
@@ -7,12 +7,89 @@ drwxr-xr-x	root/root	usr/include/X11/Xft/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libXft.a
 -rwxr-xr-x	root/root	usr/lib/libXft.la
-lrwxrwxrwx	root/root	usr/lib/libXft.so -> libXft.so.2.3.4
-lrwxrwxrwx	root/root	usr/lib/libXft.so.2 -> libXft.so.2.3.4
--rwxr-xr-x	root/root	usr/lib/libXft.so.2.3.4
+lrwxrwxrwx	root/root	usr/lib/libXft.so -> libXft.so.2.3.5
+lrwxrwxrwx	root/root	usr/lib/libXft.so.2 -> libXft.so.2.3.5
+-rwxr-xr-x	root/root	usr/lib/libXft.so.2.3.5
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/xft.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/Xft.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftCharExists.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftCharFontSpecRender.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftCharIndex.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftCharSpecRender.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftColorAllocName.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftColorAllocValue.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftColorFree.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDefaultHasRender.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDefaultSet.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDefaultSubstitute.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawChange.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawCharFontSpec.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawCharSpec.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawColormap.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawCreate.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawCreateAlpha.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawCreateBitmap.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawDestroy.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawDisplay.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawDrawable.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawGlyphFontSpec.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawGlyphSpec.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawGlyphs.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawPicture.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawRect.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawSetClip.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawSetClipRectangles.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawSetSubwindowMode.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawSrcPicture.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawString16.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawString32.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawString8.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawStringUtf16.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawStringUtf8.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftDrawVisual.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontCheckGlyph.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontClose.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontCopy.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontInfoCreate.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontInfoDestroy.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontInfoEqual.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontInfoHash.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontLoadGlyphs.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontMatch.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontOpen.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontOpenInfo.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontOpenName.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontOpenPattern.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontOpenXlfd.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftFontUnloadGlyphs.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftGetVersion.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftGlyphExtents.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftGlyphFontSpecRender.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftGlyphRender.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftGlyphSpecRender.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftInit.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftInitFtLibrary.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftListFonts.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftLockFace.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftNameParse.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftNameUnparse.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextExtents16.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextExtents32.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextExtents8.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextExtentsUtf16.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextExtentsUtf8.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextRender16.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextRender16BE.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextRender16LE.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextRender32.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextRender32BE.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextRender32LE.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextRender8.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextRenderUtf16.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftTextRenderUtf8.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftUnlockFace.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/XftXlfdParse.3.gz
diff --git a/xorg-libxft/.signature b/xorg-libxft/.signature
index 08873c62..e63ab6ba 100644
--- a/xorg-libxft/.signature
+++ b/xorg-libxft/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndJGn9kCYTXX5qh7PGMaZHMQPvuixTlahRV3sUs+mI44kVDdLcWK/V8PnqXk4qGxssskUCpORmiclEE0P2IQo5Qg=
-SHA256 (Pkgfile) = 519e12c818c37f403dd8ab8a2284777010d509a885645a4a700b134a55067575
-SHA256 (.footprint) = b8031a6d32c6700b5ed3f2038ece5074e620e06a7ce64907476b7f739f5bb452
-SHA256 (libXft-2.3.4.tar.bz2) = 57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
+RWTSGWF5Q7TndIhu3/FBagJBd76V4kpXk5UYXXRvJfO4N+E+d2ELa1RpE2D4CzC8zpK5f20uJAh70Mf93B76fiieCzPGQBgfBwo=
+SHA256 (Pkgfile) = 9fe372716f84cebfdf2801254e4e93efabfa55e304ae6929f5cc5acc578eaa4d
+SHA256 (.footprint) = f090133342a8da5cb22f70bb5af40768a41e3c51b2969fe1ba707bb984311760
+SHA256 (libXft-2.3.5.tar.xz) = 684fd6ec83db80b391b8111f604d9225772b26bb78bba261d77a5eaddab6a1ee
diff --git a/xorg-libxft/Pkgfile b/xorg-libxft/Pkgfile
index 3d334c55..b93fa50e 100644
--- a/xorg-libxft/Pkgfile
+++ b/xorg-libxft/Pkgfile
@@ -4,9 +4,9 @@
 # Depends on: harfbuzz util-linux
 
 name=xorg-libxft
-version=2.3.4
+version=2.3.5
 release=1
-source=(https://www.x.org/releases/individual/lib/libXft-$version.tar.bz2)
+source=(https://www.x.org/releases/individual/lib/libXft-$version.tar.xz)
 
 build() {
 	cd libXft-$version