Merge branch '3.4' into 3.5

2019-05-07 23:47:22 +02:00 · 2019-05-07 23:47:22 +02:00 · 27e33337fd
commit 27e33337fd
parent d5c07f6693 16fae435f6
64 changed files with 3576 additions and 6250 deletions
--- a/cmark/.footprint
+++ b/cmark/.footprint
@ -0,0 +1,22 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/cmark
+drwxr-xr-x	root/root	usr/include/
+-rw-r--r--	root/root	usr/include/cmark.h
+-rw-r--r--	root/root	usr/include/cmark_export.h
+-rw-r--r--	root/root	usr/include/cmark_version.h
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/cmake/
+-rw-r--r--	root/root	usr/lib/cmake/cmark-release.cmake
+-rw-r--r--	root/root	usr/lib/cmake/cmark.cmake
+-rw-r--r--	root/root	usr/lib/libcmark.a
+lrwxrwxrwx	root/root	usr/lib/libcmark.so -> libcmark.so.0.29.0
+-rwxr-xr-x	root/root	usr/lib/libcmark.so.0.29.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/libcmark.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/cmark.1.gz
+drwxr-xr-x	root/root	usr/share/man/man3/
+-rw-r--r--	root/root	usr/share/man/man3/cmark.3.gz
--- a/cmark/.signature
+++ b/cmark/.signature
@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF3+kmr9CST9kPQbnKX+Lkj7L6mBWgQw172dBlDPZZPlYtV/Yp4Mp2CyZt5COKbA56TwuRH6RVQJqgzU94z2P54wk=
+SHA256 (Pkgfile) = 1e00090ed8413ed5beb1a05e1f0aafb2a1148d02a506caf4278b5ae97002c9fe
+SHA256 (.footprint) = e5a7f390dd93c1251814952881cfb05354403794e97231863ff9f35071099529
+SHA256 (cmark-0.29.0.tar.gz) = 2558ace3cbeff85610de3bda32858f722b359acdadf0c4691851865bb84924a6
--- a/cmark/Pkgfile
+++ b/cmark/Pkgfile
@ -0,0 +1,24 @@
+# Description: CommonMark parsing and rendering library and program in C
+# URL: https://github.com/jgm/cmark
+# Maintainer: Danny Rawlins, crux at romster dot me
+# Depends on: cmake python
+
+name=cmark
+version=0.29.0
+release=1
+source=(https://github.com/jgm/$name/archive/$version/$name-$version.tar.gz)
+
+build() {
+	cd $name-$version
+
+	mkdir -p build
+	cd build
+
+	cmake .. \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DCMAKE_BUILD_TYPE=Release
+
+	make
+	make DESTDIR=$PKG install
+}
--- a/firefox/.signature
+++ b/firefox/.signature
@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3xu2pIe+c/10Bl+eEuBSN31WvzbjXCJEUipDxNoCtnybpPgzAQffnmqC+QxYjgT9wzNGe8VJQkEDmMXqGEU8MgA=
-SHA256 (Pkgfile) = 6cbbff98ed2fd80388188d0b6ea77c5a17b2e120319520c1af3f11d5a9dff502
+RWSagIOpLGJF36PRRzg13NTUOpJ0N8iilvz24nME+7wIehsFqxrwEQZI8Y0I9ixL9YR1wfGmLIsazD+hB0/5ABy93ZWtqx0Tygw=
+SHA256 (Pkgfile) = 9e059435f0a3d49072d24b3e8a45e6264bf459734cf77b086837353b60faa929
 SHA256 (.footprint) = ba83ace6604f2c04a4e10eb00060ef7d98360e643f3674b29314fe9cec899189
-SHA256 (firefox-66.0.3.source.tar.xz) = 1fe4cfe4f4afce8d5532da8f36a48c333750c90a6ee67167309357edf514c22a
+SHA256 (firefox-66.0.4.source.tar.xz) = 7ac6fae17e402276483fbfbb6b320d61e6695a28f1112ba2c987127f105dc25d
 SHA256 (firefox.desktop) = 8ba3439f3dfc5cab883641969c93d8d15f8f20d7188d9568346b2edad52d6f91
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@ -5,7 +5,7 @@
 # Optional: sccache

 name=firefox
-version=66.0.3
+version=66.0.4
 release=1
 source=(https://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.xz
 	firefox.desktop)
--- a/fpc/.footprint
+++ b/fpc/.footprint
--- a/fpc/.signature
+++ b/fpc/.signature
@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/2fPfZ86T7dkX0jSJy9kqspUrDGNwONHEuiw1LIhzdvIx7peMvP6BHXB6LhvdxQUl3JUPLYvhY6cYqfnZYW6AM=
-SHA256 (Pkgfile) = ed862148f3a3fbee690bea786cd4785b144dd21b4677f75da3167633c9876b9b
-SHA256 (.footprint) = 241338004b6a6e882c90ebe3c444a29f89d5c521c7bf428c79ddfc102b149569
-SHA256 (fpcbuild-2.6.4.tar.gz) = 8d9c3bcfa469d9b37c05663e2775d179809e4b3443604fac7d21aa64c9a56daa
-SHA256 (x86_64-linux-ppcx64.bz2) = 3650b8a6c5821c37bb7e436913197cae08dac4c023d8efe8e2e58292651b45aa
-SHA256 (libgdb_mingw702.zip) = f794721ad0e2c4c3a56854107e251619e69c19005930195ffeef080103a75a23
+RWSagIOpLGJF38kVqSnoPxC261aNsRN6MdmlVWO0WCofZv7phS93zIEw3O6BzIwaJk4+qc4m74B0ipxXOfYwIQ3ArHorDOXHtAc=
+SHA256 (Pkgfile) = 8be765d865df79ecefc25523c864dd330330c837091f5b45444eb7a4f6d27880
+SHA256 (.footprint) = f456a8409b18f7c1358855727bb4add3e98e6755089422dece99747457f58596
+SHA256 (fpcbuild-3.0.4.tar.gz) = f66514e6f2c2e4e1bccccb4d554c24b77682ed61c87811ae5dd210f421855e76
+SHA256 (fpc-3.0.4.source.tar.gz) = 69b3b7667b72b6759cf27226df5eb54112ce3515ff5efb79d95ac14bac742845
+SHA256 (fpc-3.0.4.x86_64-linux.tar) = 7e965baf13c9822a0ff39e7bbfa040bd5599e94d0f3338f1ac4efa989081fd77
--- a/fpc/Pkgfile
+++ b/fpc/Pkgfile
@ -1,41 +1,43 @@
-# Description: A Free Pascal compiler.
-# URL: http://www.freepascal.org/
-# Packager: Danny Rawlins, crux at romster dot me
+# Description: Free Pascal compiler.
+# URL: https://www.freepascal.org/
 # Maintainer: Danny Rawlins, crux at romster dot me

 name=fpc
-version=2.6.4
+version=3.0.4
 release=1
-source=(ftp://ftp.freepascal.org/pub/fpc/dist/$version/source/fpcbuild-$version.tar.gz
-	http://crux.ster.zone/downloads/fpc/md5/2f440a0e40d134ed67db2fbf58c6e30a/x86_64-linux-ppcx64.bz2
-	ftp://ftp.freepascal.org/pub/fpc/contrib/libgdb/v7.2/libgdb_mingw702.zip)
+source=(
+	https://sourceforge.net/projects/freepascal/files/Source/$version/fpcbuild-$version.tar.gz
+	https://sourceforge.net/projects/freepascal/files/Source/$version/fpc-$version.source.tar.gz
+	https://sourceforge.net/projects/freepascal/files/Linux/$version/$name-$version.x86_64-linux.tar
+)

 build() {
-	bunzip2 x86_64-linux-ppcx64.bz2
-	chmod 0755 x86_64-linux-ppcx64
+	JOBS='-j1'

-	export LIBGDBDIR=$SRC/libgdb/win64/x86_64/
+	tar -xf fpc-$version.x86_64-linux/binary.x86_64-linux.tar
+	tar -xzf base.x86_64-linux.tar.gz

 	cd fpcbuild-$version/fpcsrc/
 	
-	make -j 1 PP=$SRC/x86_64-linux-ppcx64 build
+	make $JOBS PP=$SRC/lib/fpc/$version/ppcx64 build

 	cp $SRC/fpcbuild-$version/fpcsrc/compiler/ppcx64 \
 		$SRC/fpcbuild-$version/fpcsrc/compiler/ppcx64.new

-	make -j 1 PP=$SRC/fpcbuild-$version/fpcsrc/compiler/ppcx64.new build
+	make $JOBS PP=$SRC/fpcbuild-$version/fpcsrc/compiler/ppcx64.new build
 	rm $SRC/fpcbuild-$version/fpcsrc/compiler/ppcx64.new

-	make -j 1 PP=$SRC/fpcbuild-$version/fpcsrc/compiler/ppcx64 rtl_clean
-	make -j 1 PP=$SRC/fpcbuild-$version/fpcsrc/compiler/ppcx64 rtl packages_all utils
+	make $JOBS PP=$SRC/fpcbuild-$version/fpcsrc/compiler/ppcx64 rtl_clean
+	make $JOBS PP=$SRC/fpcbuild-$version/fpcsrc/compiler/ppcx64 rtl packages_all utils

 	set -- PP=$SRC/fpcbuild-$version/fpcsrc/compiler/ppcx64 \
-		FPCMAKE=$SRC/fpcbuild-$version/fpcsrc/utils/fpcm/fpcmake \
 		INSTALL_PREFIX=$PKG/usr \
 		INSTALL_DOCDIR=$PKG/usr/share/doc/fpcbuild \
 		INSTALL_MANDIR=$PKG/usr/share/man \
 		INSTALL_SOURCEDIR=$PKG/usr/lib/fpc/fpcbuild-$version/source

-	make -j 1 "$@" compiler_install rtl_install packages_install utils_install
+	make $JOBS "$@" compiler_install rtl_install packages_install utils_install
 	ln -sf /usr/lib/fpc/$version/ppcx64 $PKG/usr/bin/ppcx64
+
+	rm -r $PKG/usr/share/doc
 }
--- a/glslang/.footprint
+++ b/glslang/.footprint
@ -1,75 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
-rwxr-xr-x	root/root	usr/bin/glslangValidator
-rwxr-xr-x	root/root	usr/bin/spirv-remap
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/SPIRV/
-rw-r--r--	root/root	usr/include/SPIRV/GLSL.ext.AMD.h
-rw-r--r--	root/root	usr/include/SPIRV/GLSL.ext.EXT.h
-rw-r--r--	root/root	usr/include/SPIRV/GLSL.ext.KHR.h
-rw-r--r--	root/root	usr/include/SPIRV/GLSL.ext.NV.h
-rw-r--r--	root/root	usr/include/SPIRV/GLSL.std.450.h
-rw-r--r--	root/root	usr/include/SPIRV/GlslangToSpv.h
-rw-r--r--	root/root	usr/include/SPIRV/Logger.h
-rw-r--r--	root/root	usr/include/SPIRV/SPVRemapper.h
-rw-r--r--	root/root	usr/include/SPIRV/SpvBuilder.h
-rw-r--r--	root/root	usr/include/SPIRV/SpvTools.h
-rw-r--r--	root/root	usr/include/SPIRV/bitutils.h
-rw-r--r--	root/root	usr/include/SPIRV/disassemble.h
-rw-r--r--	root/root	usr/include/SPIRV/doc.h
-rw-r--r--	root/root	usr/include/SPIRV/hex_float.h
-rw-r--r--	root/root	usr/include/SPIRV/spirv.hpp
-rw-r--r--	root/root	usr/include/SPIRV/spvIR.h
-drwxr-xr-x	root/root	usr/include/glslang/
-drwxr-xr-x	root/root	usr/include/glslang/Include/
-rw-r--r--	root/root	usr/include/glslang/Include/BaseTypes.h
-rw-r--r--	root/root	usr/include/glslang/Include/Common.h
-rw-r--r--	root/root	usr/include/glslang/Include/ConstantUnion.h
-rw-r--r--	root/root	usr/include/glslang/Include/InfoSink.h
-rw-r--r--	root/root	usr/include/glslang/Include/InitializeGlobals.h
-rw-r--r--	root/root	usr/include/glslang/Include/PoolAlloc.h
-rw-r--r--	root/root	usr/include/glslang/Include/ResourceLimits.h
-rw-r--r--	root/root	usr/include/glslang/Include/ShHandle.h
-rw-r--r--	root/root	usr/include/glslang/Include/Types.h
-rw-r--r--	root/root	usr/include/glslang/Include/arrays.h
-rw-r--r--	root/root	usr/include/glslang/Include/intermediate.h
-rw-r--r--	root/root	usr/include/glslang/Include/revision.h
-drwxr-xr-x	root/root	usr/include/glslang/MachineIndependent/
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/Initialize.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/LiveTraverser.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/ParseHelper.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/RemoveTree.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/Scan.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/ScanContext.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/SymbolTable.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/Versions.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/attribute.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/gl_types.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/glslang_tab.cpp.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/iomapper.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/localintermediate.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/parseVersions.h
-drwxr-xr-x	root/root	usr/include/glslang/MachineIndependent/preprocessor/
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/preprocessor/PpContext.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/preprocessor/PpTokens.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/propagateNoContraction.h
-rw-r--r--	root/root	usr/include/glslang/MachineIndependent/reflection.h
-drwxr-xr-x	root/root	usr/include/glslang/Public/
-rw-r--r--	root/root	usr/include/glslang/Public/ShaderLang.h
-drwxr-xr-x	root/root	usr/lib/
-rw-r--r--	root/root	usr/lib/libHLSL.a
-rwxr-xr-x	root/root	usr/lib/libHLSL.so
-lrwxrwxrwx	root/root	usr/lib/libHLSL.so.0 -> libHLSL.so
-rw-r--r--	root/root	usr/lib/libOGLCompiler.a
-rw-r--r--	root/root	usr/lib/libOSDependent.a
-rw-r--r--	root/root	usr/lib/libSPIRV.a
-rwxr-xr-x	root/root	usr/lib/libSPIRV.so
-lrwxrwxrwx	root/root	usr/lib/libSPIRV.so.0 -> libSPIRV.so
-rw-r--r--	root/root	usr/lib/libSPVRemapper.a
-rwxr-xr-x	root/root	usr/lib/libSPVRemapper.so
-lrwxrwxrwx	root/root	usr/lib/libSPVRemapper.so.0 -> libSPVRemapper.so
-rwxr-xr-x	root/root	usr/lib/libglslang-default-resource-limits.so
-lrwxrwxrwx	root/root	usr/lib/libglslang-default-resource-limits.so.0 -> libglslang-default-resource-limits.so
-rw-r--r--	root/root	usr/lib/libglslang.a
-rwxr-xr-x	root/root	usr/lib/libglslang.so
-lrwxrwxrwx	root/root	usr/lib/libglslang.so.0 -> libglslang.so
--- a/glslang/.signature
+++ b/glslang/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32R12Mnd1qd4WQbwCEKD9Id2svkmCi7bfWoJoRDR6GEPgfSytlXoqdm9fpIPlHs1iV/ADSTZ4uhk2+OO5t2MVgc=
-SHA256 (Pkgfile) = 99178f94052b33217ba21d79adbc6c4ef4a47ce2df97d55d7d0e0e385a6d3af4
-SHA256 (.footprint) = 6efc8343d6d8e000bcb8127c467203b1c2938fcc087ab826a00dd97c6f5b51e0
-SHA256 (glslang-7.11.3113.tar.gz) = 4d238000162029f791cfcd65a28f10defa574516b94d9392695d27c8a1ce8b62
--- a/glslang/Pkgfile
+++ b/glslang/Pkgfile
@ -1,40 +0,0 @@
-# Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
-# URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler
-# Maintainer:
-# Depends on: spirv-tools
-
-name=glslang
-version=7.11.3113
-release=2
-source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar.gz)
-#source=(https://bitbucket.org/predivan/distfiles/downloads/$name-$version.tar.bz2)
-
-build() {
-    cd $name-$version
-
-    mkdir -p build-{shared,static}
-
-    (cd build-shared
-    cmake .. \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DBUILD_SHARED_LIBS=ON
-    make
-    )
-
-    (cd build-static
-    cmake .. \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DBUILD_SHARED_LIBS=OFF
-    make
-    )
-
-    make -C build-shared DESTDIR=$PKG install
-    make -C build-static DESTDIR=$PKG install
-
-    cd $PKG/usr/lib
-        for lib in *.so; do
-        ln -sf "${lib}" "${lib}.0"
-    done
-}
--- a/gst-libav/.footprint
+++ b/gst-libav/.footprint
@ -1,6 +1,4 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/gstreamer-1.0/
-rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstlibav.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstlibav.so
-drwxr-xr-x	root/root	usr/share/
--- a/gst-libav/.signature
+++ b/gst-libav/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/hqLGNXCptFJVMge/rJBcFCLvPOTF5gJ/kfP7JqCHjll+mLBq0Z2PNDneoqXI5uWJGFUnYH/CxsN1ROEwJTpgU=
-SHA256 (Pkgfile) = 84d6e276bb37b251145efa60c43709f348663ea434b405f11fdd6c31bc48008c
-SHA256 (.footprint) = d74c92d6ce61aa73f319dc0142b76031fc1eed2bf3609fbe282054e9dc1e06de
+RWSagIOpLGJF3633opyJLe3wRjRVATXilJPoAq8sHyo3YoM0O6QyKxNWi//Ou9ci3DN6By5WgFpiQZ/QMD/A/DwLXZlYZcA68gg=
+SHA256 (Pkgfile) = da4b1b230d638f752d2d92937d6502c9d5d9475d54a73c61893e72556acc4844
+SHA256 (.footprint) = 2b4603029b15032a74098cf497de9777c10b2c1d1fcca733daa90fdac79a1073
 SHA256 (gst-libav-1.16.0.tar.xz) = dfac119043a9cfdcacd7acde77f674ab172cf2537b5812be52f49e9cddc53d9a
--- a/gst-libav/Pkgfile
+++ b/gst-libav/Pkgfile
@ -1,24 +1,16 @@
 # Description: Gstreamer libav Plugin.
 # URL: https://gstreamer.freedesktop.org/modules/gst-libav.html
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: autoconf-archive gst-plugins-base yasm
+# Depends on: ffmpeg gst-plugins-base

 name=gst-libav
 version=1.16.0
-release=1
+release=2
 source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz)

 build() {
 	cd $name-$version
-
-	./configure \
-		--prefix=/usr \
-		--without-system-libav
-
-	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-	make
-	make DESTDIR=$PKG install
-
-	rm -r $PKG/usr/share/gtk-doc
+	meson build --prefix /usr
+	ninja -C build -j ${JOBS:-1}
+	DESTDIR="$PKG" ninja -C build install
 }
--- a/imagemagick-compat/.footprint
+++ b/imagemagick-compat/.footprint
@ -428,7 +428,6 @@ drwxr-xr-x	root/root	usr/lib/perl5/site_perl/
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/linux-thread-multi/
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/linux-thread-multi/Image/
-r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/linux-thread-multi/Image/Magick.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/linux-thread-multi/Image/Magick/
 -r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/linux-thread-multi/Image/Magick/Q16.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/linux-thread-multi/auto/
--- a/imagemagick-compat/.signature
+++ b/imagemagick-compat/.signature
@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3yn40RCb+ESVoLy/jGkR2CpaozYyU5mR6mUTlK0Oo+8tpnwKKGVWt23HX+nPzEtrb4dFnRTEVt4YJ+ajZO/HUgM=
-SHA256 (Pkgfile) = d04bbaea5e900ac09974762b4967f01cf181e7fe360ce4feb2b1c57794ab4874
-SHA256 (.footprint) = b05c8822077a9d92459e37b1ea456a91619c2c823fd1e7d68e94590d3a8b5667
-SHA256 (ImageMagick-6.9.10-20.tar.xz) = 5e5077f68c5d67366b22eb05cf90a9facb71b0ca1024b1e0c2306e2555125ce7
+RWSagIOpLGJF3093km40kQnRdt4xt8AksqQG0YZtDuwGMtCAgQAZTTvMNZaKkee96NgXwUX14mzmDIru+ZUlQG2hxsMDsDc1LQk=
+SHA256 (Pkgfile) = 70987a8eb54886c4f6051fffc62fe1656644af83c442b014d4be3bf8637ca120
+SHA256 (.footprint) = 4fc20adbf5f0b883bf5c88cf98ce2ad0be81c7afcb32cd806377dc29507d0199
+SHA256 (ImageMagick-6.9.10-44.tar.xz) = ca5563ff3b71fce02c85a3067f23dc32c9bd7602fa04c4348a43f2570c4a3860
 SHA256 (IM6-GS-policy.patch) = f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6
--- a/imagemagick-compat/Pkgfile
+++ b/imagemagick-compat/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: util-linux lcms2 pango xorg-libxt

 name=imagemagick-compat
-version=6.9.10-20
+version=6.9.10-44
 release=1
 source=(https://www.imagemagick.org/download/ImageMagick-$version.tar.xz
 	IM6-GS-policy.patch)
@ -41,4 +41,6 @@ build () {

    rm -r $PKG/usr/{bin,share/man}
    rm $PKG/usr/lib/*.la
+
+    rm $PKG/usr/lib/perl5/site_perl/5.26/linux-thread-multi/Image/Magick.pm
 }
--- a/inkscape/.signature
+++ b/inkscape/.signature
@ -1,7 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/Ru9c5lg9dAmpYREBI9V72oj1mrd8TfPp9r6gnrEsSQIJZOeaV1CaqePLYlAydGrDQzc+r+w8LkZC/oGEE6UQI=
-SHA256 (Pkgfile) = 75adb4c930007088c22bc991bd156f826a331abd5ce3b2d96ff2597b6d1a9d5d
+RWSagIOpLGJF31eKlzOW5oKcRe5fL/Tn7UAD6eT6umizECSach72pIb5Nq3/DGkO71BakKY1vH5yk1fl2cTXlrbuKDcOSCVy3ww=
+SHA256 (Pkgfile) = af496c0ea0e5534258f22b7acee0b008cf6163dc2d9bb35f95bc4d47944121b7
 SHA256 (.footprint) = a231855b77d8603f16e2a8754074e97f6c430bf80ac8ccaa02b35814f2f4db2b
-SHA256 (inkscape-0.92.3.tar.bz2) = 063296c05a65d7a92a0f627485b66221487acfc64a24f712eb5237c4bd7816b2
-SHA256 (inkscape-poppler.patch) = ff6d3f6b4076fcdb7cf20085844eb318aff54ba6c8da042eac815bcbf02aa558
-SHA256 (inkscape-gtk3.patch) = b8932e5052571b5c4fb381192799a9568857bc02ec9ba9906ebb74d3f876579b
+SHA256 (inkscape-0.92.4.tar.bz2) = 57ec2da8177b36614a513e2822efd73af721e690f7ddc6bd0a5fbb1525b4515e
+SHA256 (inkscape-0.92.4-poppler-0.76.0.patch) = 3c476cccaa12d962d13e446da4075e821980a883f2be8dac0ec9ae2061926d6a
--- a/inkscape/Pkgfile
+++ b/inkscape/Pkgfile
@ -5,17 +5,15 @@
 # Optional: rtmpdump openldap libexif openjade gtk-doc gtkspell brotli imagemagick-compat

 name=inkscape
-version=0.92.3
-release=3
+version=0.92.4
+release=1
 source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.bz2
-	inkscape-poppler.patch
-	inkscape-gtk3.patch)
+	inkscape-0.92.4-poppler-0.76.0.patch)

 build() {
 	cd $name-$version

-	patch -p1 -i $SRC/inkscape-poppler.patch
-	patch -p1 -i $SRC/inkscape-gtk3.patch
+	patch -p1 -i $SRC/inkscape-0.92.4-poppler-0.76.0.patch

 	CXXFLAGS+=' -std=c++11'

--- a/inkscape/inkscape-0.92.4-poppler-0.76.0.patch
+++ b/inkscape/inkscape-0.92.4-poppler-0.76.0.patch
@ -0,0 +1,44 @@
+From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001
+From: Marc Jeanmougin <marc@jeanmougin.fr>
+Date: Wed, 24 Apr 2019 14:11:26 +0200
+Subject: [PATCH] Tentative fix for poppler 0.76
+
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp           | 2 +-
+ src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index 2981d6ee51..ddbff7671f 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
+ 	error(errInternal, -1, "Weird page contents");
+     	return;
+   }
+-  parser = new Parser(xref, new Lexer(xref, obj), gFalse);
+  parser = new _POPPLER_NEW_PARSER(xref, obj);
+   go(topLevel);
+   delete parser;
+   parser = NULL;
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 6e4dde7dee..21a60702fa 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -3,6 +3,13 @@
+ 
+ #include <glib/poppler-features.h>
+ 
+#if POPPLER_CHECK_VERSION(0, 76, 0)
+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
+#else
+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse)
+#endif
+
+
+ #if POPPLER_CHECK_VERSION(0, 72, 0)
+ #define getCString c_str
+ #endif
+-- 
+2.18.1
+
--- a/inkscape/inkscape-gtk3.patch
+++ b/inkscape/inkscape-gtk3.patch
@ -1,13 +0,0 @@
--- inkscape-0.92.1/configure.ac.orig	2017-06-28 19:16:17.655179973 +0200
-+++ inkscape-0.92.1/configure.ac	2017-06-28 20:40:42.491788807 +0200
-@@ -723,8 +723,8 @@
- if test "x$enable_gtk3" = "xyes"; then
- 
- 	ink_spell_pkg=
-	if pkg-config --exists gtkspell-3.0; then
-		ink_spell_pkg=gtkspell-3.0
-+	if pkg-config --exists gtkspell3-3.0; then
-+		ink_spell_pkg=gtkspell3-3.0
- 		AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
- 	fi
- 
--- a/inkscape/inkscape-poppler.patch
+++ b/inkscape/inkscape-poppler.patch
--- a/libquicktime/.signature
+++ b/libquicktime/.signature
@ -1,6 +1,9 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF381sFKfGeHNvfETGirKnm+wyorfyQKxGVDe5OW0K9JLuTfSX0FJf5HpNnzY5zGsU5FOZSmvGPqUPdBTztsfp/QM=
-SHA256 (Pkgfile) = 885e6499f15d0172e9e5f5ca314c7162669bc563c82bedfc939ce90f57b67f6e
+RWSagIOpLGJF31sw/zTLS4+EpnXDqaNVNVGHlm+0aAwQ0KbFpFktYs9R4eh+tdsKlkXUUdL1kFzkUwBiq+Kvh2zmqN4s9IrKkQA=
+SHA256 (Pkgfile) = 586ba27e5945e755bb9235845994493d9976d9920dcdfe23f5347186358143e6
 SHA256 (.footprint) = c19db413f77f309a736a9a1a40e444cf40210885243f035d4dc61a94d2a48da8
 SHA256 (libquicktime-1.2.4.tar.gz) = 1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368
-SHA256 (libquicktime-1.2.4-ffmpeg3-1.patch) = 2e46f547fdf0f550857115c4e2bdcd5299c35386be253da1f7adb1aba36b64fb
+SHA256 (CVE-2016-2399.patch) = 006c6be761075ca25217fe510e1ec7cfbb6262c3d758c1bd629719072ddb0935
+SHA256 (libquicktime-1.2.4-ffmpeg2.patch) = 2c7bb532ea8ac3b0e7a9a76ca6ad41127810529e7f7c2faac6f1e2f7c5c4bb93
+SHA256 (libquicktime-1.2.4-ffmpeg29.patch) = c3a8dfb6bfb69c2b54aeafe3306a8af1fff5a3a06fd05b28725d3ea7688ce2cd
+SHA256 (libquicktime-1.2.4-ffmpeg4.patch) = d4582dc2ed389acd01080690a95643277e43955adcb4058132506c5b437d044f
--- a/libquicktime/CVE-2016-2399.patch
+++ b/libquicktime/CVE-2016-2399.patch
@ -0,0 +1,25 @@
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855099
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2399
+
+diff --git a/src/util.c b/src/util.c
+index d8dc3c3..9422fc5 100644
+--- a/src/util.c
+++ b/src/util.c
+@@ -340,9 +340,14 @@ int64_t quicktime_byte_position(quicktime_t *file)
+ 
+ void quicktime_read_pascal(quicktime_t *file, char *data)
+ {
+-	char len = quicktime_read_char(file);
+-	quicktime_read_data(file, (uint8_t*)data, len);
+-	data[(int)len] = 0;
+	int len = quicktime_read_char(file);
+	if ((len > 0) && (len < 256)) {
+          /* data[] is expected to be 256 bytes long */
+          quicktime_read_data(file, (uint8_t*)data, len);
+          data[len] = 0;
+        } else {
+          data[0] = 0;
+        }
+ }
+ 
+ void quicktime_write_pascal(quicktime_t *file, char *data)
--- a/libquicktime/Pkgfile
+++ b/libquicktime/Pkgfile
@ -1,19 +1,27 @@
 # Description: A library based on quicktime4linux with extensions.
 # URL: http://libquicktime.sourceforge.net/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Younes Hafri, ycrux at club-internet dot fr
-# Depends on: faac faad2 ffmpeg gtk libdv util-linux xorg-libxaw
+# Depends on: faac faad2 ffmpeg gtk lame libdv libvorbis schroedinger util-linux x264 xorg-libxaw

 name=libquicktime
 version=1.2.4
-release=3
-source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz
-	libquicktime-1.2.4-ffmpeg3-1.patch)
+release=4
+source=(https://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz
+	CVE-2016-2399.patch
+	libquicktime-1.2.4-ffmpeg2.patch
+	libquicktime-1.2.4-ffmpeg29.patch
+	libquicktime-1.2.4-ffmpeg4.patch)

 build() {
 	cd $name-$version

-	patch -p 1 -i $SRC/libquicktime-1.2.4-ffmpeg3-1.patch
+	patch -p 1 -i $SRC/CVE-2016-2399.patch
+	patch -p 1 -i $SRC/libquicktime-1.2.4-ffmpeg2.patch
+	patch -p 1 -i $SRC/libquicktime-1.2.4-ffmpeg29.patch
+	patch -p 1 -i $SRC/libquicktime-1.2.4-ffmpeg4.patch
+	for FILE in lqt_ffmpeg.c video.c audio.c ; do
+		sed -i -e "s:CODEC_ID_:AV_&:g" "plugins/ffmpeg/${FILE}"
+	done

 	./configure \
 		--prefix=/usr \
--- a/libquicktime/libquicktime-1.2.4-ffmpeg2.patch
+++ b/libquicktime/libquicktime-1.2.4-ffmpeg2.patch
@ -0,0 +1,98 @@
+Extracted from upstream CVS.
+https://bugs.gentoo.org/show_bug.cgi?id=476498
+
+Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c
+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c
+@@ -45,6 +45,11 @@
+ #define ENCODE_AUDIO 1
+ #endif
+ 
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+/* from libavcodec/avcodec.h dated Dec 23 2012 */
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
+
+ /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */
+ 
+ /* MPEG Audio header parsing code */
+Index: libquicktime-1.2.4/plugins/ffmpeg/params.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c
+++ libquicktime-1.2.4/plugins/ffmpeg/params.c
+@@ -101,6 +101,17 @@ typedef struct
+     }                                           \
+   }
+ 
+#define PARAM_DICT_INT(name, dict_name)             \
+  {                                                 \
+  if(!strcasecmp(name, key))                        \
+    {                                               \
+    char buf[128];                                  \
+    snprintf(buf, sizeof(buf), "%d", *(int*)value); \
+    av_dict_set(options, dict_name, buf, 0);        \
+    found = 1;                                      \
+    }                                               \
+  }
+
+ #define PARAM_DICT_FLAG(name, dict_name)        \
+   {                                             \
+   if(!strcasecmp(name, key))                    \
+@@ -202,8 +213,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_INT("ff_max_b_frames",max_b_frames);
+   PARAM_FLOAT("ff_b_quant_factor",b_quant_factor);
+   PARAM_INT("ff_b_frame_strategy",b_frame_strategy);
+
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+  PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold");
+  PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold");
+#else
+   PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold);
+   PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold);
+#endif
+
+   PARAM_INT("ff_strict_std_compliance",strict_std_compliance);
+   PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset);
+   PARAM_INT("ff_rc_min_rate",rc_min_rate);
+@@ -241,8 +259,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_QP2LAMBDA("ff_lmax", lmax);
+   PARAM_INT("ff_noise_reduction",noise_reduction);
+   PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);
+
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+  PARAM_DICT_INT("ff_inter_threshold","inter_threshold");
+  PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping");
+#else
+   PARAM_INT("ff_inter_threshold",inter_threshold);
+   PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping);
+#endif
+
+   PARAM_INT("ff_thread_count",thread_count);
+   PARAM_INT("ff_me_threshold",me_threshold);
+   PARAM_INT("ff_mb_threshold",mb_threshold);
+@@ -272,8 +297,16 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT);
+   PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED);
+   //  PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused
+
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+  PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd");
+  PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd");
+  PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop");
+#else
+   PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD);
+   PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD);
+  PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
+#endif
+ 
+ #if LIBAVCODEC_VERSION_MAJOR >= 54
+   PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv");
+@@ -288,7 +321,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER);
+   PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP);
+   PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST);
+-  PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
+   PARAM_ENUM("ff_coder_type",coder_type,coder_type);
+   
+   }
--- a/libquicktime/libquicktime-1.2.4-ffmpeg29.patch
+++ b/libquicktime/libquicktime-1.2.4-ffmpeg29.patch
@ -0,0 +1,287 @@
+Index: libquicktime-1.2.4/plugins/ffmpeg/video.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c
+++ libquicktime-1.2.4/plugins/ffmpeg/video.c
+@@ -37,10 +37,10 @@
+ #endif
+ 
+ 
+-#ifdef  PIX_FMT_YUV422P10
+-#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10
+#ifdef  AV_PIX_FMT_YUV422P10
+#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10
+ #else
+-#define PIX_FMT_YUV422P10_OR_DUMMY -1234
+#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234
+ #endif
+ 
+ #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0)
+@@ -90,9 +90,9 @@ typedef struct
+   int imx_bitrate;
+   int imx_strip_vbi;
+ 
+-  /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while
+-     we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */
+-  enum PixelFormat reinterpret_pix_fmt;
+  /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while
+     we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */
+  enum AVPixelFormat reinterpret_pix_fmt;
+   
+   int is_imx;
+   int y_offset;
+@@ -137,42 +137,42 @@ typedef struct
+ 
+ static const struct
+   {
+-  enum PixelFormat ffmpeg_id;
+  enum AVPixelFormat ffmpeg_id;
+   int              lqt_id;
+   int              exact;
+   }
+ colormodels[] =
+   {
+-    { PIX_FMT_YUV420P,   BC_YUV420P,   1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples)
+    { AV_PIX_FMT_YUV420P,   BC_YUV420P,   1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples)
+ #if LIBAVUTIL_VERSION_INT < (50<<16)
+-    { PIX_FMT_YUV422,    BC_YUV422,    1 },
+    { AV_PIX_FMT_YUV422,    BC_YUV422,    1 },
+ #else
+-    { PIX_FMT_YUYV422,   BC_YUV422,    1 },
+    { AV_PIX_FMT_YUYV422,   BC_YUV422,    1 },
+ #endif
+-    { PIX_FMT_RGB24,     BC_RGB888,    1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB...
+-    { PIX_FMT_BGR24,     BC_BGR888,    1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR...
+-    { PIX_FMT_YUV422P,   BC_YUV422P,   1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
+-    { PIX_FMT_YUV444P,   BC_YUV444P,   1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples)
+-    { PIX_FMT_YUV411P,   BC_YUV411P,   1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples)
+-    { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
+-#ifdef PIX_FMT_YUV422P10
+-    { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2
+-#endif
+-    { PIX_FMT_RGB565,    BC_RGB565,    1 }, ///< always stored in cpu endianness
+-    { PIX_FMT_YUVJ420P,  BC_YUVJ420P,  1 }, ///< Planar YUV 4:2:0 full scale (jpeg)
+-    { PIX_FMT_YUVJ422P,  BC_YUVJ422P,  1 }, ///< Planar YUV 4:2:2 full scale (jpeg)
+-    { PIX_FMT_YUVJ444P,  BC_YUVJ444P,  1 }, ///< Planar YUV 4:4:4 full scale (jpeg)
+    { AV_PIX_FMT_RGB24,     BC_RGB888,    1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB...
+    { AV_PIX_FMT_BGR24,     BC_BGR888,    1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR...
+    { AV_PIX_FMT_YUV422P,   BC_YUV422P,   1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
+    { AV_PIX_FMT_YUV444P,   BC_YUV444P,   1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples)
+    { AV_PIX_FMT_YUV411P,   BC_YUV411P,   1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples)
+    { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
+#ifdef AV_PIX_FMT_YUV422P10
+    { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2
+#endif
+    { AV_PIX_FMT_RGB565,    BC_RGB565,    1 }, ///< always stored in cpu endianness
+    { AV_PIX_FMT_YUVJ420P,  BC_YUVJ420P,  1 }, ///< Planar YUV 4:2:0 full scale (jpeg)
+    { AV_PIX_FMT_YUVJ422P,  BC_YUVJ422P,  1 }, ///< Planar YUV 4:2:2 full scale (jpeg)
+    { AV_PIX_FMT_YUVJ444P,  BC_YUVJ444P,  1 }, ///< Planar YUV 4:4:4 full scale (jpeg)
+ #if LIBAVUTIL_VERSION_INT < (50<<16)
+-    { PIX_FMT_RGBA32,    BC_RGBA8888,  0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
+    { AV_PIX_FMT_RGBA32,    BC_RGBA8888,  0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
+ #else
+-    { PIX_FMT_RGB32,     BC_RGBA8888,  0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
+    { AV_PIX_FMT_RGB32,     BC_RGBA8888,  0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
+ #endif
+-    { PIX_FMT_RGB555,    BC_RGB888,    0 }, ///< always stored in cpu endianness, most significant bit to 1
+-    { PIX_FMT_GRAY8,     BC_RGB888,    0 },
+-    { PIX_FMT_MONOWHITE, BC_RGB888,    0 }, ///< 0 is white
+-    { PIX_FMT_MONOBLACK, BC_RGB888,    0 }, ///< 0 is black
+-    { PIX_FMT_PAL8,      BC_RGB888,    0 }, ///< 8 bit with RGBA palette
+-    { PIX_FMT_YUV410P,   BC_YUV420P,   0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples)
+    { AV_PIX_FMT_RGB555,    BC_RGB888,    0 }, ///< always stored in cpu endianness, most significant bit to 1
+    { AV_PIX_FMT_GRAY8,     BC_RGB888,    0 },
+    { AV_PIX_FMT_MONOWHITE, BC_RGB888,    0 }, ///< 0 is white
+    { AV_PIX_FMT_MONOBLACK, BC_RGB888,    0 }, ///< 0 is black
+    { AV_PIX_FMT_PAL8,      BC_RGB888,    0 }, ///< 8 bit with RGBA palette
+    { AV_PIX_FMT_YUV410P,   BC_YUV420P,   0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples)
+   };
+ 
+ static const struct
+@@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV
+   if (!codec->pix_fmts)
+     return 0;
+ 
+-  for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i)
+  for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i)
+     {
+-    if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY)
+    if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY)
+       return 1;
+     }
+ 
+   return 0;
+   }
+ 
+-static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id)
+static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id)
+   {
+   int i;
+ 
+@@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f
+     if(colormodels[i].lqt_id == id)
+       return colormodels[i].ffmpeg_id;
+     }
+-  return PIX_FMT_NB;
+  return AV_PIX_FMT_NB;
+   }
+ 
+-static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact)
+static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact)
+   {
+   int i;
+ 
+@@ -402,24 +402,24 @@ static void lqt_ffmpeg_setup_decoding_co
+   /* First we try codec-specific colormodel matching. */
+   if(codec->decoder->id == AV_CODEC_ID_DNXHD)
+     {
+-    /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which
+-       we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */
+-    if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY)
+    /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which
+       we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */
+    if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY)
+       {
+-      int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY);
+      int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY);
+       *exact = 1;
+       if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE)
+         {
+         vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P;
+-        codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P;
+-        // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except
+        codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P;
+        // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except
+         // there is no such colormodel in FFMpeg. Fortunately, it's not a problem
+         // in this case, as reinterpret_pix_fmt is only used when *exact == 0.
+         }
+       else
+         {
+         vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P;
+-        codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P;
+        codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P;
+         }
+       return;
+       }
+@@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co
+ 
+   if (codec->encoder->id == AV_CODEC_ID_DNXHD)
+     {
+-    /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10
+-       and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10
+    /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10
+       and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10
+        (in fact, the latter doesn't even exist) */
+-    codec->avctx->pix_fmt = PIX_FMT_YUV422P;
+    codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P;
+     if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10)
+       {
+       if (lqt_tenbit_dnxhd_supported(codec->encoder))
+-        codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY;
+        codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY;
+       }
+     }
+   }
+@@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co
+ /* From avcodec.h: */
+ 
+ /*
+- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA
+ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA
+  * color is put together as:
+  *  (A << 24) | (R << 16) | (G << 8) | B
+  * This is stored as BGRA on little endian CPU architectures and ARGB on
+@@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t
+  */
+ 
+ static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec,
+-                                 AVFrame * in_frame, enum PixelFormat in_format,
+                                 AVFrame * in_frame, enum AVPixelFormat in_format,
+                                  unsigned char ** out_frame, int out_format,
+                                  int width, int height, int row_span, int row_span_uv)
+   {
+@@ -547,9 +547,9 @@ static void convert_image_decode(quickti
+    *  RGBA format like in ffmpeg??
+    */
+ #if LIBAVUTIL_VERSION_INT < (50<<16)
+-  if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888))
+  if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888))
+ #else
+-    if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888))
+    if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888))
+ #endif
+       {
+       convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset);
+@@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick
+     if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0)
+       return -1;
+ #endif
+-    codec->frame = avcodec_alloc_frame();
+    codec->frame = av_frame_alloc();
+     vtrack->stream_cmodel = LQT_COLORMODEL_NONE;
+     codec->initialized = 1;
+     }
+@@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick
+ #ifdef HAVE_LIBSWSCALE
+ 
+ #if LIBAVUTIL_VERSION_INT < (50<<16)
+-      if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) &&
+      if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) &&
+            (vtrack->stream_cmodel == BC_RGBA8888)))
+ #else
+-        if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) &&
+        if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) &&
+              (vtrack->stream_cmodel == BC_RGBA8888)))
+ #endif
+           {
+@@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick
+         
+   if(!codec->initialized)
+     {
+-    codec->frame = avcodec_alloc_frame();
+    codec->frame = av_frame_alloc();
+ 
+     /* time_base is 1/framerate for constant framerate */
+           
+@@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick
+       if(vtrack->stream_cmodel == BC_RGBA8888)
+         {
+         /* Libquicktime doesn't natively support a color model equivalent
+-           to PIX_FMT_ARGB, which is required for QTRLE with alpha channel.
+           to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel.
+            So, we use BC_RGBA8888 and do ad hoc conversion below. */
+-        codec->avctx->pix_fmt = PIX_FMT_ARGB;
+        codec->avctx->pix_fmt = AV_PIX_FMT_ARGB;
+         vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32;
+         }
+       }
+@@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick
+     }
+   //        codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc);
+ 
+-  if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB)
+  if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB)
+     {
+     if(!codec->tmp_rows)
+       {
+@@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick
+                         vtrack->stream_cmodel,
+                         0, 0, 0, codec->y_offset);
+       }
+-    else if(codec->avctx->pix_fmt == PIX_FMT_ARGB)
+    else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB)
+       {
+       convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span,
+                            codec->tmp_rows[0], codec->tmp_row_span,
+Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c
+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c
+@@ -1266,7 +1266,7 @@ static int lqt_ffmpeg_encode_audio(quick
+     pkt.data = codec->chunk_buffer;
+     pkt.size = codec->chunk_buffer_alloc;
+ 
+-    avcodec_get_frame_defaults(&f);
+    av_frame_unref(&f);
+     f.nb_samples = codec->avctx->frame_size;
+     
+     avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt,
--- a/libquicktime/libquicktime-1.2.4-ffmpeg3-1.patch
+++ b/libquicktime/libquicktime-1.2.4-ffmpeg3-1.patch
--- a/libquicktime/libquicktime-1.2.4-ffmpeg4.patch
+++ b/libquicktime/libquicktime-1.2.4-ffmpeg4.patch
@ -0,0 +1,342 @@
+Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c
+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c
+@@ -545,7 +545,7 @@ static int decode_chunk_vbr(quicktime_t
+ 
+ #if DECODE_AUDIO3 || DECODE_AUDIO4
+     codec->pkt.data = codec->chunk_buffer;
+-    codec->pkt.size = packet_size + FF_INPUT_BUFFER_PADDING_SIZE;
+    codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE;
+ 
+ #if DECODE_AUDIO4
+     frame_bytes = avcodec_decode_audio4(codec->avctx, &f,
+@@ -583,7 +583,7 @@ static int decode_chunk_vbr(quicktime_t
+                                          (codec->sample_buffer_end - codec->sample_buffer_start)],
+                   &bytes_decoded,
+                   codec->chunk_buffer,
+-                  packet_size + FF_INPUT_BUFFER_PADDING_SIZE);
+                  packet_size + AV_INPUT_BUFFER_PADDING_SIZE);
+     if(frame_bytes < 0)
+       {
+       lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio2 error");
+@@ -645,13 +645,13 @@ static int decode_chunk(quicktime_t * fi
+         return 0;
+         }
+ 
+-      if(codec->chunk_buffer_alloc < mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE)
+      if(codec->chunk_buffer_alloc < mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE)
+         {
+-        codec->chunk_buffer_alloc = mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE;
+        codec->chunk_buffer_alloc = mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE;
+         codec->chunk_buffer = realloc(codec->chunk_buffer, codec->chunk_buffer_alloc);
+         }
+       memset(codec->chunk_buffer + codec->bytes_in_chunk_buffer, 0,
+-             mph.frame_bytes - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE);
+             mph.frame_bytes - codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE);
+       num_samples = mph.samples_per_frame;
+       codec->bytes_in_chunk_buffer = mph.frame_bytes;
+       }
+@@ -695,7 +695,7 @@ static int decode_chunk(quicktime_t * fi
+     {
+ 
+         
+-    /* BIG NOTE: We pass extra FF_INPUT_BUFFER_PADDING_SIZE for the buffer size
+    /* BIG NOTE: We pass extra AV_INPUT_BUFFER_PADDING_SIZE for the buffer size
+        because we know, that lqt_read_audio_chunk allocates 16 extra bytes for us */
+     
+     /* Some really broken mp3 files have the header bytes split across 2 chunks */
+@@ -761,7 +761,7 @@ static int decode_chunk(quicktime_t * fi
+ 
+ #if DECODE_AUDIO3 || DECODE_AUDIO4
+     codec->pkt.data = &codec->chunk_buffer[bytes_used];
+-    codec->pkt.size = codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE;
+    codec->pkt.size = codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE;
+ 
+ #if DECODE_AUDIO4
+     
+@@ -798,7 +798,7 @@ static int decode_chunk(quicktime_t * fi
+                                                   (codec->sample_buffer_end - codec->sample_buffer_start)],
+                             &bytes_decoded,
+                             &codec->chunk_buffer[bytes_used],
+-                            codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE);
+                            codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE);
+ #endif
+     if(frame_bytes < 0)
+       {
+@@ -838,7 +838,7 @@ static int decode_chunk(quicktime_t * fi
+         }
+       }
+     
+-    /* This happens because ffmpeg adds FF_INPUT_BUFFER_PADDING_SIZE to the bytes returned */
+    /* This happens because ffmpeg adds AV_INPUT_BUFFER_PADDING_SIZE to the bytes returned */
+     
+     if(codec->bytes_in_chunk_buffer < 0)
+       codec->bytes_in_chunk_buffer = 0;
+Index: libquicktime-1.2.4/plugins/ffmpeg/params.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c
+++ libquicktime-1.2.4/plugins/ffmpeg/params.c
+@@ -124,16 +124,6 @@ typedef struct
+   }
+ 
+ 
+-enum_t me_method[] =
+-  {
+-    { "Zero",  ME_ZERO },
+-    { "Phods", ME_PHODS },
+-    { "Log",   ME_LOG },
+-    { "X1",    ME_X1 },
+-    { "Epzs",  ME_EPZS },
+-    { "Full",  ME_FULL }
+-  };
+-
+ enum_t prediction_method[] =
+   {
+     { "Left",   FF_PRED_LEFT },
+@@ -163,15 +153,6 @@ enum_t mb_decision[] =
+     { "Rate distoration",     FF_MB_DECISION_RD }
+   };
+ 
+-enum_t coder_type[] =
+-  {
+-    { "VLC",                  FF_CODER_TYPE_VLC },
+-    { "Arithmetic",           FF_CODER_TYPE_AC },
+-    { "Raw",                  FF_CODER_TYPE_RAW },
+-    { "RLE",                  FF_CODER_TYPE_RLE },
+-    { "Deflate",              FF_CODER_TYPE_DEFLATE },
+-  };
+-
+ #define PARAM_ENUM(name, var, arr) \
+   if(!strcasecmp(key, name)) \
+     { \
+@@ -203,7 +184,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_INT_SCALE("ff_bit_rate_audio",bit_rate,1000);
+   PARAM_INT_SCALE("ff_bit_rate_video",bit_rate,1000);
+   PARAM_INT_SCALE("ff_bit_rate_tolerance",bit_rate_tolerance,1000);
+-  PARAM_ENUM("ff_me_method",me_method,me_method);
+  PARAM_DICT_INT("ff_me_method","motion-est");
+   PARAM_INT("ff_gop_size",gop_size);
+   PARAM_FLOAT("ff_qcompress",qcompress);
+   PARAM_FLOAT("ff_qblur",qblur);
+@@ -227,10 +208,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_INT("ff_rc_min_rate",rc_min_rate);
+   PARAM_INT("ff_rc_max_rate",rc_max_rate);
+   PARAM_INT_SCALE("ff_rc_buffer_size",rc_buffer_size,1000);
+-  PARAM_FLOAT("ff_rc_buffer_aggressivity",rc_buffer_aggressivity);
+   PARAM_FLOAT("ff_i_quant_factor",i_quant_factor);
+   PARAM_QP2LAMBDA("ff_i_quant_offset",i_quant_offset);
+-  PARAM_FLOAT("ff_rc_initial_cplx",rc_initial_cplx);
+  PARAM_DICT_INT("ff_rc_initial_cplx","rc_init_cplx");
+   PARAM_FLOAT("ff_lumi_masking",lumi_masking);
+   PARAM_FLOAT("ff_temporal_cplx_masking",temporal_cplx_masking);
+   PARAM_FLOAT("ff_spatial_cplx_masking",spatial_cplx_masking);
+@@ -255,8 +235,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_INT("ff_me_range",me_range);
+   PARAM_ENUM("ff_mb_decision",mb_decision,mb_decision);
+   PARAM_INT("ff_scenechange_threshold",scenechange_threshold);
+-  PARAM_QP2LAMBDA("ff_lmin", lmin);
+-  PARAM_QP2LAMBDA("ff_lmax", lmax);
+  PARAM_DICT_INT("ff_lmin", "lmin");
+  PARAM_DICT_INT("ff_lmax", "lmax");
+   PARAM_INT("ff_noise_reduction",noise_reduction);
+   PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);
+ 
+@@ -269,33 +249,29 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+ #endif
+ 
+   PARAM_INT("ff_thread_count",thread_count);
+-  PARAM_INT("ff_me_threshold",me_threshold);
+-  PARAM_INT("ff_mb_threshold",mb_threshold);
+   PARAM_INT("ff_nsse_weight",nsse_weight);
+-  PARAM_FLOAT("ff_border_masking",border_masking);
+  PARAM_DICT_INT("ff_border_masking","border_mask");
+   PARAM_QP2LAMBDA("ff_mb_lmin", mb_lmin);
+   PARAM_QP2LAMBDA("ff_mb_lmax", mb_lmax);
+   PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation);
+   PARAM_INT("ff_bidir_refine",bidir_refine);
+   PARAM_INT("ff_brd_scale",brd_scale);
+-  PARAM_INT("ff_scenechange_factor",scenechange_factor);
+-  PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE);
+-  PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV);
+-  PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL);
+-  PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC);
+-  PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0);
+  PARAM_FLAG("ff_flag_qscale",AV_CODEC_FLAG_QSCALE);
+  PARAM_FLAG("ff_flag_4mv",AV_CODEC_FLAG_4MV);
+  PARAM_FLAG("ff_flag_qpel",AV_CODEC_FLAG_QPEL);
+  PARAM_DICT_FLAG("ff_flag_gmc","gmc");
+  PARAM_DICT_FLAG("ff_flag_mv0","mpv_flags");
+   //  PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused
+-  PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY);
+-  PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE);
+-  PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP);
+  PARAM_FLAG("ff_flag_gray",AV_CODEC_FLAG_GRAY);
+  PARAM_DICT_FLAG("ff_flag_normalize_aqp","naq");
+   //  PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+   PARAM_FLAG("ff_flag_trellis_quant",CODEC_FLAG_TRELLIS_QUANT);
+ #else
+   PARAM_INT("ff_trellis",trellis);
+ #endif
+-  PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT);
+-  PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED);
+  PARAM_FLAG("ff_flag_bitexact",AV_CODEC_FLAG_BITEXACT);
+  PARAM_FLAG("ff_flag_ac_pred",AV_CODEC_FLAG_AC_PRED);
+   //  PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused
+ 
+ #if LIBAVCODEC_VERSION_MAJOR >= 55
+@@ -303,9 +279,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd");
+   PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop");
+ #else
+-  PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD);
+-  PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD);
+-  PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
+  PARAM_FLAG("ff_flag_cbp_rd",AV_CODEC_FLAG_CBP_RD);
+  PARAM_FLAG("ff_flag_qp_rd",AV_CODEC_FLAG_QP_RD);
+  PARAM_FLAG2("ff_flag2_strict_gop",AV_CODEC_FLAG2_STRICT_GOP);
+ #endif
+ 
+ #if LIBAVCODEC_VERSION_MAJOR >= 54
+@@ -313,14 +289,14 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_DICT_FLAG("ff_flag_obmc","obmc");
+   PARAM_DICT_FLAG("ff_flag_h263p_slice_struct","structured_slices");
+ #else
+-  PARAM_FLAG("ff_flag_h263p_aiv",CODEC_FLAG_H263P_AIV);
+-  PARAM_FLAG("ff_flag_obmc",CODEC_FLAG_OBMC);
+-  PARAM_FLAG("ff_flag_h263p_slice_struct",CODEC_FLAG_H263P_SLICE_STRUCT);
+  PARAM_FLAG("ff_flag_h263p_aiv",AV_CODEC_FLAG_H263P_AIV);
+  PARAM_FLAG("ff_flag_obmc",AV_CODEC_FLAG_OBMC);
+  PARAM_FLAG("ff_flag_h263p_slice_struct",AV_CODEC_FLAG_H263P_SLICE_STRUCT);
+ #endif
+ 
+-  PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER);
+-  PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP);
+-  PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST);
+-  PARAM_ENUM("ff_coder_type",coder_type,coder_type);
+  PARAM_FLAG("ff_flag_loop_filter",AV_CODEC_FLAG_LOOP_FILTER);
+  PARAM_FLAG("ff_flag_closed_gop",AV_CODEC_FLAG_CLOSED_GOP);
+  PARAM_FLAG2("ff_flag2_fast",AV_CODEC_FLAG2_FAST);
+  PARAM_DICT_INT("ff_coder_type","coder");
+   
+   }
+Index: libquicktime-1.2.4/plugins/ffmpeg/params.h
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h
+++ libquicktime-1.2.4/plugins/ffmpeg/params.h
+@@ -149,7 +149,7 @@ the reference. Unused for constant quant
+     .type =        LQT_PARAMETER_INT, \
+     .val_default = { .val_int = 0 }, \
+     .val_min =     { .val_int = 0 }, \
+-    .val_max =     { .val_int = FF_MAX_B_FRAMES }, \
+    .val_max =     { .val_int = 16 }, \
+     .help_string = TRS("Maximum number of B-frames between non B-frames") \
+   }
+ 
+Index: libquicktime-1.2.4/plugins/ffmpeg/video.c
+===================================================================
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c
+++ libquicktime-1.2.4/plugins/ffmpeg/video.c
+@@ -781,7 +781,7 @@ static int lqt_ffmpeg_decode_video(quick
+     if(extradata)
+       {
+       codec->extradata =
+-        calloc(1, extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+        calloc(1, extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
+       memcpy(codec->extradata, extradata, extradata_size);
+       codec->avctx->extradata_size = extradata_size;
+       codec->avctx->extradata = codec->extradata;
+@@ -1140,8 +1140,8 @@ static int init_imx_encoder(quicktime_t
+   codec->avctx->qmin = 1;
+   codec->avctx->qmax = 3;
+   codec->avctx->rtp_payload_size = 1; // ??
+-  codec->avctx->rc_buffer_aggressivity = 0.25;
+-  codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY;
+  av_dict_set(&codec->options, "rc_buf_aggressivity", "0.25", 0);
+  codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_LOW_DELAY;
+ 
+ #if (LIBAVCODEC_VERSION_MAJOR < 54)
+   codec->avctx->flags2 |= CODEC_FLAG2_INTRA_VLC|CODEC_FLAG2_NON_LINEAR_QUANT;
+@@ -1328,7 +1328,7 @@ static int lqt_ffmpeg_encode_video(quick
+     //          codec->avctx->time_base.den = 1;
+     //          codec->avctx->time_base.num = lqt_video_time_scale(file, track);
+ 
+-    if(codec->avctx->flags & CODEC_FLAG_QSCALE)
+    if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE)
+       codec->avctx->global_quality = codec->qscale;
+                               
+     codec->avctx->width = width;
+@@ -1344,7 +1344,7 @@ static int lqt_ffmpeg_encode_video(quick
+       {
+       if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
+         {
+-        codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+        codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+         codec->write_global_header = 1;
+         }
+             
+@@ -1360,7 +1360,7 @@ static int lqt_ffmpeg_encode_video(quick
+         {
+         lqt_log(file, LQT_LOG_INFO, LOG_DOMAIN, "Enabling interlaced encoding");
+         codec->avctx->flags |=
+-          (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN);
+          (AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME|AV_CODEC_FLAG_ALT_SCAN);
+         }
+ #endif
+       }
+@@ -1387,7 +1387,7 @@ static int lqt_ffmpeg_encode_video(quick
+       {
+       if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
+         {
+-        codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+        codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+         codec->write_global_header = 1;
+         }
+       }
+@@ -1410,7 +1410,7 @@ static int lqt_ffmpeg_encode_video(quick
+       {
+       if(vtrack->interlace_mode != LQT_INTERLACE_NONE)
+         {
+-        codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT;
+        codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
+         }
+       }
+     else if(codec->is_imx)
+@@ -1422,7 +1422,7 @@ static int lqt_ffmpeg_encode_video(quick
+       if(codec->pass == 1)
+         {
+         codec->stats_file = fopen(codec->stats_filename, "w");
+-        codec->avctx->flags |= CODEC_FLAG_PASS1;
+        codec->avctx->flags |= AV_CODEC_FLAG_PASS1;
+         }
+       else if(codec->pass == codec->total_passes)
+         {
+@@ -1438,7 +1438,7 @@ static int lqt_ffmpeg_encode_video(quick
+         fclose(codec->stats_file);
+         codec->stats_file = (FILE*)0;
+               
+-        codec->avctx->flags |= CODEC_FLAG_PASS2;
+        codec->avctx->flags |= AV_CODEC_FLAG_PASS2;
+         }
+       }
+     /* Open codec */
+@@ -1516,7 +1516,7 @@ static int lqt_ffmpeg_encode_video(quick
+     }
+   
+   codec->frame->pts = vtrack->timestamp;
+-  if(codec->avctx->flags & CODEC_FLAG_QSCALE)
+  if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE)
+     codec->frame->quality = codec->qscale;
+ #ifdef DO_INTERLACE
+   if(vtrack->interlace_mode != LQT_INTERLACE_NONE)
+@@ -1599,8 +1599,7 @@ static int lqt_ffmpeg_encode_video(quick
+     else if(codec->encoder->id == AV_CODEC_ID_MPEG4)
+       {
+       int advanced = 0;
+-      if(codec->avctx->max_b_frames ||
+-         (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC)))
+      if(codec->avctx->max_b_frames)
+         advanced = 1;
+ 
+       setup_header_mpeg4(file, track, codec->avctx->extradata,
--- a/mii-tool/.footprint
+++ b/mii-tool/.footprint
@ -0,0 +1,7 @@
+drwxr-xr-x	root/root	sbin/
+-rwxr-xr-x	root/root	sbin/mii-tool
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/mii-tool.8.gz
--- a/mii-tool/.signature
+++ b/mii-tool/.signature
@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF3yKh9zM7Jqsu/c3/F8AnUle98Yd8CDn5j6w/wk4SFVGsgYH9AhGLoDPIMqxjH5wVPSoAbV0UvkpWcST07n6pZgY=
+SHA256 (Pkgfile) = 597d7603ac826eb85e5b991d244fdaccf7fee6d902e19d74d550e21f6adc2f0f
+SHA256 (.footprint) = 183eb01cd34c7669b189d9146efa1ac546fd1381461d0d77f2251bfc07086bba
+SHA256 (METUX.mii-tool-1.65.0.0.tar.gz) = 3797be60f4098f4a449023123ae0e879b28effd18b24972e2730fc6e48609690
--- a/mii-tool/Pkgfile
+++ b/mii-tool/Pkgfile
@ -0,0 +1,14 @@
+# Description: Set or autodetect the media type or mii chipset-based ethernet devices.
+# URL: http://freshmeat.sourceforge.net/projects/mii-tool/
+# Maintainer: Danny Rawlins, crux at romster dot me
+
+name=mii-tool
+version=1.65.0
+release=1
+source=(https://repo.or.cz/w/oss-qm-packages.git/snapshot/METUX.mii-tool-$version.0.tar.gz)
+
+build() {
+	cd oss-qm-packages-METUX.mii-tool-$version.*
+	make
+	make DESTDIR=$PKG install
+}
--- a/mkvtoolnix/.signature
+++ b/mkvtoolnix/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zIVe2YqDwJ2orNWyXbsJrC67SK8FZF50uNIaGmub1sJb2xTmHGuyTHEICoFmmEZfqNNlrXp6DupHFNy6edZhw8=
-SHA256 (Pkgfile) = 585964641b3fb7e0772c2bfad12c704893596c51f61278aece29d101139b6c56
+RWSagIOpLGJF3wZE3+gb60sjk61klrQRvXzFryxpBKC9ljnFK5o1mUN80h6y4h2E3epHhMDa7cujRZejKgSbY6JCIpJO6l4gyAM=
+SHA256 (Pkgfile) = 3fea1925fd468f83bf031e6235b8ef9da3a7c9c3332b9d50041ddd142f3002a2
 SHA256 (.footprint) = d9f866a4dfc3083dcd50f41597aef384052b792a8dd6005d4aef83ff4bdbe4ac
 SHA256 (mkvtoolnix-33.1.0.tar.xz) = c077f4563fe76e09799fca2451464e0d2d0ebf0e17d1b1b179ec735b19fe6f2a
--- a/mkvtoolnix/Pkgfile
+++ b/mkvtoolnix/Pkgfile
@ -1,8 +1,8 @@
 # Description: Tools to create, alter and inspect Matroska files.
 # URL: https://mkvtoolnix.download/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: boost file flac libmatroska libvorbis ruby docbook-xsl
-# Optional: wxgtk
+# Depends on: boost cmark docbook-xsl file flac libmatroska libvorbis ruby
+# Optional: qt5 hicolor-icon-theme

 name=mkvtoolnix
 version=33.1.0
@ -21,7 +21,5 @@ build() {
 	rake DESTDIR=$PKG install

 	rm -r $PKG/usr/share/locale
-
-	# remove doc's if wxgtk is installed
 	rm -rf $PKG/usr/share/doc
 }
--- a/sfml/.footprint
+++ b/sfml/.footprint
@ -20,6 +20,7 @@ drwxr-xr-x	root/root	usr/include/SFML/Audio/
 -rw-r--r--	root/root	usr/include/SFML/Audio/SoundSource.hpp
 -rw-r--r--	root/root	usr/include/SFML/Audio/SoundStream.hpp
 -rw-r--r--	root/root	usr/include/SFML/Config.hpp
+-rw-r--r--	root/root	usr/include/SFML/GpuPreference.hpp
 -rw-r--r--	root/root	usr/include/SFML/Graphics.hpp
 drwxr-xr-x	root/root	usr/include/SFML/Graphics/
 -rw-r--r--	root/root	usr/include/SFML/Graphics/BlendMode.hpp
@ -50,6 +51,7 @@ drwxr-xr-x	root/root	usr/include/SFML/Graphics/
 -rw-r--r--	root/root	usr/include/SFML/Graphics/Transformable.hpp
 -rw-r--r--	root/root	usr/include/SFML/Graphics/Vertex.hpp
 -rw-r--r--	root/root	usr/include/SFML/Graphics/VertexArray.hpp
+-rw-r--r--	root/root	usr/include/SFML/Graphics/VertexBuffer.hpp
 -rw-r--r--	root/root	usr/include/SFML/Graphics/View.hpp
 -rw-r--r--	root/root	usr/include/SFML/Main.hpp
 -rw-r--r--	root/root	usr/include/SFML/Network.hpp
@ -95,8 +97,10 @@ drwxr-xr-x	root/root	usr/include/SFML/System/
 -rw-r--r--	root/root	usr/include/SFML/System/Vector3.inl
 -rw-r--r--	root/root	usr/include/SFML/Window.hpp
 drwxr-xr-x	root/root	usr/include/SFML/Window/
+-rw-r--r--	root/root	usr/include/SFML/Window/Clipboard.hpp
 -rw-r--r--	root/root	usr/include/SFML/Window/Context.hpp
 -rw-r--r--	root/root	usr/include/SFML/Window/ContextSettings.hpp
+-rw-r--r--	root/root	usr/include/SFML/Window/Cursor.hpp
 -rw-r--r--	root/root	usr/include/SFML/Window/Event.hpp
 -rw-r--r--	root/root	usr/include/SFML/Window/Export.hpp
 -rw-r--r--	root/root	usr/include/SFML/Window/GlResource.hpp
@ -110,21 +114,28 @@ drwxr-xr-x	root/root	usr/include/SFML/Window/
 -rw-r--r--	root/root	usr/include/SFML/Window/WindowHandle.hpp
 -rw-r--r--	root/root	usr/include/SFML/Window/WindowStyle.hpp
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libsfml-audio.so -> libsfml-audio.so.2.4
-lrwxrwxrwx	root/root	usr/lib/libsfml-audio.so.2.4 -> libsfml-audio.so.2.4.0
-rwxr-xr-x	root/root	usr/lib/libsfml-audio.so.2.4.0
-lrwxrwxrwx	root/root	usr/lib/libsfml-graphics.so -> libsfml-graphics.so.2.4
-lrwxrwxrwx	root/root	usr/lib/libsfml-graphics.so.2.4 -> libsfml-graphics.so.2.4.0
-rwxr-xr-x	root/root	usr/lib/libsfml-graphics.so.2.4.0
-lrwxrwxrwx	root/root	usr/lib/libsfml-network.so -> libsfml-network.so.2.4
-lrwxrwxrwx	root/root	usr/lib/libsfml-network.so.2.4 -> libsfml-network.so.2.4.0
-rwxr-xr-x	root/root	usr/lib/libsfml-network.so.2.4.0
-lrwxrwxrwx	root/root	usr/lib/libsfml-system.so -> libsfml-system.so.2.4
-lrwxrwxrwx	root/root	usr/lib/libsfml-system.so.2.4 -> libsfml-system.so.2.4.0
-rwxr-xr-x	root/root	usr/lib/libsfml-system.so.2.4.0
-lrwxrwxrwx	root/root	usr/lib/libsfml-window.so -> libsfml-window.so.2.4
-lrwxrwxrwx	root/root	usr/lib/libsfml-window.so.2.4 -> libsfml-window.so.2.4.0
-rwxr-xr-x	root/root	usr/lib/libsfml-window.so.2.4.0
+drwxr-xr-x	root/root	usr/lib/cmake/
+drwxr-xr-x	root/root	usr/lib/cmake/SFML/
+-rw-r--r--	root/root	usr/lib/cmake/SFML/SFMLConfig.cmake
+-rw-r--r--	root/root	usr/lib/cmake/SFML/SFMLConfigDependencies.cmake
+-rw-r--r--	root/root	usr/lib/cmake/SFML/SFMLConfigVersion.cmake
+-rw-r--r--	root/root	usr/lib/cmake/SFML/SFMLSharedTargets-release.cmake
+-rw-r--r--	root/root	usr/lib/cmake/SFML/SFMLSharedTargets.cmake
+lrwxrwxrwx	root/root	usr/lib/libsfml-audio.so -> libsfml-audio.so.2.5
+lrwxrwxrwx	root/root	usr/lib/libsfml-audio.so.2.5 -> libsfml-audio.so.2.5.1
+-rwxr-xr-x	root/root	usr/lib/libsfml-audio.so.2.5.1
+lrwxrwxrwx	root/root	usr/lib/libsfml-graphics.so -> libsfml-graphics.so.2.5
+lrwxrwxrwx	root/root	usr/lib/libsfml-graphics.so.2.5 -> libsfml-graphics.so.2.5.1
+-rwxr-xr-x	root/root	usr/lib/libsfml-graphics.so.2.5.1
+lrwxrwxrwx	root/root	usr/lib/libsfml-network.so -> libsfml-network.so.2.5
+lrwxrwxrwx	root/root	usr/lib/libsfml-network.so.2.5 -> libsfml-network.so.2.5.1
+-rwxr-xr-x	root/root	usr/lib/libsfml-network.so.2.5.1
+lrwxrwxrwx	root/root	usr/lib/libsfml-system.so -> libsfml-system.so.2.5
+lrwxrwxrwx	root/root	usr/lib/libsfml-system.so.2.5 -> libsfml-system.so.2.5.1
+-rwxr-xr-x	root/root	usr/lib/libsfml-system.so.2.5.1
+lrwxrwxrwx	root/root	usr/lib/libsfml-window.so -> libsfml-window.so.2.5
+lrwxrwxrwx	root/root	usr/lib/libsfml-window.so.2.5 -> libsfml-window.so.2.5.1
+-rwxr-xr-x	root/root	usr/lib/libsfml-window.so.2.5.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/sfml-all.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/sfml-audio.pc
@ -134,9 +145,3 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/sfml-window.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/SFML/
-drwxr-xr-x	root/root	usr/share/SFML/cmake/
-drwxr-xr-x	root/root	usr/share/SFML/cmake/Modules/
-rw-r--r--	root/root	usr/share/SFML/cmake/Modules/FindSFML.cmake
-drwxr-xr-x	root/root	usr/share/cmake/
-drwxr-xr-x	root/root	usr/share/cmake/Modules/
-rw-r--r--	root/root	usr/share/cmake/Modules/FindSFML.cmake
--- a/sfml/.signature
+++ b/sfml/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30BdB+zG6M3LoTvB1BVyS9KcYmmsKopo5/hGDGL5wpIW+R5KJ0RBMPz537VmGNa8RECA6n6X6whjKP/yXzeL7wo=
-SHA256 (Pkgfile) = 1ee108baff1630265827140908d11b870f7e533d8ddd97f31bd7a16bfae43fe4
-SHA256 (.footprint) = 215ee7ced251fc048b354a5e6b6c157976e166a87b2352d8fd5dccdfae2e7cf2
-SHA256 (SFML-2.4.0-sources.zip) = 868a1a1e43a7ee40c1a90efcbcea061b6f0a6ed129075d9a8f19c8c69e644b0f
+RWSagIOpLGJF359tgYXgUXMzihZDf0CgVTqsddzIHANDYAsg+9Ys8RuT3Of8AZzYKf8wVJUE+H8VQvcuyaRkb9uBv6OURP9byA8=
+SHA256 (Pkgfile) = 7d106421dbdab8246ba0d1e607e112b079627798fd4d8726dfa328a2cc49384f
+SHA256 (.footprint) = b120eedbfb83112e81f89ca90ce8b5daa2e8e8afcead6bf8934e55e235e0e236
+SHA256 (SFML-2.5.1-sources.zip) = bf1e0643acb92369b24572b703473af60bac82caf5af61e77c063b779471bb7f
--- a/sfml/Pkgfile
+++ b/sfml/Pkgfile
@ -1,12 +1,11 @@
 # Description: A simple, fast, cross-platform, and object-oriented multimedia API.
 # URL: http://www.sfml-dev.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Danny Rawlins, crux at romster dot me
-# Depends on: flac freetype libjpeg-turbo libvorbis mesa3d openal util-linux xorg-libsm xorg-libxrandr xorg-xcb-util-image
+# Depends on: flac freetype libjpeg-turbo libvorbis mesa3d openal util-linux xorg-libsm xorg-xcb-util-image

 name=sfml
-version=2.4.0
-release=2
+version=2.5.1
+release=1
 source=(https://www.sfml-dev.org/files/SFML-$version-sources.zip)

 build() {
@ -19,6 +18,7 @@ build() {
 		-DCMAKE_BUILD_TYPE='Release' \
 		-DCMAKE_INSTALL_PREFIX='/usr' \
 		-DSFML_INSTALL_PKGCONFIG_FILES=1 \
+		-DSFML_USE_SYSTEM_DEPS=ON \
 		-DSFML_BUILD_EXAMPLES=0 \
 		-DSFML_BUILD_DOC=0 \

@ -26,8 +26,5 @@ build() {
 	make
 	make DESTDIR=$PKG install

-	install -D -m 0644 $PKG/usr/share/SFML/cmake/Modules/FindSFML.cmake \
-		$PKG/usr/share/cmake/Modules/FindSFML.cmake
-
-	rm -r $PKG/usr/share/SFML/{license,readme}.txt
+	rm -r $PKG/usr/share/SFML/{license,readme}.md
 }
--- a/streamlink/.footprint
+++ b/streamlink/.footprint
@ -7,13 +7,13 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.6/
 drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/streamlink-1.0.0-py3.6.egg-info/
-rw-rw-r--	root/root	usr/lib/python3.6/site-packages/streamlink-1.0.0-py3.6.egg-info/PKG-INFO
-rw-rw-r--	root/root	usr/lib/python3.6/site-packages/streamlink-1.0.0-py3.6.egg-info/SOURCES.txt
-rw-rw-r--	root/root	usr/lib/python3.6/site-packages/streamlink-1.0.0-py3.6.egg-info/dependency_links.txt
-rw-rw-r--	root/root	usr/lib/python3.6/site-packages/streamlink-1.0.0-py3.6.egg-info/entry_points.txt
-rw-rw-r--	root/root	usr/lib/python3.6/site-packages/streamlink-1.0.0-py3.6.egg-info/requires.txt
-rw-rw-r--	root/root	usr/lib/python3.6/site-packages/streamlink-1.0.0-py3.6.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/streamlink-1.1.1-py3.6.egg-info/
+-rw-rw-r--	root/root	usr/lib/python3.6/site-packages/streamlink-1.1.1-py3.6.egg-info/PKG-INFO
+-rw-rw-r--	root/root	usr/lib/python3.6/site-packages/streamlink-1.1.1-py3.6.egg-info/SOURCES.txt
+-rw-rw-r--	root/root	usr/lib/python3.6/site-packages/streamlink-1.1.1-py3.6.egg-info/dependency_links.txt
+-rw-rw-r--	root/root	usr/lib/python3.6/site-packages/streamlink-1.1.1-py3.6.egg-info/entry_points.txt
+-rw-rw-r--	root/root	usr/lib/python3.6/site-packages/streamlink-1.1.1-py3.6.egg-info/requires.txt
+-rw-rw-r--	root/root	usr/lib/python3.6/site-packages/streamlink-1.1.1-py3.6.egg-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/streamlink/
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/streamlink/__pycache__/
@ -303,8 +303,10 @@ drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycach
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycache__/npo.cpython-36.pyc
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycache__/nrk.cpython-36.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycache__/nrk.cpython-36.pyc
-rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycache__/ok_live.cpython-36.opt-1.pyc
-rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycache__/ok_live.cpython-36.pyc
+-rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycache__/ntv.cpython-36.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycache__/ntv.cpython-36.pyc
+-rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycache__/okru.cpython-36.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycache__/okru.cpython-36.pyc
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycache__/olympicchannel.cpython-36.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycache__/olympicchannel.cpython-36.pyc
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycache__/onetv.cpython-36.opt-1.pyc
@ -575,7 +577,8 @@ drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/__pycach
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/nos.py
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/npo.py
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/nrk.py
-rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/ok_live.py
+-rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/ntv.py
+-rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/okru.py
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/olympicchannel.py
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/onetv.py
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/streamlink/plugins/openrectv.py
--- a/streamlink/.signature
+++ b/streamlink/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38vLHx9s3Qa5dOd1zJvKZwWXSuYxdYykYl1VDdq92OzTQS81LZBoMvbMEXzy8WoDD7Do2lnA2pyiX6TbZWL+1w8=
-SHA256 (Pkgfile) = 4d38f37e66f042491c1818b2e0e77fb0b51cb6c173aeab13c8c9f07dc75a870a
-SHA256 (.footprint) = 6a8583ad59f7c395bcbf80861dde55d6ed8c23e87c75cbd728adf43418d4c30d
-SHA256 (streamlink-1.0.0.tar.gz) = b0a355add636c37531efc76e784d1c9e390f3d171f039e07a6be717eb956bfc7
+RWSagIOpLGJF3yG4Zk3xGJ3nlsU0rBnBgo+KvnnvowitBAJgBMN/7HNm01E1OO2z3R+tuCarNQR63+zgswQaTWZCNqku+xkUcA4=
+SHA256 (Pkgfile) = 0f594502a7a315b0a096e25abdd62d400cf971ac28db5678737b8f2718fc34f3
+SHA256 (.footprint) = 0b26976733100bde8934c30b699cdd7a2bb365025dbe8166bd1757ff8387699a
+SHA256 (streamlink-1.1.1.tar.gz) = 496c81804bbe534b47f6cf4d77aa6fae95347ebaab495277f9d2526543cbafa6
--- a/streamlink/Pkgfile
+++ b/streamlink/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: python3-iso-639 python3-iso3166 python3-isodate python3-pycryptodome python3-requests python3-websocket-client python3-pysocks python3-six

 name=streamlink
-version=1.0.0
+version=1.1.1
 release=1
 source=(https://files.pythonhosted.org/packages/source/${name:0:1}/$name/$name-$version.tar.gz)

--- a/vkd3d/.footprint
+++ b/vkd3d/.footprint
@ -1,24 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/vkd3d/
-rw-r--r--	root/root	usr/include/vkd3d/vkd3d.h
-rw-r--r--	root/root	usr/include/vkd3d/vkd3d_d3d12.h
-rw-r--r--	root/root	usr/include/vkd3d/vkd3d_d3dcommon.h
-rw-r--r--	root/root	usr/include/vkd3d/vkd3d_dxgibase.h
-rw-r--r--	root/root	usr/include/vkd3d/vkd3d_dxgiformat.h
-rw-r--r--	root/root	usr/include/vkd3d/vkd3d_utils.h
-rw-r--r--	root/root	usr/include/vkd3d/vkd3d_windows.h
-drwxr-xr-x	root/root	usr/lib/
-rw-r--r--	root/root	usr/lib/libvkd3d-utils.a
-rwxr-xr-x	root/root	usr/lib/libvkd3d-utils.la
-lrwxrwxrwx	root/root	usr/lib/libvkd3d-utils.so -> libvkd3d-utils.so.1.0.1
-lrwxrwxrwx	root/root	usr/lib/libvkd3d-utils.so.1 -> libvkd3d-utils.so.1.0.1
-rwxr-xr-x	root/root	usr/lib/libvkd3d-utils.so.1.0.1
-rw-r--r--	root/root	usr/lib/libvkd3d.a
-rwxr-xr-x	root/root	usr/lib/libvkd3d.la
-lrwxrwxrwx	root/root	usr/lib/libvkd3d.so -> libvkd3d.so.1.1.0
-lrwxrwxrwx	root/root	usr/lib/libvkd3d.so.1 -> libvkd3d.so.1.1.0
-rwxr-xr-x	root/root	usr/lib/libvkd3d.so.1.1.0
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
-rw-r--r--	root/root	usr/lib/pkgconfig/libvkd3d-utils.pc
-rw-r--r--	root/root	usr/lib/pkgconfig/libvkd3d.pc
--- a/vkd3d/.signature
+++ b/vkd3d/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3yVcwoN7NbgECzOS1OIDd0SdiH35VfAc9HMnSxWqMPY8PwRyGftxbiUGrx8fmdgJe3nWY6VBCSEsRNxHS28N8AM=
-SHA256 (Pkgfile) = 8dc233351ad47c27774c3005e2ddabde04f40b69c572b32bd39c0c4cb2021466
-SHA256 (.footprint) = 83f0606cf8a591cff4886fc9d7f3b07b2de019a08bbc60f978ac3ebb8f40623f
-SHA256 (vkd3d-1.1.tar.xz) = 495adc61cc80c65d54b2f5b52092ea05d3797cc2c17a610f0fc98457d2f56ab6
--- a/vkd3d/Pkgfile
+++ b/vkd3d/Pkgfile
@ -1,18 +0,0 @@
-# Description: Direct3D 12 to Vulkan translation library By WineHQ.
-# URL: https://github.com/d3d12/vkd3d
-# Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: spirv-headers vulkan-loader xorg-xcb-util-keysyms
-
-name=vkd3d
-version=1.1
-release=2
-source=(https://dl.winehq.org/vkd3d/source/$name-$version.tar.xz)
-
-build() {
-	cd $name-$version
-
-	./configure --prefix=/usr
-
-	make
-	make DESTDIR=$PKG install
-}
--- a/vulkan-headers/.footprint
+++ b/vulkan-headers/.footprint
@ -1,30 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/vulkan/
-rw-r--r--	root/root	usr/include/vulkan/vk_icd.h
-rw-r--r--	root/root	usr/include/vulkan/vk_layer.h
-rw-r--r--	root/root	usr/include/vulkan/vk_platform.h
-rw-r--r--	root/root	usr/include/vulkan/vk_sdk_platform.h
-rw-r--r--	root/root	usr/include/vulkan/vulkan.h
-rw-r--r--	root/root	usr/include/vulkan/vulkan.hpp
-rw-r--r--	root/root	usr/include/vulkan/vulkan_android.h
-rw-r--r--	root/root	usr/include/vulkan/vulkan_core.h
-rw-r--r--	root/root	usr/include/vulkan/vulkan_fuchsia.h
-rw-r--r--	root/root	usr/include/vulkan/vulkan_ios.h
-rw-r--r--	root/root	usr/include/vulkan/vulkan_macos.h
-rw-r--r--	root/root	usr/include/vulkan/vulkan_mir.h
-rw-r--r--	root/root	usr/include/vulkan/vulkan_vi.h
-rw-r--r--	root/root	usr/include/vulkan/vulkan_wayland.h
-rw-r--r--	root/root	usr/include/vulkan/vulkan_win32.h
-rw-r--r--	root/root	usr/include/vulkan/vulkan_xcb.h
-rw-r--r--	root/root	usr/include/vulkan/vulkan_xlib.h
-rw-r--r--	root/root	usr/include/vulkan/vulkan_xlib_xrandr.h
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/vulkan/
-drwxr-xr-x	root/root	usr/share/vulkan/registry/
-rw-r--r--	root/root	usr/share/vulkan/registry/cgenerator.py
-rw-r--r--	root/root	usr/share/vulkan/registry/generator.py
-rw-r--r--	root/root	usr/share/vulkan/registry/genvk.py
-rw-r--r--	root/root	usr/share/vulkan/registry/reg.py
-rw-r--r--	root/root	usr/share/vulkan/registry/validusage.json
-rw-r--r--	root/root	usr/share/vulkan/registry/vk.xml
--- a/vulkan-headers/.signature
+++ b/vulkan-headers/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF34X0Mq971YpwxPYytdrFaQAyDtM+fVZhlqwdblEMagi/62WY1Hh9xVUWISUtH8PGrAzYZgm61oM4E2uYw0W8YgY=
-SHA256 (Pkgfile) = 1d45d0ca909045217771e61f17bc5fa4a6095fbd90629d232fe96ec5f5b9ff47
-SHA256 (.footprint) = ce0b07733c4e8c8847af0c89ab2398fb4113669db48781c20bec1adb81352fbf
-SHA256 (Vulkan-Headers-sdk-1.1.101.0.tar.gz) = 59e17335932574e736472b0677390f84150d6bd461e648b13e17d870c42c1c3b
--- a/vulkan-headers/Pkgfile
+++ b/vulkan-headers/Pkgfile
@ -1,18 +0,0 @@
-# Description: Vulkan headers
-# URL: https://www.khronos.org/vulkan/
-# Maintainer:
-# Depends on: cmake
-
-name=vulkan-headers
-version=1.1.101.0
-release=1
-source=(https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$version/Vulkan-Headers-sdk-$version.tar.gz)
-
-build() {
-    cd Vulkan-Headers-sdk-$version
-    mkdir build ; cd build
-    cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release ..
-    make
-    make DESTDIR=$PKG install
-}
--- a/vulkan-loader/.footprint
+++ b/vulkan-loader/.footprint
@ -1,7 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libvulkan.so -> libvulkan.so.1
-lrwxrwxrwx	root/root	usr/lib/libvulkan.so.1 -> libvulkan.so.1.1.101
-rwxr-xr-x	root/root	usr/lib/libvulkan.so.1.1.101
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
-rw-r--r--	root/root	usr/lib/pkgconfig/vulkan.pc
--- a/vulkan-loader/.signature
+++ b/vulkan-loader/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF35JJHcfT63Gbkryy79Ho/JJ0gAlGR6P3JGLIsFE1x+nSdqj0DVcCCw+Rrd/JLBa3jfQdHFbt4LEN8HiLLd6TSgg=
-SHA256 (Pkgfile) = e6068576e078c31b1db5f1f4348cd5873f60e5f2264d6bb37aae1972644ffd6b
-SHA256 (.footprint) = 5a72ebd072f602561a60e9633a845e834513322668e0898faebe53f1132a97e6
-SHA256 (Vulkan-Loader-sdk-1.1.101.0.tar.gz) = ddb1b877c7fca8a9732e851d004062b54ff420cf5395dfcbf5e8e8390bca4b27
--- a/vulkan-loader/Pkgfile
+++ b/vulkan-loader/Pkgfile
@ -1,20 +0,0 @@
-# Description: Vulkan loader
-# URL: https://www.khronos.org/vulkan/
-# Maintainer:
-# Depends on: vulkan-headers python3 xorg-libxrandr
-
-name=vulkan-loader
-version=1.1.101.0
-release=1
-source=(https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$version/Vulkan-Loader-sdk-$version.tar.gz)
-
-build() {
-    cd Vulkan-Loader-sdk-$version
-    mkdir build ; cd build
-    cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_LIBDIR=lib \
-        -DBUILD_WSI_WAYLAND_SUPPORT=OFF ../
-    make
-    make DESTDIR=$PKG install
-}
--- a/vulkan-tools/.footprint
+++ b/vulkan-tools/.footprint
@ -1,5 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
-rwxr-xr-x	root/root	usr/bin/vkcube
-rwxr-xr-x	root/root	usr/bin/vkcubepp
-rwxr-xr-x	root/root	usr/bin/vulkaninfo
--- a/vulkan-tools/.signature
+++ b/vulkan-tools/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF343vDIoDCjMQoogCDWR/jBbMwUQ9HDUPYankgGHtB5Kvc4CmOknpi6Y0gZAYlgFTZBOtiAS7EQzNVURJo0H04QA=
-SHA256 (Pkgfile) = cc05fcd58ef5613cf9f2c13a71ed343a43fd5df36adebb95b04959f418122686
-SHA256 (.footprint) = 2193acbc7cabcf79829a7caf3821d84e01bc4e695a36a948b8eb4379bbf8150f
-SHA256 (Vulkan-Tools-sdk-1.1.101.0.tar.gz) = 03d05f0bcfa051f44971442d2075afec92fa4e6f4d09f1f9cbd21587cdb4bb38
--- a/vulkan-tools/Pkgfile
+++ b/vulkan-tools/Pkgfile
@ -1,22 +0,0 @@
-# Description: Vulkan tools
-# URL: https://www.khronos.org/vulkan/
-# Maintainer:
-# Depends on: glslang vulkan-loader
-
-name=vulkan-tools
-version=1.1.101.0
-release=1
-source=(https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$version/Vulkan-Tools-sdk-$version.tar.gz)
-
-build() {
-    cd Vulkan-Tools-sdk-$version
-    mkdir build ; cd build
-    cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_LIBDIR=lib \
-        -DGLSLANG_INSTALL_DIR=/usr \
-        -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
-        -DBUILD_ICD=OFF ../
-    make
-    make DESTDIR=$PKG install
-}
--- a/vulkan-validation-layers/.footprint
+++ b/vulkan-validation-layers/.footprint
@ -1,41 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/include/
-rw-r--r--	root/root	usr/include/hash_util.h
-rw-r--r--	root/root	usr/include/hash_vk_types.h
-rw-r--r--	root/root	usr/include/vk_dispatch_table_helper.h
-rw-r--r--	root/root	usr/include/vk_enum_string_helper.h
-rw-r--r--	root/root	usr/include/vk_extension_helper.h
-rw-r--r--	root/root	usr/include/vk_format_utils.cpp
-rw-r--r--	root/root	usr/include/vk_format_utils.h
-rw-r--r--	root/root	usr/include/vk_layer_config.cpp
-rw-r--r--	root/root	usr/include/vk_layer_config.h
-rw-r--r--	root/root	usr/include/vk_layer_data.h
-rw-r--r--	root/root	usr/include/vk_layer_dispatch_table.h
-rw-r--r--	root/root	usr/include/vk_layer_extension_utils.cpp
-rw-r--r--	root/root	usr/include/vk_layer_extension_utils.h
-rw-r--r--	root/root	usr/include/vk_layer_logging.h
-rw-r--r--	root/root	usr/include/vk_layer_utils.cpp
-rw-r--r--	root/root	usr/include/vk_layer_utils.h
-rw-r--r--	root/root	usr/include/vk_loader_layer.h
-rw-r--r--	root/root	usr/include/vk_loader_platform.h
-rw-r--r--	root/root	usr/include/vk_object_types.h
-rw-r--r--	root/root	usr/include/vk_safe_struct.cpp
-rw-r--r--	root/root	usr/include/vk_safe_struct.h
-rw-r--r--	root/root	usr/include/vk_typemap_helper.h
-rw-r--r--	root/root	usr/include/vk_validation_error_messages.h
-drwxr-xr-x	root/root	usr/lib/
-rwxr-xr-x	root/root	usr/lib/libVkLayer_core_validation.so
-rwxr-xr-x	root/root	usr/lib/libVkLayer_object_lifetimes.so
-rwxr-xr-x	root/root	usr/lib/libVkLayer_stateless_validation.so
-rwxr-xr-x	root/root	usr/lib/libVkLayer_thread_safety.so
-rwxr-xr-x	root/root	usr/lib/libVkLayer_unique_objects.so
-rw-r--r--	root/root	usr/lib/libVkLayer_utils.a
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/vulkan/
-drwxr-xr-x	root/root	usr/share/vulkan/explicit_layer.d/
-rw-r--r--	root/root	usr/share/vulkan/explicit_layer.d/VkLayer_core_validation.json
-rw-r--r--	root/root	usr/share/vulkan/explicit_layer.d/VkLayer_object_lifetimes.json
-rw-r--r--	root/root	usr/share/vulkan/explicit_layer.d/VkLayer_standard_validation.json
-rw-r--r--	root/root	usr/share/vulkan/explicit_layer.d/VkLayer_stateless_validation.json
-rw-r--r--	root/root	usr/share/vulkan/explicit_layer.d/VkLayer_thread_safety.json
-rw-r--r--	root/root	usr/share/vulkan/explicit_layer.d/VkLayer_unique_objects.json
--- a/vulkan-validation-layers/.signature
+++ b/vulkan-validation-layers/.signature
@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF35W2BnofRqGDJj+oHx0bntTRJrOXhr40nYELUX4B4INKirdHTjV6P+C/TebLPtNZG8jcnrHtkkEljqdA92wMRAM=
-SHA256 (Pkgfile) = e686acdb9e107f6a40e6c16b9498c9447acf461899e302b6e6b01d535ee9f30e
-SHA256 (.footprint) = 74b2f05ff12bbc791a2d1ea6d9f91c469943c5fafc729a04c4fca80ba7e228fd
-SHA256 (Vulkan-ValidationLayers-sdk-1.1.101.0.tar.gz) = 9022a3cf73c54343049a7ba01496687ce89186024c70646a1bfa6196c54ac6b0
--- a/vulkan-validation-layers/Pkgfile
+++ b/vulkan-validation-layers/Pkgfile
@ -1,30 +0,0 @@
-# Description: Vulkan validation layers
-# URL: https://www.khronos.org/vulkan/
-# Maintainer:
-# Depends on: glslang vulkan-loader
-
-name=vulkan-validation-layers
-version=1.1.101.0
-release=2
-source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$version/Vulkan-ValidationLayers-sdk-$version.tar.gz)
-
-build() {
-    cd Vulkan-ValidationLayers-sdk-$version
-
-    mkdir build ; cd build
-    cmake .. \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-        -DCMAKE_INSTALL_LIBDIR=lib \
-        -DCMAKE_INSTALL_DATADIR=/share \
-        -DGLSLANG_INSTALL_DIR=/usr \
-        -DCMAKE_SKIP_RPATH=True \
-        -DBUILD_TESTS=Off \
-        -DBUILD_WSI_XCB_SUPPORT=On \
-        -DBUILD_WSI_XLIB_SUPPORT=On \
-        -DBUILD_WSI_WAYLAND_SUPPORT=Off
-    make
-    make DESTDIR=$PKG install
-
-}
--- a/wicd/.footprint
+++ b/wicd/.footprint
@ -23,6 +23,7 @@ drwxr-xr-x	root/root	etc/wicd/encryption/templates/
 -rw-rw-r--	root/root	etc/wicd/encryption/templates/wpa
 -rw-rw-r--	root/root	etc/wicd/encryption/templates/wpa-peap
 -rw-rw-r--	root/root	etc/wicd/encryption/templates/wpa-psk
+-rw-rw-r--	root/root	etc/wicd/encryption/templates/wpa-psk-hex
 -rw-rw-r--	root/root	etc/wicd/encryption/templates/wpa2-leap
 -rw-rw-r--	root/root	etc/wicd/encryption/templates/wpa2-peap
 drwxr-xr-x	root/root	etc/wicd/scripts/
@ -35,6 +36,9 @@ drwxr-xr-x	root/root	etc/wicd/scripts/preconnect/
 -rw-rw-r--	root/root	etc/wicd/scripts/preconnect/.empty_on_purpose
 drwxr-xr-x	root/root	etc/wicd/scripts/predisconnect/
 -rw-rw-r--	root/root	etc/wicd/scripts/predisconnect/.empty_on_purpose
+drwxr-xr-x	root/root	etc/xdg/
+drwxr-xr-x	root/root	etc/xdg/autostart/
+-rw-rw-r--	root/root	etc/xdg/autostart/wicd-tray.desktop
 drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/systemd/
 drwxr-xr-x	root/root	lib/systemd/system/
@ -50,14 +54,11 @@ drwxr-xr-x	root/root	usr/etc/dbus-1/
 drwxr-xr-x	root/root	usr/etc/dbus-1/system.d/
 -rw-rw-r--	root/root	usr/etc/dbus-1/system.d/wicd.conf
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/pm-utils/
-drwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/
-rwxrwxr-x	root/root	usr/lib/pm-utils/sleep.d/55wicd
 drwxr-xr-x	root/root	usr/lib/python2.7/
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
-rw-r--r--	root/root	usr/lib/python2.7/site-packages/wicd-1.7.2.4-py2.7.egg-info
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/wicd-1.7.4-py2.7.egg-info
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/wicd/
-rw-r--r--	root/root	usr/lib/python2.7/site-packages/wicd/__init__.py (EMPTY)
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/wicd/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/wicd/__init__.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/wicd/backend.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/wicd/backend.pyc
@ -136,54 +137,6 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-rw-r--	root/root	usr/share/man/man8/wicd.8.gz
 drwxr-xr-x	root/root	usr/share/pixmaps/
 -rw-rw-r--	root/root	usr/share/pixmaps/wicd-gtk.xpm
-drwxr-xr-x	root/root	usr/share/pixmaps/wicd/
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/bad-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/bad-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/both-bad-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/both-bad-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/both-good-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/both-good-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/both-high-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/both-high-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/both-low-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/both-low-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/good-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/good-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/high-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/high-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/idle-bad-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/idle-bad-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/idle-good-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/idle-good-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/idle-high-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/idle-high-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/idle-low-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/idle-low-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/low-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/low-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/no-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/receiving-bad-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/receiving-bad-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/receiving-good-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/receiving-good-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/receiving-high-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/receiving-high-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/receiving-low-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/receiving-low-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/signal-100.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/signal-25.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/signal-50.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/signal-75.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/transmitting-bad-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/transmitting-bad-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/transmitting-good-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/transmitting-good-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/transmitting-high-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/transmitting-high-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/transmitting-low-signal-lock.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/transmitting-low-signal.png
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/wired-gui.svg
-rw-rw-r--	root/root	usr/share/pixmaps/wicd/wired.png
 drwxr-xr-x	root/root	usr/share/wicd/
 drwxr-xr-x	root/root	usr/share/wicd/backends/
 -rw-rw-r--	root/root	usr/share/wicd/backends/be-external.py
@ -224,9 +177,100 @@ drwxr-xr-x	root/root	usr/share/wicd/gtk/
 -rw-r--r--	root/root	usr/share/wicd/gtk/netentry.pyc
 -rw-rw-r--	root/root	usr/share/wicd/gtk/prefs.py
 -rw-r--r--	root/root	usr/share/wicd/gtk/prefs.pyc
-rw-r--r--	root/root	usr/share/wicd/gtk/wicd-client.py
+-rw-rw-r--	root/root	usr/share/wicd/gtk/wicd-client.py
 -rw-r--r--	root/root	usr/share/wicd/gtk/wicd-client.pyc
-rw-r--r--	root/root	usr/share/wicd/gtk/wicd.ui
+-rw-rw-r--	root/root	usr/share/wicd/gtk/wicd.ui
+drwxr-xr-x	root/root	usr/share/wicd/icons/
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/16x16/
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/16x16/status/
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/16x16/status/signal-100.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/16x16/status/signal-25.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/16x16/status/signal-50.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/16x16/status/signal-75.png
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/22x22/
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/22x22/status/
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/bad-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/bad-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/both-bad-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/both-bad-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/both-good-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/both-good-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/both-high-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/both-high-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/both-low-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/both-low-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/good-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/good-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/high-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/high-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/idle-bad-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/idle-bad-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/idle-good-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/idle-good-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/idle-high-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/idle-high-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/idle-low-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/idle-low-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/low-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/low-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/no-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/receiving-bad-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/receiving-bad-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/receiving-good-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/receiving-good-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/receiving-high-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/receiving-high-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/receiving-low-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/receiving-low-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/signal-100.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/signal-25.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/signal-50.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/signal-75.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/transmitting-bad-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/transmitting-bad-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/transmitting-good-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/transmitting-good-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/transmitting-high-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/transmitting-high-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/transmitting-low-signal-lock.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/transmitting-low-signal.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/22x22/status/wired.png
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/24x24/
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/24x24/status/
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/24x24/status/signal-100.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/24x24/status/signal-25.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/24x24/status/signal-50.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/24x24/status/signal-75.png
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/32x32/
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/32x32/status/
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/32x32/status/signal-100.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/32x32/status/signal-25.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/32x32/status/signal-50.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/32x32/status/signal-75.png
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/36x36/
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/36x36/status/
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/36x36/status/signal-100.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/36x36/status/signal-25.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/36x36/status/signal-50.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/36x36/status/signal-75.png
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/48x48/
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/48x48/devices/
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/48x48/devices/wired-gui.png
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/48x48/status/
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/48x48/status/signal-100.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/48x48/status/signal-25.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/48x48/status/signal-50.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/48x48/status/signal-75.png
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/original/
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/original/status/
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/original/status/signal-100.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/original/status/signal-25.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/original/status/signal-50.png
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/original/status/signal-75.png
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/scalable/
+drwxr-xr-x	root/root	usr/share/wicd/icons/hicolor/scalable/devices/
+-rw-rw-r--	root/root	usr/share/wicd/icons/hicolor/scalable/devices/wired-gui.svg
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
 drwxr-xr-x	root/root	var/lib/wicd/
--- a/wicd/.signature
+++ b/wicd/.signature
@ -1,9 +1,9 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37A3ZI8UDesm3fdMTsy0f9uXgL9YCodkJb4J5NKYoQqHkr+7LTjlUnjZjoAwNYy/Qmlgbpz+1c+p2pGgZK+WXQ8=
-SHA256 (Pkgfile) = ce783ef2bc9644e83d9b8c844ad83cd41e9725c4938255a391b8696832d22b07
-SHA256 (.footprint) = 0f31192888f5f78166e31c27149bade446641c8704428be55c0d89b8466224a6
-SHA256 (wicd-1.7.2.4.tar.gz) = dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f1cf40d12fb7fe0e0c7cdc97
+RWSagIOpLGJF3+8t+gwYMWkYDNXzCVb4b07xy4/t9YHenUTpFlUl4wX0fV+6EcWBpcJV3Mou0u71v02mkF5uq/1L5mJbSdM2Bwk=
+SHA256 (Pkgfile) = d64b08d94e2c93523946608f8ada92938d4dbff85c585e6bf864eba064dba0c8
+SHA256 (.footprint) = d45c6085223d35a4412fbb9c53291a06b30d3798ce1e18282720dc76a1ec2c7c
+SHA256 (wicd-1.7.4.tar.gz) = 67989614004773db349791c37675efb914d084bdb221356a05e4369c35e7eb62
 SHA256 (wicd.rc) = 2d153bd96d561fae56b8b0bbba58584a634356718b1aa1e29a6c3efc08f25df9
-SHA256 (770) = 665c86a6412fd8178ef3ef1552180d4d6ec86f2c625cb6640816b5952e6b1192
-SHA256 (831) = 6770f31f3a701fcdb019562ec63e53653463aca471d0d907227f6608d671cdf2
-SHA256 (835) = 3eed2084f5631bdeb4a27ce1f729aa4be8cb12414af5364312b09005b75bc7b5
+SHA256 (wicd-1.7.3-bitrate-property.patch) = 06c38a1ac8c7f150473c33da4053badd19ae5b6cbae740b3511be012e63139a1
+SHA256 (wicd-1.7.3-undefined-LANG.patch) = 747f5a0b87460148af67c37cb63c563dd0ec68b362a1853836515f4ccfed182e
+SHA256 (wicd-1.7.3-urwid-1.3.0.patch) = eed37078a474fa64da0290c34c9107f2562a76ddc3f73796e00124061862dc6b
--- a/wicd/Pkgfile
+++ b/wicd/Pkgfile
@ -1,45 +1,41 @@
 # Description: A wired and wireless network manager.
 # URL: http://launchpad.net/wicd
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: dbus-python pygtk urwid wpa_supplicant
+# Depends on: dbus-python mii-tool pygtk wireless-tools wpa_supplicant

 name=wicd
-version=1.7.2.4
-release=5
-source=(http://launchpad.net/wicd/1.7/$version/+download/$name-$version.tar.gz
+version=1.7.4
+release=1
+source=(https://launchpad.net/wicd/${version%.*}/$version/+download/$name-$version.tar.gz
 	wicd.rc
-	http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/770
-	http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/831
-	http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/835)
+	wicd-1.7.3-bitrate-property.patch
+	wicd-1.7.3-undefined-LANG.patch
+	wicd-1.7.3-urwid-1.3.0.patch)

 build() {
 	cd $name-$version

-	# https://launchpad.net/bugs/993912
-	# http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/770
-	patch -p0 -i $SRC/770
-
-	# https://launchpad.net/bugs/1075399
-	# http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/831
-	patch -p0 -i $SRC/831
-
-	# https://launchpad.net/bugs/1075399
-	# http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/835
-	patch -p0 -i $SRC/835
+	patch -p1 -i $SRC/wicd-1.7.3-bitrate-property.patch
+	patch -p1 -i $SRC/wicd-1.7.3-undefined-LANG.patch
+	patch -p1 -i $SRC/wicd-1.7.3-urwid-1.3.0.patch

 	# really don't use NLS
-	rm -r po
+	rm po/*.po

 	/usr/bin/python setup.py configure \
-		--dbus=/usr/etc/dbus-1/system.d \
 		--etc=/etc/wicd \
+		--dbus=/usr/etc/dbus-1/system.d \
+		--no-install-kde \
 		--no-install-acpi \
+		--no-install-pmutils \
+		--no-install-init \
 		--no-install-i18n-man \
-		--no-install-docs
+		--no-install-docs \
+		--no-install-gnome-shell-extensions

+	/usr/bin/python setup.py build
 	/usr/bin/python setup.py install --root=$PKG
 	/usr/bin/python -mcompileall $PKG
-	install -m 0744 -D $SRC/wicd.rc $PKG/etc/rc.d/wicd

-	rm -r $PKG/etc/xdg
+	install -m 0744 -D $SRC/wicd.rc $PKG/etc/rc.d/wicd
 }
--- a/wicd/wicd-1.7.3-bitrate-property.patch
+++ b/wicd/wicd-1.7.3-bitrate-property.patch
@ -0,0 +1,19 @@
+--- a/curses/netentry_curses.py
+++ b/curses/netentry_curses.py
+@@ -538,11 +538,12 @@
+         self.bitrates = wireless.GetAvailableBitrates()
+         self.bitrates.append('auto')
+         self.bitrate_combo.set_list(self.bitrates)
+-        self.bitrate_combo.set_focus(
+-            self.bitrates.index(
+-                wireless.GetWirelessProperty(networkID, 'bitrate')
+        if wireless.GetWirelessProperty(networkID, 'bitrate'):
+            self.bitrate_combo.set_focus(
+                self.bitrates.index(
+                    wireless.GetWirelessProperty(networkID, 'bitrate')
+                )
+             )
+-        )
+         self.allow_lower_bitrates_chkbox.set_state(
+             to_bool(self.format_entry(networkID, 'allow_lower_bitrates'))
+         )
--- a/wicd/wicd-1.7.3-undefined-LANG.patch
+++ b/wicd/wicd-1.7.3-undefined-LANG.patch
@ -0,0 +1,24 @@
+Fixes compilation errors when os.environ['LANG'] is undefiend
+--- ./setup.py
+++ ./setup.py
+@@ -621,7 +621,7 @@ class compile_translations(Command):
+                 shutil.rmtree('translations/')
+             os.makedirs('translations')
+ 
+-            oldlang = os.environ['LANG']
+            oldlang = os.environ.get('LANG', None)
+             os.environ['LANG'] = 'C'
+ 
+             for pofile in sorted(glob('po/*.po')):
+@@ -656,7 +656,10 @@ class compile_translations(Command):
+                     os.makedirs('translations/' + lang + '/LC_MESSAGES/')
+                     os.system('pybabel compile -D wicd -i %s -l %s -d translations/' % (pofile, lang))
+ 
+-            os.environ['LANG'] = oldlang
+            if oldlang is not None:
+                os.environ['LANG'] = oldlang
+            else:
+                del os.environ['LANG']
+ 
+ class uninstall(Command):
+     description = "remove Wicd using uninstall.sh and install.log"
--- a/wicd/wicd-1.7.3-urwid-1.3.0.patch
+++ b/wicd/wicd-1.7.3-urwid-1.3.0.patch
@ -0,0 +1,15 @@
+--- a/curses/wicd-curses.py
+++ b/curses/wicd-curses.py
+@@ -1153,9 +1153,10 @@
+         if not ui._started:
+             return False
+ 
+-        input_data = ui.get_input_nonblocking()
+        ui.set_input_timeouts(max_wait=0)
+        input_data = ui.get_input()
+         # Resolve any "alarms" in the waiting
+-        self.handle_keys(input_data[1])
+        self.handle_keys(input_data)
+ 
+         # Update the screen
+         canvas = self.frame.render((self.size), True)
--- a/wine-staging/.footprint
+++ b/wine-staging/.footprint
@ -62,6 +62,7 @@ drwxr-xr-x	root/root	usr/include/wine/msvcrt/
 -rw-r--r--	root/root	usr/include/wine/msvcrt/share.h
 -rw-r--r--	root/root	usr/include/wine/msvcrt/signal.h
 -rw-r--r--	root/root	usr/include/wine/msvcrt/stddef.h
+-rw-r--r--	root/root	usr/include/wine/msvcrt/stdint.h
 -rw-r--r--	root/root	usr/include/wine/msvcrt/stdio.h
 -rw-r--r--	root/root	usr/include/wine/msvcrt/stdlib.h
 -rw-r--r--	root/root	usr/include/wine/msvcrt/string.h
@ -548,6 +549,8 @@ drwxr-xr-x	root/root	usr/include/wine/windows/ddk/
 -rw-r--r--	root/root	usr/include/wine/windows/mfidl.idl
 -rw-r--r--	root/root	usr/include/wine/windows/mfobjects.h
 -rw-r--r--	root/root	usr/include/wine/windows/mfobjects.idl
+-rw-r--r--	root/root	usr/include/wine/windows/mfplay.h
+-rw-r--r--	root/root	usr/include/wine/windows/mfplay.idl
 -rw-r--r--	root/root	usr/include/wine/windows/mfreadwrite.h
 -rw-r--r--	root/root	usr/include/wine/windows/mfreadwrite.idl
 -rw-r--r--	root/root	usr/include/wine/windows/mftransform.h
@ -642,6 +645,7 @@ drwxr-xr-x	root/root	usr/include/wine/windows/ddk/
 -rw-r--r--	root/root	usr/include/wine/windows/ntddvdeo.h
 -rw-r--r--	root/root	usr/include/wine/windows/ntdef.h
 -rw-r--r--	root/root	usr/include/wine/windows/ntdsapi.h
+-rw-r--r--	root/root	usr/include/wine/windows/ntifs.h
 -rw-r--r--	root/root	usr/include/wine/windows/ntlsa.h
 -rw-r--r--	root/root	usr/include/wine/windows/ntquery.h
 -rw-r--r--	root/root	usr/include/wine/windows/ntsecapi.h
@ -720,6 +724,8 @@ drwxr-xr-x	root/root	usr/include/wine/windows/ddk/
 -rw-r--r--	root/root	usr/include/wine/windows/reason.h
 -rw-r--r--	root/root	usr/include/wine/windows/regstr.h
 -rw-r--r--	root/root	usr/include/wine/windows/restartmanager.h
+-rw-r--r--	root/root	usr/include/wine/windows/restrictederrorinfo.h
+-rw-r--r--	root/root	usr/include/wine/windows/restrictederrorinfo.idl
 -rw-r--r--	root/root	usr/include/wine/windows/richedit.h
 -rw-r--r--	root/root	usr/include/wine/windows/richole.h
 -rw-r--r--	root/root	usr/include/wine/windows/richole.idl
@ -1281,6 +1287,7 @@ drwxr-xr-x	root/root	usr/lib/wine/
 -rwxr-xr-x	root/root	usr/lib/wine/d3d10_1.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/d3d10core.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/d3d11.dll.so
+-rwxr-xr-x	root/root	usr/lib/wine/d3d12.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/d3d8.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/d3d9.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/d3dcompiler_33.dll.so
@ -1719,6 +1726,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/d3d10_1.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/d3d10core.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/d3d11.dll
+-rw-r--r--	root/root	usr/lib/wine/fakedlls/d3d12.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/d3d8.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/d3d9.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/d3dcompiler_33.dll
@ -2406,6 +2414,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/libd3d10_1.def
 -rw-r--r--	root/root	usr/lib/wine/libd3d10core.def
 -rw-r--r--	root/root	usr/lib/wine/libd3d11.def
+-rw-r--r--	root/root	usr/lib/wine/libd3d12.def
 -rw-r--r--	root/root	usr/lib/wine/libd3d8.def
 -rw-r--r--	root/root	usr/lib/wine/libd3d9.def
 -rw-r--r--	root/root	usr/lib/wine/libd3dcompiler.def
@ -2500,6 +2509,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/libpropsys.def
 -rw-r--r--	root/root	usr/lib/wine/libpsapi.def
 -rw-r--r--	root/root	usr/lib/wine/libquartz.def
+-rw-r--r--	root/root	usr/lib/wine/libqwave.def
 -rw-r--r--	root/root	usr/lib/wine/librasapi32.def
 -rw-r--r--	root/root	usr/lib/wine/librasdlg.def
 -rw-r--r--	root/root	usr/lib/wine/libresutils.def
@ -3235,6 +3245,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/
 -rwxr-xr-x	root/root	usr/lib32/wine/d3d10_1.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/d3d10core.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/d3d11.dll.so
+-rwxr-xr-x	root/root	usr/lib32/wine/d3d12.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/d3d8.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/d3d9.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/d3dcompiler_33.dll.so
@ -3682,6 +3693,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/d3d10_1.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/d3d10core.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/d3d11.dll
+-rw-r--r--	root/root	usr/lib32/wine/fakedlls/d3d12.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/d3d8.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/d3d9.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/d3dcompiler_33.dll
@ -4431,6 +4443,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/libd3d10_1.def
 -rw-r--r--	root/root	usr/lib32/wine/libd3d10core.def
 -rw-r--r--	root/root	usr/lib32/wine/libd3d11.def
+-rw-r--r--	root/root	usr/lib32/wine/libd3d12.def
 -rw-r--r--	root/root	usr/lib32/wine/libd3d8.def
 -rw-r--r--	root/root	usr/lib32/wine/libd3d9.def
 -rw-r--r--	root/root	usr/lib32/wine/libd3dcompiler.def
@ -4526,6 +4539,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/libpropsys.def
 -rw-r--r--	root/root	usr/lib32/wine/libpsapi.def
 -rw-r--r--	root/root	usr/lib32/wine/libquartz.def
+-rw-r--r--	root/root	usr/lib32/wine/libqwave.def
 -rw-r--r--	root/root	usr/lib32/wine/librasapi32.def
 -rw-r--r--	root/root	usr/lib32/wine/librasdlg.def
 -rw-r--r--	root/root	usr/lib32/wine/libresutils.def
@ -5112,5 +5126,5 @@ drwxr-xr-x	root/root	usr/share/wine/gecko/
 -rwxr-xr-x	root/root	usr/share/wine/gecko/wine_gecko-2.47-x86_64.msi
 -rw-r--r--	root/root	usr/share/wine/l_intl.nls
 drwxr-xr-x	root/root	usr/share/wine/mono/
-rwxr-xr-x	root/root	usr/share/wine/mono/wine-mono-4.8.1.msi
+-rwxr-xr-x	root/root	usr/share/wine/mono/wine-mono-4.8.3.msi
 -rw-r--r--	root/root	usr/share/wine/wine.inf
--- a/wine-staging/.signature
+++ b/wine-staging/.signature
@ -1,9 +1,9 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3z3gzq5mPb3uNu1alYM11CS06tb5gBjsGMYfCjo6RNjTVCDuaokQisMJJL5OLS1Nb9gp3yzbvlQFqib9pa/lhwk=
-SHA256 (Pkgfile) = 303afa31b6b2f065812db03b6b107ae332fa1430b1ee109903823932abf860ef
-SHA256 (.footprint) = b7d81e77d8a4d4fe5fdd2fe445ffe95a217ea88dfe15c8b58621a8734846fe0b
-SHA256 (wine-4.6.tar.xz) = 329001f924d3f825121a1b28cae8e36515405f2a1d22bc266897d3d926b562da
-SHA256 (wine-staging-4.6.tar.gz) = c9164ef486b3a0b947251910318de6fffb7fdcd8c311ec8ccca5dab399700592
+RWSagIOpLGJF3x/zIL1Mvecjuy4GJpFzSpN6QxP1DLbVBc8cZAUQYkgzX+VgxGSa5V/M/gPlBiIl/StTVg+UJAeDg677kyn5bAE=
+SHA256 (Pkgfile) = b9b382dbabfd33a17a8e3b33fdc81ccee199e5dc74ebdf13caf5b650e9b0c85a
+SHA256 (.footprint) = bd2f4e22364f3b67e1c417a25d6f7ca92962bb4ab153b0e9183e6e2dd35c497e
+SHA256 (wine-4.7.tar.xz) = 3bca9084354a60d202f6b8e670b130366126db0583fa27054f1f02294de7bab0
+SHA256 (wine-staging-4.7.tar.gz) = 3199e75e5085ab742280ef4f924205af977a2b5cb8d8051419d97d274545ef6f
 SHA256 (wine_gecko-2.47-x86.msi) = 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a
 SHA256 (wine_gecko-2.47-x86_64.msi) = c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d
-SHA256 (wine-mono-4.8.1.msi) = 4e073038c14c2496246ecb044ef8abfb8a1cfede58aa35168e04d484a003b032
+SHA256 (wine-mono-4.8.3.msi) = d6fa1f019bfa3c572438e4a2473ce25af1e937ed4cdcbe46554164ce25db0a76
--- a/wine-staging/Pkgfile
+++ b/wine-staging/Pkgfile
@ -1,16 +1,16 @@
 # Description: WINE with staging patches
 # URL: https://wiki.winehq.org/Wine-Staging
 # Maintainer: Matt Housh, jaeger at crux dot ninja
-# Depends on: fontconfig-32 freeglut-32 gnutls-32 lcms2-32 mpg123-32 openal-32 prelink xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32
+# Depends on: fontconfig-32 freeglut-32 gnutls-32 lcms2-32 mpg123-32 openal-32 prelink xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 vkd3d-32

 name=wine-staging
-version=4.6
+version=4.7
 release=1
 source=(https://dl.winehq.org/wine/source/4.x/wine-$version.tar.xz \
 	https://github.com/$name/$name/archive/v${version}/$name-$version.tar.gz \
 	https://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86.msi \
 	https://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86_64.msi \
-	https://dl.winehq.org/wine/wine-mono/4.8.1/wine-mono-4.8.1.msi)
+	https://dl.winehq.org/wine/wine-mono/4.8.3/wine-mono-4.8.3.msi)

 build() {
 	# apply staging patches
@ -58,7 +58,7 @@ build() {
 		$SRC/wine_gecko-2.47-x86.msi \
 		$SRC/wine_gecko-2.47-x86_64.msi

-	install $SRC/wine-mono-4.8.1.msi $PKG/usr/share/wine/mono/
+	install $SRC/wine-mono-4.8.3.msi $PKG/usr/share/wine/mono/

 	rm -r $PKG/usr/share/man/??.UTF-8
 }