From b811afbfa3ff4d648fe4eb2e18d56811541a3681 Mon Sep 17 00:00:00 2001
From: Kaido Kert <kaidokert@google.com>
Date: Wed, 31 May 2023 10:17:01 -0700
Subject: [PATCH] Switch Raspi to dynamically load ffmpeg (#504)

This saves a significant amount of apparent reported RSS memory
when preloading Cobalt, as ffmpeg grabs nearly 10MB of memory.

b/285130256
---
 starboard/raspi/2/toolchain/BUILD.gn                   | 4 ++--
 starboard/raspi/shared/BUILD.gn                        | 2 +-
 starboard/raspi/shared/platform_configuration/BUILD.gn | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/starboard/raspi/2/toolchain/BUILD.gn b/starboard/raspi/2/toolchain/BUILD.gn
index 0993e864567d..dcce760e7f6f 100644
--- a/starboard/raspi/2/toolchain/BUILD.gn
+++ b/starboard/raspi/2/toolchain/BUILD.gn
@@ -23,7 +23,7 @@ gcc_toolchain("target") {
   # We use whatever 'ar' resolves to.
   ar = gcc_toolchain_ar
 
-  tail_lib_dependencies = "-l:libpthread.so.0"
+  tail_lib_dependencies = "-l:libpthread.so.0 -l:libdl.so.2"
 
   toolchain_args = {
     is_clang = false
@@ -38,7 +38,7 @@ gcc_toolchain("native_target") {
   # We use whatever 'ar' resolves to.
   ar = gcc_toolchain_ar
 
-  tail_lib_dependencies = "-l:libpthread.so.0"
+  tail_lib_dependencies = "-l:libpthread.so.0 -l:libdl.so.2"
 
   toolchain_args = {
     is_starboard = false
diff --git a/starboard/raspi/shared/BUILD.gn b/starboard/raspi/shared/BUILD.gn
index 29c056da4eee..3a4b331eb487 100644
--- a/starboard/raspi/shared/BUILD.gn
+++ b/starboard/raspi/shared/BUILD.gn
@@ -354,7 +354,7 @@ static_library("starboard_platform_sources") {
     ":starboard_base_symbolize",
     "//starboard:starboard_headers_only",
     "//starboard/common",
-    "//starboard/shared/ffmpeg:ffmpeg_linked",
+    "//starboard/shared/ffmpeg:ffmpeg_dynamic_load",
     "//starboard/shared/starboard/media:media_util",
     "//starboard/shared/starboard/player/filter:filter_based_player_sources",
   ]
diff --git a/starboard/raspi/shared/platform_configuration/BUILD.gn b/starboard/raspi/shared/platform_configuration/BUILD.gn
index fff6fe8545f7..b1c930ed3a14 100644
--- a/starboard/raspi/shared/platform_configuration/BUILD.gn
+++ b/starboard/raspi/shared/platform_configuration/BUILD.gn
@@ -123,9 +123,7 @@ config("compiler_flags") {
 config("platform_configuration") {
   libs = [
     "asound",
-    "avcodec",
-    "avformat",
-    "avutil",
+    "dl",
     "pthread",
     "rt",
     "openmaxil",