|
 |
474558 |
From 6a807a31b5d762797850948761d66c1ab4fbfd7b Mon Sep 17 00:00:00 2001
|
|
|
e3f29c |
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
|
e3f29c |
Date: Fri, 15 Sep 2017 09:39:18 +0200
|
|
|
e3f29c |
Subject: [PATCH] Revert "build: Require libgudev >= 232"
|
|
|
e3f29c |
|
|
|
e3f29c |
This reverts commit 361bf847af82c7dca097302fe64c575079280c9c.
|
|
|
e3f29c |
---
|
|
|
474558 |
configure.ac | 4 ++--
|
|
|
474558 |
src/backends/native/meta-launcher.c | 2 ++
|
|
|
474558 |
src/backends/native/meta-monitor-manager-kms.c | 3 +++
|
|
|
474558 |
3 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
e3f29c |
|
|
|
e3f29c |
diff --git a/configure.ac b/configure.ac
|
|
|
474558 |
index e6b2bf8..2fde187 100644
|
|
|
e3f29c |
--- a/configure.ac
|
|
|
e3f29c |
+++ b/configure.ac
|
|
|
474558 |
@@ -227,10 +227,10 @@ AC_MSG_CHECKING([gudev])
|
|
|
e3f29c |
if test x$with_gudev = xno ; then
|
|
|
e3f29c |
AC_MSG_RESULT([disabled])
|
|
|
e3f29c |
else
|
|
|
e3f29c |
- if $PKG_CONFIG --exists "gudev-1.0 >= 232"; then
|
|
|
e3f29c |
+ if $PKG_CONFIG --exists gudev-1.0; then
|
|
|
e3f29c |
have_gudev=yes
|
|
|
e3f29c |
AC_MSG_RESULT(yes)
|
|
|
e3f29c |
- MUTTER_PC_MODULES="$MUTTER_PC_MODULES gudev-1.0 >= 232"
|
|
|
e3f29c |
+ MUTTER_PC_MODULES="$MUTTER_PC_MODULES gudev-1.0"
|
|
|
e3f29c |
AC_DEFINE([HAVE_LIBGUDEV], 1, [Building with gudev for device type detection])
|
|
|
e3f29c |
else
|
|
|
e3f29c |
AC_MSG_RESULT(no)
|
|
|
e3f29c |
diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c
|
|
|
474558 |
index 8b066c9..22ea2ad 100644
|
|
|
e3f29c |
--- a/src/backends/native/meta-launcher.c
|
|
|
e3f29c |
+++ b/src/backends/native/meta-launcher.c
|
|
|
474558 |
@@ -46,6 +46,8 @@
|
|
|
474558 |
#include "meta-cursor-renderer-native.h"
|
|
|
474558 |
#include "meta-renderer-native.h"
|
|
|
474558 |
|
|
|
474558 |
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref)
|
|
|
474558 |
+
|
|
|
474558 |
struct _MetaLauncher
|
|
|
474558 |
{
|
|
|
474558 |
Login1Session *session_proxy;
|
|
|
474558 |
diff --git a/src/backends/native/meta-monitor-manager-kms.c b/src/backends/native/meta-monitor-manager-kms.c
|
|
|
474558 |
index 1a2eaec..2a13cdb 100644
|
|
|
474558 |
--- a/src/backends/native/meta-monitor-manager-kms.c
|
|
|
474558 |
+++ b/src/backends/native/meta-monitor-manager-kms.c
|
|
|
474558 |
@@ -52,6 +52,9 @@
|
|
|
e3f29c |
|
|
|
e3f29c |
#define DRM_CARD_UDEV_DEVICE_TYPE "drm_minor"
|
|
|
e3f29c |
|
|
|
e3f29c |
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref)
|
|
|
e3f29c |
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, g_object_unref)
|
|
|
e3f29c |
+
|
|
|
474558 |
typedef struct
|
|
|
e3f29c |
{
|
|
|
474558 |
GSource source;
|
|
|
e3f29c |
--
|
|
|
474558 |
1.8.3.1
|
|
|
e3f29c |
|