summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2009-01-24 17:42:46 -0500
committerKristian Høgsberg <krh@redhat.com>2009-01-24 17:42:46 -0500
commit6ff7c8f0f77a50ad15e198351e54465aa7fd4742 (patch)
tree0ccfd27d702e0f8f36087aedabbad8f492eb7365
parent520625328aeef23487ddf7f6b7bd26912b058e0b (diff)
Depend on udev 136 and use udev_device_get_property_value()
-rw-r--r--configure.ac2
-rw-r--r--eagle.c14
2 files changed, 2 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index 0243253..d91509a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PROG_CC
# FIXME: We should make the x11-dri2 backend optional
PKG_PROG_PKG_CONFIG()
-PKG_CHECK_MODULES(EAGLE, [libdrm dri x11 xfixes xext libudev])
+PKG_CHECK_MODULES(EAGLE, [libdrm dri x11 xfixes xext libudev >= 136])
if test $CC = gcc; then
GCC_CFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes"
diff --git a/eagle.c b/eagle.c
index 989671d..cbf9c06 100644
--- a/eagle.c
+++ b/eagle.c
@@ -223,18 +223,6 @@ eglInitDisplay(EGLDisplay display,
return -1;
}
-static const char *
-get_udev_property(struct udev_device *device, const char *name)
-{
- struct udev_list_entry *entry;
-
- udev_list_entry_foreach(entry, udev_device_get_properties_list_entry(device))
- if (strcmp(udev_list_entry_get_name(entry), name) == 0)
- return udev_list_entry_get_value(entry);
-
- return NULL;
-}
-
struct dri_driver_entry {
uint32_t vendor_id;
uint32_t chip_id;
@@ -260,7 +248,7 @@ eglCreateDisplayNative(struct udev_device *device)
int i;
parent = udev_device_get_parent(device);
- pci_id = get_udev_property(parent, "PCI_ID");
+ pci_id = udev_device_get_property_value(parent, "PCI_ID");
if (sscanf(pci_id, "%x:%x", &vendor_id, &chip_id) != 2)
return NULL;