[SCM] vlc/master: Remove hurd.patch, because this is a bug in Hurd and not in VLC.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Tue Aug 26 19:44:26 UTC 2014
The following commit has been merged in the master branch:
commit bcd266ec79c32b5e25078b258d24dee813d02e22
Author: Benjamin Drung <bdrung at debian.org>
Date: Tue Aug 26 21:42:48 2014 +0200
Remove hurd.patch, because this is a bug in Hurd and not in VLC.
See https://lists.debian.org/debian-hurd/2014/02/msg00118.html for details.
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
deleted file mode 100644
index acd0314..0000000
--- a/debian/patches/hurd.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
-@@ -300,7 +300,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
-@@ -874,7 +874,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. */
-@@ -901,7 +901,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
deleted file mode 100644
index 27e280c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-hurd.patch
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list