[libvpx,lmdb,aubio,freetype-gl,intelrdfpmathlib,libbson,libtcod,metis…

…,pqp,smpeg2] Build fixes 2022-04-28 (microsoft#24470) * [libvpx,lmdb,aubio,freetype-gl,intelrdfpmathlib,libbson,libtcod,metis,pqp,smpeg2] Build fixes 2022-04-28 These results are from the most recent CI run: https://dev.azure.com/vcpkg/public/_build/results?buildId=71465 PASSING, REMOVE FROM FAIL LIST: aubio:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). I also did some investigation as to why aubio:arm-uwp didn't pass. Turns out, it's because aubio depends on ffmpeg, which failed to build because it depends on libvpx, which we never fixed for UWP following the VS2022 update. See also https://developercommunity.visualstudio.com/t/MicrosoftVisualStudioComponentVCTool/10002207?space=62&scope=follow&sort=newest PASSING, REMOVE FROM FAIL LIST: freetype-gl:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). I also checked freetype-gl:arm-uwp, but it's blocked by glew which is blocked by opengl which appears to not be a thing on arm. PASSING, REMOVE FROM FAIL LIST: intelrdfpmathlib:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). The arm-uwp version of this emits errors that look like source issues; I blocked arm&windows with a supports expression: D:\buildtrees\intelrdfpmathlib\src\athLib20U2-d2a8954428.clean\LIBRARY\src\bid_functions.h(3113): error C2719: 'x': formal parameter with requested alignment of 16 won't be aligned PASSING, REMOVE FROM FAIL LIST: libbson:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: libbson:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: libtcod:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: libtcod:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: lmdb:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). arm-uwp failed with again what looks like a source issue: mdb.c.obj : error LNK2001: unresolved external symbol __tls_used mdb.c.obj : error LNK2001: unresolved external symbol _mdb_tls_cbp PASSING, REMOVE FROM FAIL LIST: metis:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: metis:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: pqp:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: pqp:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: smpeg2:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: smpeg2:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). I also checked Linux and it says Could NOT find ibverbs (missing: IBVERBS_INCLUDE_DIRS IBVERBS_LIBRARIES) which may be vcpkg's fault so I left that ci.baseline.txt skip alone. REGRESSION: jansson:arm-uwp failed with POST_BUILD_CHECKS_FAILED. If expected, add jansson:arm-uwp=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: jansson:x64-uwp failed with POST_BUILD_CHECKS_FAILED. If expected, add jansson:x64-uwp=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. Already fixed by microsoft#24466 * dos2unix the patch * :dos2unix the other patches too
SupSuper · Apr 30, 2022 · c8a56fd · c8a56fd
1 parent 2ece8fe
commit c8a56fd
Show file tree

Hide file tree

Showing 12 changed files with 125 additions and 76 deletions.
diff --git a/ports/intelrdfpmathlib/vcpkg.json b/ports/intelrdfpmathlib/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "intelrdfpmathlib",
   "version-string": "20U2",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Intel(R) Decimal Floating-Point Math Library",
+  "supports": "!(arm & windows)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch b/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch
@@ -1,21 +1,21 @@
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 81d30a16c..d4f19cd97 100644
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -1370,12 +1370,14 @@ EOF
-       case  ${tgt_os} in
-         win32)
-           add_asflags -f win32
--          enabled debug && add_asflags -g cv8
-+          enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
-+          enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8
-           EXE_SFX=.exe
-           ;;
-         win64)
-           add_asflags -f win64
--          enabled debug && add_asflags -g cv8
-+          enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
-+          enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8
-           EXE_SFX=.exe
-           ;;
-         linux*|solaris*|android*)
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index 81d30a1..325017e 100644
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -1370,12 +1370,14 @@ EOF
+       case  ${tgt_os} in
+         win32)
+           add_asflags -f win32
+-          enabled debug && add_asflags -g cv8
++          enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
++          enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8
+           EXE_SFX=.exe
+           ;;
+         win64)
+           add_asflags -f win64
+-          enabled debug && add_asflags -g cv8
++          enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
++          enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8
+           EXE_SFX=.exe
+           ;;
+         linux*|solaris*|android*)
diff --git a/...ibvpx/0003-add-uwp-and-v142-support.patch → .../0003-add-uwp-v142-and-v143-support.patch b/...ibvpx/0003-add-uwp-and-v142-support.patch → .../0003-add-uwp-v142-and-v143-support.patch
@@ -1,5 +1,5 @@
 diff --git a/build/make/configure.sh b/build/make/configure.sh
-index d4f19cd97..fb51368b1 100644
+index 325017e..5ab54e4 100644
 --- a/build/make/configure.sh
 +++ b/build/make/configure.sh
 @@ -1016,7 +1016,7 @@ EOF
@@ -47,10 +47,31 @@ index d4f19cd97..fb51368b1 100644
        *-win*-vs*)
          ;;
        *-android-gcc)
+diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh
+index d1adfd7..a03ea59 100644
+--- a/build/make/gen_msvs_sln.sh
++++ b/build/make/gen_msvs_sln.sh
+@@ -219,6 +219,7 @@ for opt in "$@"; do
+         14) vs_year=2015 ;;
+         15) vs_year=2017 ;;
+         16) vs_year=2019 ;;
++        17) vs_year=2022 ;;
+         *) die Unrecognized Visual Studio Version in $opt ;;
+       esac
+     ;;
 diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
-index 6f91ad478..916851662 100755
+index 6f91ad4..b4cad6c 100644
 --- a/build/make/gen_msvs_vcxproj.sh
 +++ b/build/make/gen_msvs_vcxproj.sh
+@@ -170,7 +170,7 @@ for opt in "$@"; do
+         --ver=*)
+             vs_ver="$optval"
+             case "$optval" in
+-                1[4-6])
++                1[4-7])
+                 ;;
+                 *) die Unrecognized Visual Studio Version in $opt
+                 ;;
 @@ -296,7 +296,22 @@ generate_vcxproj() {
          tag_content ProjectGuid "{${guid}}"
          tag_content RootNamespace ${name}
@@ -75,7 +96,17 @@ index 6f91ad478..916851662 100755
              tag_content AppContainerApplication true
              # The application type can be one of "Windows Store",
              # "Windows Phone" or "Windows Phone Silverlight". The
-@@ -391,7 +406,7 @@ generate_vcxproj() {
+@@ -344,6 +359,9 @@ generate_vcxproj() {
+             if [ "$vs_ver" = "16" ]; then
+                 tag_content PlatformToolset v142
+             fi
++            if [ "$vs_ver" = "17" ]; then
++                tag_content PlatformToolset v143
++            fi
+             tag_content CharacterSet Unicode
+             if [ "$config" = "Release" ]; then
+                 tag_content WholeProgramOptimization true
+@@ -391,7 +409,7 @@ generate_vcxproj() {
                  Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'"
              if [ "$name" == "vpx" ]; then
                  hostplat=$plat
@@ -85,47 +116,63 @@ index 6f91ad478..916851662 100755
                  fi
              fi
 diff --git a/configure b/configure
-index da631a45e..da93474e5 100755
+index da631a4..2804678 100644
 --- a/configure
 +++ b/configure
-@@ -101,16 +101,20 @@ all_platforms="${all_platforms} arm64-android-gcc"
+@@ -101,16 +101,24 @@ all_platforms="${all_platforms} arm64-android-gcc"
  all_platforms="${all_platforms} arm64-darwin-gcc"
  all_platforms="${all_platforms} arm64-darwin20-gcc"
  all_platforms="${all_platforms} arm64-linux-gcc"
 +all_platforms="${all_platforms} arm64-uwp-vs16"
++all_platforms="${all_platforms} arm64-uwp-vs17"
  all_platforms="${all_platforms} arm64-win64-gcc"
  all_platforms="${all_platforms} arm64-win64-vs15"
 +all_platforms="${all_platforms} arm64-win64-vs16"
++all_platforms="${all_platforms} arm64-win64-vs17"
  all_platforms="${all_platforms} armv7-android-gcc"   #neon Cortex-A8
  all_platforms="${all_platforms} armv7-darwin-gcc"    #neon Cortex-A8
  all_platforms="${all_platforms} armv7-linux-rvct"    #neon Cortex-A8
  all_platforms="${all_platforms} armv7-linux-gcc"     #neon Cortex-A8
  all_platforms="${all_platforms} armv7-none-rvct"     #neon Cortex-A8
 +all_platforms="${all_platforms} armv7-uwp-vs16"
++all_platforms="${all_platforms} armv7-uwp-vs17"
  all_platforms="${all_platforms} armv7-win32-gcc"
  all_platforms="${all_platforms} armv7-win32-vs14"
  all_platforms="${all_platforms} armv7-win32-vs15"
 +all_platforms="${all_platforms} armv7-win32-vs16"
++all_platforms="${all_platforms} armv7-win32-vs17"
  all_platforms="${all_platforms} armv7s-darwin-gcc"
  all_platforms="${all_platforms} armv8-linux-gcc"
  all_platforms="${all_platforms} mips32-linux-gcc"
-@@ -135,6 +139,7 @@ all_platforms="${all_platforms} x86-linux-gcc"
+@@ -135,10 +143,13 @@ all_platforms="${all_platforms} x86-linux-gcc"
  all_platforms="${all_platforms} x86-linux-icc"
  all_platforms="${all_platforms} x86-os2-gcc"
  all_platforms="${all_platforms} x86-solaris-gcc"
 +all_platforms="${all_platforms} x86-uwp-vs16"
++all_platforms="${all_platforms} x86-uwp-vs17"
  all_platforms="${all_platforms} x86-win32-gcc"
  all_platforms="${all_platforms} x86-win32-vs14"
  all_platforms="${all_platforms} x86-win32-vs15"
-@@ -156,6 +161,7 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
+ all_platforms="${all_platforms} x86-win32-vs16"
++all_platforms="${all_platforms} x86-win32-vs17"
+ all_platforms="${all_platforms} x86_64-android-gcc"
+ all_platforms="${all_platforms} x86_64-darwin9-gcc"
+ all_platforms="${all_platforms} x86_64-darwin10-gcc"
+@@ -156,10 +167,13 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
  all_platforms="${all_platforms} x86_64-linux-gcc"
  all_platforms="${all_platforms} x86_64-linux-icc"
  all_platforms="${all_platforms} x86_64-solaris-gcc"
 +all_platforms="${all_platforms} x86_64-uwp-vs16"
++all_platforms="${all_platforms} x86_64-uwp-vs17"
  all_platforms="${all_platforms} x86_64-win64-gcc"
  all_platforms="${all_platforms} x86_64-win64-vs14"
  all_platforms="${all_platforms} x86_64-win64-vs15"
-@@ -476,11 +482,10 @@ process_targets() {
+ all_platforms="${all_platforms} x86_64-win64-vs16"
++all_platforms="${all_platforms} x86_64-win64-vs17"
+ all_platforms="${all_platforms} generic-gnu"
+
+ # all_targets is a list of all targets that can be configured
+@@ -476,11 +490,10 @@ process_targets() {
      ! enabled multithread && DIST_DIR="${DIST_DIR}-nomt"
      ! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs"
      DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}"
@@ -141,7 +188,7 @@ index da631a45e..da93474e5 100755
      if [ -f "${source_path}/build/make/version.sh" ]; then
          ver=`"$source_path/build/make/version.sh" --bare "$source_path"`
          DIST_DIR="${DIST_DIR}-${ver}"
-@@ -569,6 +574,10 @@ process_detect() {
+@@ -569,6 +582,10 @@ process_detect() {
 
              # Specialize windows and POSIX environments.
              case $toolchain in

diff --git a/ports/libvpx/0004-remove-library-suffixes.patch b/ports/libvpx/0004-remove-library-suffixes.patch
@@ -1,13 +1,13 @@
-diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
-index 916851662..e60405bc9 100755
---- a/build/make/gen_msvs_vcxproj.sh
-+++ b/build/make/gen_msvs_vcxproj.sh
-@@ -394,7 +394,7 @@ generate_vcxproj() {
-               else
-                 config_suffix=""
-               fi
--              tag_content TargetName "${name}${lib_sfx}${config_suffix}"
-+              tag_content TargetName "${name}"
-             fi
-             close_tag PropertyGroup
-         done
+diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
+index 916851662..e60405bc9 100755
+--- a/build/make/gen_msvs_vcxproj.sh
++++ b/build/make/gen_msvs_vcxproj.sh
+@@ -394,7 +394,7 @@ generate_vcxproj() {
+               else
+                 config_suffix=""
+               fi
+-              tag_content TargetName "${name}${lib_sfx}${config_suffix}"
++              tag_content TargetName "${name}"
+             fi
+             close_tag PropertyGroup
+         done
diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake
@@ -10,7 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         0002-Fix-nasm-debug-format-flag.patch
-        0003-add-uwp-and-v142-support.patch
+        0003-add-uwp-v142-and-v143-support.patch
         0004-remove-library-suffixes.patch
 )
 
@@ -19,12 +19,12 @@ vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
 
 if(CMAKE_HOST_WIN32)
-	vcpkg_acquire_msys(MSYS_ROOT PACKAGES make)
-	set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
-	set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}")
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES make)
+    set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
+    set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}")
 else()
-	set(BASH /bin/bash)
-	set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}")
+    set(BASH /bin/bash)
+    set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}")
 endif()
 
 vcpkg_find_acquire_program(NASM)
@@ -42,7 +42,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
         set(LIBVPX_CRT_SUFFIX md)
     endif()
 
-    if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore AND VCPKG_PLATFORM_TOOLSET STREQUAL v142)
+    if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore AND (VCPKG_PLATFORM_TOOLSET STREQUAL v142 OR VCPKG_PLATFORM_TOOLSET STREQUAL v143))
         set(LIBVPX_TARGET_OS "uwp")
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
         set(LIBVPX_TARGET_OS "win32")
@@ -64,7 +64,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
         set(LIBVPX_ARCH_DIR "ARM")
     endif()
 
-    if(VCPKG_PLATFORM_TOOLSET STREQUAL v142)
+    if(VCPKG_PLATFORM_TOOLSET STREQUAL v143)
+        set(LIBVPX_TARGET_VS "vs17")
+    elseif(VCPKG_PLATFORM_TOOLSET STREQUAL v142)
         set(LIBVPX_TARGET_VS "vs16")
     else()
         set(LIBVPX_TARGET_VS "vs15")
@@ -143,10 +145,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
         set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}")
         configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/vpx.pc" @ONLY)
     endif()
-    
+
     if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
         set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}/debug")
-        configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vpx.pc" @ONLY)   
+        configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vpx.pc" @ONLY)
     endif()
 
 else()

diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libvpx",
   "version": "1.11.0",
+  "port-version": 1,
   "description": "The reference software implementation for the video coding formats VP8 and VP9.",
   "homepage": "https://github.com/webmproject/libvpx",
   "license": "BSD-3-Clause",

diff --git a/ports/lmdb/vcpkg.json b/ports/lmdb/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "lmdb",
   "version": "0.9.29",
-  "port-version": 1,
+  "port-version": 2,
   "description": "LMDB is an extraordinarily fast, memory-efficient database",
   "homepage": "https://github.com/LMDB/lmdb",
   "license": null,
+  "supports": "!(arm & windows)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -48,8 +48,6 @@
 # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h
 apr:arm64-windows=fail
 
-aubio:arm-uwp=fail
-aubio:x64-uwp=fail
 # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937
 bde:x64-linux=fail
 bitserializer:x64-osx=fail
@@ -288,7 +286,6 @@ freeglut:x64-uwp=fail
 freeglut:x64-osx=fail
 # Needs /bigobj
 freeopcua:arm64-windows=fail
-freetype-gl:x64-uwp=fail
 ftgl:x64-uwp=fail
 # https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207
 functions-framework-cpp:x64-uwp=fail
@@ -400,8 +397,6 @@ intel-mkl:x64-windows=fail
 intel-mkl:x64-windows-static=fail
 intel-mkl:x64-windows-static-md=fail
 intel-mkl:x86-windows=fail
-intelrdfpmathlib:arm-uwp=fail
-intelrdfpmathlib:x64-uwp=fail
 irrlicht:arm64-windows=fail
 irrlicht:arm-uwp=fail
 irrlicht:x64-uwp=fail
@@ -450,8 +445,6 @@ libbf:x64-windows=fail
 libbf:x64-windows-static=fail
 libbf:x64-windows-static-md=fail
 libbf:x86-windows=fail
-libbson:arm-uwp=fail
-libbson:x64-uwp=fail
 libcopp:arm64-windows=fail
 libcopp:arm-uwp=fail
 # Missing system libraries on linux to run/prepare autoconf
@@ -584,8 +577,6 @@ libsrt:x64-uwp=fail
 libssh:arm64-windows=fail
 libssh:arm-uwp=fail
 libssh:x64-uwp=fail
-libtcod:arm-uwp=fail
-libtcod:x64-uwp=fail
 libtins:arm-uwp=fail
 libtins:x64-uwp=fail
 libtomcrypt:arm64-windows=fail
@@ -616,7 +607,6 @@ libvmdk:x64-windows-static-md=skip
 libvmdk:arm64=skip
 libvmdk:x64-linux=skip
 libvmdk:x64-osx=skip
-libvpx:arm-uwp=fail
 libwandio:x86-windows=fail
 libwandio:x64-windows=fail
 libwandio:x64-windows-static=fail
@@ -633,8 +623,6 @@ live555:x64-osx=fail
 live555:x64-uwp=fail
 llgl:arm-uwp=fail
 llgl:x64-uwp=fail
-lmdb:arm-uwp=fail
-lmdb:x64-uwp=fail
 log4cplus:arm-uwp=fail
 log4cplus:x64-uwp=fail
 log4cxx:arm-uwp=fail
@@ -676,8 +664,6 @@ mesa:x64-windows-static-md=fail
 # Missing dependent libraries.
 mesa:x64-linux=fail
 mesa:x64-osx=fail
-metis:arm-uwp=fail
-metis:x64-uwp=fail
 mfl:x64-linux=skip
 mfl:x64-osx=skip
 milerius-sfml-imgui:x64-windows-static=fail
@@ -933,8 +919,6 @@ pmdk:x64-windows-static=fail
 pmdk:x86-windows=fail
 popsift:x64-windows-static-md=fail
 portable-snippets:arm-uwp=fail
-pqp:arm-uwp=fail
-pqp:x64-uwp=fail
 # Not yet ready for these platforms.
 qbittorrent:x64-osx=fail
 qbittorrent:x64-linux=fail
@@ -1117,9 +1101,7 @@ skia:x64-uwp=fail
 sleef:x86-windows=fail
 slikenet:arm-uwp=fail
 slikenet:x64-uwp=fail
-smpeg2:arm-uwp=fail
 smpeg2:x64-linux=fail
-smpeg2:x64-uwp=fail
 soci:arm-uwp=fail
 soci:x64-uwp=fail
 sockpp:arm-uwp=fail