[arch-commits] Commit in vlc/trunk (PKGBUILD update-vlc-plugin-cache.hook vlc.install)

[Antonio Rojas]

    Date: Sunday, May 22, 2016 @ 23:19:13
  Author: arojas
Revision: 268494

Use a hook to update the plugin cache, should fix crashes in KDE when the cache becomes outdated after installing external plugins

Added:
  vlc/trunk/update-vlc-plugin-cache.hook
Modified:
  vlc/trunk/PKGBUILD
Deleted:
  vlc/trunk/vlc.install

------------------------------+
 PKGBUILD                     |   16 +++++++++-------
 update-vlc-plugin-cache.hook |   11 +++++++++++
 vlc.install                  |   11 -----------
 3 files changed, 20 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-22 20:48:59 UTC (rev 268493)
+++ PKGBUILD	2016-05-22 21:19:13 UTC (rev 268494)
@@ -5,7 +5,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/"
@@ -57,16 +57,16 @@
 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
@@ -75,10 +75,10 @@
 }
 
 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 \
@@ -99,7 +99,7 @@
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
 
@@ -107,4 +107,6 @@
     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
 }

Added: update-vlc-plugin-cache.hook
===================================================================
--- update-vlc-plugin-cache.hook	                        (rev 0)
+++ update-vlc-plugin-cache.hook	2016-05-22 21:19:13 UTC (rev 268494)
@@ -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

Deleted: vlc.install
===================================================================
--- vlc.install	2016-05-22 20:48:59 UTC (rev 268493)
+++ vlc.install	2016-05-22 21:19:13 UTC (rev 268494)
@@ -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
-}