Index | Thread | Search

From:
Antoine Jacoutot <ajacoutot@bsdfrog.org>
Subject:
Re: fix libei build when libevdev-openbsd is installed
To:
Matthieu Herrb <matthieu@openbsd.org>
Cc:
ports@openbsd.org
Date:
Sun, 14 Jan 2024 19:50:28 +0100

Download raw body.

Thread
On Sun, Jan 14, 2024 at 06:52:54PM +0100, Matthieu Herrb wrote:
> It detects libevdev.pc  and activates the build of eis_demo_server,
> which fails because libevdev-openbsd is not a full libevedev
> implementation.
> 
> No REVISION bump as the package doesn't change if it builds.
> 
> ok ?

Maybe replacing dep_libevdev with:
dep_libevdev = []
in meson.build is enough?


> 
> Index: patches/patch-tools_meson_build
> ===================================================================
> RCS file: patches/patch-tools_meson_build
> diff -N patches/patch-tools_meson_build
> --- /dev/null	1 Jan 1970 00:00:00 -0000
> +++ patches/patch-tools_meson_build	14 Jan 2024 17:50:20 -0000
> @@ -0,0 +1,32 @@
> +Disable build of eis_demo_server. Fails with libevdev-openbsd installed.
> +
> +Index: tools/meson.build
> +--- tools/meson.build.orig
> ++++ tools/meson.build
> +@@ -7,16 +7,16 @@ if dep_libevdev.found()
> +     )
> + endif
> + 
> +-eis_demo_server = executable('eis-demo-server',
> +-           src_eis_demo_server,
> +-           dependencies: [
> +-               dep_libutil,
> +-               dep_libeis,
> +-               dep_libxkbcommon,
> +-               dep_libevdev
> +-           ],
> +-           include_directories: [inc_builddir],
> +-)
> ++#eis_demo_server = executable('eis-demo-server',
> ++#           src_eis_demo_server,
> ++#           dependencies: [
> ++#               dep_libutil,
> ++#               dep_libeis,
> ++#               dep_libxkbcommon,
> ++#               dep_libevdev
> ++#           ],
> ++#           include_directories: [inc_builddir],
> ++#)
> + 
> + executable('ei-demo-client',
> +            'ei-demo-client.c',
> 
> -- 
> Matthieu Herrb
> 

-- 
Antoine