On Sun, Jul 16 2023, Robert Nagy <rob...@openbsd.org> wrote:
> Hi
>
> I think we should look into fixing libv4l because at one point
> we plan to enable libudev-openbsd port.
I think Matthieu's diff is one way to do it, there's no easy button to
push to disable udev in libv4l.
> On 15/07/23 20:26 +0200, Matthieu Herrb wrote:
>> Hi,
>>
>> For my wlroots/sway work I have sysutils/libudev-openbsd installed as
>> a dependecy. This breaks multimedia/libv4l (which is needed as
>> dependency for ffmpeg, which is a run-dependency for wlroots).
>>
>> The patch below is a way to fix this. Comments, ok ?
No need for the REVISION bump IMO but ok jca@ anyway.
>> Index: Makefile
>> ===================================================================
>> RCS file: /local/cvs/ports/multimedia/libv4l/Makefile,v
>> retrieving revision 1.30
>> diff -u -p -u -r1.30 Makefile
>> --- Makefile 3 Mar 2023 11:42:45 -0000 1.30
>> +++ Makefile 15 Jul 2023 18:24:16 -0000
>> @@ -3,7 +3,7 @@ COMMENT = libv4l userspace library
>> VERSION = 1.20.0
>> DISTNAME = v4l-utils-${VERSION}
>> PKGNAME = libv4l-${VERSION}
>> -REVISION = 3
>> +REVISION = 4
>>
>> SHARED_LIBS += v4l1 0.0 # 0.0
>> SHARED_LIBS += v4l2 0.0 # 0.0
>> Index: patches/patch-configure_ac
>> ===================================================================
>> RCS file: patches/patch-configure_ac
>> diff -N patches/patch-configure_ac
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-configure_ac 15 Jul 2023 18:24:16 -0000
>> @@ -0,0 +1,16 @@
>> +Ignore libudev-openbsd if present
>> +
>> +Index: configure.ac
>> +--- configure.ac.orig
>> ++++ configure.ac
>> +@@ -291,8 +291,8 @@ else
>> + AC_MSG_WARN(ALSA library not available)
>> + fi
>> +
>> +-PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no)
>> +-if test "x$have_libudev" = "xyes"; then
>> ++# PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no)
>> ++if /bin/false; then
>> + AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev])
>> + LIBUDEV_CFLAGS="$libudev_CFLAGS"
>> + LIBUDEV_LIBS="$libudev_LIBS"
>>
>> --
>> Matthieu Herrb
>>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
