[arch-commits] Commit in vlc/trunk (PKGBUILD)

[Levente Polyak]

    Date: Thursday, August 16, 2018 @ 22:08:03
  Author: anthraxx
Revision: 331620

upgpkg: vlc 3.0.3.r1-1

Modified:
  vlc/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-16 18:44:45 UTC (rev 331619)
+++ PKGBUILD	2018-08-16 22:08:03 UTC (rev 331620)
@@ -4,8 +4,11 @@
 # Contributor: Martin Sandsmark <martin.sandsmark at kde.org>
 
 pkgname=vlc
-pkgver=3.0.3
-pkgrel=4
+_vlcver=3.0.3
+# optional fixup version including hyphen
+_vlcfixupver=-1
+pkgver=${_vlcver}${_vlcfixupver//-/.r}
+pkgrel=1
 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
 url='https://www.videolan.org/vlc/'
 arch=('x86_64')
@@ -90,7 +93,7 @@
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 options=('!emptydirs')
-source=(https://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}-1.tar.xz{,.asc}
+source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
         update-vlc-plugin-cache.hook
         aom-remove-unsupported-pixel-formats.patch
         lua53_compat.patch
@@ -106,7 +109,7 @@
 validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
 
 prepare() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${_vlcver}
   sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp
   sed -e 's|-Werror-implicit-function-declaration||g' -i configure
   sed 's|whoami|echo builduser|g' -i configure
@@ -118,7 +121,7 @@
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${_vlcver}
 
   export CFLAGS+=" -I/usr/include/samba-4.0"
   export CPPFLAGS+=" -I/usr/include/samba-4.0"
@@ -221,12 +224,12 @@
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
+  cd ${pkgname}-${_vlcver}
 
   make DESTDIR="${pkgdir}" install
 
   for res in 16 32 48 128 256; do
-    install -Dm 644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
+    install -Dm 644 "${srcdir}/vlc-${_vlcver}/share/icons/${res}x${res}/vlc.png" \
                      "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
   done
   install -Dm 644 "${srcdir}/update-vlc-plugin-cache.hook" -t "${pkgdir}/usr/share/libalpm/hooks"