summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBooloki2016-03-30 19:01:22 +0200
committerBooloki2016-03-30 19:01:22 +0200
commitc85e6a97dd9f76d6fdac056110552da5e4f66ad8 (patch)
tree52a4fb657633c558d9f570c0b9a81dee9d22dda2
parentbf236ed8d6b56d02b775ad6c5b4ca591eb3b026f (diff)
downloadaur-c85e6a97dd9f76d6fdac056110552da5e4f66ad8.tar.gz
Change dependency from ffmpeg to ffmpeg2.8 + vlc conflicts/replaces bugfix
-rw-r--r--PKGBUILD9
1 files changed, 5 insertions, 4 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 4fc30b57b68..e4633f1078b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,14 +7,14 @@
_pkgbase=vlc
pkgname=vlc-nox
pkgver=2.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player (without X support)"
arch=('i686' 'x86_64')
url="http://www.videolan.org/vlc/"
license=('LGPL2.1' 'GPL2')
depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy'
'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska'
- 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
+ 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg2.8' 'faad2' 'libupnp'
'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
'libxinerama')
makedepends=('live-media' 'libnotify' 'libbluray' 'flac'
@@ -49,8 +49,8 @@ optdepends=('avahi: for service discovery using bonjour protocol'
'opus: for opus support'
'libssh2: for sftp support'
'lua-socket: for http interface')
-conflicts=('${_pkgbase}' 'vlc-plugin' 'vlc-git')
-replaces=('${_pkgbase}' 'vlc-plugin' 'vlc-git')
+conflicts=('vlc' 'vlc-plugin' 'vlc-git')
+replaces=('vlc' 'vlc-plugin' 'vlc-git')
backup=('usr/share/vlc/lua/http/.hosts'
'usr/share/vlc/lua/http/dialogs/.hosts')
options=('!emptydirs')
@@ -72,6 +72,7 @@ prepare() {
build() {
cd "${srcdir}/${_pkgbase}-${pkgver}"
+ PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig" \
CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" \
./configure --prefix=/usr \
--sysconfdir=/etc \