git » vlc.git » commit f0897dc

diff --git a/PKGBUILD b/PKGBUILD
index 61a7424..4bea71e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,20 @@
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
+# Warning: VLC 1.1.7 cannot be compiled with the new versions 
+# of matroska: libebml-1.2.0, libmatroska-1.1.0, mkvtoolnix-4.5.0
+# For more look at http://forum.videolan.org/viewtopic.php?f=13&t=87044
+
 pkgbase=vlc
 pkgname=('vlc' 'vlc-plugin')
 pkgver=1.1.7
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
 makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils'
              'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-             'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
+             'lua' 'v4l-utils' 'libcddb' 'smbclient' 'zvbi'
              'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
              'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
              'avahi' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'libxpm'
@@ -46,7 +50,7 @@ package_vlc() {
   pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
   depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio'
            'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-           'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
+           'lua' 'v4l-utils' 'libcddb' 'smbclient' 'zvbi'
            'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
            'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
            'ttf-freefont' 'libxv' 'libass' 'xdg-utils')
diff --git a/lirc-build.patch b/lirc-build.patch
deleted file mode 100644
index b95bc55..0000000
--- a/lirc-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b5569228dd32aa848d2c8eed7e3f50d3a8522b8d Mon Sep 17 00:00:00 2001
-From: Pierre Ynard <linkfanel@yahoo.fr>
-Date: Sun, 23 Jan 2011 18:19:05 +0100
-Subject: [PATCH 1/1] lirc: build fix
- (cherry picked from commit 942ab6c31026a84e4c5503cb8e68a5135dfc2f2b)
-
-Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>
----
- modules/control/lirc.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/modules/control/lirc.c b/modules/control/lirc.c
-index 6270abb..5c585bc 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();
--- 
-1.7.2.3
-