Date: Tuesday, February 2, 2016 @ 20:17:11 Author: alucryd Revision: 258815
archrelease: copy trunk to extra-i686, extra-x86_64 Added: vlc/repos/extra-i686/PKGBUILD (from rev 258814, vlc/trunk/PKGBUILD) vlc/repos/extra-i686/lua53_compat.patch (from rev 258814, vlc/trunk/lua53_compat.patch) vlc/repos/extra-i686/vlc.install (from rev 258814, vlc/trunk/vlc.install) vlc/repos/extra-x86_64/PKGBUILD (from rev 258814, vlc/trunk/PKGBUILD) vlc/repos/extra-x86_64/lua53_compat.patch (from rev 258814, vlc/trunk/lua53_compat.patch) vlc/repos/extra-x86_64/vlc.install (from rev 258814, vlc/trunk/vlc.install) Deleted: vlc/repos/extra-i686/PKGBUILD vlc/repos/extra-i686/lua53_compat.patch vlc/repos/extra-i686/vlc.install vlc/repos/extra-x86_64/PKGBUILD vlc/repos/extra-x86_64/lua53_compat.patch vlc/repos/extra-x86_64/vlc.install ---------------------------------+ /PKGBUILD | 212 ++++++++++++++++++++++++++++++++++++++ /lua53_compat.patch | 60 ++++++++++ /vlc.install | 36 ++++++ extra-i686/PKGBUILD | 106 ------------------- extra-i686/lua53_compat.patch | 30 ----- extra-i686/vlc.install | 18 --- extra-x86_64/PKGBUILD | 106 ------------------- extra-x86_64/lua53_compat.patch | 30 ----- extra-x86_64/vlc.install | 18 --- 9 files changed, 308 insertions(+), 308 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-02-02 19:16:59 UTC (rev 258814) +++ extra-i686/PKGBUILD 2016-02-02 19:17:11 UTC (rev 258815) @@ -1,106 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Sarah Hay <sarah...@mb.sympatico.ca> -# Contributor: Martin Sandsmark <martin.sandsm...@kde.org> - -pkgname=vlc -pkgver=2.2.1 -pkgrel=11 -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' 'qt4' 'libproxy' - 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' - 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' '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') -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') -conflicts=('vlc-plugin') -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" - "lua53_compat.patch") -md5sums=('42273945758b521c408fabc7fd6d9946' - '96d3b346d9149ffb1b430066dfb6249a') - -prepare() { - cd "${srcdir}/${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 "${srcdir}/${pkgname}-${pkgver}" - - CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" \ - ./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 "${srcdir}/${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 -} Copied: vlc/repos/extra-i686/PKGBUILD (from rev 258814, vlc/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-02-02 19:17:11 UTC (rev 258815) @@ -0,0 +1,106 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Sarah Hay <sarah...@mb.sympatico.ca> +# Contributor: Martin Sandsmark <martin.sandsm...@kde.org> + +pkgname=vlc +pkgver=2.2.1 +pkgrel=12 +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' 'qt4' 'libproxy' + 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' + 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' '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') +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') +conflicts=('vlc-plugin') +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" + "lua53_compat.patch") +md5sums=('42273945758b521c408fabc7fd6d9946' + '96d3b346d9149ffb1b430066dfb6249a') + +prepare() { + cd "${srcdir}/${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 "${srcdir}/${pkgname}-${pkgver}" + + CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" \ + ./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 "${srcdir}/${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 +} Deleted: extra-i686/lua53_compat.patch =================================================================== --- extra-i686/lua53_compat.patch 2016-02-02 19:16:59 UTC (rev 258814) +++ extra-i686/lua53_compat.patch 2016-02-02 19:17:11 UTC (rev 258815) @@ -1,30 +0,0 @@ -commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23 -Author: Vinson Lee <v...@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 <v...@freedesktop.org> - Signed-off-by: Jean-Baptiste Kempf <j...@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 258814, vlc/trunk/lua53_compat.patch) =================================================================== --- extra-i686/lua53_compat.patch (rev 0) +++ extra-i686/lua53_compat.patch 2016-02-02 19:17:11 UTC (rev 258815) @@ -0,0 +1,30 @@ +commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23 +Author: Vinson Lee <v...@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 <v...@freedesktop.org> + Signed-off-by: Jean-Baptiste Kempf <j...@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/vlc.install =================================================================== --- extra-i686/vlc.install 2016-02-02 19:16:59 UTC (rev 258814) +++ extra-i686/vlc.install 2016-02-02 19:17:11 UTC (rev 258815) @@ -1,18 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/vlc/plugins/plugins-*.dat -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} Copied: vlc/repos/extra-i686/vlc.install (from rev 258814, vlc/trunk/vlc.install) =================================================================== --- extra-i686/vlc.install (rev 0) +++ extra-i686/vlc.install 2016-02-02 19:17:11 UTC (rev 258815) @@ -0,0 +1,18 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/vlc/plugins/plugins-*.dat +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-02-02 19:16:59 UTC (rev 258814) +++ extra-x86_64/PKGBUILD 2016-02-02 19:17:11 UTC (rev 258815) @@ -1,106 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Sarah Hay <sarah...@mb.sympatico.ca> -# Contributor: Martin Sandsmark <martin.sandsm...@kde.org> - -pkgname=vlc -pkgver=2.2.1 -pkgrel=11 -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' 'qt4' 'libproxy' - 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' - 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' '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') -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') -conflicts=('vlc-plugin') -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" - "lua53_compat.patch") -md5sums=('42273945758b521c408fabc7fd6d9946' - '96d3b346d9149ffb1b430066dfb6249a') - -prepare() { - cd "${srcdir}/${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 "${srcdir}/${pkgname}-${pkgver}" - - CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" \ - ./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 "${srcdir}/${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 -} Copied: vlc/repos/extra-x86_64/PKGBUILD (from rev 258814, vlc/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-02-02 19:17:11 UTC (rev 258815) @@ -0,0 +1,106 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Sarah Hay <sarah...@mb.sympatico.ca> +# Contributor: Martin Sandsmark <martin.sandsm...@kde.org> + +pkgname=vlc +pkgver=2.2.1 +pkgrel=12 +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' 'qt4' 'libproxy' + 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' + 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' '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') +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') +conflicts=('vlc-plugin') +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" + "lua53_compat.patch") +md5sums=('42273945758b521c408fabc7fd6d9946' + '96d3b346d9149ffb1b430066dfb6249a') + +prepare() { + cd "${srcdir}/${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 "${srcdir}/${pkgname}-${pkgver}" + + CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" \ + ./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 "${srcdir}/${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 +} Deleted: extra-x86_64/lua53_compat.patch =================================================================== --- extra-x86_64/lua53_compat.patch 2016-02-02 19:16:59 UTC (rev 258814) +++ extra-x86_64/lua53_compat.patch 2016-02-02 19:17:11 UTC (rev 258815) @@ -1,30 +0,0 @@ -commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23 -Author: Vinson Lee <v...@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 <v...@freedesktop.org> - Signed-off-by: Jean-Baptiste Kempf <j...@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 258814, vlc/trunk/lua53_compat.patch) =================================================================== --- extra-x86_64/lua53_compat.patch (rev 0) +++ extra-x86_64/lua53_compat.patch 2016-02-02 19:17:11 UTC (rev 258815) @@ -0,0 +1,30 @@ +commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23 +Author: Vinson Lee <v...@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 <v...@freedesktop.org> + Signed-off-by: Jean-Baptiste Kempf <j...@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/vlc.install =================================================================== --- extra-x86_64/vlc.install 2016-02-02 19:16:59 UTC (rev 258814) +++ extra-x86_64/vlc.install 2016-02-02 19:17:11 UTC (rev 258815) @@ -1,18 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/vlc/plugins/plugins-*.dat -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} Copied: vlc/repos/extra-x86_64/vlc.install (from rev 258814, vlc/trunk/vlc.install) =================================================================== --- extra-x86_64/vlc.install (rev 0) +++ extra-x86_64/vlc.install 2016-02-02 19:17:11 UTC (rev 258815) @@ -0,0 +1,18 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/vlc/plugins/plugins-*.dat +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +}