Commit 934cf349 authored by Phil's avatar Phil
Browse files

vlc: update to 1.1.6

parent 9f55085c
...@@ -10,8 +10,8 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf ...@@ -10,8 +10,8 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgbase=vlc pkgbase=vlc
pkgname=('vlc' pkgname=('vlc'
'vlc-plugin') 'vlc-plugin')
pkgver=1.1.5 pkgver=1.1.6
pkgrel=3 pkgrel=1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://www.videolan.org/vlc/" url="http://www.videolan.org/vlc/"
license=('GPL') license=('GPL')
...@@ -25,12 +25,16 @@ makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils' ...@@ -25,12 +25,16 @@ makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils'
'flac' 'libtheora' 'alsa-lib' 'jack' 'udev' 'flac' 'libtheora' 'alsa-lib' 'jack' 'udev'
'libraw1394' 'libdc1394' 'libavc1394' 'libva') 'libraw1394' 'libdc1394' 'libavc1394' 'libva')
options=('!libtool') options=('!libtool')
source=("http://sourceforge.net/projects/${pkgbase}/files/${pkgver}/${pkgbase}-${pkgver}.tar.bz2/download") source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
md5sums=('fdc23693351ed57af9f4c85ea885b536') lirc-build.patch)
md5sums=('c47f3ebc886f2aff8c95b98c564d1759'
'f276f5bec6e9d00058548cea1070dd2c')
build() { build() {
cd "${srcdir}/${pkgbase}-${pkgver}" cd "${srcdir}/${pkgbase}-${pkgver}"
patch -Np1 -i "${srcdir}/lirc-build.patch"
sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
./configure --prefix=/usr \ ./configure --prefix=/usr \
--disable-rpath \ --disable-rpath \
......
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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment