upgpkg: vlc-qt5 2.2.6-1

Update to new version

1 files changed, 27 insertions, 25 deletions

diff --git a/PKGBUILD b/PKGBUILD
index bc3bbd973c7b..bcdba23098e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
+# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc-qt5
 _pkgname=vlc
-pkgver=2.2.4
+pkgver=2.2.6
 pkgrel=1
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player (Qt5 version)"
+pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player (Qt5 version)'
+url='https://www.videolan.org/vlc/'
 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'
@@ -52,33 +53,34 @@ optdepends=('avahi: for service discovery using bonjour protocol'
             'qt5-base: for the GUI')
 conflicts=($_pkgname)
 provides=($_pkgname)
-backup=('usr/share/vlc/lua/http/.hosts'
-        'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!emptydirs')
-source=("http://download.videolan.org/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.xz"{,.asc}
-        update-vlc-plugin-cache.hook "lua53_compat.patch" "Fix-build-using-old-GCC-intrinsics.patch")
-validpgpkeys=(65F7C6B4206BD057A7EB73787180713BE58D1ADC) # VideoLAN Release Signing Key
-md5sums=('55666c9898f658c7fcca12725bf7dd1b'
-         'SKIP'
-         '6449d0d26bd34bca009eed58a4c20c83'
-         '96d3b346d9149ffb1b430066dfb6249a'
-         '61c8cfdf29668aa1f4a607f6bec6dfa8')
+source=(https://download.videolan.org/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.xz{,.asc}
+        update-vlc-plugin-cache.hook
+        lua53_compat.patch)
+sha512sums=('9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d'
+            'SKIP'
+            'd9e69a01eb8868647beac0f419328e6ca3fe14a2e2a9e6ce4b61ed590b41b0136fb3ac9e284b174a910c2fe8822d1b37445a48d0b7caea647060ebfabe899e7b'
+            '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f')
+validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
 
 prepare() {
-  cd "${_pkgname}-${pkgver}"
-
+  cd ${_pkgname}-${pkgver}
   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 -p1 < "${srcdir}/Fix-build-using-old-GCC-intrinsics.patch"
 }
 
 build() {
-  cd "${_pkgname}-${pkgver}"
+  cd ${_pkgname}-${pkgver}
+
+  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=c++11"
+  export LUAC=/usr/bin/luac
+  export LUA_LIBS="`pkg-config --libs lua`"
+  export RCC=/usr/bin/rcc-qt5
 
-  PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig" \
-  CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" CXXFLAGS+=" -std=c++11" \
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --disable-rpath \
@@ -91,9 +93,7 @@ build() {
               --enable-vcdx \
               --enable-upnp \
               --enable-opus \
-              --enable-sftp \
-              LUAC=/usr/bin/luac  LUA_LIBS="`pkg-config --libs lua`" \
-              RCC=/usr/bin/rcc-qt5
+              --enable-sftp
 
   make
 }
@@ -104,9 +104,11 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
+    install -Dm 644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
                      "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
   done
 
-  install -Dm644 "$srcdir"/update-vlc-plugin-cache.hook "$pkgdir"/usr/share/libalpm/hooks/update-vlc-plugin-cache.hook
+  install -Dm 644 "${srcdir}/update-vlc-plugin-cache.hook" -t "${pkgdir}/usr/share/libalpm/hooks"
 }
+
+# vim: ts=2 sw=2 et: