[SCM] vlc/master: Drop patches that were backported and accepted by upstream.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8fbe69ffa9929e35538a44f3f9d411ad5cf6e308
Author: Benjamin Drung <bdrung at debian.org>
Date:   Fri Mar 23 16:50:58 2012 +0100

    Drop patches that were backported and accepted by upstream.

diff --git a/debian/patches/altivec-cflags.patch b/debian/patches/altivec-cflags.patch
deleted file mode 100644
index 9886b17..0000000
--- a/debian/patches/altivec-cflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Add missing CFLAGS_* variables to pass the "-maltivec" flag.
-Author: Benjamin Drung <bdrung at debian.org>
-Bug-Debian: http://bugs.debian.org/660936
-
---- a/modules/altivec/Modules.am
-+++ b/modules/altivec/Modules.am
-@@ -1,13 +1,13 @@
- libmemcpyaltivec_plugin_la_SOURCES = memcpy.c
--libmemcpyaltivec_plugin_la_CFLAGS = $(AM_CFLAGS)
--libmemcpyaltivec_plugin_la_LIBADD = $(AM_LIBADD)
-+libmemcpyaltivec_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_memcpyaltivec)
-+libmemcpyaltivec_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_memcpyaltivec)
- libmemcpyaltivec_plugin_la_DEPENDENCIES =
- 
- libi420_yuy2_altivec_plugin_la_SOURCES = \
-         ../video_chroma/i420_yuy2.c \
- 	../video_chroma/i420_yuy2.h
--libi420_yuy2_altivec_plugin_la_CFLAGS = $(AM_CFLAGS)
--libi420_yuy2_altivec_plugin_la_LIBADD = $(AM_LIBADD)
-+libi420_yuy2_altivec_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_i420_yuy2_altivec)
-+libi420_yuy2_altivec_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_i420_yuy2_altivec)
- libi420_yuy2_altivec_plugin_la_DEPENDENCIES =
- 
- libvlc_LTLIBRARIES += \
diff --git a/debian/patches/bp-monotonic-clock.patch b/debian/patches/bp-monotonic-clock.patch
deleted file mode 100644
index b9a2ae7..0000000
--- a/debian/patches/bp-monotonic-clock.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
index a673ab9..5703d5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-bp-monotonic-clock.patch
-altivec-cflags.patch
 v4l-kfreebsd.patch
 link-vlc-cache-gen-with-c++.patch
 link-vlc-with-c++.patch

-- 
VLC media player packaging