From ee46d61fb9e6a90fcb452da7f933bf8665d12c61 Mon Sep 17 00:00:00 2001
From: Tim Zimmermann <tim@linux4.de>
Date: Fri, 4 Apr 2025 06:36:38 +0200
Subject: [PATCH] d1: Use custom fence implementation for camera HAL

* This device does not properly close fences causing FD leaks.

Change-Id: Id589b3122921e03e677fb0cd1233d67e26430456
---
 extract-files.py      | 4 +++-
 proprietary-files.txt | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/extract-files.py b/extract-files.py
index 58ffbdd..6ba7080 100755
--- a/extract-files.py
+++ b/extract-files.py
@@ -27,7 +27,9 @@ blob_fixups: blob_fixups_user_type = {
     ): blob_fixup()
         .binary_regex_replace(b'ro.factory.factory_binary', b'ro.vendor.factory_binary\x00'),
     'vendor/lib64/libexynoscamera3.so': blob_fixup()
-        .sig_replace('8B 02 20 36', '1F 20 03 D5'),
+        .sig_replace('8B 02 20 36', '1F 20 03 D5')
+        .add_needed('libshim_camera.so')
+        .binary_regex_replace(b'_ZN7android5Fence', b'_ZN7exynos55Fence'),
     (
         'vendor/lib/sensors.bio.so',
         'vendor/lib/sensors.sensorhub.so',
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 428ab25..27a7ada 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -26,7 +26,7 @@ vendor/firmware/bcm4375B1_semco_sem.hcd
 
 ## Camera - from d1 - N970FXXS7GVB1
 vendor/lib64/hw/camera.exynos9825.so|63a55d3796921c03c331a63fa57cd17987442677
-vendor/lib64/libexynoscamera3.so|dba359984d33b5f5c5be532aa28cb4f029773c19|dba359984d33b5f5c5be532aa28cb4f029773c19
+vendor/lib64/libexynoscamera3.so|c3a70cf200642a10e02ddadfbbd2237c39cac13c|c3a70cf200642a10e02ddadfbbd2237c39cac13c
 
 ## Camera Firmware
 vendor/firmware/fimc_is_fw_mcu.bin