cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix from upstream instead of a local revert

Browse Source
This commit is contained in:
jasper 2018-04-26 14:40:52 +00:00
parent f9533b75c0
commit d551a9b7ef
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
x11/gnome/mutter/patches/patch-configure_ac
View File

@ -1,31 +1,21 @@
$OpenBSD: patch-configure_ac,v 1.4 2018/04/26 09:19:27 jasper Exp $ $OpenBSD: patch-configure_ac,v 1.5 2018/04/26 14:40:52 jasper Exp $
Revert: https://github.com/GNOME/mutter/commit/b096c0ac334f8e92dce730ba02e99fa4f174af5e#diff-67e997bcfdac55191033d57a16d1408a https://gitlab.gnome.org/GNOME/mutter/merge_requests/96
Index: configure.ac Index: configure.ac
--- configure.ac.orig --- configure.ac.orig
+++ configure.ac +++ configure.ac
@@ -262,22 +262,7 @@ AC_SUBST(XWAYLAND_PATH) @@ -270,12 +270,9 @@ fi
PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES) PKG_CHECK_MODULES(SYSTEMD, [libsystemd], [have_systemd=yes], [have_systemd=no])
-PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
-
-if test x$have_elogind = xyes; then
- logind_provider="libelogind"
-fi
-
-PKG_CHECK_MODULES(SYSTEMD, [libsystemd], [have_systemd=yes], [have_systemd=no])
-
-if test x$have_systemd = xyes; then -if test x$have_systemd = xyes; then
- logind_provider="libsystemd" +if test x$have_systemd = xyes -o test -z "$logind_provider"; then
-fi logind_provider="libsystemd"
fi
- -
-AS_IF([test -z "$logind_provider"], -AS_IF([test -z "$logind_provider"],
- AC_MSG_ERROR([Could not find either systemd or elogind as logind provider])]) - AC_MSG_ERROR([Could not find either systemd or elogind as logind provider])])
-
-MUTTER_NATIVE_BACKEND_MODULES="libdrm $logind_provider libinput >= 1.4 gudev-1.0 gbm >= 10.3"
+MUTTER_NATIVE_BACKEND_MODULES="libdrm >= 2.4.83 libsystemd libinput >= 1.4 gudev-1.0 gbm >= 17.1"
AC_ARG_ENABLE(native-backend, MUTTER_NATIVE_BACKEND_MODULES="libdrm $logind_provider libinput >= 1.4 gudev-1.0 gbm >= 10.3"
AS_HELP_STRING([--disable-native-backend], [disable mutter native (KMS) backend]),,