From 120a00c2e7434d26caa9d72b7c00221d1917cf22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Thu, 7 Feb 2008 12:05:44 +0000
Subject: [PATCH] configure.ac: The dc1394 plugin seems to use API that was
 removed or changed before the final 2.0.0 release, so only ...

Original commit message from CVS:
* configure.ac:
The dc1394 plugin seems to use API that was removed or changed
before the final 2.0.0 release, so only build it if 2.0.0-rc5
is available. Someone needs to port it to the final API.
* ext/dc1394/gstdc1394.c: (gst_dc1394_change_camera_transmission):
Include string.h for memcpy and use g_usleep instead of usleep.
---
 ChangeLog              | 10 ++++++++++
 configure.ac           |  2 +-
 ext/dc1394/gstdc1394.c |  3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a48ee22ba..e0dd4a728a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-07  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* configure.ac:
+	  The dc1394 plugin seems to use API that was removed or changed
+	  before the final 2.0.0 release, so only build it if 2.0.0-rc5
+	  is available. Someone needs to port it to the final API.
+
+	* ext/dc1394/gstdc1394.c: (gst_dc1394_change_camera_transmission):
+	  Include string.h for memcpy and use g_usleep instead of usleep.
+
 2008-02-07  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* gst/filter/gstlpwsinc.c:
diff --git a/configure.ac b/configure.ac
index f5ba905a48..264043de00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -377,7 +377,7 @@ AG_GST_CHECK_FEATURE(CDAUDIO, [cdaudio], cdaudio, [
 dnl *** dc1394  ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_DC1394, true)
 AG_GST_CHECK_FEATURE(DC1394, [libdc1394], dc1394, [
-   PKG_CHECK_MODULES(LIBDC1394, libdc1394-2 >= 2.0.0-rc5, HAVE_DC1394="yes", [
+   PKG_CHECK_MODULES(LIBDC1394, libdc1394-2 == 2.0.0-rc5, HAVE_DC1394="yes", [
         HAVE_DC1394="no"
 	AC_MSG_RESULT(no)
    ])
diff --git a/ext/dc1394/gstdc1394.c b/ext/dc1394/gstdc1394.c
index 9d81f72085..9b55a7c76c 100644
--- a/ext/dc1394/gstdc1394.c
+++ b/ext/dc1394/gstdc1394.c
@@ -42,6 +42,7 @@
 #include "gstdc1394.h"
 #include <sys/time.h>
 #include <time.h>
+#include <string.h>
 
 GST_DEBUG_CATEGORY (dc1394_debug);
 #define GST_CAT_DEFAULT dc1394_debug
@@ -1175,7 +1176,7 @@ gst_dc1394_change_camera_transmission (GstDc1394 * src, gboolean on)
 
     i = 0;
     while (status == DC1394_OFF && i++ < 5) {
-      usleep (50000);
+      g_usleep (50000);
       if (dc1394_video_get_transmission (src->camera,
               &status) != DC1394_SUCCESS) {
         if (status == DC1394_OFF) {