[SCM] vlc/master: Backport patch from upstream to the fix build failures on kfreebsd.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 64333b95aff3e916dc42d2cf80a77e056b824939
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sun Feb 26 00:35:41 2012 +0100

    Backport patch from upstream to the fix build failures on kfreebsd.
    
    Closes: #660935

diff --git a/debian/patches/bp-monotonic-clock.patch b/debian/patches/bp-monotonic-clock.patch
new file mode 100644
index 0000000..b9a2ae7
--- /dev/null
+++ b/debian/patches/bp-monotonic-clock.patch
@@ -0,0 +1,43 @@
+From: Rémi Denis-Courmont <remi at remlab.net>
+Subject: Do not use the monotonic clock if CS is missing
+ This can happen on some POSIX.2001 systems.
+Origin: upstream, http://git.videolan.org/?p=vlc/vlc-2.0.git;a=commitdiff;h=77bcce1ef1ac4627fa632825fa3718081117f3a1
+Bug-Debian: http://bugs.debian.org/660935
+
+--- a/src/posix/thread.c
++++ b/src/posix/thread.c
+@@ -76,11 +76,11 @@
+ #if (_POSIX_TIMERS > 0)
+ static unsigned vlc_clock_prec;
+ 
+-# if (_POSIX_MONOTONIC_CLOCK > 0)
++# if (_POSIX_MONOTONIC_CLOCK > 0) && (_POSIX_CLOCK_SELECTION > 0)
+ /* Compile-time POSIX monotonic clock support */
+ #  define vlc_clock_id (CLOCK_MONOTONIC)
+ 
+-# elif (_POSIX_MONOTONIC_CLOCK == 0)
++# elif (_POSIX_MONOTONIC_CLOCK == 0) && (_POSIX_CLOCK_SELECTION > 0)
+ /* Run-time POSIX monotonic clock support (see clock_setup() below) */
+ static clockid_t vlc_clock_id;
+ 
+@@ -450,20 +450,6 @@
+ int vlc_cond_timedwait (vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex,
+                         mtime_t deadline)
+ {
+-#if (_POSIX_MONOTONIC_CLOCK > 0) && (_POSIX_CLOCK_SELECTION < 0)
+-    /* Without clock selection, the real-time clock is used for the absolute
+-     * timeout in pthread_cond_timedwait(). We may need to adjust. */
+-# error FIXME: breaks vlc_cond_init_daytime()
+-    if (vlc_clock_id != CLOCK_REALTIME)
+-    {
+-        struct timeval tv;
+-
+-        deadline -= mdate ();
+-        gettimeofday (&tv, NULL);
+-        deadline += tv.tv_sec * UINT64_C(1000000) + tv.tv_usec;
+-    }
+-#endif
+-
+     struct timespec ts = mtime_to_ts (deadline);
+     int val = pthread_cond_timedwait (p_condvar, p_mutex, &ts);
+     if (val != ETIMEDOUT)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..937aa9b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+bp-monotonic-clock.patch

-- 
VLC media player packaging