Hello,
These patches allow xf86-video-ati to build (tested on generic/i686).
diff -Nur udev-136-original//udev/lib/libudev.h udev-136/udev/lib/libudev.h
--- udev-136-original//udev/lib/libudev.h 2010-08-02 08:35:40.000000000 +0000
+++ udev-136/udev/lib/libudev.h 2010-08-02 08:40:13.000000000 +0000
@@ -24,6 +24,8 @@
#include <sys/types.h>
#include <sys/stat.h>
+#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
+
/* this will stay as long as the DeviceKit integration of udev is work in progress */
#if !defined _LIBUDEV_COMPILATION && !defined LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
#error "#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE is needed to use this experimental library version"
diff -Nur udev-136-original//udev/lib/libudev.h~ udev-136/udev/lib/libudev.h~
--- udev-136-original//udev/lib/libudev.h~ 1970-01-01 00:00:00.000000000 +0000
+++ udev-136/udev/lib/libudev.h~ 2009-01-05 23:12:11.000000000 +0000
@@ -0,0 +1,125 @@
+/*
+ * libudev - interface to udev device information
+ *
+ * Copyright (C) 2008 Kay Sievers <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _LIBUDEV_H_
+#define _LIBUDEV_H_
+
+#include <stdarg.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+/* this will stay as long as the DeviceKit integration of udev is work in progress */
+#if !defined _LIBUDEV_COMPILATION && !defined LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
+#error "#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE is needed to use this experimental library version"
+#endif
+
+/* library context */
+struct udev;
+extern struct udev *udev_new(void);
+extern struct udev *udev_ref(struct udev *udev);
+extern void udev_unref(struct udev *udev);
+extern void udev_set_log_fn(struct udev *udev,
+ void (*log_fn)(struct udev *udev,
+ int priority, const char *file, int line, const char *fn,
+ const char *format, va_list args));
+extern int udev_get_log_priority(struct udev *udev);
+extern void udev_set_log_priority(struct udev *udev, int priority);
+extern const char *udev_get_sys_path(struct udev *udev);
+extern const char *udev_get_dev_path(struct udev *udev);
+extern void *udev_get_userdata(struct udev *udev);
+extern void udev_set_userdata(struct udev *udev, void *userdata);
+
+/* list iteration */
+struct udev_list_entry;
+extern struct udev_list_entry *udev_list_entry_get_next(struct udev_list_entry *list_entry);
+extern struct udev_list_entry *udev_list_entry_get_by_name(struct udev_list_entry *list_entry, const char *name);
+extern const char *udev_list_entry_get_name(struct udev_list_entry *list_entry);
+extern const char *udev_list_entry_get_value(struct udev_list_entry *list_entry);
+#define udev_list_entry_foreach(entry, first) \
+ for (entry = first; \
+ entry != NULL; \
+ entry = udev_list_entry_get_next(entry))
+
+/* sys devices */
+struct udev_device;
+extern struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *syspath);
+extern struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, dev_t devnum);
+extern struct udev_device *udev_device_new_from_subsystem_sysname(struct udev *udev, const char *subsystem, const char *sysname);
+extern struct udev_device *udev_device_get_parent(struct udev_device *udev_device);
+extern struct udev_device *udev_device_get_parent_with_subsystem_devtype(struct udev_device *udev_device, const char *subsystem, const char *devtype);
+extern struct udev_device *udev_device_ref(struct udev_device *udev_device);
+extern void udev_device_unref(struct udev_device *udev_device);
+extern struct udev *udev_device_get_udev(struct udev_device *udev_device);
+extern const char *udev_device_get_devpath(struct udev_device *udev_device);
+extern const char *udev_device_get_subsystem(struct udev_device *udev_device);
+extern const char *udev_device_get_devtype(struct udev_device *udev_device);
+extern const char *udev_device_get_syspath(struct udev_device *udev_device);
+extern const char *udev_device_get_sysname(struct udev_device *udev_device);
+extern const char *udev_device_get_sysnum(struct udev_device *udev_device);
+extern const char *udev_device_get_devnode(struct udev_device *udev_device);
+extern struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device);
+extern struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device);
+extern const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key);
+extern const char *udev_device_get_driver(struct udev_device *udev_device);
+extern dev_t udev_device_get_devnum(struct udev_device *udev_device);
+extern const char *udev_device_get_action(struct udev_device *udev_device);
+extern unsigned long long int udev_device_get_seqnum(struct udev_device *udev_device);
+extern const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr);
+
+/* udev and kernel device events */
+struct udev_monitor;
+extern struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path);
+extern struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev);
+extern int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor);
+extern struct udev_monitor *udev_monitor_ref(struct udev_monitor *udev_monitor);
+extern void udev_monitor_unref(struct udev_monitor *udev_monitor);
+extern struct udev *udev_monitor_get_udev(struct udev_monitor *udev_monitor);
+extern int udev_monitor_get_fd(struct udev_monitor *udev_monitor);
+extern struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monitor);
+
+/* sys enumeration */
+struct udev_enumerate;
+extern struct udev_enumerate *udev_enumerate_new(struct udev *udev);
+extern struct udev_enumerate *udev_enumerate_ref(struct udev_enumerate *udev_enumerate);
+extern void udev_enumerate_unref(struct udev_enumerate *udev_enumerate);
+extern struct udev *udev_enumerate_get_udev(struct udev_enumerate *udev_enumerate);
+extern int udev_enumerate_add_match_subsystem(struct udev_enumerate *udev_enumerate, const char *subsystem);
+extern int udev_enumerate_add_nomatch_subsystem(struct udev_enumerate *udev_enumerate, const char *subsystem);
+extern int udev_enumerate_add_match_sysattr(struct udev_enumerate *udev_enumerate, const char *sysattr, const char *value);
+extern int udev_enumerate_add_nomatch_sysattr(struct udev_enumerate *udev_enumerate, const char *sysattr, const char *value);
+extern int udev_enumerate_add_match_property(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
+extern int udev_enumerate_add_syspath(struct udev_enumerate *udev_enumerate, const char *syspath);
+extern int udev_enumerate_scan_devices(struct udev_enumerate *udev_enumerate);
+extern int udev_enumerate_scan_subsystems(struct udev_enumerate *udev_enumerate);
+extern struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enumerate *udev_enumerate);
+
+/* event queue */
+struct udev_queue;
+extern struct udev_queue *udev_queue_new(struct udev *udev);
+extern struct udev_queue *udev_queue_ref(struct udev_queue *udev_queue);
+extern void udev_queue_unref(struct udev_queue *udev_queue);
+extern struct udev *udev_queue_get_udev(struct udev_queue *udev_queue);
+extern unsigned long long int udev_queue_get_kernel_seqnum(struct udev_queue *udev_queue);
+extern unsigned long long int udev_queue_get_udev_seqnum(struct udev_queue *udev_queue);
+extern int udev_queue_get_udev_is_active(struct udev_queue *udev_queue);
+extern int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue);
+extern int udev_queue_get_seqnum_is_finished(struct udev_queue *udev_queue, unsigned long long int seqnum);
+extern struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev_queue);
+extern struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev_queue);
+#endif
diff -Nur xf86-video-ati-6.13.1.original//src/drmmode_display.c xf86-video-ati-6.13.1//src/drmmode_display.c
--- xf86-video-ati-6.13.1.original//src/drmmode_display.c 2010-08-02 07:59:12.000000000 +0000
+++ xf86-video-ati-6.13.1//src/drmmode_display.c 2010-08-02 08:00:53.000000000 +0000
@@ -1430,7 +1430,7 @@
u = udev_new();
if (!u)
return;
- mon = udev_monitor_new_from_netlink(u, "udev");
+ mon = udev_monitor_new_from_netlink(u);
if (!mon) {
udev_unref(u);
return;
The api-... patch is for udev, the other for xf86-video-ati.
Cheers,
Roger
-----------------------------------------------------------
If you wish to unsubscribe from this mailing, send mail to
[email protected] with a subject of: unsubscribe t2
