From a50d2e1a301f9cc69b337de8e73ac48b8ab89c8e Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 22 May 2016 21:41:14 +0000
Subject: [PATCH] extra/vlc to 2.2.3-3

---
 extra/vlc/PKGBUILD                     | 16 +++++++++-------
 extra/vlc/update-vlc-plugin-cache.hook | 11 +++++++++++
 extra/vlc/vlc.install                  | 11 -----------
 3 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 extra/vlc/update-vlc-plugin-cache.hook
 delete mode 100644 extra/vlc/vlc.install

diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 1df5c7f26..99630be4f 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=vlc
 pkgver=2.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -60,16 +60,16 @@ replaces=('vlc-plugin')
 backup=('usr/share/vlc/lua/http/.hosts'
         'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!emptydirs')
-install=vlc.install
 source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}
-        "lua53_compat.patch")
+        update-vlc-plugin-cache.hook "lua53_compat.patch")
 validpgpkeys=(65F7C6B4206BD057A7EB73787180713BE58D1ADC) # VideoLAN Release Signing Key
 md5sums=('ecbc65be549e5cc83e4cbe0129e66dcd'
          'SKIP'
+         '6fdaca3aa56c0676e9c88049b8650324'
          '96d3b346d9149ffb1b430066dfb6249a')
 
 prepare() {
-  cd "${srcdir}/${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
@@ -78,10 +78,10 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
 
   PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig" \
-  CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" \
+  CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" CXXFLAGS+=" -std=gnu++98" \
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --disable-rpath \
@@ -103,7 +103,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
 
@@ -111,4 +111,6 @@ package() {
     install -D -m644 "${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
 }
diff --git a/extra/vlc/update-vlc-plugin-cache.hook b/extra/vlc/update-vlc-plugin-cache.hook
new file mode 100644
index 000000000..89fbd2174
--- /dev/null
+++ b/extra/vlc/update-vlc-plugin-cache.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/vlc/plugins/*
+
+[Action]
+Description = Updating the vlc plugin cache...
+When = PostTransaction
+Exec = /usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
diff --git a/extra/vlc/vlc.install b/extra/vlc/vlc.install
deleted file mode 100644
index 7aa8741d2..000000000
--- a/extra/vlc/vlc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/vlc/plugins/plugins-*.dat
-}