[arch-commits] Commit in vlc/repos (12 files)

Antonio Rojas arojas at archlinux.org
Sat Jan 21 09:36:06 UTC 2017


    Date: Saturday, January 21, 2017 @ 09:36:05
  Author: arojas
Revision: 287068

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  vlc/repos/extra-i686/PKGBUILD
    (from rev 287067, vlc/trunk/PKGBUILD)
  vlc/repos/extra-i686/lua53_compat.patch
    (from rev 287067, vlc/trunk/lua53_compat.patch)
  vlc/repos/extra-i686/update-vlc-plugin-cache.hook
    (from rev 287067, vlc/trunk/update-vlc-plugin-cache.hook)
  vlc/repos/extra-x86_64/PKGBUILD
    (from rev 287067, vlc/trunk/PKGBUILD)
  vlc/repos/extra-x86_64/lua53_compat.patch
    (from rev 287067, vlc/trunk/lua53_compat.patch)
  vlc/repos/extra-x86_64/update-vlc-plugin-cache.hook
    (from rev 287067, vlc/trunk/update-vlc-plugin-cache.hook)
Deleted:
  vlc/repos/extra-i686/PKGBUILD
  vlc/repos/extra-i686/lua53_compat.patch
  vlc/repos/extra-i686/update-vlc-plugin-cache.hook
  vlc/repos/extra-x86_64/PKGBUILD
  vlc/repos/extra-x86_64/lua53_compat.patch
  vlc/repos/extra-x86_64/update-vlc-plugin-cache.hook

-------------------------------------------+
 /PKGBUILD                                 |  222 ++++++++++++++++++++++++++++
 /lua53_compat.patch                       |   60 +++++++
 /update-vlc-plugin-cache.hook             |   34 ++++
 extra-i686/PKGBUILD                       |  112 --------------
 extra-i686/lua53_compat.patch             |   30 ---
 extra-i686/update-vlc-plugin-cache.hook   |   17 --
 extra-x86_64/PKGBUILD                     |  112 --------------
 extra-x86_64/lua53_compat.patch           |   30 ---
 extra-x86_64/update-vlc-plugin-cache.hook |   17 --
 9 files changed, 316 insertions(+), 318 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-01-21 09:34:59 UTC (rev 287067)
+++ extra-i686/PKGBUILD	2017-01-21 09:36:05 UTC (rev 287068)
@@ -1,112 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark at kde.org>
-
-pkgname=vlc
-pkgver=2.2.4
-pkgrel=6
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-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'
-         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg2.8' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
-         'libxinerama')
-makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
-             'libdc1394' 'libavc1394' 'lirc' 'libcaca' 'gtk2'
-             'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm'
-             'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs'
-             'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa' 'qt4')
-optdepends=('avahi: for service discovery using bonjour protocol'
-            'libnotify: for notification plugin'
-            'gtk2: for notify plugin'
-            'ncurses: for ncurses interface support'
-            'libdvdcss: for decoding encrypted DVDs'
-            'lirc: for lirc plugin'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libdc1394: for IEEE 1394 plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'libva-vdpau-driver: vdpau back-end for nvidia'
-            'libva-intel-driver: back-end for intel cards'
-            'libbluray: for Blu-Ray support'
-            'flac: for Free Lossless Audio Codec plugin'
-            'portaudio: for portaudio support'
-            'twolame: for TwoLAME mpeg2 encoder plugin'
-            'projectm: for ProjectM visualisation plugin'
-            'libcaca: for colored ASCII art video output'
-            'libgme: for libgme plugin'
-            'librsvg: for SVG plugin'
-            'gnome-vfs: for GNOME Virtual File System support'
-            'libgoom2: for libgoom plugin'
-            'vcdimager: navigate VCD with libvcdinfo'
-            'aalib: for ASCII art plugin'
-            'libmtp: for MTP devices support'
-            'smbclient: for SMB access plugin'
-            'libcdio: for audio CD playback support'
-            'ttf-freefont: for subtitle font '
-            'ttf-dejavu: for subtitle font'
-            'opus: for opus support'
-            'libssh2: for sftp support'
-            'lua-socket: for http interface'
-            'qt4: for the GUI')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-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")
-validpgpkeys=(65F7C6B4206BD057A7EB73787180713BE58D1ADC) # VideoLAN Release Signing Key
-md5sums=('55666c9898f658c7fcca12725bf7dd1b'
-         'SKIP'
-         '6449d0d26bd34bca009eed58a4c20c83'
-         '96d3b346d9149ffb1b430066dfb6249a')
-
-prepare() {
-  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"
-}
-
-build() {
-  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" CXXFLAGS+=" -std=gnu++98" \
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --disable-rpath \
-              --enable-faad \
-              --enable-nls \
-              --enable-lirc \
-              --enable-ncurses \
-              --enable-realrtsp \
-              --enable-aa \
-              --enable-vcdx \
-              --enable-upnp \
-              --enable-opus \
-              --enable-sftp \
-              LUAC=/usr/bin/luac  LUA_LIBS="`pkg-config --libs lua`" \
-              RCC=/usr/bin/rcc-qt4
-
-  make
-}
-
-package() {
-  cd "${pkgname}-${pkgver}"
-
-  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" \
-                     "${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
-}

Copied: vlc/repos/extra-i686/PKGBUILD (from rev 287067, vlc/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-01-21 09:36:05 UTC (rev 287068)
@@ -0,0 +1,111 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: Martin Sandsmark <martin.sandsmark at kde.org>
+
+pkgname=vlc
+pkgver=2.2.4
+pkgrel=7
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+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'
+         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg2.8' 'faad2' 'libupnp'
+         'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
+         'libxinerama')
+makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
+             'libdc1394' 'libavc1394' 'lirc' 'libcaca' 'gtk2'
+             'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm'
+             'twolame' 'aalib' 'libmtp' 'libdvdcss' 'smbclient'
+             'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa' 'qt4')
+optdepends=('avahi: for service discovery using bonjour protocol'
+            'libnotify: for notification plugin'
+            'gtk2: for notify plugin'
+            'ncurses: for ncurses interface support'
+            'libdvdcss: for decoding encrypted DVDs'
+            'lirc: for lirc plugin'
+            'libavc1394: for devices using the 1394ta AV/C'
+            'libdc1394: for IEEE 1394 plugin'
+            'kdelibs: KDE Solid hardware integration'
+            'libva-vdpau-driver: vdpau back-end for nvidia'
+            'libva-intel-driver: back-end for intel cards'
+            'libbluray: for Blu-Ray support'
+            'flac: for Free Lossless Audio Codec plugin'
+            'portaudio: for portaudio support'
+            'twolame: for TwoLAME mpeg2 encoder plugin'
+            'projectm: for ProjectM visualisation plugin'
+            'libcaca: for colored ASCII art video output'
+            'libgme: for libgme plugin'
+            'librsvg: for SVG plugin'
+            'libgoom2: for libgoom plugin'
+            'vcdimager: navigate VCD with libvcdinfo'
+            'aalib: for ASCII art plugin'
+            'libmtp: for MTP devices support'
+            'smbclient: for SMB access plugin'
+            'libcdio: for audio CD playback support'
+            'ttf-freefont: for subtitle font '
+            'ttf-dejavu: for subtitle font'
+            'opus: for opus support'
+            'libssh2: for sftp support'
+            'lua-socket: for http interface'
+            'qt4: for the GUI')
+conflicts=('vlc-plugin')
+replaces=('vlc-plugin')
+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")
+validpgpkeys=(65F7C6B4206BD057A7EB73787180713BE58D1ADC) # VideoLAN Release Signing Key
+md5sums=('55666c9898f658c7fcca12725bf7dd1b'
+         'SKIP'
+         '6449d0d26bd34bca009eed58a4c20c83'
+         '96d3b346d9149ffb1b430066dfb6249a')
+
+prepare() {
+  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"
+}
+
+build() {
+  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" CXXFLAGS+=" -std=gnu++98" \
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --disable-rpath \
+              --enable-faad \
+              --enable-nls \
+              --enable-lirc \
+              --enable-ncurses \
+              --enable-realrtsp \
+              --enable-aa \
+              --enable-vcdx \
+              --enable-upnp \
+              --enable-opus \
+              --enable-sftp \
+              LUAC=/usr/bin/luac  LUA_LIBS="`pkg-config --libs lua`" \
+              RCC=/usr/bin/rcc-qt4
+
+  make
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+
+  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" \
+                     "${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
+}

Deleted: extra-i686/lua53_compat.patch
===================================================================
--- extra-i686/lua53_compat.patch	2017-01-21 09:34:59 UTC (rev 287067)
+++ extra-i686/lua53_compat.patch	2017-01-21 09:36:05 UTC (rev 287068)
@@ -1,30 +0,0 @@
-commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
-Author: Vinson Lee <vlee at freedesktop.org>
-Date:   Thu Feb 5 14:48:53 2015 -0800
-
-    lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility.
-    
-    In Lua 5.3.0, luaL_checkint was deprecated.
-    
-    This patch fixes this build error with Lua 5.3.0.
-    
-    lua/demux.c: In function ‘vlclua_demux_peek’:
-    lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
-         int n = luaL_checkint( L, 1 );
-         ^
-    
-    Signed-off-by: Vinson Lee <vlee at freedesktop.org>
-    Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
-
-diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
-index efd94f1..85c7fc1 100644
---- a/modules/lua/vlc.h
-+++ b/modules/lua/vlc.h
-@@ -38,6 +38,7 @@
- #include <vlc_stream.h>
- #include <vlc_demux.h>
- 
-+#define LUA_COMPAT_APIINTCASTS
- #define LUA_COMPAT_MODULE
- #include <lua.h>        /* Low level lua C API */
- #include <lauxlib.h>    /* Higher level C API */

Copied: vlc/repos/extra-i686/lua53_compat.patch (from rev 287067, vlc/trunk/lua53_compat.patch)
===================================================================
--- extra-i686/lua53_compat.patch	                        (rev 0)
+++ extra-i686/lua53_compat.patch	2017-01-21 09:36:05 UTC (rev 287068)
@@ -0,0 +1,30 @@
+commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
+Author: Vinson Lee <vlee at freedesktop.org>
+Date:   Thu Feb 5 14:48:53 2015 -0800
+
+    lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility.
+    
+    In Lua 5.3.0, luaL_checkint was deprecated.
+    
+    This patch fixes this build error with Lua 5.3.0.
+    
+    lua/demux.c: In function ‘vlclua_demux_peek’:
+    lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
+         int n = luaL_checkint( L, 1 );
+         ^
+    
+    Signed-off-by: Vinson Lee <vlee at freedesktop.org>
+    Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index efd94f1..85c7fc1 100644
+--- a/modules/lua/vlc.h
++++ b/modules/lua/vlc.h
+@@ -38,6 +38,7 @@
+ #include <vlc_stream.h>
+ #include <vlc_demux.h>
+ 
++#define LUA_COMPAT_APIINTCASTS
+ #define LUA_COMPAT_MODULE
+ #include <lua.h>        /* Low level lua C API */
+ #include <lauxlib.h>    /* Higher level C API */

Deleted: extra-i686/update-vlc-plugin-cache.hook
===================================================================
--- extra-i686/update-vlc-plugin-cache.hook	2017-01-21 09:34:59 UTC (rev 287067)
+++ extra-i686/update-vlc-plugin-cache.hook	2017-01-21 09:36:05 UTC (rev 287068)
@@ -1,17 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/vlc/plugins/*
-
-[Trigger]
-Type = Package
-Operation = Install
-Operation = Remove
-Target = qt4
-
-[Action]
-Description = Updating the vlc plugin cache...
-When = PostTransaction
-Exec = /usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins

Copied: vlc/repos/extra-i686/update-vlc-plugin-cache.hook (from rev 287067, vlc/trunk/update-vlc-plugin-cache.hook)
===================================================================
--- extra-i686/update-vlc-plugin-cache.hook	                        (rev 0)
+++ extra-i686/update-vlc-plugin-cache.hook	2017-01-21 09:36:05 UTC (rev 287068)
@@ -0,0 +1,17 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/vlc/plugins/*
+
+[Trigger]
+Type = Package
+Operation = Install
+Operation = Remove
+Target = qt4
+
+[Action]
+Description = Updating the vlc plugin cache...
+When = PostTransaction
+Exec = /usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-01-21 09:34:59 UTC (rev 287067)
+++ extra-x86_64/PKGBUILD	2017-01-21 09:36:05 UTC (rev 287068)
@@ -1,112 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark at kde.org>
-
-pkgname=vlc
-pkgver=2.2.4
-pkgrel=6
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-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'
-         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg2.8' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
-         'libxinerama')
-makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
-             'libdc1394' 'libavc1394' 'lirc' 'libcaca' 'gtk2'
-             'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm'
-             'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs'
-             'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa' 'qt4')
-optdepends=('avahi: for service discovery using bonjour protocol'
-            'libnotify: for notification plugin'
-            'gtk2: for notify plugin'
-            'ncurses: for ncurses interface support'
-            'libdvdcss: for decoding encrypted DVDs'
-            'lirc: for lirc plugin'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libdc1394: for IEEE 1394 plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'libva-vdpau-driver: vdpau back-end for nvidia'
-            'libva-intel-driver: back-end for intel cards'
-            'libbluray: for Blu-Ray support'
-            'flac: for Free Lossless Audio Codec plugin'
-            'portaudio: for portaudio support'
-            'twolame: for TwoLAME mpeg2 encoder plugin'
-            'projectm: for ProjectM visualisation plugin'
-            'libcaca: for colored ASCII art video output'
-            'libgme: for libgme plugin'
-            'librsvg: for SVG plugin'
-            'gnome-vfs: for GNOME Virtual File System support'
-            'libgoom2: for libgoom plugin'
-            'vcdimager: navigate VCD with libvcdinfo'
-            'aalib: for ASCII art plugin'
-            'libmtp: for MTP devices support'
-            'smbclient: for SMB access plugin'
-            'libcdio: for audio CD playback support'
-            'ttf-freefont: for subtitle font '
-            'ttf-dejavu: for subtitle font'
-            'opus: for opus support'
-            'libssh2: for sftp support'
-            'lua-socket: for http interface'
-            'qt4: for the GUI')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-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")
-validpgpkeys=(65F7C6B4206BD057A7EB73787180713BE58D1ADC) # VideoLAN Release Signing Key
-md5sums=('55666c9898f658c7fcca12725bf7dd1b'
-         'SKIP'
-         '6449d0d26bd34bca009eed58a4c20c83'
-         '96d3b346d9149ffb1b430066dfb6249a')
-
-prepare() {
-  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"
-}
-
-build() {
-  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" CXXFLAGS+=" -std=gnu++98" \
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --disable-rpath \
-              --enable-faad \
-              --enable-nls \
-              --enable-lirc \
-              --enable-ncurses \
-              --enable-realrtsp \
-              --enable-aa \
-              --enable-vcdx \
-              --enable-upnp \
-              --enable-opus \
-              --enable-sftp \
-              LUAC=/usr/bin/luac  LUA_LIBS="`pkg-config --libs lua`" \
-              RCC=/usr/bin/rcc-qt4
-
-  make
-}
-
-package() {
-  cd "${pkgname}-${pkgver}"
-
-  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" \
-                     "${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
-}

Copied: vlc/repos/extra-x86_64/PKGBUILD (from rev 287067, vlc/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-01-21 09:36:05 UTC (rev 287068)
@@ -0,0 +1,111 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: Martin Sandsmark <martin.sandsmark at kde.org>
+
+pkgname=vlc
+pkgver=2.2.4
+pkgrel=7
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+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'
+         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg2.8' 'faad2' 'libupnp'
+         'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
+         'libxinerama')
+makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
+             'libdc1394' 'libavc1394' 'lirc' 'libcaca' 'gtk2'
+             'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm'
+             'twolame' 'aalib' 'libmtp' 'libdvdcss' 'smbclient'
+             'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa' 'qt4')
+optdepends=('avahi: for service discovery using bonjour protocol'
+            'libnotify: for notification plugin'
+            'gtk2: for notify plugin'
+            'ncurses: for ncurses interface support'
+            'libdvdcss: for decoding encrypted DVDs'
+            'lirc: for lirc plugin'
+            'libavc1394: for devices using the 1394ta AV/C'
+            'libdc1394: for IEEE 1394 plugin'
+            'kdelibs: KDE Solid hardware integration'
+            'libva-vdpau-driver: vdpau back-end for nvidia'
+            'libva-intel-driver: back-end for intel cards'
+            'libbluray: for Blu-Ray support'
+            'flac: for Free Lossless Audio Codec plugin'
+            'portaudio: for portaudio support'
+            'twolame: for TwoLAME mpeg2 encoder plugin'
+            'projectm: for ProjectM visualisation plugin'
+            'libcaca: for colored ASCII art video output'
+            'libgme: for libgme plugin'
+            'librsvg: for SVG plugin'
+            'libgoom2: for libgoom plugin'
+            'vcdimager: navigate VCD with libvcdinfo'
+            'aalib: for ASCII art plugin'
+            'libmtp: for MTP devices support'
+            'smbclient: for SMB access plugin'
+            'libcdio: for audio CD playback support'
+            'ttf-freefont: for subtitle font '
+            'ttf-dejavu: for subtitle font'
+            'opus: for opus support'
+            'libssh2: for sftp support'
+            'lua-socket: for http interface'
+            'qt4: for the GUI')
+conflicts=('vlc-plugin')
+replaces=('vlc-plugin')
+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")
+validpgpkeys=(65F7C6B4206BD057A7EB73787180713BE58D1ADC) # VideoLAN Release Signing Key
+md5sums=('55666c9898f658c7fcca12725bf7dd1b'
+         'SKIP'
+         '6449d0d26bd34bca009eed58a4c20c83'
+         '96d3b346d9149ffb1b430066dfb6249a')
+
+prepare() {
+  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"
+}
+
+build() {
+  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" CXXFLAGS+=" -std=gnu++98" \
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --disable-rpath \
+              --enable-faad \
+              --enable-nls \
+              --enable-lirc \
+              --enable-ncurses \
+              --enable-realrtsp \
+              --enable-aa \
+              --enable-vcdx \
+              --enable-upnp \
+              --enable-opus \
+              --enable-sftp \
+              LUAC=/usr/bin/luac  LUA_LIBS="`pkg-config --libs lua`" \
+              RCC=/usr/bin/rcc-qt4
+
+  make
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+
+  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" \
+                     "${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
+}

Deleted: extra-x86_64/lua53_compat.patch
===================================================================
--- extra-x86_64/lua53_compat.patch	2017-01-21 09:34:59 UTC (rev 287067)
+++ extra-x86_64/lua53_compat.patch	2017-01-21 09:36:05 UTC (rev 287068)
@@ -1,30 +0,0 @@
-commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
-Author: Vinson Lee <vlee at freedesktop.org>
-Date:   Thu Feb 5 14:48:53 2015 -0800
-
-    lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility.
-    
-    In Lua 5.3.0, luaL_checkint was deprecated.
-    
-    This patch fixes this build error with Lua 5.3.0.
-    
-    lua/demux.c: In function ‘vlclua_demux_peek’:
-    lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
-         int n = luaL_checkint( L, 1 );
-         ^
-    
-    Signed-off-by: Vinson Lee <vlee at freedesktop.org>
-    Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
-
-diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
-index efd94f1..85c7fc1 100644
---- a/modules/lua/vlc.h
-+++ b/modules/lua/vlc.h
-@@ -38,6 +38,7 @@
- #include <vlc_stream.h>
- #include <vlc_demux.h>
- 
-+#define LUA_COMPAT_APIINTCASTS
- #define LUA_COMPAT_MODULE
- #include <lua.h>        /* Low level lua C API */
- #include <lauxlib.h>    /* Higher level C API */

Copied: vlc/repos/extra-x86_64/lua53_compat.patch (from rev 287067, vlc/trunk/lua53_compat.patch)
===================================================================
--- extra-x86_64/lua53_compat.patch	                        (rev 0)
+++ extra-x86_64/lua53_compat.patch	2017-01-21 09:36:05 UTC (rev 287068)
@@ -0,0 +1,30 @@
+commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
+Author: Vinson Lee <vlee at freedesktop.org>
+Date:   Thu Feb 5 14:48:53 2015 -0800
+
+    lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility.
+    
+    In Lua 5.3.0, luaL_checkint was deprecated.
+    
+    This patch fixes this build error with Lua 5.3.0.
+    
+    lua/demux.c: In function ‘vlclua_demux_peek’:
+    lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
+         int n = luaL_checkint( L, 1 );
+         ^
+    
+    Signed-off-by: Vinson Lee <vlee at freedesktop.org>
+    Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index efd94f1..85c7fc1 100644
+--- a/modules/lua/vlc.h
++++ b/modules/lua/vlc.h
+@@ -38,6 +38,7 @@
+ #include <vlc_stream.h>
+ #include <vlc_demux.h>
+ 
++#define LUA_COMPAT_APIINTCASTS
+ #define LUA_COMPAT_MODULE
+ #include <lua.h>        /* Low level lua C API */
+ #include <lauxlib.h>    /* Higher level C API */

Deleted: extra-x86_64/update-vlc-plugin-cache.hook
===================================================================
--- extra-x86_64/update-vlc-plugin-cache.hook	2017-01-21 09:34:59 UTC (rev 287067)
+++ extra-x86_64/update-vlc-plugin-cache.hook	2017-01-21 09:36:05 UTC (rev 287068)
@@ -1,17 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/vlc/plugins/*
-
-[Trigger]
-Type = Package
-Operation = Install
-Operation = Remove
-Target = qt4
-
-[Action]
-Description = Updating the vlc plugin cache...
-When = PostTransaction
-Exec = /usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins

Copied: vlc/repos/extra-x86_64/update-vlc-plugin-cache.hook (from rev 287067, vlc/trunk/update-vlc-plugin-cache.hook)
===================================================================
--- extra-x86_64/update-vlc-plugin-cache.hook	                        (rev 0)
+++ extra-x86_64/update-vlc-plugin-cache.hook	2017-01-21 09:36:05 UTC (rev 287068)
@@ -0,0 +1,17 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/vlc/plugins/*
+
+[Trigger]
+Type = Package
+Operation = Install
+Operation = Remove
+Target = qt4
+
+[Action]
+Description = Updating the vlc plugin cache...
+When = PostTransaction
+Exec = /usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins



More information about the arch-commits mailing list