summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD20
2 files changed, 17 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 21cad44778b8..fadc5cd30d29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat May 27 13:58:11 UTC 2017
+# Thu Jan 25 18:42:00 UTC 2018
pkgbase = vlc-nox
pkgdesc = A multi-platform MPEG, VCD/DVD, and DivX player (without X support)
- pkgver = 2.2.6
+ pkgver = 2.2.8
pkgrel = 1
url = http://www.videolan.org/vlc/
install = vlc.install
@@ -90,9 +90,9 @@ pkgbase = vlc-nox
options = !emptydirs
backup = usr/share/vlc/lua/http/.hosts
backup = usr/share/vlc/lua/http/dialogs/.hosts
- source = http://download.videolan.org/vlc/2.2.6/vlc-2.2.6.tar.xz
+ source = http://download.videolan.org/vlc/2.2.8/vlc-2.2.8.tar.xz
source = lua53_compat.patch
- md5sums = 031d1bbef7737d44d18d78d6761ed26e
+ md5sums = b721fddf65aaf64eeee5629aa9bf7c9e
md5sums = 96d3b346d9149ffb1b430066dfb6249a
pkgname = vlc-nox
diff --git a/PKGBUILD b/PKGBUILD
index e2be6c959da2..9b83b0cdc7f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
_pkgbase=vlc
pkgname=vlc-nox
-pkgver=2.2.6
+pkgver=2.2.8
pkgrel=1
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player (without X support)"
arch=('i686' 'x86_64')
@@ -56,9 +56,13 @@ backup=('usr/share/vlc/lua/http/.hosts'
options=('!emptydirs')
install=${_pkgbase}.install
source=("http://download.videolan.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz"
- "lua53_compat.patch")
-md5sums=('031d1bbef7737d44d18d78d6761ed26e'
- '96d3b346d9149ffb1b430066dfb6249a')
+ "lua53_compat.patch"
+ "vlc-2.2.6-fix-memleak.patch"
+ "vlc-2.2.8-libupnp-1.6.24.patch")
+md5sums=('b721fddf65aaf64eeee5629aa9bf7c9e'
+ '96d3b346d9149ffb1b430066dfb6249a'
+ '0df7ee60b31cc4dc372950cc595e8638'
+ '9ac961bc55509ec9c87a5fc6e9a04d39')
prepare() {
cd "${srcdir}/${_pkgbase}-${pkgver}"
@@ -66,7 +70,9 @@ prepare() {
sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
- patch -p1 < "${srcdir}/lua53_compat.patch"
+ patch -Np1 < "${srcdir}/lua53_compat.patch"
+ patch -Np1 < "${srcdir}/vlc-2.2.6-fix-memleak.patch"
+ patch -Np1 < "${srcdir}/vlc-2.2.8-libupnp-1.6.24.patch"
}
build() {
@@ -75,9 +81,9 @@ build() {
export PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig"
export CFLAGS+=" -I/usr/include/samba-4.0"
export CPPFLAGS+=" -I/usr/include/samba-4.0"
- export CXXFLAGS+=" -std=gnu++98"
+ export CXXFLAGS+=" -std=c++11"
export LUAC=/usr/bin/luac
- export LUA_LIBS="`pkg-config --libs lua`"
+ export LUA_LIBS="$(pkg-config --libs lua)"
export RCC=/usr/bin/rcc-qt4
./configure --prefix=/usr \