Skip to contentSkip to conversation

Revert "meson: v4l2grab needs libv4lconvert with fork support enabled"

PATCH New Peter Seiderer 1 participant 2 messages Dec 5, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Revert "meson: v4l2grab needs libv4lconvert with fork support enabled"

This reverts commit 589da519e230e84b3603dddab42561983b1469aa as a less intrusive fix is available (make libv4lconvert helpers depend on fork support, see follow up patch).

---
 contrib/test/meson.build | 2 --
 1 file changed, 2 deletions(-)
contrib/test/meson.build +0 -2
index c1f40354..29b51df6 100644
@@ -25,7 +25,6 @@ sliced_vbi_detect = executable('sliced-vbi-detect',
                                sliced_vbi_detect_sources,
                                include_directories : v4l2_utils_incdir)
 
-if have_fork
 v4l2grab_sources = files(
     'v4l2grab.c',
 
@@ -42,7 +41,6 @@ v4l2grab = executable('v4l2grab',
                       v4l2grab_sources,
                       dependencies : v4l2grab_deps,
                       include_directories : v4l2_utils_incdir)
-endif
 
 driver_test_sources = files(
     'driver-test.c',
Signature · 1 line
2.43.0
#1 lore raw

PATCH 2/2 meson: libv4lconvert helpers need fork support

- libv4lconvert helpers (v4lconvert_helper_decompress, v4lconvert_helper_cleanup, ...) need fork() support, so add additional dependency for HAVE_LIBV4LCONVERT_HELPERS

Fixes:

FAILED: contrib/test/v4l2grab
.../bootlin-armv7m-uclibc/host/bin/arm-linux-gcc -o contrib/test/v4l2grab contrib/test/v4l2grab.p/v4l2grab.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,-elf2flt=-r -static -Wl,--start-group lib/libv4l2/libv4l2.a lib/libv4lconvert/libv4lconvert.a -largp -pthread -ldl -lm -lrt -Wl,--end-group .../bootlin-armv7m-uclibc/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: lib/libv4lconvert/libv4lconvert.a(libv4lconvert.c.o): in function `v4lconvert_destroy':
libv4lconvert.c:(.text+0x5c0): undefined reference to `v4lconvert_helper_cleanup'
.../bootlin-armv7m-uclibc/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: lib/libv4lconvert/libv4lconvert.a(libv4lconvert.c.o): in function `v4lconvert_convert_pixfmt':
libv4lconvert.c:(.text+0x1450): undefined reference to `v4lconvert_helper_decompress'
collect2: error: ld returned 1 exit status

---
 lib/libv4lconvert/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/libv4lconvert/meson.build +1 -1
index 38740755..4bda5671 100644
@@ -91,7 +91,7 @@ if have_fork
                               include_directories : v4l2_utils_incdir)
 endif
 
-if have_visibility
+if have_visibility and have_fork
     libv4lconvert_c_args += [
       '-fvisibility=hidden',
       '-DHAVE_LIBV4LCONVERT_HELPERS',
Signature · 1 line
2.43.0