[SCM] vlc/master: Drop backported patch.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Tue Feb 1 00:12:44 UTC 2011


The following commit has been merged in the master branch:
commit 9c1d702c4f479a44b470ddde9a777546873e2300
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Jan 31 23:20:03 2011 +0100

    Drop backported patch.

diff --git a/debian/patches/fix-lirc-build-failure.patch b/debian/patches/fix-lirc-build-failure.patch
deleted file mode 100644
index 996ca11..0000000
--- a/debian/patches/fix-lirc-build-failure.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Pierre Ynard <linkfanel at yahoo.fr>
-Subject: lirc: build fix
-Origin: upstream, http://git.videolan.org/?p=vlc/vlc-1.1.git;a=commitdiff;h=b5569228dd32aa848d2c8eed7e3f50d3a8522b8d
-Applied-Upstream: 1.1.7
-
-diff --git a/modules/control/lirc.c b/modules/control/lirc.c
-index aee33c3..e8c4780 100644
---- a/modules/control/lirc.c
-+++ b/modules/control/lirc.c
-@@ -25,6 +25,7 @@
-  * Preamble
-  *****************************************************************************/
- 
-+#include <errno.h>
- #include <fcntl.h>
- 
- #ifdef HAVE_CONFIG_H
-@@ -154,10 +155,12 @@ static void Run( intf_thread_t *p_intf )
-         /* Wait for data */
-         struct pollfd ufd = { .fd = p_sys->i_fd, .events = POLLIN, .revents = 0 };
-         if( poll( &ufd, 1, -1 ) == -1 )
-+        {
-             if( errno == EINTR )
-                 continue;
-             else
-                 break;
-+        }
- 
-         /* Process */
-         int canc = vlc_savecancel();
diff --git a/debian/patches/series b/debian/patches/series
index 52cf4eb..7e96ff5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 052_as-needed.patch
 200_osdmenu_paths.patch
-fix-lirc-build-failure.patch

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list