Miroirs/libdisplay-info
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/emersion/libdisplay-info.git synced 2024-12-25 21:59:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: update edid-decode to new repository

Browse source 
Signed-off-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
Simon Ser 2024-12-20 20:12:46 +01:00
parent 211fa636a3
commit 6879d24379
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.gitlab-ci.yml
View file

@ -11,7 +11,7 @@ include:
# $ git push -f -o ci.variable="FDO_FORCE_REBUILD=1" # $ git push -f -o ci.variable="FDO_FORCE_REBUILD=1"
variables: variables:
FDO_UPSTREAM_REPO: 'emersion/libdisplay-info' FDO_UPSTREAM_REPO: 'emersion/libdisplay-info'
FDO_DISTRIBUTION_TAG: '2024-06-07.0' FDO_DISTRIBUTION_TAG: '2024-10-20.0'
workflow: workflow:
rules: rules:
@ -39,17 +39,17 @@ prepare-container:
extends: .fdo.container-build@alpine@x86_64 extends: .fdo.container-build@alpine@x86_64
stage: "Prepare container" stage: "Prepare container"
variables: variables:
EDID_DECODE_COMMIT: c6b859d7f0251e2433fb81bd3f67bd2011c2036c EDID_DECODE_COMMIT: f6270b7ce87eed140234db1119890cb90b781ed7
FDO_BASE_IMAGE: alpine:latest FDO_BASE_IMAGE: alpine:latest
FDO_DISTRIBUTION_PACKAGES: | FDO_DISTRIBUTION_PACKAGES: |
build-base clang compiler-rt meson make git gcovr py3-pygments go hwdata build-base clang compiler-rt meson make git gcovr py3-pygments go hwdata
FDO_DISTRIBUTION_EXEC: | FDO_DISTRIBUTION_EXEC: |
grep $EDID_DECODE_COMMIT ./subprojects/edid-decode.wrap >/dev/null || \ grep $EDID_DECODE_COMMIT ./subprojects/v4l-utils.wrap >/dev/null || \
(echo "Keep edid-decode.wrap and CI in sync!" && exit 1) (echo "Keep v4l-utils.wrap and CI in sync!" && exit 1)
git clone git://linuxtv.org/edid-decode.git git clone https://git.linuxtv.org/v4l-utils.git
cd edid-decode cd v4l-utils
git checkout $EDID_DECODE_COMMIT git checkout $EDID_DECODE_COMMIT
meson setup build/ meson setup build/ -Dauto_features=disabled
ninja -C build/ ninja -C build/
ninja -C build/ install ninja -C build/ install
cd .. cd ..

3
subprojects/edid-decode.wrap
View file

@ -1,3 +0,0 @@
[wrap-git]
url = https://git.linuxtv.org/edid-decode.git
revision = c6b859d7f0251e2433fb81bd3f67bd2011c2036c

3
subprojects/v4l-utils.wrap Normal file
View file

@ -0,0 +1,3 @@
[wrap-git]
url = https://git.linuxtv.org/v4l-utils.git
revision = f6270b7ce87eed140234db1119890cb90b781ed7

2
test/meson.build
View file

@ -64,7 +64,7 @@ foreach tc : test_cases
gen_targets += files('data/' + tc + '.edid') gen_targets += files('data/' + tc + '.edid')
endforeach endforeach
subproject('edid-decode', required: false) subproject('v4l-utils', required: false)
ref_edid_decode = find_program('edid-decode', native: true, required: false) ref_edid_decode = find_program('edid-decode', native: true, required: false)
if ref_edid_decode.found() if ref_edid_decode.found()
test_env += 'REF_EDID_DECODE=' + ref_edid_decode.full_path() test_env += 'REF_EDID_DECODE=' + ref_edid_decode.full_path()