merge

externals/cpmfile.json

@@ -98,7 +98,10 @@
         "hash": "a0d2fa8c957704dd49e00a726284ac5ca034b50b00d2b20a94fa1bbfbb80841467834bfdc84aa0ed0d6aab894608fd6c86c3b94eee46343f0e6d9c22e391dbf9",
         "version": "1.3",
         "git_version": "1.3.18",
-        "find_args": "MODULE"
+        "find_args": "MODULE",
+        "patches": [
+            "0001-openorbis.patch"
+        ]
     },
     "spirv-tools": {
         "package": "SPIRV-Tools",
@@ -112,6 +115,7 @@
         "patches": [
             "0001-netbsd-fix.patch",
             "0002-allow-static-only.patch"
+            "0003-openorbis.patch"
         ]
     },
     "spirv-headers": {

externals/ffmpeg/CMakeLists.txt

@@ -240,7 +240,10 @@ else()
                 --enable-pic
                 --cc="${FFmpeg_CC}"
                 --cxx="${FFmpeg_CXX}"
-                ${FFmpeg_CROSS_COMPILE_FLAG}
+                --ld="${CMAKE_LINKER}"
+                --ldflags="${CMAKE_C_LINK_FLAGS}"
+                --cflags="${CMAKE_C_FLAGS}"
+                --cxxflags="${CMAKE_CXX_FLAGS}"
                 ${FFmpeg_HWACCEL_FLAGS}
                 ${FFmpeg_CROSS_COMPILE_FLAGS}
         WORKING_DIRECTORY