diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/configure.ac | 9 | ||||
| -rw-r--r-- | gtk/src/callbacks.c | 11 |
2 files changed, 15 insertions, 5 deletions
diff --git a/gtk/configure.ac b/gtk/configure.ac index d2db300c4..94219c32d 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -94,10 +94,15 @@ case $host in mingw_flag=yes ;; *) + case "$host_os" in + linux*) + pkg_gudev="gudev-1.0" + ;; + esac if test "x$gst_disable" = "xyes" ; then - GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gio-2.0 libnotify dbus-glib-1 gudev-1.0" + GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gio-2.0 libnotify dbus-glib-1 $pkg_gudev" else - GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 libnotify dbus-glib-1 gudev-1.0" + GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 libnotify dbus-glib-1 $pkg_gudev" fi mingw_flag=no ;; diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index 5173a6b29..228375f33 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -28,7 +28,9 @@ #if !defined(_WIN32) #include <poll.h> #define G_UDEV_API_IS_SUBJECT_TO_CHANGE 1 +#if defined(__linux__) #include <gudev/gudev.h> +#endif #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> @@ -49,6 +51,9 @@ #endif #include <gdk/gdkx.h> +#ifndef NOTIFY_CHECK_VERSION +#define NOTIFY_CHECK_VERSION(x,y,z) 0 +#endif #else #define WINVER 0x0500 #include <winsock2.h> @@ -3942,14 +3947,14 @@ dvd_device_list() return dvd_devices; } -#if !defined(_WIN32) +#if defined(__linux__) static GUdevClient *udev_ctx = NULL; #endif gboolean ghb_is_cd(GDrive *gd) { -#if !defined(_WIN32) +#if defined(__linux__) gchar *device; GUdevDevice *udd; @@ -3983,7 +3988,7 @@ ghb_is_cd(GDrive *gd) void ghb_udev_init() { -#if !defined(_WIN32) +#if defined(__linux__) udev_ctx = g_udev_client_new(NULL); #endif } |