From 30153eaad372f1bf40b67965cab71d19cc839a4e Mon Sep 17 00:00:00 2001
From: Marc Bertola <5149167+marcbertola@users.noreply.github.com>
Date: Sun, 1 Dec 2019 21:24:10 -0500
Subject: [PATCH 1/9] Add NVIDIA Codec support for Windows, Linux and Linux for
 Tegra

---
 ports/ffmpeg/CONTROL           |  4 +++
 ports/ffmpeg/build_linux.sh    |  1 +
 ports/ffmpeg/portfile.cmake    | 13 ++++---
 ports/ffnvcodec/CONTROL        |  8 ++---
 ports/ffnvcodec/build.sh       | 17 +++++++++
 ports/ffnvcodec/copyright      | 26 ++++++++++++++
 ports/ffnvcodec/portfile.cmake | 63 +++++++++++++++++++++++++++-------
 7 files changed, 111 insertions(+), 21 deletions(-)
 create mode 100644 ports/ffnvcodec/build.sh
 create mode 100644 ports/ffnvcodec/copyright

diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index e8f12f97e77db5..057b6d21cba4e4 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -50,3 +50,7 @@ Description: allow GPL licensed libraries
 
 Feature: avresample
 Description: Libav audio resampling library support in ffmpeg
+
+Feature: nvcodec
+Build-Depends: ffnvcodec, cuda
+Description: Hardware accelerated codecs
\ No newline at end of file
diff --git a/ports/ffmpeg/build_linux.sh b/ports/ffmpeg/build_linux.sh
index b24be1346d3c45..d7360ce1df0300 100644
--- a/ports/ffmpeg/build_linux.sh
+++ b/ports/ffmpeg/build_linux.sh
@@ -16,6 +16,7 @@ PATH_TO_PACKAGE_DIR=$3
 
 cd "$PATH_TO_BUILD_DIR"
 echo "=== CONFIGURING ==="
+chmod a+x "$PATH_TO_SRC_DIR/configure"
 "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" $4
 echo "=== BUILDING ==="
 make -j6
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index 71bea6e9556de9..8e00d37a3f37b7 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ffmpeg/ffmpeg
@@ -129,6 +127,12 @@ if("avresample" IN_LIST FEATURES)
     set(OPTIONS "${OPTIONS} --enable-avresample")
 endif()
 
+if("nvcodec" IN_LIST FEATURES)
+    set(OPTIONS "${OPTIONS} --enable-cuda --enable-nvenc --enable-cuvid --disable-libnpp")
+else()
+    set(OPTIONS "${OPTIONS} --disable-cuda --disable-nvenc --disable-cuvid --disable-libnpp")
+endif()
+
 set(OPTIONS_CROSS "")
 
 if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
@@ -175,12 +179,13 @@ if(VCPKG_TARGET_IS_WINDOWS)
 endif()
 
 set(ENV_LIB_PATH "$ENV{${LIB_PATH_VAR}}")
+set(ENV{PKG_CONFIG_PATH} "${CURRENT_PACKAGES_DIR}/../ffnvcodec_${TARGET_TRIPLET}/lib/pkgconfig")
 
 message(STATUS "Building Options: ${OPTIONS}")
 
-# Relase build
+# Release build
 if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release)
-    message(STATUS "Building Relase Options: ${OPTIONS_RELEASE}")
+    message(STATUS "Building Release Options: ${OPTIONS_RELEASE}")
     set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/lib${SEP}${ENV_LIB_PATH}")
     set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}")
     set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}")
diff --git a/ports/ffnvcodec/CONTROL b/ports/ffnvcodec/CONTROL
index 5cc6cb19b8d34a..fe8f68970786fa 100644
--- a/ports/ffnvcodec/CONTROL
+++ b/ports/ffnvcodec/CONTROL
@@ -1,4 +1,4 @@
-Source: ffnvcodec
-Version: 9.1.23.0
-Homepage: https://github.com/FFmpeg/nv-codec-headers
-Description: FFmpeg version of Nvidia Codec SDK headers.
\ No newline at end of file
+Source: ffnvcodec
+Version: 9.0.18.1
+Homepage: https://github.com/FFmpeg/nv-codec-headers
+Description: FFmpeg version of Nvidia Codec SDK headers.
diff --git a/ports/ffnvcodec/build.sh b/ports/ffnvcodec/build.sh
new file mode 100644
index 00000000000000..d9ba93b219e96d
--- /dev/null
+++ b/ports/ffnvcodec/build.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/bash
+set -e
+export PATH=/usr/bin:$PATH
+
+#SOURCE_PATH="`cygpath "$1"`"
+#CURRENT_PACKAGES_DIR="`cygpath "$2"`"
+SOURCE_PATH="$1"
+CURRENT_PACKAGES_DIR="$2"
+
+echo "CURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}"
+
+pushd ${SOURCE_PATH}
+make PREFIX=${CURRENT_PACKAGES_DIR}
+make install PREFIX=${CURRENT_PACKAGES_DIR}
+mkdir -p /usr/lib/pkgconfig
+cp ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ffnvcodec.pc /usr/lib/pkgconfig
+popd
diff --git a/ports/ffnvcodec/copyright b/ports/ffnvcodec/copyright
new file mode 100644
index 00000000000000..07c1bc4d77f452
--- /dev/null
+++ b/ports/ffnvcodec/copyright
@@ -0,0 +1,26 @@
+/*
+ * This copyright notice applies to this header file only:
+ *
+ * Copyright (c) 2010-2019 NVIDIA Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the software, and to permit persons to whom the
+ * software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
diff --git a/ports/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake
index c6f13e711ab9e7..eea4a0aa79ab9f 100644
--- a/ports/ffnvcodec/portfile.cmake
+++ b/ports/ffnvcodec/portfile.cmake
@@ -1,13 +1,50 @@
-# Header-only-library
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO FFmpeg/nv-codec-headers
-    REF n9.1.23.0 
-    SHA512 d9cb1ad496d971da31165e643c6c4f433561a856050503783051604f24ea5f9997859b05695632ea94ce9659966915789e6d7f7d536764804c9f673d1c8c63e4
-    HEAD_REF master
-)
-
-file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
-
-#Handle copyright
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+# Get nvcodec
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO FFmpeg/nv-codec-headers
+    REF n9.0.18.1
+    SHA512 4306ee3c6e72e9e3172b28c5e6166ec3fb9dfdc32578aebda0588afc682f56286dd6f616284c9892907cd413f57770be3662572207a36d6ac65c75a03d381f6f
+    HEAD_REF master
+)
+
+# ====================================================
+# Install the pkgconfig info for the the `nvcodec` package
+# ====================================================
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}\\build.sh)
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES make pkg-config)
+    set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
+
+    message(STATUS "Building ${_csc_PROJECT_PATH} for Release")
+    file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
+
+    # Build script parameters:
+    # source root
+    # root of where the package would be installed on a linux system (here this is the package dir)
+    vcpkg_execute_required_process(
+        COMMAND ${BASH} --noprofile --norc "${BUILD_SCRIPT}"
+            "${SOURCE_PATH}" # SOURCE DIR
+            "${CURRENT_PACKAGES_DIR}" # PACKAGE DIR
+        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}
+        LOGNAME build-${TARGET_TRIPLET}
+    )
+
+else()
+    FIND_PROGRAM(MAKE make)
+    IF (NOT MAKE)
+        MESSAGE(FATAL_ERROR "MAKE not found")
+    ENDIF ()
+    
+    vcpkg_execute_required_process(
+        COMMAND make PREFIX=$${CURRENT_PACKAGES_DIR}
+        WORKING_DIRECTORY ${SOURCE_PATH}
+        LOGNAME make-${TARGET_TRIPLET}
+    )
+
+    # Deploy a copy of the ffnvcodec.pc file where ffmpeg's pkgconfig call expects to find it
+    file(INSTALL ${SOURCE_PATH}/ffnvcodec.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
+endif()
+
+# Install the files to their generic location as well
+file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
+file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/ffnvcodec)

From 2804186eecb93fa9759f7090a0b8cec7cd310350 Mon Sep 17 00:00:00 2001
From: Marc Bertola <5149167+marcbertola@users.noreply.github.com>
Date: Mon, 2 Dec 2019 08:36:34 -0500
Subject: [PATCH 2/9] [ffnvcodec] Fix typos, add/remove comments

---
 ports/ffnvcodec/build.sh       | 13 +++++++++----
 ports/ffnvcodec/portfile.cmake | 19 +++++++++++--------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ports/ffnvcodec/build.sh b/ports/ffnvcodec/build.sh
index d9ba93b219e96d..24776d8a3cf34b 100644
--- a/ports/ffnvcodec/build.sh
+++ b/ports/ffnvcodec/build.sh
@@ -1,17 +1,22 @@
 #!/usr/bin/bash
+
+# Deploys the ffnvcodec.pc file to the MSYS rootfs so that pkgconfig can find it.
+
 set -e
 export PATH=/usr/bin:$PATH
 
-#SOURCE_PATH="`cygpath "$1"`"
-#CURRENT_PACKAGES_DIR="`cygpath "$2"`"
 SOURCE_PATH="$1"
 CURRENT_PACKAGES_DIR="$2"
 
-echo "CURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}"
-
 pushd ${SOURCE_PATH}
+
+# Create ffnvcodec.pc
 make PREFIX=${CURRENT_PACKAGES_DIR}
 make install PREFIX=${CURRENT_PACKAGES_DIR}
+
+# Copy ffnvcodec.pc to the location in the MSYS environment where pkgconfig
+# expects to find it.
 mkdir -p /usr/lib/pkgconfig
 cp ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ffnvcodec.pc /usr/lib/pkgconfig
+
 popd
diff --git a/ports/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake
index eea4a0aa79ab9f..dc2d6c2a836c6f 100644
--- a/ports/ffnvcodec/portfile.cmake
+++ b/ports/ffnvcodec/portfile.cmake
@@ -8,8 +8,10 @@ vcpkg_from_github(
 )
 
 # ====================================================
-# Install the pkgconfig info for the the `nvcodec` package
+# Install the pkgconfig info for the `nvcodec` package
 # ====================================================
+
+# Windows
 if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}\\build.sh)
     vcpkg_acquire_msys(MSYS_ROOT PACKAGES make pkg-config)
@@ -18,17 +20,17 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore
     message(STATUS "Building ${_csc_PROJECT_PATH} for Release")
     file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
 
-    # Build script parameters:
-    # source root
-    # root of where the package would be installed on a linux system (here this is the package dir)
+    # Make and deploy the ffnvcodec.pc file using MSYS
+    # (so that FFmpeg can find it in the MSYS rootfs)
     vcpkg_execute_required_process(
         COMMAND ${BASH} --noprofile --norc "${BUILD_SCRIPT}"
-            "${SOURCE_PATH}" # SOURCE DIR
-            "${CURRENT_PACKAGES_DIR}" # PACKAGE DIR
+            "${SOURCE_PATH}"
+            "${CURRENT_PACKAGES_DIR}"
         WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}
         LOGNAME build-${TARGET_TRIPLET}
     )
 
+# Linux, etc.
 else()
     FIND_PROGRAM(MAKE make)
     IF (NOT MAKE)
@@ -41,10 +43,11 @@ else()
         LOGNAME make-${TARGET_TRIPLET}
     )
 
-    # Deploy a copy of the ffnvcodec.pc file where ffmpeg's pkgconfig call expects to find it
+    # FFmpeg uses pkgconfig to find ffnvcodec.pc, so install it where 
+    # FFMpeg's call to pkgconfig expects to find it.
     file(INSTALL ${SOURCE_PATH}/ffnvcodec.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
 endif()
 
-# Install the files to their generic location as well
+# Install the files to their default vcpkg locations
 file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
 file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/ffnvcodec)

From c56a092d526ab1746da0f0a2c0e61924c279ae8e Mon Sep 17 00:00:00 2001
From: Marc Bertola <5149167+marcbertola@users.noreply.github.com>
Date: Sun, 23 Feb 2020 11:26:48 -0500
Subject: [PATCH 3/9] Bump nvcodec version to 9.1.23.1

---
 ports/ffnvcodec/CONTROL        | 2 +-
 ports/ffnvcodec/portfile.cmake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/ffnvcodec/CONTROL b/ports/ffnvcodec/CONTROL
index fe8f68970786fa..5779ec9e3dd385 100644
--- a/ports/ffnvcodec/CONTROL
+++ b/ports/ffnvcodec/CONTROL
@@ -1,4 +1,4 @@
 Source: ffnvcodec
-Version: 9.0.18.1
+Version: 9.1.23.1
 Homepage: https://github.com/FFmpeg/nv-codec-headers
 Description: FFmpeg version of Nvidia Codec SDK headers.
diff --git a/ports/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake
index dc2d6c2a836c6f..c85a60b2e9d737 100644
--- a/ports/ffnvcodec/portfile.cmake
+++ b/ports/ffnvcodec/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FFmpeg/nv-codec-headers
-    REF n9.0.18.1
-    SHA512 4306ee3c6e72e9e3172b28c5e6166ec3fb9dfdc32578aebda0588afc682f56286dd6f616284c9892907cd413f57770be3662572207a36d6ac65c75a03d381f6f
+    REF 4a0bbfd58724d6d19851cd8a6f7a9098dde9ab77
+    SHA512 39b643c6925558428f2e814fc3441878a906f324163396b8c6139ce48f62308c3dc2416b9c995eaed890338919ca0dfc9437fbb6b6d078f7a6f1b9675104c223
     HEAD_REF master
 )
 

From 5420690f0f5995153e1b1e5861cf6160e24af610 Mon Sep 17 00:00:00 2001
From: Marc Bertola <5149167+marcbertola@users.noreply.github.com>
Date: Thu, 27 Feb 2020 09:19:37 -0500
Subject: [PATCH 4/9] Update version number as per change request

---
 ports/ffmpeg/CONTROL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index f9c3798b109e0b..ef26c4d9729bed 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,5 +1,5 @@
 Source: ffmpeg
-Version: 4.2-5
+Version: 4.2-6
 Build-Depends: zlib
 Homepage: https://ffmpeg.org
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.

From 955e86d8fb29051bb11d52714ec67d3fa70d818f Mon Sep 17 00:00:00 2001
From: Marc Bertola <5149167+marcbertola@users.noreply.github.com>
Date: Thu, 27 Feb 2020 09:32:06 -0500
Subject: [PATCH 5/9] Use PORT variable instead of hardcoded portname

---
 ports/ffnvcodec/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake
index c85a60b2e9d737..cade1c86d86fbc 100644
--- a/ports/ffnvcodec/portfile.cmake
+++ b/ports/ffnvcodec/portfile.cmake
@@ -50,4 +50,4 @@ endif()
 
 # Install the files to their default vcpkg locations
 file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
-file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/ffnvcodec)
+file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})

From 2bb53536a1755365395a12899fe78d08af75b5d9 Mon Sep 17 00:00:00 2001
From: Marc Bertola <5149167+marcbertola@users.noreply.github.com>
Date: Fri, 20 Mar 2020 08:49:36 -0400
Subject: [PATCH 6/9] Identify the release the hash pertains to

---
 ports/ffnvcodec/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake
index cade1c86d86fbc..66d8bcb18c2c25 100644
--- a/ports/ffnvcodec/portfile.cmake
+++ b/ports/ffnvcodec/portfile.cmake
@@ -2,7 +2,7 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FFmpeg/nv-codec-headers
-    REF 4a0bbfd58724d6d19851cd8a6f7a9098dde9ab77
+    REF 4a0bbfd58724d6d19851cd8a6f7a9098dde9ab77 # 9.1.23.1
     SHA512 39b643c6925558428f2e814fc3441878a906f324163396b8c6139ce48f62308c3dc2416b9c995eaed890338919ca0dfc9437fbb6b6d078f7a6f1b9675104c223
     HEAD_REF master
 )

From a61a1432cd91617a0d41f42dfe02606e858a841e Mon Sep 17 00:00:00 2001
From: Marc Bertola <5149167+marcbertola@users.noreply.github.com>
Date: Fri, 20 Mar 2020 08:51:08 -0400
Subject: [PATCH 7/9] Find nvcodec in 'installed' instead of 'packages'

---
 ports/ffmpeg/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index 271adca997d5c8..201f4a971052eb 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -183,7 +183,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
 endif()
 
 set(ENV_LIB_PATH "$ENV{${LIB_PATH_VAR}}")
-set(ENV{PKG_CONFIG_PATH} "${CURRENT_PACKAGES_DIR}/../ffnvcodec_${TARGET_TRIPLET}/lib/pkgconfig")
+set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig")
 
 message(STATUS "Building Options: ${OPTIONS}")
 

From 92786a45304ec55679dbd233d137d7ee7c65dee9 Mon Sep 17 00:00:00 2001
From: Marc Bertola <5149167+marcbertola@users.noreply.github.com>
Date: Fri, 20 Mar 2020 18:03:19 -0400
Subject: [PATCH 8/9] Force FFmpeg to look for nvcodec headers in the installed
 directory instead of /usr/lib/pkgconfig.

---
 ports/ffmpeg/build.sh    | 1 +
 ports/ffnvcodec/build.sh | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ports/ffmpeg/build.sh b/ports/ffmpeg/build.sh
index 048d9ec08d250c..152e4e4406bc3f 100644
--- a/ports/ffmpeg/build.sh
+++ b/ports/ffmpeg/build.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/bash
 set -e
 export PATH=/usr/bin:$PATH
+export PKG_CONFIG_PATH="`cygpath ${PKG_CONFIG_PATH}`"
 # Export HTTP(S)_PROXY as http(s)_proxy:
 if [ "$HTTP_PROXY" ]; then
     export http_proxy=$HTTP_PROXY
diff --git a/ports/ffnvcodec/build.sh b/ports/ffnvcodec/build.sh
index 24776d8a3cf34b..416c6bd8f93f29 100644
--- a/ports/ffnvcodec/build.sh
+++ b/ports/ffnvcodec/build.sh
@@ -14,9 +14,5 @@ pushd ${SOURCE_PATH}
 make PREFIX=${CURRENT_PACKAGES_DIR}
 make install PREFIX=${CURRENT_PACKAGES_DIR}
 
-# Copy ffnvcodec.pc to the location in the MSYS environment where pkgconfig
-# expects to find it.
-mkdir -p /usr/lib/pkgconfig
-cp ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ffnvcodec.pc /usr/lib/pkgconfig
 
 popd

From f542c5ce09da9f913b016ddeea907f81f525f389 Mon Sep 17 00:00:00 2001
From: Marc Bertola <5149167+marcbertola@users.noreply.github.com>
Date: Fri, 20 Mar 2020 18:15:32 -0400
Subject: [PATCH 9/9] Use p option on cygpath to convert full path in case it
 contains more than one entry

---
 ports/ffmpeg/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/ffmpeg/build.sh b/ports/ffmpeg/build.sh
index 152e4e4406bc3f..40f1797cdad767 100644
--- a/ports/ffmpeg/build.sh
+++ b/ports/ffmpeg/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 set -e
 export PATH=/usr/bin:$PATH
-export PKG_CONFIG_PATH="`cygpath ${PKG_CONFIG_PATH}`"
+export PKG_CONFIG_PATH="`cygpath -p ${PKG_CONFIG_PATH}`"
 # Export HTTP(S)_PROXY as http(s)_proxy:
 if [ "$HTTP_PROXY" ]; then
     export http_proxy=$HTTP_PROXY