From 6879d2437920417dd633611dd189b71eac8abd96 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Fri, 20 Dec 2024 20:12:46 +0100
Subject: [PATCH] build: update edid-decode to new repository

Signed-off-by: Simon Ser <contact@emersion.fr>
---
 .gitlab-ci.yml               | 14 +++++++-------
 subprojects/edid-decode.wrap |  3 ---
 subprojects/v4l-utils.wrap   |  3 +++
 test/meson.build             |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 subprojects/edid-decode.wrap
 create mode 100644 subprojects/v4l-utils.wrap

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c81c8b..ace1c4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ include:
 # $ git push -f -o ci.variable="FDO_FORCE_REBUILD=1"
 variables:
   FDO_UPSTREAM_REPO: 'emersion/libdisplay-info'
-  FDO_DISTRIBUTION_TAG: '2024-06-07.0'
+  FDO_DISTRIBUTION_TAG: '2024-10-20.0'
 
 workflow:
   rules:
@@ -39,17 +39,17 @@ prepare-container:
   extends: .fdo.container-build@alpine@x86_64
   stage: "Prepare container"
   variables:
-    EDID_DECODE_COMMIT: c6b859d7f0251e2433fb81bd3f67bd2011c2036c
+    EDID_DECODE_COMMIT: f6270b7ce87eed140234db1119890cb90b781ed7
     FDO_BASE_IMAGE: alpine:latest
     FDO_DISTRIBUTION_PACKAGES: |
       build-base clang compiler-rt meson make git gcovr py3-pygments go hwdata
     FDO_DISTRIBUTION_EXEC: |
-      grep $EDID_DECODE_COMMIT ./subprojects/edid-decode.wrap >/dev/null || \
-        (echo "Keep edid-decode.wrap and CI in sync!" && exit 1)
-      git clone git://linuxtv.org/edid-decode.git
-      cd edid-decode
+      grep $EDID_DECODE_COMMIT ./subprojects/v4l-utils.wrap >/dev/null || \
+        (echo "Keep v4l-utils.wrap and CI in sync!" && exit 1)
+      git clone https://git.linuxtv.org/v4l-utils.git
+      cd v4l-utils
       git checkout $EDID_DECODE_COMMIT
-      meson setup build/
+      meson setup build/ -Dauto_features=disabled
       ninja -C build/
       ninja -C build/ install
       cd ..
diff --git a/subprojects/edid-decode.wrap b/subprojects/edid-decode.wrap
deleted file mode 100644
index 4ba5132..0000000
--- a/subprojects/edid-decode.wrap
+++ /dev/null
@@ -1,3 +0,0 @@
-[wrap-git]
-url = https://git.linuxtv.org/edid-decode.git
-revision = c6b859d7f0251e2433fb81bd3f67bd2011c2036c
diff --git a/subprojects/v4l-utils.wrap b/subprojects/v4l-utils.wrap
new file mode 100644
index 0000000..ed2d47c
--- /dev/null
+++ b/subprojects/v4l-utils.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://git.linuxtv.org/v4l-utils.git
+revision = f6270b7ce87eed140234db1119890cb90b781ed7
diff --git a/test/meson.build b/test/meson.build
index a1e7914..4b7b6b4 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -64,7 +64,7 @@ foreach tc : test_cases
 	gen_targets += files('data/' + tc + '.edid')
 endforeach
 
-subproject('edid-decode', required: false)
+subproject('v4l-utils', required: false)
 ref_edid_decode = find_program('edid-decode', native: true, required: false)
 if ref_edid_decode.found()
 	test_env += 'REF_EDID_DECODE=' + ref_edid_decode.full_path()