Re: prevent from using libudev if present
On Mon Nov 06, 2023 at 09:18:45AM +0100, Landry Breuil wrote: > Le Mon, Nov 06, 2023 at 09:08:20AM +0100, Matthieu Herrb a écrit : > > On Sun, Nov 05, 2023 at 11:29:13AM +0100, Rafael Sadowski wrote: > > > Here is a diff that deactivate libudev detection in dvdstyler and add a > > > comment in libudev-openbsd. > > > > > > The list should then be complete, just like the list for libinput in > > > wayland/libinput-openbsd. All consumers should now be patched. > > > > > > Comments, OK? > > > > I'm ok with this for now. > > i'm just not fully sure _all_ ports that might detect libudev/libinput > have been patched. rafael, where does the list come from ? if that's > from a grep tb@ did, iirc that just matched autoconf ports, ie not > cmake/meson/other build systems.. > Yes this list comes form tb@. If someone wants to give me a bigger aka more complete list. I will gladly do the work! As already mentioned on hackers@ I checked: https://www.freshports.org/x11-servers/xwayland/ https://www.freshports.org/x11/libinput/ but nor yet: https://www.freshports.org/devel/libudev-devd/ Rafael
Re: prevent from using libudev if present
On Mon Nov 06, 2023 at 09:40:10AM +0100, Antoine Jacoutot wrote: > > I agree. > Speaking about it, maybe those ports that are now more widely used (libinotify > comes to mind) could be move to a regular installation PREFIX? > It's a different discussion but YES I would very much welcome that for libinotify! Rafael
Re: prevent from using libudev if present
On Mon, Nov 06, 2023 at 09:18:45AM +0100, Landry Breuil wrote: > Le Mon, Nov 06, 2023 at 09:08:20AM +0100, Matthieu Herrb a écrit : > > On Sun, Nov 05, 2023 at 11:29:13AM +0100, Rafael Sadowski wrote: > > > Here is a diff that deactivate libudev detection in dvdstyler and add a > > > comment in libudev-openbsd. > > > > > > The list should then be complete, just like the list for libinput in > > > wayland/libinput-openbsd. All consumers should now be patched. > > > > > > Comments, OK? > > > > I'm ok with this for now. > > i'm just not fully sure _all_ ports that might detect libudev/libinput > have been patched. rafael, where does the list come from ? if that's > from a grep tb@ did, iirc that just matched autoconf ports, ie not > cmake/meson/other build systems.. > > as advised in another related thread, i'm not sure putting > libudev/libinput under a different path as like is done with inotify is > a good idea, it's sometimes a pain to deal with, triggers > port-lib-depends-check warnings that confuse ports newcomers, and feels > like gratuitous self-inflicted pain. I agree. Speaking about it, maybe those ports that are now more widely used (libinotify comes to mind) could be move to a regular installation PREFIX? -- Antoine
Re: prevent from using libudev if present
Le Mon, Nov 06, 2023 at 09:08:20AM +0100, Matthieu Herrb a écrit : > On Sun, Nov 05, 2023 at 11:29:13AM +0100, Rafael Sadowski wrote: > > Here is a diff that deactivate libudev detection in dvdstyler and add a > > comment in libudev-openbsd. > > > > The list should then be complete, just like the list for libinput in > > wayland/libinput-openbsd. All consumers should now be patched. > > > > Comments, OK? > > I'm ok with this for now. i'm just not fully sure _all_ ports that might detect libudev/libinput have been patched. rafael, where does the list come from ? if that's from a grep tb@ did, iirc that just matched autoconf ports, ie not cmake/meson/other build systems.. as advised in another related thread, i'm not sure putting libudev/libinput under a different path as like is done with inotify is a good idea, it's sometimes a pain to deal with, triggers port-lib-depends-check warnings that confuse ports newcomers, and feels like gratuitous self-inflicted pain. > Under X on OpenBSD nothing should to use libinput or libudev for input > handling. It's not going to work since X is reading directly from > wscons devices and not though libinput, and I've no plans to change > that. agreed, maybe that should go in a comment in the libinput/libudev ports so that ppl stumbling on it understand they shouldnt add a dependency without a good reason ?
Re: prevent from using libudev if present
On Sun, Nov 05, 2023 at 11:29:13AM +0100, Rafael Sadowski wrote:
> Here is a diff that deactivate libudev detection in dvdstyler and add a
> comment in libudev-openbsd.
>
> The list should then be complete, just like the list for libinput in
> wayland/libinput-openbsd. All consumers should now be patched.
>
> Comments, OK?
I'm ok with this for now.
Under X on OpenBSD nothing should to use libinput or libudev for input
handling. It's not going to work since X is reading directly from
wscons devices and not though libinput, and I've no plans to change
that.
Whether these ports need to have that support to run under Wayland
still needs to be analyzed. In the list below only consolekit looks to
me like a candidate where this may be needed. Hopefully We'll look at
this in Coimbra later this week.
>
> Rafael
>
>
> Index: sysutils/libudev-openbsd/Makefile
> ===
> RCS file: /cvs/ports/sysutils/libudev-openbsd/Makefile,v
> diff -u -p -r1.3 Makefile
> --- sysutils/libudev-openbsd/Makefile 21 Sep 2023 10:56:41 - 1.3
> +++ sysutils/libudev-openbsd/Makefile 5 Nov 2023 20:16:24 -
> @@ -1,3 +1,11 @@
> +# XXX
> +# The libudev detection has been deactivated in the following ports:
> +# x11/tigervnc
> +# devel/openmpi
> +# sysutils/consolekit
> +# multimedia/libv4l
> +# multimedia/dvdstyler
> +
> COMMENT =library to access udev device information
>
> VERSION =20230921
> Index: multimedia/dvdstyler/Makefile
> ===
> RCS file: /cvs/ports/multimedia/dvdstyler/Makefile,v
> diff -u -p -r1.51 Makefile
> --- multimedia/dvdstyler/Makefile 27 Sep 2023 10:10:19 - 1.51
> +++ multimedia/dvdstyler/Makefile 5 Nov 2023 20:16:24 -
> @@ -2,7 +2,7 @@ COMMENT= DVD authoring application
>
> DISTNAME=DVDStyler-3.2.1
> PKGNAME= ${DISTNAME:L}
> -REVISION=0
> +REVISION=1
> CATEGORIES= multimedia
> SITES= ${SITE_SOURCEFORGE:=dvdstyler/}
> EXTRACT_SUFX=.tar.bz2
> Index: multimedia/dvdstyler/patches/patch-configure
> ===
> RCS file: multimedia/dvdstyler/patches/patch-configure
> diff -N multimedia/dvdstyler/patches/patch-configure
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ multimedia/dvdstyler/patches/patch-configure 5 Nov 2023 20:16:24
> -
> @@ -0,0 +1,85 @@
> +Index: configure
> +--- configure.orig
> configure
> +@@ -7492,81 +7492,6 @@ fi
> + CXXFLAGS="$CXXFLAGS $FONTCONFIG_CFLAGS"
> + LIBS="$LIBS $FONTCONFIG_LIBS"
> +
> +-
> +-pkg_failed=no
> +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libudev" >&5
> +-$as_echo_n "checking for libudev... " >&6; }
> +-
> +-if test -n "$LIBUDEV_CFLAGS"; then
> +-pkg_cv_LIBUDEV_CFLAGS="$LIBUDEV_CFLAGS"
> +- elif test -n "$PKG_CONFIG"; then
> +-if test -n "$PKG_CONFIG" && \
> +-{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
> --print-errors \"libudev\""; } >&5
> +- ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
> +- ac_status=$?
> +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> +- test $ac_status = 0; }; then
> +- pkg_cv_LIBUDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev" 2>/dev/null`
> +- test "x$?" != "x0" && pkg_failed=yes
> +-else
> +- pkg_failed=yes
> +-fi
> +- else
> +-pkg_failed=untried
> +-fi
> +-if test -n "$LIBUDEV_LIBS"; then
> +-pkg_cv_LIBUDEV_LIBS="$LIBUDEV_LIBS"
> +- elif test -n "$PKG_CONFIG"; then
> +-if test -n "$PKG_CONFIG" && \
> +-{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
> --print-errors \"libudev\""; } >&5
> +- ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
> +- ac_status=$?
> +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> +- test $ac_status = 0; }; then
> +- pkg_cv_LIBUDEV_LIBS=`$PKG_CONFIG --libs "libudev" 2>/dev/null`
> +- test "x$?" != "x0" && pkg_failed=yes
> +-else
> +- pkg_failed=yes
> +-fi
> +- else
> +-pkg_failed=untried
> +-fi
> +-
> +-
> +-
> +-if test $pkg_failed = yes; then
> +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +-$as_echo "no" >&6; }
> +-
> +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
> +-_pkg_short_errors_supported=yes
> +-else
> +-_pkg_short_errors_supported=no
> +-fi
> +-if test $_pkg_short_errors_supported = yes; then
> +-LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
> --cflags --libs "libudev" 2>&1`
> +-else
> +-LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
> "libudev" 2>&1`
> +-fi
> +-# Put the nasty error message in config.log where it belongs
> +-echo "$LIBUDEV_PKG_ERRORS" >&5
> +-
> +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libudev will not be
> used to get
prevent from using libudev if present
Here is a diff that deactivate libudev detection in dvdstyler and add a
comment in libudev-openbsd.
The list should then be complete, just like the list for libinput in
wayland/libinput-openbsd. All consumers should now be patched.
Comments, OK?
Rafael
Index: sysutils/libudev-openbsd/Makefile
===
RCS file: /cvs/ports/sysutils/libudev-openbsd/Makefile,v
diff -u -p -r1.3 Makefile
--- sysutils/libudev-openbsd/Makefile 21 Sep 2023 10:56:41 - 1.3
+++ sysutils/libudev-openbsd/Makefile 5 Nov 2023 20:16:24 -
@@ -1,3 +1,11 @@
+# XXX
+# The libudev detection has been deactivated in the following ports:
+# x11/tigervnc
+# devel/openmpi
+# sysutils/consolekit
+# multimedia/libv4l
+# multimedia/dvdstyler
+
COMMENT = library to access udev device information
VERSION = 20230921
Index: multimedia/dvdstyler/Makefile
===
RCS file: /cvs/ports/multimedia/dvdstyler/Makefile,v
diff -u -p -r1.51 Makefile
--- multimedia/dvdstyler/Makefile 27 Sep 2023 10:10:19 - 1.51
+++ multimedia/dvdstyler/Makefile 5 Nov 2023 20:16:24 -
@@ -2,7 +2,7 @@ COMMENT=DVD authoring application
DISTNAME= DVDStyler-3.2.1
PKGNAME= ${DISTNAME:L}
-REVISION= 0
+REVISION= 1
CATEGORIES=multimedia
SITES= ${SITE_SOURCEFORGE:=dvdstyler/}
EXTRACT_SUFX= .tar.bz2
Index: multimedia/dvdstyler/patches/patch-configure
===
RCS file: multimedia/dvdstyler/patches/patch-configure
diff -N multimedia/dvdstyler/patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ multimedia/dvdstyler/patches/patch-configure5 Nov 2023 20:16:24
-
@@ -0,0 +1,85 @@
+Index: configure
+--- configure.orig
configure
+@@ -7492,81 +7492,6 @@ fi
+ CXXFLAGS="$CXXFLAGS $FONTCONFIG_CFLAGS"
+ LIBS="$LIBS $FONTCONFIG_LIBS"
+
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libudev" >&5
+-$as_echo_n "checking for libudev... " >&6; }
+-
+-if test -n "$LIBUDEV_CFLAGS"; then
+-pkg_cv_LIBUDEV_CFLAGS="$LIBUDEV_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-if test -n "$PKG_CONFIG" && \
+-{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libudev\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_LIBUDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev" 2>/dev/null`
+-test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+-pkg_failed=untried
+-fi
+-if test -n "$LIBUDEV_LIBS"; then
+-pkg_cv_LIBUDEV_LIBS="$LIBUDEV_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-if test -n "$PKG_CONFIG" && \
+-{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libudev\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_LIBUDEV_LIBS=`$PKG_CONFIG --libs "libudev" 2>/dev/null`
+-test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+-pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-_pkg_short_errors_supported=yes
+-else
+-_pkg_short_errors_supported=no
+-fi
+-if test $_pkg_short_errors_supported = yes; then
+- LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libudev" 2>&1`
+-else
+- LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libudev" 2>&1`
+-fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$LIBUDEV_PKG_ERRORS" >&5
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libudev will not be
used to get list of devices" >&5
+-$as_echo "$as_me: WARNING: libudev will not be used to get list of devices"
>&2;}
+-elif test $pkg_failed = untried; then
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libudev will not be
used to get list of devices" >&5
+-$as_echo "$as_me: WARNING: libudev will not be used to get list of devices"
>&2;}
+-else
+- LIBUDEV_CFLAGS=$pkg_cv_LIBUDEV_CFLAGS
+- LIBUDEV_LIBS=$pkg_cv_LIBUDEV_LIBS
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- CXXFLAGS="$CXXFLAGS $LIBUDEV_CFLAGS -DHAVE_LIBUDEV";LIBS="$LIBS
$LIBUDEV_LIBS"
+-fi
+-
+-
+ pkg_failed=no
+ { $as_echo
