git » vlc.git » commit df67380

diff --git a/PKGBUILD b/PKGBUILD
index 2dc2eea..3a39c5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgbase=vlc
 pkgname=('vlc' 'vlc-plugin')
-pkgver=1.1.5
-pkgrel=3
+pkgver=1.1.6
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
@@ -19,12 +19,16 @@ makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils'
              'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
              'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse')
 options=('!libtool')
-source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('fdc23693351ed57af9f4c85ea885b536')
+source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
+        lirc-build.patch)
+md5sums=('c47f3ebc886f2aff8c95b98c564d1759'
+         'f276f5bec6e9d00058548cea1070dd2c')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/lirc-build.patch"
+
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
   ./configure --prefix=/usr \
               --disable-rpath \
@@ -39,7 +43,6 @@ build() {
               --enable-mozilla \
               --with-live555-tree=/usr/lib/live \
               --enable-realrtsp
-  CFLAGS="-fPIC"
   make
 }
 
diff --git a/lirc-build.patch b/lirc-build.patch
new file mode 100644
index 0000000..b95bc55
--- /dev/null
+++ b/lirc-build.patch
@@ -0,0 +1,39 @@
+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
+