[SCM] vlc/master: Fix FTBFS on hurd. (Closes: #742183)

[mati75-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 37b95f4d6093ac966e3f7529651f8f8a409b65ae
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Mon May 19 15:35:44 2014 +0200

    Fix FTBFS on hurd. (Closes: #742183)

diff --git a/debian/changelog b/debian/changelog
index 79df803..388db66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vlc (2.1.4-2) UNRELEASED; urgency=medium
+
+  * Fix FTBFS on hurd. (Closes: #742183)
+
+ -- Mateusz Łukasik <mati75 at linuxmint.pl>  Mon, 19 May 2014 13:56:41 +0200
+
 vlc (2.1.4-1) unstable; urgency=medium
 
   * New upstream release (Closes: #742625, LP: #1276650)
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
new file mode 100644
index 0000000..b57ef69
--- /dev/null
+++ b/debian/patches/hurd.patch
@@ -0,0 +1,40 @@
+Description: Fix FTBFS on GNU/Hurd
+ On Hurd, due to a missing implementation _POSIX_TIMERS = 0,
+ _POSIX_MONOTONIC_CLOCK [0] and _POSIX_CLOCK_SELECTION = 200809L. Such
+ combination is considered non POSIX-compliant by vlc upstream which
+ don't accept patches to workaround it. More info at [1,2].
+ .
+ [0] http://anonscm.debian.org/viewvc/pkg-glibc/glibc-package/trunk/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff?revision=5951&view=markup
+ [1] https://lists.debian.org/debian-hurd/2014/02/msg00112.html
+ [2] https://lists.debian.org/debian-hurd/2014/02/msg00118.html
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+Forwarded: not-needed
+--- a/src/posix/thread.c
++++ b/src/posix/thread.c
+@@ -327,7 +327,7 @@ void vlc_cond_init (vlc_cond_t *p_condva
+ 
+     if (unlikely(pthread_condattr_init (&attr)))
+         abort ();
+-#if (_POSIX_CLOCK_SELECTION > 0)
++#if (_POSIX_TIMERS > 0) && (_POSIX_CLOCK_SELECTION > 0)
+     vlc_clock_setup ();
+     pthread_condattr_setclock (&attr, vlc_clock_id);
+ #endif
+@@ -929,7 +929,7 @@ mtime_t mdate (void)
+  */
+ void mwait (mtime_t deadline)
+ {
+-#if (_POSIX_CLOCK_SELECTION > 0)
++#if (_POSIX_TIMERS > 0) && (_POSIX_CLOCK_SELECTION > 0)
+     vlc_clock_setup ();
+     /* If the deadline is already elapsed, or within the clock precision,
+      * do not even bother the system timer. */
+@@ -956,7 +956,7 @@ void msleep (mtime_t delay)
+ {
+     struct timespec ts = mtime_to_ts (delay);
+ 
+-#if (_POSIX_CLOCK_SELECTION > 0)
++#if (_POSIX_TIMERS > 0) && (_POSIX_CLOCK_SELECTION > 0)
+     vlc_clock_setup ();
+     while (clock_nanosleep (vlc_clock_id, 0, &ts, &ts) == EINTR);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 420def5..106e947 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 pnap-grammar.patch
+hurd.patch
diff --git a/debian/rules b/debian/rules
index 06e4d7d..7fbdc2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,6 @@ confflags += \
 	--enable-notify \
 	--enable-ogg \
 	--enable-opus \
-	--enable-oss \
 	--enable-pulse \
 	--enable-qt \
 	--enable-realrtsp \
@@ -95,7 +94,6 @@ confflags += \
 	--enable-theora \
 	--enable-twolame \
 	--enable-upnp \
-	--enable-vcd \
 	--enable-vcdx \
 	--enable-vdpau \
 	--enable-vorbis \
@@ -170,6 +168,23 @@ removeplugins += \
 	$(NULL)
 endif
 
+# Hurd specific flags
+ifeq (,$(filter-out hurd,$(DEB_HOST_ARCH_OS)))
+confflags += \
+	--disable-oss \
+	--disable-vcd
+removeplugins += \
+	oss \
+	cdda \
+	vcd \
+	$(NULL)
+else
+confflags += \
+	--enable-oss \
+	--enable-vcd \
+	$(NULL)
+endif
+
 # Linux and kFreeBSD specific flags
 ifeq (,$(filter-out linux kfreebsd,$(DEB_HOST_ARCH_OS)))
 confflags += --enable-libva

-- 
VLC media player packaging